通风优化

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/ventilation/controller/AerationRecordController.java

@@ -98,19 +98,25 @@ public class AerationRecordController {
                     TCtldevinfo tCtldevinfo;
                     for (TCtldevinfo ctldevinfo : idObject) {
                         tCtldevinfo = aerationParameterService.getById(ctldevinfo.getId());
-                        tCtldevinfo.setvState(Integer.valueOf(ctldevinfo.getVstatue()));
-                        //tCtldevinfo.setVstatue(idObject.get(i).getVstatue());
-                        String dir = ConstUtils.directiveJoint("00", tCtldevinfo.getVcfcode(), tCtldevinfo.getVdevcode(), tCtldevinfo.getVdevkindcode(), "0" + ctldevinfo.getVstatue(), "");
-                        System.out.println(dir);
-                        // 16进制字符串转byte数组
-                        byte[] bytes = HexConvertUtils.hexStringToByte(dir);
-                        // 发送指令
-                        String soc = socketClient.startClient(bytes);
-                        result = TypeEnum.resultDispose(soc);
+                        // 设备状态
+                        String vstatue = tCtldevinfo.getVstatue();
+                        // 用户操作
+                        String vstatue1 = ctldevinfo.getVstatue();
+                        if (!vstatue1.equals(vstatue)) {
+                            tCtldevinfo.setvState(Integer.valueOf(ctldevinfo.getVstatue()));
+                            //tCtldevinfo.setVstatue(idObject.get(i).getVstatue());
+                            String dir = ConstUtils.directiveJoint("00", tCtldevinfo.getVcfcode(), tCtldevinfo.getVdevcode(), tCtldevinfo.getVdevkindcode(), "0" + vstatue1, "");
+                            System.out.println(dir);
+                            // 16进制字符串转byte数组
+                            byte[] bytes = HexConvertUtils.hexStringToByte(dir);
+                            // 发送指令
+                            String soc = socketClient.startClient(bytes);
+                            result = TypeEnum.resultDispose(soc);
+                        }
                         if (TypeEnum.S_SOH.getDesc().equals(result) && tCtldevinfo.getvState() != Integer.valueOf(tCtldevinfo.getVstatue())) {
                             aerationRecordService.save(tCtldevinfo, aerationTaskControl, orgId);
                         }
-                        Thread.currentThread().sleep(2000);
+//                        Thread.currentThread().sleep(2000);
                     }
                 }