阈值

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnergyWarningThresholdController.java

@@ -8,12 +8,15 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.EnergyWarningThreshold;
+import com.huimv.guowei.admin.entity.EnvDeviceChip;
 import com.huimv.guowei.admin.service.IEnergyWarningThresholdService;
+import com.huimv.guowei.admin.service.IEnvDeviceChipService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,10 +33,11 @@ import java.util.Map;
 public class EnergyWarningThresholdController {
     @Resource
     private IEnergyWarningThresholdService energyWarningThresholdService;
+    @Resource
+    private IEnvDeviceChipService envDeviceChipService;
 
     @PostMapping("/saveThreshold")
     @Transactional
-    //TODO 目前先写死 水线芯片号
     public Result saveThreshold(@RequestBody Map<String ,String> paramsMap){
         String maxWater = paramsMap.get("maxWater");
         String maxEle = paramsMap.get("maxEle");
@@ -41,6 +45,10 @@ public class EnergyWarningThresholdController {
         String maxWaterLine2 = paramsMap.get("maxWaterLine2");
         String maxWaterLine3 = paramsMap.get("maxWaterLine3");
         String maxWaterLine4 = paramsMap.get("maxWaterLine4");
+        String maxWaterLinePressure1 = paramsMap.get("maxWaterLinePressure1");
+        String maxWaterLinePressure2 = paramsMap.get("maxWaterLinePressure2");
+        String maxWaterLinePressure3 = paramsMap.get("maxWaterLinePressure3");
+        String maxWaterLinePressure4 = paramsMap.get("maxWaterLinePressure4");
         String farmId = paramsMap.get("farmId");
 
         maxWater = nullParameter(maxWater);
@@ -49,6 +57,10 @@ public class EnergyWarningThresholdController {
         maxWaterLine2 = nullParameter(maxWaterLine2);
         maxWaterLine3 = nullParameter(maxWaterLine3);
         maxWaterLine4 = nullParameter(maxWaterLine4);
+        maxWaterLinePressure1 = nullParameter(maxWaterLinePressure1);
+        maxWaterLinePressure2 = nullParameter(maxWaterLinePressure2);
+        maxWaterLinePressure3 = nullParameter(maxWaterLinePressure3);
+        maxWaterLinePressure4 = nullParameter(maxWaterLinePressure4);
 
         EnergyWarningThreshold energyWarningThreshold0 = new EnergyWarningThreshold();
         energyWarningThreshold0.setMaxValue(maxWater);
@@ -66,41 +78,49 @@ public class EnergyWarningThresholdController {
                 .eq("farm_id",farmId)
                 .eq("warning_type",1));
 
-        EnergyWarningThreshold energyWarningThreshold2 = new EnergyWarningThreshold();
-        energyWarningThreshold2.setMaxValue(maxWaterLine1);
-        energyWarningThreshold2.setFarmId(Integer.parseInt(farmId));
-        energyWarningThreshold2.setWarningType(2);
-        energyWarningThreshold2.setChipCode("1001");
-        energyWarningThresholdService.saveOrUpdate(energyWarningThreshold2,new UpdateWrapper<EnergyWarningThreshold>()
-                .eq("farm_id",farmId)
-                .eq("warning_type",2).eq("chip_code","1001"));
-
-        EnergyWarningThreshold energyWarningThreshold3 = new EnergyWarningThreshold();
-        energyWarningThreshold3.setMaxValue(maxWaterLine2);
-        energyWarningThreshold3.setFarmId(Integer.parseInt(farmId));
-        energyWarningThreshold3.setWarningType(2);
-        energyWarningThreshold3.setChipCode("1002");
-        energyWarningThresholdService.saveOrUpdate(energyWarningThreshold3,new UpdateWrapper<EnergyWarningThreshold>()
-                .eq("farm_id",farmId)
-                .eq("warning_type",2).eq("chip_code","1002"));
-
-        EnergyWarningThreshold energyWarningThreshold4 = new EnergyWarningThreshold();
-        energyWarningThreshold4.setMaxValue(maxWaterLine3);
-        energyWarningThreshold4.setFarmId(Integer.parseInt(farmId));
-        energyWarningThreshold4.setWarningType(2);
-        energyWarningThreshold4.setChipCode("1003");
-        energyWarningThresholdService.saveOrUpdate(energyWarningThreshold4,new UpdateWrapper<EnergyWarningThreshold>()
-                .eq("farm_id",farmId)
-                .eq("warning_type",2).eq("chip_code","1003"));
+        List<EnvDeviceChip> energyWarningThresholdList = envDeviceChipService.list(new QueryWrapper<EnvDeviceChip>().eq("chip_type",3));
+        for (int i = 0; i < energyWarningThresholdList.size(); i++) {
+            EnergyWarningThreshold energyWarningThreshold = new EnergyWarningThreshold();
+            String maxWaterLine = "";
+            if (i == 0) {
+                maxWaterLine = maxWaterLine1;
+            } else if (i == 1) {
+                maxWaterLine = maxWaterLine2;
+            } else if (i == 2) {
+                maxWaterLine = maxWaterLine3;
+            } else if (i == 3) {
+                maxWaterLine = maxWaterLine4;
+            }
+            energyWarningThreshold.setMaxValue(maxWaterLine);
+            energyWarningThreshold.setFarmId(Integer.parseInt(farmId));
+            energyWarningThreshold.setWarningType(2);
+            energyWarningThreshold.setChipCode(energyWarningThresholdList.get(i).getChipCode());
+            energyWarningThresholdService.saveOrUpdate(energyWarningThreshold,new UpdateWrapper<EnergyWarningThreshold>()
+                    .eq("farm_id",farmId)
+                    .eq("warning_type",2).eq("chip_code",energyWarningThresholdList.get(i).getChipCode()));
+        }
 
-        EnergyWarningThreshold energyWarningThreshold5 = new EnergyWarningThreshold();
-        energyWarningThreshold5.setMaxValue(maxWaterLine4);
-        energyWarningThreshold5.setFarmId(Integer.parseInt(farmId));
-        energyWarningThreshold5.setWarningType(2);
-        energyWarningThreshold5.setChipCode("1004");
-        energyWarningThresholdService.saveOrUpdate(energyWarningThreshold5,new UpdateWrapper<EnergyWarningThreshold>()
-                .eq("farm_id",farmId)
-                .eq("warning_type",2).eq("chip_code","1004"));
+        List<EnvDeviceChip> energyWarningPressureThresholdList = envDeviceChipService.list(new QueryWrapper<EnvDeviceChip>().eq("chip_type",3));
+        for (int i = 0; i < energyWarningPressureThresholdList.size(); i++) {
+            EnergyWarningThreshold energyWarningThreshold = new EnergyWarningThreshold();
+            String maxWaterLinePressure = "";
+            if (i == 0) {
+                maxWaterLinePressure = maxWaterLinePressure1;
+            } else if (i == 1) {
+                maxWaterLinePressure = maxWaterLinePressure2;
+            } else if (i == 2) {
+                maxWaterLinePressure = maxWaterLinePressure3;
+            } else if (i == 3) {
+                maxWaterLinePressure = maxWaterLinePressure4;
+            }
+            energyWarningThreshold.setMaxValue(maxWaterLinePressure);
+            energyWarningThreshold.setFarmId(Integer.parseInt(farmId));
+            energyWarningThreshold.setWarningType(3);
+            energyWarningThreshold.setChipCode(energyWarningThresholdList.get(i).getChipCode());
+            energyWarningThresholdService.saveOrUpdate(energyWarningThreshold,new UpdateWrapper<EnergyWarningThreshold>()
+                    .eq("farm_id",farmId)
+                    .eq("warning_type",3).eq("chip_code",energyWarningThresholdList.get(i).getChipCode()));
+        }
         return Result.SUCCESS();
     }
 
@@ -128,48 +148,46 @@ public class EnergyWarningThresholdController {
                 resultMap.put("maxEle",0);
             }
         }
-        //TODO 写死水线芯片号
-        EnergyWarningThreshold water1 = energyWarningThresholdService.getOne(new QueryWrapper<EnergyWarningThreshold>().eq("farm_id", farmId).eq("warning_type", 2).eq("chip_code", "1001"));
-        if (ObjectUtil.isEmpty(water1)){
-            resultMap.put("maxWaterLine1",0);
-        }else {
-            if(!StringUtils.isEmpty(water1.getMaxValue())){
-                resultMap.put("maxWaterLine1",water1.getMaxValue());
-            }else {
-                resultMap.put("maxWaterLine1",0);
-            }
+        //水表
+        List<EnergyWarningThreshold> energyWarningThresholdList = energyWarningThresholdService.list(new QueryWrapper<EnergyWarningThreshold>().eq("warning_type", 2).eq("farm_id", farmId));
+        if (ObjectUtil.isEmpty(energyWarningThresholdList)){
+           resultMap.put("maxWaterLine1",0);
+           resultMap.put("maxWaterLine2",0);
+           resultMap.put("maxWaterLine3",0);
+           resultMap.put("maxWaterLine4",0);
         }
-        EnergyWarningThreshold water2 = energyWarningThresholdService.getOne(new QueryWrapper<EnergyWarningThreshold>().eq("farm_id", farmId).eq("warning_type", 2).eq("chip_code", "1002"));
-        if (ObjectUtil.isEmpty(water2)){
-            resultMap.put("maxWaterLine2",0);
-        }else {
-            if(!StringUtils.isEmpty(water2.getMaxValue())){
-                resultMap.put("maxWaterLine2",water2.getMaxValue());
+        for (int i = 1; i <= energyWarningThresholdList.size(); i++) {
+            EnergyWarningThreshold energyWarningThreshold = energyWarningThresholdList.get(i-1);
+            if (ObjectUtil.isEmpty(energyWarningThreshold)){
+                resultMap.put("maxWaterLine"+i,0);
             }else {
-                resultMap.put("maxWaterLine2",0);
+                if(!StringUtils.isEmpty(energyWarningThreshold.getMaxValue())){
+                    resultMap.put("maxWaterLine"+i,energyWarningThreshold.getMaxValue());
+                }else {
+                    resultMap.put("maxWaterLine"+i,0);
+                }
             }
         }
-        EnergyWarningThreshold water3 = energyWarningThresholdService.getOne(new QueryWrapper<EnergyWarningThreshold>().eq("farm_id", farmId).eq("warning_type", 2).eq("chip_code", "1003"));
-        if (ObjectUtil.isEmpty(water3)){
-            resultMap.put("maxWaterLine3",0);
-        }else {
-            if(!StringUtils.isEmpty(water3.getMaxValue())){
-                resultMap.put("maxWaterLine3",water3.getMaxValue());
-            }else {
-                resultMap.put("maxWaterLine3",0);
-            }
+        //水压
+        List<EnergyWarningThreshold> energyWarningPressureThresholdList = energyWarningThresholdService.list(new QueryWrapper<EnergyWarningThreshold>().eq("warning_type", 3).eq("farm_id", farmId));
+        if (ObjectUtil.isEmpty(energyWarningPressureThresholdList)){
+            resultMap.put("maxWaterLinePressure1",0);
+            resultMap.put("maxWaterLinePressure2",0);
+            resultMap.put("maxWaterLinePressure3",0);
+            resultMap.put("maxWaterLinePressure4",0);
         }
-        EnergyWarningThreshold water4 = energyWarningThresholdService.getOne(new QueryWrapper<EnergyWarningThreshold>().eq("farm_id", farmId).eq("warning_type", 2).eq("chip_code", "1004"));
-        if (ObjectUtil.isEmpty(water4)){
-            resultMap.put("maxWaterLine4",0);
-        }else {
-            if(!StringUtils.isEmpty(water4.getMaxValue())){
-                resultMap.put("maxWaterLine4",water4.getMaxValue());
+        for (int i = 1; i <= energyWarningPressureThresholdList.size(); i++) {
+            EnergyWarningThreshold energyWarningThreshold = energyWarningPressureThresholdList.get(i-1);
+            if (ObjectUtil.isEmpty(energyWarningThreshold)){
+                resultMap.put("maxWaterLinePressure"+i,0);
             }else {
-                resultMap.put("maxWaterLine4",0);
+                if(!StringUtils.isEmpty(energyWarningThreshold.getMaxValue())){
+                    resultMap.put("maxWaterLinePressure"+i,energyWarningThreshold.getMaxValue());
+                }else {
+                    resultMap.put("maxWaterLinePressure"+i,0);
+                }
             }
         }
-
         return new Result(ResultCode.SUCCESS,resultMap);
     }
 

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDeviceController.java

@@ -42,17 +42,26 @@ public class EnvDeviceController {
         String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         Page<EnvDevice> page = new Page(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
-        if (deviceType.equals("1")){
-            return new Result(ResultCode.SUCCESS,envDeviceService.page(page, new QueryWrapper<EnvDevice>()
+        return new Result(ResultCode.SUCCESS,envDeviceService.page(page, new QueryWrapper<EnvDevice>()
                     .eq(!StringUtils.isEmpty(deviceType),"device_type",deviceType)
                     .eq("farm_id",farmId)));
-        }else if (deviceType.equals("2")){
+    }
+
+    @PostMapping("/listH5Device")
+    public Result listH5Device(@RequestBody Map<String ,String> paramsMap){
+        String deviceType = paramsMap.get("deviceType");
+        String farmId = paramsMap.get("farmId");
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        Page<EnvDevice> page = new Page(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        if (deviceType.equals("1")){
             return new Result(ResultCode.SUCCESS,envDeviceService.page(page, new QueryWrapper<EnvDevice>()
-                    .in("device_type",2,3)
+                    .eq(!StringUtils.isEmpty(deviceType),"device_type",deviceType)
                     .eq("farm_id",farmId)));
         }else {
-            return new Result(ResultCode.SUCCESS,envDeviceService.page(page, new QueryWrapper<EnvDevice>()
-                    .eq("farm_id",farmId)));
+            return new Result(ResultCode.SUCCESS, envDeviceService.page(page, new QueryWrapper<EnvDevice>()
+                    .in("device_type", 2, 3)
+                    .eq("farm_id", farmId)));
         }
     }