优化远程开关机

src/main/java/com/shawn/web/controller/TEquipmentController.java

@@ -234,18 +234,44 @@ public class TEquipmentController extends BaseController<TEquipment, TEquipmentE
                         .setData("SUCCESS")
                         .setMessage("SUCCESS"));
     }
-
-    //机器关机
+    // 获取机器开关机状态
+    @PostMapping("/onoffStatus")
+    public ResponseEntity<?> onoffStatus(@RequestBody StatisticsParam param) {
+        String equipmentId = param.getEquipmentId();
+        Long id = Long.valueOf(equipmentId);
+        TEquipment equipments = tEquipmentService.selectEntityById(id);
+        PushUtils.push(equipments.getGtClientId(), "", "", PushUtils.buildJson("onoffstatus", "0").toString());
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(new ResultMessage()
+                        .setCode(true)
+                        .setData("SUCCESS")
+                        .setMessage("SUCCESS"));
+    }
+    //机器开关机
     @PostMapping("/onOff")
     public ResponseEntity<?> onOff(@RequestBody StatisticsParam param) {
         String equipmentId = param.getEquipmentId();
         Long id = Long.valueOf(equipmentId);
+//        TEquipment equipments = tEquipmentService.selectEntityById(id);
+//        PushUtils.push(equipments.getGtClientId(), "", "", PushUtils.buildJson("onoffstatus", "0").toString());
         TEquipment equipment = tEquipmentService.selectEntityById(id);
         if (equipment == null) {
 //			return ERROR_MESSAGE;
         }
         String eqeStatus = "1";
         String code = param.getAdminId();
+        //开机为1，关机为0
+        Integer intcode = Integer.valueOf(code);
+        Integer eqeStatus1 = equipment.getEqeStatus();
+        if(intcode==eqeStatus1){
+            return ResponseEntity
+                    .status(HttpStatus.OK)
+                    .body(new ResultMessage()
+                            .setCode(false)
+                            .setData("ERROT")
+                            .setMessage("操作异常"));
+        }
         if (code.equals("0")) {
             eqeStatus = "0";
             equipment.setEqeStatus(0);
@@ -253,9 +279,9 @@ public class TEquipmentController extends BaseController<TEquipment, TEquipmentE
             equipment.setEqeStatus(1);
         }
 
+        PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("eqeStatus", eqeStatus).toString());
 
         tEquipmentService.updateById(equipment);
-        PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("eqeStatus", eqeStatus).toString());
         return ResponseEntity
                 .status(HttpStatus.OK)
                 .body(new ResultMessage()