修改2

huimv-admin/src/main/java/com/huimv/admin/service/impl/GasDataServiceImpl.java

@@ -44,37 +44,70 @@ public class GasDataServiceImpl extends ServiceImpl<GasDataMapper, GasData> impl
 
         QueryWrapper<GasData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
-        if (date == null || date == "") {
-            DateTime dateTime = DateUtil.beginOfDay(new Date());
-            date = dateTime.toString();
-            queryWrapper.ge("create_time", date).orderByAsc("create_time");
-        } else {
-            String startTime = date + " 00:00:00";
-            String endTime = date + " 23:59:59";
-            queryWrapper.between("create_time", startTime, endTime).orderByAsc("create_time");
-        }
-        List<GasData> gasData = dataMapper.selectList(queryWrapper);
-        GasDataVo gasDataVo = new GasDataVo();
-        List<GasData> gasDataList = new LinkedList<>();
-        List<GasData> gasDataList1 = new LinkedList<>();
-        List<GasData> gasDataList2 = new LinkedList<>();
-        List<GasData> gasDataList3 = new LinkedList<>();
-        for (GasData gasDatum : gasData) {
-            if (gasDatum.getLoctionType() == 1) {
-                gasDataList.add(gasDatum);
-            } else if (gasDatum.getLoctionType() == 2) {
-                gasDataList1.add(gasDatum);
-            } else if (gasDatum.getLoctionType() == 3) {
-                gasDataList2.add(gasDatum);
-            } else if (gasDatum.getLoctionType() == 4) {
-                gasDataList3.add(gasDatum);
+        if (farmId.equals("22")) {
+            if (date == null || date == "") {
+                queryWrapper.orderByAsc("create_time");
+            } else {
+                String startTime = date + " 00:00:00";
+                String endTime = date + " 23:59:59";
+                queryWrapper.between("create_time", startTime, endTime).orderByAsc("create_time");
+            }
+            List<GasData> gasData = dataMapper.selectList(queryWrapper);
+            GasDataVo gasDataVo = new GasDataVo();
+            List<GasData> gasDataList = new LinkedList<>();
+            List<GasData> gasDataList1 = new LinkedList<>();
+            List<GasData> gasDataList2 = new LinkedList<>();
+            List<GasData> gasDataList3 = new LinkedList<>();
+            for (GasData gasDatum : gasData) {
+                if (gasDatum.getLoctionType() == 1) {
+                    gasDataList.add(gasDatum);
+                } else if (gasDatum.getLoctionType() == 2) {
+                    gasDataList1.add(gasDatum);
+                } else if (gasDatum.getLoctionType() == 3) {
+                    gasDataList2.add(gasDatum);
+                } else if (gasDatum.getLoctionType() == 4) {
+                    gasDataList3.add(gasDatum);
+                }
+            }
+            gasDataVo.setPigpen(gasDataList);
+            gasDataVo.setAbove(gasDataList1);
+            gasDataVo.setUnder(gasDataList2);
+            gasDataVo.setPeople(gasDataList3);
+            return new Result(ResultCode.SUCCESS,gasDataVo);
+        }else {
+            if (date == null || date == "") {
+                DateTime dateTime = DateUtil.beginOfDay(new Date());
+                date = dateTime.toString();
+                queryWrapper.ge("create_time", date).orderByAsc("create_time");
+            } else {
+                String startTime = date + " 00:00:00";
+                String endTime = date + " 23:59:59";
+                queryWrapper.between("create_time", startTime, endTime).orderByAsc("create_time");
+            }
+            List<GasData> gasData = dataMapper.selectList(queryWrapper);
+            GasDataVo gasDataVo = new GasDataVo();
+            List<GasData> gasDataList = new LinkedList<>();
+            List<GasData> gasDataList1 = new LinkedList<>();
+            List<GasData> gasDataList2 = new LinkedList<>();
+            List<GasData> gasDataList3 = new LinkedList<>();
+            for (GasData gasDatum : gasData) {
+                if (gasDatum.getLoctionType() == 1) {
+                    gasDataList.add(gasDatum);
+                } else if (gasDatum.getLoctionType() == 2) {
+                    gasDataList1.add(gasDatum);
+                } else if (gasDatum.getLoctionType() == 3) {
+                    gasDataList2.add(gasDatum);
+                } else if (gasDatum.getLoctionType() == 4) {
+                    gasDataList3.add(gasDatum);
+                }
             }
+            gasDataVo.setPigpen(gasDataList);
+            gasDataVo.setAbove(gasDataList1);
+            gasDataVo.setUnder(gasDataList2);
+            gasDataVo.setPeople(gasDataList3);
+            return new Result(ResultCode.SUCCESS,gasDataVo);
         }
-        gasDataVo.setPigpen(gasDataList);
-        gasDataVo.setAbove(gasDataList1);
-        gasDataVo.setUnder(gasDataList2);
-        gasDataVo.setPeople(gasDataList3);
-        return new Result(ResultCode.SUCCESS,gasDataVo);
+
     }
 
     @Override

huimv-admin/src/main/java/com/huimv/admin/service/impl/GasThresholdServiceImpl.java

@@ -58,15 +58,11 @@ public class GasThresholdServiceImpl extends ServiceImpl<GasThresholdMapper, Gas
         }
         JSONObject jsonObject = new JSONObject();
         if (gasThresholds.size() == 0) {
-            jsonObject.put("NH3-N", 0);
-            jsonObject.put("JLM", 0);
-            jsonObject.put("ELHT", 0);
-            jsonObject.put("EJEL", 0);
-            jsonObject.put("H2S", 0);
-            jsonObject.put("BYX", 0);
-            jsonObject.put("CH3SH", 0);
-            jsonObject.put("SJA", 0);
-            jsonObject.put("CQ", 0);
+            jsonObject.put("pigpen", getProtThreshold());
+            jsonObject.put("above", getProtThreshold());
+            jsonObject.put("under", getProtThreshold());
+            jsonObject.put("people", getProtThreshold());
+
         } else {
             for (GasThreshold gasThreshold : gasThresholds) {
                 if (gasThreshold.getGasType() == 1) {
@@ -86,7 +82,19 @@ public class GasThresholdServiceImpl extends ServiceImpl<GasThresholdMapper, Gas
         }
         return new Result(ResultCode.SUCCESS,jsonObject);
     }
-
+    private JSONObject getProtThreshold() {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("nh3N", 0);
+        jsonObject.put("jlm", 0);
+        jsonObject.put("elht", 0);
+        jsonObject.put("ejel", 0);
+        jsonObject.put("h2s", 0);
+        jsonObject.put("byx", 0);
+        jsonObject.put("ch3sh", 0);
+        jsonObject.put("sja", 0);
+        jsonObject.put("cq", 0);
+        return jsonObject;
+    }
     @Override
     public Result edit(HttpServletRequest httpServletRequest, List<GasThreshold> gasThresholds) {
         for (GasThreshold gasThreshold : gasThresholds) {

huimv-admin/src/main/java/com/huimv/admin/service/impl/ProtThresholdServiceImpl.java

@@ -87,7 +87,7 @@ public class ProtThresholdServiceImpl extends ServiceImpl<ProtThresholdMapper, P
         jsonObject.put("cod2", 0);
         jsonObject.put("ph1", 0);
         jsonObject.put("ph2", 0);
-        jsonObject.put("nh3n11", 0);
+        jsonObject.put("nh3n1", 0);
         jsonObject.put("nh3n2", 0);
         jsonObject.put("tp1", 0);
         jsonObject.put("tp2", 0);