fix: 指令执行

src/main/java/com/qyft/gd/controller/CMDController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 
 @Tag(name = "控制指令")
@@ -53,7 +54,9 @@ public class CMDController {
             CMDForm cmdForm = new CMDForm();
             cmdForm.setCommand("startHeat");
             cmdForm.setCommandId(UUID.randomUUID().toString());
-            cmdForm.getParams().put("areaId", i);
+            Map<String, Object> params = new HashMap<>();
+            params.put("areaId", i);
+            cmdForm.setParams(params);
             cmdService.executeCommand(cmdForm);
         }
         return Result.success("操作成功");
@@ -66,9 +69,11 @@ public class CMDController {
             CMDForm cmdForm = new CMDForm();
             cmdForm.setCommand("injectFluid");
             cmdForm.setCommandId(UUID.randomUUID().toString());
-            cmdForm.getParams().put("tubeNum", cmdInjectFluidDTO.getTubeNum());
-            cmdForm.getParams().put("solutionId", cmdInjectFluidDTO.getSolutionId());
-            cmdForm.getParams().put("volume", cmdInjectFluidDTO.getVolume());
+            Map<String, Object> params = new HashMap<>();
+            params.put("tubeNum", cmdInjectFluidDTO.getTubeNum());
+            params.put("solutionId", cmdInjectFluidDTO.getSolutionId());
+            params.put("volume", cmdInjectFluidDTO.getVolume());
+            cmdForm.setParams(params);
             cmdService.executeCommand(cmdForm);
         }
         return Result.success("操作成功");

src/main/java/com/qyft/gd/model/dto/CmdInjectFluidDTO.java

@@ -1,14 +1,15 @@
 package com.qyft.gd.model.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.Data;
 
 @Data
 public class CmdInjectFluidDTO {
     @Schema(description = "试管编号")
-    private Long tubeNum;
+    private Integer tubeNum;
     @Schema(description = "溶液id")
-    private Long solutionId;
+    private Integer solutionId;
     @Schema(description = "容量")
-    private Long volume;
+    private Integer volume;
 }

src/main/java/com/qyft/gd/service/CMDService.java

@@ -348,7 +348,8 @@ public class CMDService {
         if (command == null) {
             return false;
         }
-        command.apply(form.getParams());
+        List<Supplier<Boolean>> cmdList = command.apply(form.getParams());
+        initExecutorThread(cmdList);
         return true;
     }
 }

src/main/resources/mapper/ContainerMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qyft.gd.mapper.ContainerMapper">
-    <select id="selectAll" resultType="com.qyft.gd.model.entity.Container">
+    <select id="selectAll" resultType="com.qyft.gd.model.vo.ContainerListVO">
         select * from container
     </select>
 </mapper>