Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/iflytop/gd/hardware/service/HardwareService.java

src/main/java/com/iflytop/gd/app/cmd/debug/ColdTrapStartHeatingCommandHandler.java

@@ -2,7 +2,11 @@ package com.iflytop.gd.app.cmd.debug;
 
 import com.iflytop.gd.app.core.BaseCommandHandler;
 import com.iflytop.gd.app.model.dto.CmdDTO;
+import com.iflytop.gd.app.service.DeviceCommandService;
 import com.iflytop.gd.common.annotation.CommandMapping;
+import com.iflytop.gd.common.cmd.CommandFuture;
+import com.iflytop.gd.common.cmd.DeviceCommand;
+import com.iflytop.gd.common.cmd.DeviceCommandGenerator;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -15,9 +19,13 @@ import org.springframework.stereotype.Component;
 @RequiredArgsConstructor
 @CommandMapping("debug_cold_trap_start_heating")
 public class ColdTrapStartHeatingCommandHandler extends BaseCommandHandler {
+    private final DeviceCommandService deviceCommandService;
 
     @Override
-    public void handle(CmdDTO cmdDTO) {
+    public void handle(CmdDTO cmdDTO) throws Exception {
+        DeviceCommand deviceCommand = DeviceCommandGenerator.coldTrapOpenHeart();
+        CommandFuture deviceCommandFuture = deviceCommandService.sendCommand(cmdDTO.getCommandId(), cmdDTO.getCommand(), deviceCommand);
+        commandWait(deviceCommandFuture);
 
     }
 }

src/main/java/com/iflytop/gd/app/controller/CmdDebugController.java

@@ -33,7 +33,7 @@ public class CmdDebugController {
             log.info("收到调试指令{}", commandName);
             CommandHandler commandHandler = registry.getCommandHandler(commandName);
             log.info("找到指令处理器{}", commandHandler.getClass().getName());
-            CompletableFuture.runAsync(() -> commandHandler.handle(cmdDTO));
+            commandHandler.handle(cmdDTO);
             log.info("指令处理器提交异步执行");
         } catch (UnSupportCommandException exception) {
             log.error("未找到对应的调试指令{}", commandName);

src/main/java/com/iflytop/gd/app/service/DeviceCommandService.java

@@ -0,0 +1,96 @@
+package com.iflytop.gd.app.service;
+
+
+import cn.hutool.json.JSONObject;
+import com.iflytop.gd.common.cmd.CommandFuture;
+import com.iflytop.gd.common.cmd.CyclicNumberGenerator;
+import com.iflytop.gd.common.cmd.DeviceCommand;
+import com.iflytop.gd.hardware.service.HardwareService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DeviceCommandService {
+
+    private final ConcurrentMap<Integer, CommandFuture> commandFutureMap = new ConcurrentHashMap<>();
+
+    private final WebSocketService webSocketService;
+    private final HardwareService hardwareService;
+
+
+
+    public CommandFuture executeCommand(DeviceCommand cmdToDevice) {
+        int cmdId = CyclicNumberGenerator.getInstance().generateNumber();
+        cmdToDevice.setCmdId(cmdId);
+        CommandFuture cmdFuture = new CommandFuture();
+        commandFutureMap.put(cmdToDevice.getCmdId(), cmdFuture);
+        cmdFuture.setStartSendTime(System.currentTimeMillis());
+        if (!hardwareService.sendCommand(cmdToDevice)) {
+            commandFutureMap.remove(cmdToDevice.getCmdId());
+            throw new RuntimeException("向设备发送指令失败");
+        }
+
+        cmdFuture.getResponseFuture().whenComplete((result, ex) -> {
+            commandFutureMap.remove(cmdToDevice.getCmdId());
+        });
+
+        return cmdFuture;
+    }
+
+
+    public CommandFuture sendCommandNoFront(DeviceCommand deviceCommand) {
+        return executeCommand(deviceCommand);
+    }
+
+    public CommandFuture sendCommand(String cmdId, String cmdCode, DeviceCommand deviceCommand){
+        CommandFuture commandFuture = executeCommand(deviceCommand);
+        commandFuture.setCmdId(cmdId);
+        commandFuture.setCmdCode(cmdCode);
+        commandFuture.setDeviceCommand(deviceCommand);
+//        webSocketService.push(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.DEVICE_SEND, deviceCommand.getCmdName() + "指令，已发给设备", deviceCommand));
+        return commandFuture;
+    }
+
+    public void completeCommandResponse(JSONObject deviceResult) {
+        Integer cmdId = deviceResult.getInt("cmdId");
+        if (cmdId != null) {
+            CommandFuture future = commandFutureMap.get(cmdId);
+            if (future != null) {
+                future.setEndSendTime(System.currentTimeMillis());
+                Boolean success = deviceResult.getBool("success"); //数据验证
+                if (success == null || !success) { //response失败
+                    if (future.getCmdId() != null) {
+//                        webSocketService.push(FrontResponseGenerator.generateJson(future.getCmdId(), future.getCmdCode(), CommandStatus.DEVICE_ERROR,
+//                                future.getDeviceCommand().getCmdName() + "指令，设备response错误，耗时:" + (future.getEndSendTime() - future.getStartSendTime()), deviceResult));
+                    }
+                    future.completeResponseExceptionally(new RuntimeException("response失败:" + deviceResult));
+                } else {
+                    if (future.getCmdId() != null) {
+//                        webSocketService.push(FrontResponseGenerator.generateJson(future.getCmdId(), future.getCmdCode(), CommandStatus.DEVICE_RESULT,
+//                                future.getDeviceCommand().getCmdName() + "指令，设备response正常，耗时:" + (future.getEndSendTime() - future.getStartSendTime()), deviceResult));
+                    }
+                    future.completeResponse(deviceResult);
+                }
+            }
+        }
+    }
+
+    /**
+     * 取消等待中的future并从map中移除
+     */
+    public synchronized void releaseAllCommandFutures() {
+        for (Integer key : commandFutureMap.keySet()) {
+            CommandFuture future = commandFutureMap.remove(key);
+            if (future != null) {
+                future.getResponseFuture().cancel(true);
+            }
+        }
+    }
+
+}

src/main/java/com/iflytop/gd/common/cmd/CommandHandler.java

@@ -3,5 +3,5 @@ package com.iflytop.gd.common.cmd;
 import com.iflytop.gd.app.model.dto.CmdDTO;
 
 public interface CommandHandler {
-    void handle(CmdDTO cmdDTO);
+    void handle(CmdDTO cmdDTO) throws Exception;
 }

src/main/java/com/iflytop/gd/hardware/service/HardwareService.java

@@ -6,11 +6,14 @@ import com.iflytop.gd.common.cmd.DeviceCommand;
 import com.iflytop.gd.common.enums.cmd.CmdDevice;
 import com.iflytop.gd.hardware.command.CommandHandler;
 import com.iflytop.gd.hardware.command.SupportMethod;
+import org.springframework.stereotype.Component;
 
 import java.security.InvalidParameterException;
 import java.util.HashMap;
 import java.util.Map;
 
+
+@Component
 public class HardwareService {
     private final Map<CmdDevice, CommandHandler> cmdHandlers = new HashMap<>();
 
@@ -19,7 +22,7 @@ public class HardwareService {
 //        cmdHandlers.put(CmdDevice.door, new FanHandler(0));
     }
 
-    boolean sendCommand(DeviceCommand cmd)
+    public boolean sendCommand(DeviceCommand cmd)
     {
         try {
             String strMethod = cmd.getCmdCode();