:space_invader:fix: 调整物料监控功能

src/main/java/com/szwl/controller/TParametersController.java

@@ -67,11 +67,11 @@ public class TParametersController {
         String status = parameters.getStatus();
         String clientId = parameters.getClientId();
         LambdaQueryWrapper<TParameters> query = Wrappers.lambdaQuery();
-        query.eq(TParameters::getEquipmentId,equipmentId);
-        query.eq(TParameters::getClientId,clientId);
-        query.eq(TParameters::getStatus,status);
+        query.eq(TParameters::getEquipmentId, equipmentId);
+        query.eq(TParameters::getClientId, clientId);
+        query.eq(TParameters::getStatus, status);
         List<TParameters> parametersList = tParametersService.list(query);
-        if(parametersList.size()==0){
+        if (parametersList.size() == 0) {
             return ResponseEntity
                     .status(HttpStatus.OK)
                     .body(new ResultMessage()
@@ -86,6 +86,7 @@ public class TParametersController {
                         .setData(parametersList)
                         .setMessage("SUCCESS"));
     }
+
     /**
      * 推送设备共同以及/设备参数
      *
@@ -107,64 +108,65 @@ public class TParametersController {
     }
 
 
-    @ApiOperation(value = "启用物料监控")
+//    @ApiOperation(value = "启用物料监控")
+//    @PostMapping("/enableMaterial")
+//    public ResponseModel<?> enableMaterial(@RequestBody TParameters parameters) {
+//        Long equipmentId = parameters.getEquipmentId();
+//        if (equipmentId == null) {
+//            return R.fail(ResponseCodesEnum.A0001, "设备id不能为空");
+//        }
+////        TParameters tParameters = tParametersService.getById(equipmentId);
+////        if (Objects.isNull(tParameters)) {
+////            TParameters tParameters1 = new TParameters();
+////        }
+//        TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipmentId);
+//        if (Objects.isNull(equipmentDesc)) {
+//            TEquipmentDesc tEquipmentDesc = new TEquipmentDesc();
+//            tEquipmentDesc.setEquipmentId(equipmentId);
+//            tEquipmentDesc.setIsMaterialUse("1");
+//            equipmentDescService.saveOrUpdate(tEquipmentDesc);
+//        } else {
+//            String isMaterialUse = equipmentDesc.getIsMaterialUse();
+//            if (StringUtils.isNotEmpty(isMaterialUse) && "1".equals(isMaterialUse)) {
+//                return R.ok(ResponseCodesEnum.ALL_OK, "已开启ENABLED");
+//            }
+//            equipmentDesc.setIsMaterialUse("1");
+//            equipmentDescService.saveOrUpdate(equipmentDesc);
+//        }
+//
+//        TEquipment equipment = tEquipmentService.getById(equipmentId);
+//        tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("Param", "M502" + ":" + "1").toString());
+//
+//        return R.ok(ResponseCodesEnum.ALL_OK, "已发送Send");
+//    }
+
+    @ApiOperation(value = "物料监控")
     @PostMapping("/enableMaterial")
     public ResponseModel<?> enableMaterial(@RequestBody TParameters parameters) {
         Long equipmentId = parameters.getEquipmentId();
         if (equipmentId == null) {
-            return R.fail(ResponseCodesEnum.A0001,"设备id不能为空");
-        }
-//        TParameters tParameters = tParametersService.getById(equipmentId);
-//        if (Objects.isNull(tParameters)) {
-//            TParameters tParameters1 = new TParameters();
-//        }
-        TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipmentId);
-        if (Objects.isNull(equipmentDesc)) {
-            TEquipmentDesc tEquipmentDesc = new TEquipmentDesc();
-            tEquipmentDesc.setEquipmentId(equipmentId);
-            tEquipmentDesc.setIsMaterialUse("1");
-            equipmentDescService.saveOrUpdate(tEquipmentDesc);
-        } else {
-            String isMaterialUse = equipmentDesc.getIsMaterialUse();
-            if (StringUtils.isNotEmpty(isMaterialUse) && "1".equals(isMaterialUse)) {
-                return R.ok(ResponseCodesEnum.ALL_OK,"已开启ENABLED");
-            }
-            equipmentDesc.setIsMaterialUse("1");
-            equipmentDescService.saveOrUpdate(equipmentDesc);
+            return R.fail(ResponseCodesEnum.A0001, "设备id不能为空");
         }
+        String materialMonitorStatus = parameters.getMaterialMonitorStatus();
 
-        TEquipment equipment = tEquipmentService.getById(equipmentId);
-        tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("Param", "M502" + ":" + "1").toString());
-
-        return R.ok(ResponseCodesEnum.ALL_OK,"开启物料监控功能成功SUCCESS");
-    }
-
-    @ApiOperation(value = "关闭物料监控")
-    @PostMapping("/disableMaterial")
-    public ResponseModel<?> disableMaterial(@RequestBody TParameters parameters) {
-        Long equipmentId = parameters.getEquipmentId();
-        if (equipmentId == null) {
-            return R.fail(ResponseCodesEnum.A0001,"设备id不能为空");
-        }
         TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipmentId);
         if (Objects.isNull(equipmentDesc)) {
             TEquipmentDesc tEquipmentDesc = new TEquipmentDesc();
             tEquipmentDesc.setEquipmentId(equipmentId);
-            tEquipmentDesc.setIsMaterialUse("0");
+            tEquipmentDesc.setIsMaterialUse("0"); // 默认未启用
             equipmentDescService.saveOrUpdate(tEquipmentDesc);
-        } else {
-            String isMaterialUse = equipmentDesc.getIsMaterialUse();
-            if (StringUtils.isNotEmpty(isMaterialUse) && "0".equals(isMaterialUse)) {
-                return R.ok(ResponseCodesEnum.ALL_OK,"已关闭CLOSED");
-            }
-            equipmentDesc.setIsMaterialUse("0");
-            equipmentDescService.saveOrUpdate(equipmentDesc);
         }
-
         TEquipment equipment = tEquipmentService.getById(equipmentId);
-        tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("Param", "M502" + ":" + "0").toString());
+        if ("1".equals(materialMonitorStatus)) { // 当前是开启状态，用户点击后通知关闭
+//            equipmentDesc.setIsMaterialUse("0");
+            tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("Param", "M502" + ":" + "0").toString());
+            return R.ok(ResponseCodesEnum.ALL_OK, "已通知关闭");
+        } else { // 当前是未开启状态，用户点击后通知启用
+//            equipmentDesc.setIsMaterialUse("1");
+            tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("Param", "M502" + ":" + "1").toString());
+            return R.ok(ResponseCodesEnum.ALL_OK, "已通知开启");
+        }
 
-        return R.ok(ResponseCodesEnum.ALL_OK,"物料监控已关闭CLOSED");
     }
 
 }

src/main/java/com/szwl/model/entity/TParameters.java

@@ -46,5 +46,7 @@ public class TParameters implements Serializable {
     @ApiModelProperty(value = "参数类型;0：通用参数；1：进阶参数；2：调试页参数；3：湿度参数")
     private String status;
 
+    @ApiModelProperty(value="物料监控开关，开启为1，关闭为0")
+    private String materialMonitorStatus;
 
 }

src/test/java/com/szwl/SpringBootConsoleApplication.java

@@ -0,0 +1,29 @@
+package com.szwl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import javax.sql.DataSource;
+
+@SpringBootApplication
+public class SpringBootConsoleApplication implements CommandLineRunner {
+
+    @Autowired
+    DataSource dataSource;
+
+    public static void main(String[] args) throws Exception {
+        SpringApplication.run(SpringBootConsoleApplication.class, args);
+    }
+
+    @Override
+    public void run(String... args) throws Exception {
+
+        System.out.println("DATASOURCE = " + dataSource);
+        System.out.println("DATASOURCE = " + dataSource);
+        System.out.println("DATASOURCE = " + dataSource);
+
+    }
+
+}