fix:指令执行时的设备状态

src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStartCommand.java

@@ -37,11 +37,11 @@ public class AnnealStartCommand extends BaseCommandHandler {
                 //设置加热区目标温度
                 deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).setTargetTemperature(heatModuleState.getAnnealTemperature());
                 //从系统状态中获取指定加热区设定的退火温度数值
-                double temperature = deviceStateService.getHeatModuleState(heatModuleId).getAnnealTemperature();
+                double temperature = deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).getAnnealTemperature();
                 //开启退火
                 heatModuleService.heatRodOpen(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId, temperature);
                 //设置加热区状态 正在退火
-                deviceStateService.setHeatModuleStateAnnealing(heatModuleId,true);
+                deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).setAnnealing(true);
 
             }
         });

src/main/java/com/iflytop/sgs/app/cmd/control/AnnealStopCommand.java

@@ -34,7 +34,7 @@ public class AnnealStopCommand extends BaseCommandHandler {
                 //关闭加热
                 heatModuleService.heatRodClose(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId);
                 //设置加热区状态 退火结束
-                deviceStateService.setHeatModuleStateAnnealing(heatModuleId,false);
+                deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).setAnnealing(false);
             }
         });
     }

src/main/java/com/iflytop/sgs/app/cmd/control/CleanStartCommand.java

@@ -28,16 +28,7 @@ public class CleanStartCommand extends BaseCommandHandler {
     public CompletableFuture<Void> handle(CmdDTO cmdDTO) {
         JSONArray heatIdJsonArray = cmdDTO.getJSONArrayParam("heatId");
         return runAsync(() -> {
-            for (int i = 0; i < heatIdJsonArray.size(); i++) {
-                String heatId = heatIdJsonArray.getStr(i);
-                HeatModuleCode heatModuleId = HeatModuleCode.valueOf(heatId);
-                //从系统状态中获取指定加热区设定的温度数值
-                double temperature = deviceStateService.getHeatModuleState(heatModuleId).getTemperature();
-                //开启加热
-                heatModuleService.heatRodOpen(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId, temperature);
-                deviceStateService.setHeatModuleStateHeating(heatModuleId, true);//设置状态加热中
 
-            }
         });
     }
 }

src/main/java/com/iflytop/sgs/app/cmd/control/CleanStopCommand.java

@@ -28,16 +28,7 @@ public class CleanStopCommand extends BaseCommandHandler {
     public CompletableFuture<Void> handle(CmdDTO cmdDTO) {
         JSONArray heatIdJsonArray = cmdDTO.getJSONArrayParam("heatId");
         return runAsync(() -> {
-            for (int i = 0; i < heatIdJsonArray.size(); i++) {
-                String heatId = heatIdJsonArray.getStr(i);
-                HeatModuleCode heatModuleId = HeatModuleCode.valueOf(heatId);
-                //从系统状态中获取指定加热区设定的温度数值
-                double temperature = deviceStateService.getHeatModuleState(heatModuleId).getTemperature();
-                //开启加热
-                heatModuleService.heatRodOpen(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId, temperature);
-                deviceStateService.setHeatModuleStateHeating(heatModuleId, true);//设置状态加热中
 
-            }
         });
     }
 }

src/main/java/com/iflytop/sgs/app/cmd/control/DoorCloseCommand.java

@@ -28,7 +28,7 @@ public class DoorCloseCommand extends BaseCommandHandler {
             //门电机回原点
             doorModuleService.doorOrigin(cmdDTO.getCommandId(), cmdDTO.getCommand());
             //将门状态设置为false
-            deviceStateService.setDoorStatus(false);
+            deviceStateService.getDeviceState().getDoorModule().setOpen(false);
         });
     }
 }

src/main/java/com/iflytop/sgs/app/cmd/control/DoorOpenCommand.java

@@ -30,10 +30,10 @@ public class DoorOpenCommand extends BaseCommandHandler {
         return runAsync(() -> {
             //从数据库获取开门距离
             Double doorOpenDistance = devicePositionService.getPosition(DevicePositionCode.doorOpen).getDistance();
-            //门电机移动开门距离
+            //电机移动开门距离
             doorModuleService.doorMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), doorOpenDistance);
             //将门状态设置为true
-            deviceStateService.setDoorStatus(true);
+            deviceStateService.getDeviceState().getDoorModule().setOpen(true);
         });
     }
 }

src/main/java/com/iflytop/sgs/app/cmd/control/DoorOriginCommand.java

@@ -29,9 +29,10 @@ public class DoorOriginCommand extends BaseCommandHandler {
         return runAsync(() -> {
             //门电机回原点
             doorModuleService.doorOrigin(cmdDTO.getCommandId(), cmdDTO.getCommand());
-            selfTestService.getSelfTestState().setDoorOrigin(true);//设置是否在原点状态
+            //设置是否在原点状态
+            selfTestService.getSelfTestState().setDoorOrigin(true);
             //将门状态设置为false
-            deviceStateService.setDoorStatus(false);
+            deviceStateService.getDeviceState().getDoorModule().setOpen(false);
         });
     }
 }

src/main/java/com/iflytop/sgs/app/cmd/control/DryStartCommand.java

@@ -33,15 +33,15 @@ public class DryStartCommand extends BaseCommandHandler {
                 //获取当前加热区
                 String heatId = heatIdJsonArray.getStr(i);
                 HeatModuleCode heatModuleId = HeatModuleCode.valueOf(heatId);
-                HeatModuleState heatModuleState = deviceStateService.getHeatModuleState(heatModuleId);
+                HeatModuleState heatModuleState = deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId);
                 //设置加热区目标温度
-                deviceStateService.setHeatModuleStateTargetTemperature(heatModuleId, heatModuleState.getDryTemperature());
+                deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).setTargetTemperature(heatModuleState.getDryTemperature());
                 //从系统状态中获取指定加热区设定的烘干温度数值
-                double temperature = deviceStateService.getHeatModuleState(heatModuleId).getDryTemperature();
+                double temperature = deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).getDryTemperature();
                 //开启退火
                 deviceCommandUtilService.heatRodOpen(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId, temperature);
                 //设置加热区状态 正在烘干
-                deviceStateService.setHeatModuleStateAnnealing(heatModuleId, true);
+                deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).setDrying(true);
 
             }
         });

src/main/java/com/iflytop/sgs/app/cmd/control/DryStopCommand.java

@@ -34,7 +34,7 @@ public class DryStopCommand extends BaseCommandHandler {
                 //关闭加热
                 heatModuleService.heatRodClose(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId);
                 //设置加热区状态 退火结束
-                deviceStateService.setHeatModuleStateDrying(heatModuleId, false);
+                deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).setDrying(false);
 
             }
         });

src/main/java/com/iflytop/sgs/app/cmd/control/FanStartCommand.java

@@ -32,7 +32,7 @@ public class FanStartCommand extends BaseCommandHandler {
                 String heatId = heatIdJsonArray.getStr(i);
                 HeatModuleCode heatModuleId = HeatModuleCode.valueOf(heatId);
                 heatModuleService.fanStart(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId);
-                deviceStateService.setHeatModuleStateFanOpen(heatModuleId, true);
+                deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).setFanOpen(true);
             }
         });
     }

src/main/java/com/iflytop/sgs/app/cmd/control/FanStopCommand.java

@@ -32,7 +32,7 @@ public class FanStopCommand extends BaseCommandHandler {
                 String heatId = heatIdJsonArray.getStr(i);
                 HeatModuleCode heatModuleId = HeatModuleCode.valueOf(heatId);
                 heatModuleService.fanClose(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId);
-                deviceStateService.setHeatModuleStateFanOpen(heatModuleId, false);
+                deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).setFanOpen(false);
             }
         });
     }

src/main/java/com/iflytop/sgs/app/cmd/control/HeatStartCommand.java

@@ -33,15 +33,15 @@ public class HeatStartCommand extends BaseCommandHandler {
                 //获取当前加热区
                 String heatId = heatIdJsonArray.getStr(i);
                 HeatModuleCode heatModuleId = HeatModuleCode.valueOf(heatId);
-                HeatModuleState heatModuleState = deviceStateService.getHeatModuleState(heatModuleId);
+                HeatModuleState heatModuleState = deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId);
                 //设置加热区目标温度
-                deviceStateService.setHeatModuleStateTargetTemperature(heatModuleId, heatModuleState.getHeatTemperature());
+                deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).setTargetTemperature(heatModuleState.getHeatTemperature());
                 //从系统状态中获取指定加热区设定的烘干温度数值
-                double temperature = deviceStateService.getHeatModuleState(heatModuleId).getHeatTemperature();
+                double temperature = deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).getHeatTemperature();
                 //开启加热
                 heatModuleService.heatRodOpen(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId, temperature);
                 //设置加热区状态 正在加热
-                deviceStateService.setHeatModuleStateHeating(heatModuleId, true);
+                deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).setHeating(true);
 
             }
         });

src/main/java/com/iflytop/sgs/app/cmd/control/HeatStopCommand.java

@@ -33,7 +33,7 @@ public class HeatStopCommand extends BaseCommandHandler {
                 HeatModuleCode heatModuleId = HeatModuleCode.valueOf(heatId);
                 //关闭加热
                 heatModuleService.heatRodClose(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId);
-                deviceStateService.setHeatModuleStateHeating(heatModuleId, false);//设置状态停止加热
+                deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleId).setHeating(false);
             }
         });
     }

src/main/java/com/iflytop/sgs/app/cmd/control/MoveToHeatAreaCommand.java

@@ -71,7 +71,6 @@ public class MoveToHeatAreaCommand extends BaseCommandHandler {
                 //z轴返回原点
                 solutionModuleService.motorLiquidMove(0);
             } finally {
-                deviceStateService.setGantryArmStateIdle(true);
                 deviceStateService.getCommandMutexState().get().setMoveToHeatAreaCommandExecuting(false);
             }
         });

src/main/java/com/iflytop/sgs/app/cmd/control/MoveToSolutionAreaCommand.java

@@ -77,7 +77,6 @@ public class MoveToSolutionAreaCommand extends BaseCommandHandler {
                 //机械臂移动到加液区
                 transferModuleService.transferMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), liquidAreaTrayPoint3D);
             } finally {
-                deviceStateService.setGantryArmStateIdle(true);
                 deviceStateService.getCommandMutexState().get().setMoveToSolutionAreaCommandExecuting(false);
             }
         });

src/main/java/com/iflytop/sgs/app/cmd/control/SolutionAddCommand.java

@@ -24,7 +24,6 @@ public class SolutionAddCommand extends BaseCommandHandler {
 
     @Override
     public CompletableFuture<Void> handle(CmdDTO cmdDTO) {
-        deviceStateService.setSolutionModuleStatePumping(true);
         return runAsync(() -> {
 
         });

src/main/java/com/iflytop/sgs/app/cmd/control/SolutionReduceCommand.java

@@ -24,7 +24,6 @@ public class SolutionReduceCommand extends BaseCommandHandler {
 
     @Override
     public CompletableFuture<Void> handle(CmdDTO cmdDTO) {
-        deviceStateService.setSolutionModuleStatePumping(true);
         return runAsync(() -> {
         });
     }