From 71667ba30c64f9126566e81ed783d670d01aff2c Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Thu, 20 Feb 2025 11:33:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8C=87=E4=BB=A4=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/qyft/gd/controller/CMDController.java    | 13 +++++++++----
 src/main/java/com/qyft/gd/model/dto/CmdInjectFluidDTO.java |  7 ++++---
 src/main/java/com/qyft/gd/service/CMDService.java          |  3 ++-
 src/main/resources/mapper/ContainerMapper.xml              |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/qyft/gd/controller/CMDController.java b/src/main/java/com/qyft/gd/controller/CMDController.java
index c502f38..8770fab 100644
--- a/src/main/java/com/qyft/gd/controller/CMDController.java
+++ b/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("操作成功");
diff --git a/src/main/java/com/qyft/gd/model/dto/CmdInjectFluidDTO.java b/src/main/java/com/qyft/gd/model/dto/CmdInjectFluidDTO.java
index 7cf7c43..13b0ae1 100644
--- a/src/main/java/com/qyft/gd/model/dto/CmdInjectFluidDTO.java
+++ b/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;
 }
diff --git a/src/main/java/com/qyft/gd/service/CMDService.java b/src/main/java/com/qyft/gd/service/CMDService.java
index 416ba7f..2f76a3e 100644
--- a/src/main/java/com/qyft/gd/service/CMDService.java
+++ b/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;
     }
 }
diff --git a/src/main/resources/mapper/ContainerMapper.xml b/src/main/resources/mapper/ContainerMapper.xml
index 9be1189..c84e1b6 100644
--- a/src/main/resources/mapper/ContainerMapper.xml
+++ b/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>
\ No newline at end of file