feat:系统配置表sql

sql/demo.sql

@@ -34,3 +34,28 @@ INSERT INTO sys_role (name, code)
 VALUES
     ('管理员', 'ADMIN'),
     ('普通用户', 'USER');
+
+-- 创建 系统配置 表
+CREATE TABLE IF NOT EXISTS sys_settings (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    parent_id INTEGER NOT NULL,
+    name TEXT NOT NULL,
+    code TEXT,
+    value TEXT
+);
+INSERT INTO sys_settings (id, parent_id, name, code, value)
+VALUES
+    (1, -1, '加热区域配置', '', '' ),
+    (2, 1, 'A1', 'H1', '1,1,1'),
+    (3, 1, 'A2', 'H2', '2,2,2'),
+    (4, 1, 'A3', 'H3', '3,3,3'),
+    (5, 1, 'A4', 'H4', '4,4,4'),
+    (6, 1, 'A5', 'H5', '5,5,5'),
+    (7, 1, 'A6', 'H6', '6,6,6'),
+    (8, -1, '加液区域配置', '', '' ),
+    (9, 8, '加液区', 'A7', '7,7,7' ),
+    (10, -1, '拍子区域配置', '', '' ),
+    (11, 10, '拍子存放区', 'A8', '8,8,8' ),
+    (12, -1, '其他系统配置', '', '' ),
+    (13, 12, '溶液量低提示', '', '300' ),
+    (14, 12, '异常处理区', '', '7' ),

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

@@ -40,7 +40,6 @@ public class CMDService {
         commandMap.put(Commands.TAKE_OFF_CAP,  this::takeOffCap);
         commandMap.put(Commands.PUT_BACK_CAP,  this::putBackCap);
         commandMap.put(Commands.MOVE_MACHINE_ARM,  this::moveMachineArm);
-        commandMap.put(Commands.GET_LIQUID_AMOUNT,  this::getLiquidAmount);
         commandMap.put(Commands.MOVE_TUBE, this::moveTube);
     }
 // 移动单个试管
@@ -48,25 +47,29 @@ public class CMDService {
         //TODO 执行指令
         return true;
     }
-// 当前溶液数量
-    private Boolean getLiquidAmount(CMDForm cmdForm) {
-        //TODO 执行指令
-        return true;
-    }
+
 // 机械臂
     private Boolean moveMachineArm(CMDForm cmdForm) {
-        //TODO 执行指令
-        return true;
+        List<Supplier<Boolean>> cmdList = new ArrayList<>();
+        cmdList.add(() -> deviceService.moveRailArmToPoint(11,22,33));
+        return run(cmdList);
     }
 // 装回盖子
     private Boolean putBackCap(CMDForm cmdForm) {
-        //TODO 执行指令
-        return true;
+        List<Supplier<Boolean>> cmdList = new ArrayList<>();
+        cmdList.add(() -> deviceService.moveRailArmToPoint(11,22,33));
+        cmdList.add(() -> deviceService.openClaw());
+        cmdList.add(() -> deviceService.moveRailArmToPoint(4,54,6));
+        cmdList.add(() -> deviceService.closeClaw());
+        return run(cmdList);
     }
 // 取试管架盖
     private Boolean takeOffCap(CMDForm cmdForm) {
-        //TODO 执行指令
-        return true;
+        List<Supplier<Boolean>> cmdList = new ArrayList<>();
+        cmdList.add(() -> deviceService.moveRailArmToPoint(13,42,53));
+        cmdList.add(() -> deviceService.openClaw());
+        cmdList.add(() -> deviceService.moveRailArmToPoint(4,5,6));
+        return run(cmdList);
     }
 // 拍照
     private Boolean takePhoto(CMDForm cmdForm) {