东阳数据生成修改1

huimv-admin/src/main/java/com/huimv/admin/controller/EnergyDataController.java

@@ -49,4 +49,9 @@ public class EnergyDataController {
     public Result listDataScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return iEnergyDataService.listDataScreen(httpServletRequest, paramsMap);
     }
+
+    @RequestMapping("/listRankScreen")
+    public Result listRankScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return iEnergyDataService.listRankScreen(httpServletRequest, paramsMap);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/service/IEnergyDataService.java

@@ -24,4 +24,7 @@ public interface IEnergyDataService extends IService<EnergyData> {
 
     //大屏
     Result listDataScreen(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
+    Result listRankScreen(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
 }

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

@@ -329,6 +329,90 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         return new Result(ResultCode.SUCCESS, jsonObject);
     }
 
+    @Override
+    public Result listRankScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String dataType = paramsMap.get("dataType");
+        if (dataType == null || dataType == "") {
+            dataType = "1";
+        }
+        QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
+        basePigpenQueryWrapper.eq("farm_id", farmId);
+        JSONArray jsonArray = new JSONArray();
+        basePigpenQueryWrapper.eq("parent_id", 0);
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
+        for (BasePigpen basePigpen : basePigpens) {
+            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
+            List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
+            Float value = 0.00f;
+            for (BasePigpen pigpen : pigpens) {
+                QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
+                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);
+                List<Integer> idList = new ArrayList<>();
+                basePigpens1.forEach(item -> {
+                    idList.add(item.getId());
+                });//某一层所有单元的id
+                QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
+                dataQueryWrapper.eq("farm_id", farmId).in("unit_id", idList);
+
+                dataQueryWrapper.select(
+                        "IFNULL(SUM(water_value),0) waterValue,IFNULL(SUM(gas_value),0) gasValue" +
+                                ",IFNULL(SUM(electricity_value),0) electricityValue" +
+                                ",IFNULL(SUM(feed_value),0) feedValue  "
+                );
+                EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
+                JSONObject jsonObject = new JSONObject();
+                if ("1".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getWaterValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getWaterValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
+                    }
+                }
+                if ("2".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getElectricityValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getElectricityValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
+                    }
+                }
+                if ("3".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getFeedValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getFeedValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
+                    }
+                }
+                if ("4".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getGasValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getGasValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
+                    }
+                }
+                jsonObject.put("buildName", pigpen.getBuildName());
+                jsonArray.add(jsonObject);
+                value = 0.00f;
+            }
+        }
+        JSONArray arraySort = jsonArraySort1(jsonArray, "value", true);
+        JSONArray array = new JSONArray();
+        if (arraySort.size() < 5) {
+            return new Result(ResultCode.SUCCESS, arraySort);
+        } else {
+            for (int i = 0; i < 5; i++) {
+                array.add(arraySort.get(i));
+            }
+            return new Result(ResultCode.SUCCESS, array);
+        }
+    }
+
 
     /*数组排序*/
     public static JSONArray jsonArraySort(JSONArray jsonArr, String sortKey, boolean is_desc) {
@@ -414,4 +498,56 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         return sortedJsonArray;
     }
 
+    /*数组排序*/
+    public static JSONArray jsonArraySort1(JSONArray jsonArr, String sortKey, boolean is_desc) {
+        //存放排序结果json数组
+        JSONArray sortedJsonArray = new JSONArray();
+        //用于排序的list
+        List<JSONObject> jsonValues = new ArrayList<JSONObject>();
+        //将参数json数组每一项取出，放入list
+
+        for (int i = 0; i < jsonArr.size(); i++) {
+            jsonValues.add(jsonArr.getJSONObject(i));
+        }
+        //快速排序，重写compare方法，完成按指定字段比较，完成排序
+        Collections.sort(jsonValues, new Comparator<JSONObject>() {
+            //排序字段
+            private final String KEY_NAME = sortKey;
+
+            //重写compare方法
+            @Override
+            public int compare(JSONObject a, JSONObject b) {
+                //如果用String接会导致一位数和两位数混合比对的时候不能准确比出来，要用int类型接
+                //String valA = new String();
+                //String valB = new String();
+                Float valA = 0.00f;
+                Float valB = 0.00f;
+                try {
+                    valA = Float.parseFloat(a.getString(KEY_NAME));
+                    valB = Float.parseFloat(b.getString(KEY_NAME));
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                //是升序还是降序
+                if (is_desc) {
+                    return -valA.compareTo(valB);
+                } else {
+                    return -valB.compareTo(valA);
+                }
+
+            }
+        });
+        //将排序后结果放入结果jsonArray
+        if (jsonArr.size() < 5) {
+            for (int i = 0; i < jsonArr.size(); i++) {
+                sortedJsonArray.add(jsonValues.get(i));
+            }
+        } else {
+            for (int i = 0; i < 5; i++) {
+                sortedJsonArray.add(jsonValues.get(i));
+            }
+        }
+        return sortedJsonArray;
+    }
+
 }

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

@@ -117,20 +117,34 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         queryWrapper.orderByDesc("creat_time").last(" limit 1");
         ProdStock prodStock = prodStockMapper.selectOne(queryWrapper);
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("yfcl", prodStock.getYfzcl());
-        jsonObject.put("bycl", prodStock.getByzcl());
+
         QueryWrapper<ProdProduction> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("farm_id", farmId).orderByDesc("creat_time").last(" limit 1");
         ProdProduction prodProduction = productionMapper.selectOne(queryWrapper1);
-        jsonObject.put("chl", prodProduction.getBychl());
 
+        if (ObjectUtil.isEmpty(prodStock)) {
+            jsonObject.put("yfcl", 0);
+            jsonObject.put("bycl", 0);
+        } else {
+            jsonObject.put("yfcl", prodStock.getYfzcl());
+            jsonObject.put("bycl", prodStock.getByzcl());
+        }
+        if (ObjectUtil.isEmpty(prodProduction)) {
+            jsonObject.put("chl", 0);
+        } else {
+            jsonObject.put("chl", prodProduction.getBychl());
+        }
         Date timesMonthmorning = DataUill.getTimesMonthmorning();
         QueryWrapper<ProdSale> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("farm_id", farmId).ge("creat_time", timesMonthmorning);
         Integer count = 0;
         List<ProdSale> prodSales = saleMapper.selectList(queryWrapper2);
-        for (ProdSale prodSale : prodSales) {
-            count = count + prodSale.getSaleQuantity();
+        if (prodSales.size() == 0) {
+            count = 0;
+        } else {
+            for (ProdSale prodSale : prodSales) {
+                count = count + prodSale.getSaleQuantity();
+            }
         }
 
         DateTime dateTime = DateUtil.beginOfYear(new Date());
@@ -138,9 +152,14 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         queryWrapper3.eq("farm_id", farmId).ge("creat_time",dateTime);
         Integer yearCount = 0;
         List<ProdSale> yearProdSales = saleMapper.selectList(queryWrapper3);
-        for (ProdSale prodSale : yearProdSales) {
-            yearCount = yearCount + prodSale.getSaleQuantity();
+        if (yearProdSales.size() == 0) {
+            yearCount = 0;
+        } else {
+            for (ProdSale prodSale : yearProdSales) {
+                yearCount = yearCount + prodSale.getSaleQuantity();
+            }
         }
+
         jsonObject.put("monthCount", count);
         jsonObject.put("yearCount", yearCount);
         return new Result(ResultCode.SUCCESS,jsonObject);

huimv-admin/src/main/java/com/huimv/admin/timer/EnvTimer.java

@@ -160,7 +160,66 @@ public class EnvTimer {
             envData.setEnvTemp(tem);
             saveHumWarning(hum, envWarningThreshold, envDevice, farmId);
             envData.setEnvHum(hum);
+            envDataService.save(envData);
+        }
+        Integer farmId1 = 23;
+        EnvWarningThreshold envWarningThreshold1 = envWarningThresholdService.getOne(new QueryWrapper<EnvWarningThreshold>().eq("farm_id", farmId1));
+
+        List<BasePigpen> list1 = basePigpenService.list(new QueryWrapper<BasePigpen>().eq("farm_id", farmId1).eq("f_type", 3).ne("id", 225));
+//        String url="https://restapi.amap.com/v3/weather/weatherInfo?parameters&key=c1d8179ed2dda7ed48c56bed06c0c86e&city=330782&extensions=base&output=JSON";
+//        String result = HttpUtil.get(url);
+//        WeatherDto weatherDto = JSONUtil.toBean(result, WeatherDto.class);
+//        List<WeatherLives> lives = weatherDto.getLives();
+//        WeatherLives weatherLives = lives.get(0);
+//        int humidity = Integer.parseInt(weatherLives.getHumidity());
+//        int temperature = Integer.parseInt(weatherLives.getTemperature());
+
+        for (BasePigpen basePigpen : list1) {
+            EnvData envData = new EnvData();
+            envData.setCreateTime(new Date());
+            envData.setFarmId(farmId1);
+            envData.setUnitId(basePigpen.getId());
+            EnvDevice envDevice = new EnvDevice();
+            envDevice.setUnitName(basePigpen.getBuildName());
+            envDevice.setUnitId(basePigpen.getId());
+            envDevice.setFarmId(farmId1);
 
+            String tem = NumberUtils.getNum(17, 23, 1);
+            String hum = NumberUtils.getNum(65, 80, 0);
+            saveTemWarning(tem, envWarningThreshold1, envDevice, farmId1);
+            envData.setEnvTemp(tem);
+            saveHumWarning(hum, envWarningThreshold1, envDevice, farmId1);
+            envData.setEnvHum(hum);
+            envDataService.save(envData);
+        }
+        Integer farmId2 = 24;
+        EnvWarningThreshold envWarningThreshold2 = envWarningThresholdService.getOne(new QueryWrapper<EnvWarningThreshold>().eq("farm_id", farmId2));
+
+        List<BasePigpen> list2 = basePigpenService.list(new QueryWrapper<BasePigpen>().eq("farm_id", farmId2).eq("f_type", 3).ne("id", 217));
+//        String url="https://restapi.amap.com/v3/weather/weatherInfo?parameters&key=c1d8179ed2dda7ed48c56bed06c0c86e&city=330782&extensions=base&output=JSON";
+//        String result = HttpUtil.get(url);
+//        WeatherDto weatherDto = JSONUtil.toBean(result, WeatherDto.class);
+//        List<WeatherLives> lives = weatherDto.getLives();
+//        WeatherLives weatherLives = lives.get(0);
+//        int humidity = Integer.parseInt(weatherLives.getHumidity());
+//        int temperature = Integer.parseInt(weatherLives.getTemperature());
+
+        for (BasePigpen basePigpen : list2) {
+            EnvData envData = new EnvData();
+            envData.setCreateTime(new Date());
+            envData.setFarmId(farmId2);
+            envData.setUnitId(basePigpen.getId());
+            EnvDevice envDevice = new EnvDevice();
+            envDevice.setUnitName(basePigpen.getBuildName());
+            envDevice.setUnitId(basePigpen.getId());
+            envDevice.setFarmId(farmId2);
+
+            String tem = NumberUtils.getNum(17, 23, 1);
+            String hum = NumberUtils.getNum(65, 80, 0);
+            saveTemWarning(tem, envWarningThreshold2, envDevice, farmId2);
+            envData.setEnvTemp(tem);
+            saveHumWarning(hum, envWarningThreshold2, envDevice, farmId2);
+            envData.setEnvHum(hum);
             envDataService.save(envData);
         }
     }
@@ -272,19 +331,19 @@ public class EnvTimer {
             Integer count = envDeviceService.count(queryWrapper);
             QueryWrapper<EnvDevice> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("device_status", 0);
-            Integer count1 = envDeviceService.count(queryWrapper1);
-            Integer OffDeviceCount = count - count1;
+            Integer count1 = envDeviceService.count(queryWrapper1);//离线
+            Integer OnDeviceCount = count - count1;//在线
             //创建一个数值格式化对象
             NumberFormat numberFormat = NumberFormat.getInstance();
             //设置精确到小数点后两位
             numberFormat.setMaximumFractionDigits(2);
-            String onDeviceRate = numberFormat.format((float) count1 / (float) count * 100);
+            String onDeviceRate = numberFormat.format((float) OnDeviceCount / (float) count * 100);
 
             EnvDeviceOnline envDeviceOnline = envDeviceOnlineService.getOne(new QueryWrapper<EnvDeviceOnline>().eq("farm_id", farmId).ge("creat_time", beginOfMonth));
             if (ObjectUtil.isEmpty(envDeviceOnline)) {
                 envDeviceOnline = new EnvDeviceOnline();
                 envDeviceOnline.setCreatTime(date);
-                envDeviceOnline.setDeviceOff(OffDeviceCount);
+                envDeviceOnline.setDeviceOff(count1);
                 envDeviceOnline.setDeviceOn(count1);
                 envDeviceOnline.setFarmId(farmId + "");
                 envDeviceOnline.setOnlineRate(onDeviceRate);
@@ -294,7 +353,7 @@ public class EnvTimer {
             } else {
                 envDeviceOnline = new EnvDeviceOnline();
                 envDeviceOnline.setCreatTime(date);
-                envDeviceOnline.setDeviceOff(OffDeviceCount);
+                envDeviceOnline.setDeviceOff(count1);
                 envDeviceOnline.setDeviceOn(count1);
                 envDeviceOnline.setFarmId(farmId + "");
                 envDeviceOnline.setOnlineRate(onDeviceRate);

huimv-admin/src/main/java/com/huimv/admin/timer/GasTimer.java

@@ -31,7 +31,7 @@ public class  GasTimer {
     private void getShenChan() throws Exception {
 
         String type = NumberUtils.getNum(1, 5, 0);//loc_type
-        for (int i = 1; i < 9; i++) {
+        for (int i = 1; i < 13; i++) {
 
             String nh3n = NumberUtils.getNumFloat(0.0, 10.5);//NH3N
             String jlm = NumberUtils.getNumFloat(0.0, 10.5);//jlm
@@ -52,8 +52,11 @@ public class  GasTimer {
             gasData.setByx(byx);
             gasData.setCh3sh(ch3);
             gasData.setSja(sja);
-            if (i > 4) {
-                gasData.setLoctionType(i-4);
+            if (i > 8) {
+                gasData.setLoctionType(i - 8);//浦江
+                gasData.setFarmId(23);
+            } else if (i > 4) {
+                gasData.setLoctionType(i - 4);//东阳
                 gasData.setFarmId(24);
             } else {
                 gasData.setLoctionType(i);
@@ -64,13 +67,15 @@ public class  GasTimer {
 
             QueryWrapper<GasThreshold> queryWrapper = new QueryWrapper<>();
             GasWarningInfo warningInfo = new GasWarningInfo();
-            if (i==1||i==5) {
+            if (i==1||i==5||i==9) {
                 String cq = NumberUtils.getNumFloat(0.0, 1000.5);//cq
                 gasData.setCq(cq);
                 if (i == 1) {
                     queryWrapper.eq("farm_id", 21).eq("gas_type", 1);
-                } else {
+                } else if (i == 5) {
                     queryWrapper.eq("farm_id", 24).eq("gas_type", 1);
+                } else {
+                    queryWrapper.eq("farm_id", 23).eq("gas_type", 1);
                 }
                 GasThreshold gasThreshold = thresholdMapper.selectOne(queryWrapper);
                 if (Double.parseDouble(nh3n) > Double.parseDouble(gasThreshold.getNh3N())) {
@@ -155,14 +160,15 @@ public class  GasTimer {
                     warningInfoMapper.insert(warningInfo);
                 }
 
-            } else if (i==2||i==6) {
+            } else if (i==2||i==6||i==10) {
                 String cq = NumberUtils.getNumFloat(0.0, 5000.5);//cq
                 gasData.setCq(cq);
-
                 if (i == 2) {
                     queryWrapper.eq("farm_id", 21).eq("gas_type", 2);
-                } else {
+                } else if (i == 6) {
                     queryWrapper.eq("farm_id", 24).eq("gas_type", 2);
+                } else {
+                    queryWrapper.eq("farm_id", 23).eq("gas_type", 2);
                 }
                 GasThreshold gasThreshold = thresholdMapper.selectOne(queryWrapper);
                 if (Double.parseDouble(nh3n) > Double.parseDouble(gasThreshold.getNh3N())) {
@@ -248,16 +254,16 @@ public class  GasTimer {
                     warningInfoMapper.insert(warningInfo);
                 }
 
-            } else if (i==3||i==7) {
+            } else if (i==3||i==7||i==11) {
                 String cq = NumberUtils.getNumFloat(0.0, 1000.5);//cq
                 gasData.setCq(cq);
-
                 if (i == 3) {
                     queryWrapper.eq("farm_id", 21).eq("gas_type", 3);
-                } else {
+                } else if (i == 7) {
                     queryWrapper.eq("farm_id", 24).eq("gas_type", 3);
+                } else {
+                    queryWrapper.eq("farm_id", 23).eq("gas_type", 3);
                 }
-
                 GasThreshold gasThreshold = thresholdMapper.selectOne(queryWrapper);
                 if (Double.parseDouble(nh3n) > Double.parseDouble(gasThreshold.getNh3N())) {
                     warningInfo.setWarningContent("NH3N为"+nh3n + "超过阈值，系统预警提醒");
@@ -342,14 +348,15 @@ public class  GasTimer {
                     warningInfoMapper.insert(warningInfo);
                 }
 
-            } else if (i==4||i==8) {
+            } else if (i==4||i==8||i==12) {
                 String cq = NumberUtils.getNumFloat(0.0, 10000.5);//cq
                 gasData.setCq(cq);
-
                 if (i == 4) {
                     queryWrapper.eq("farm_id", 21).eq("gas_type", 4);
-                } else {
+                } else if (i == 8) {
                     queryWrapper.eq("farm_id", 24).eq("gas_type", 4);
+                } else {
+                    queryWrapper.eq("farm_id", 23).eq("gas_type", 4);
                 }
                 GasThreshold gasThreshold = thresholdMapper.selectOne(queryWrapper);
                 if (Double.parseDouble(nh3n) > Double.parseDouble(gasThreshold.getNh3N())) {

huimv-admin/src/main/java/com/huimv/admin/timer/ProtTimer.java

@@ -31,23 +31,28 @@ public class ProtTimer {
     private void getShenChan() throws Exception {
 
 
-        for (int i = 1; i < 7; i++) {
+        for (int i = 1; i < 10; i++) {
             //假设已经拿到了数据
             String num = NumberUtils.getNumFloat(6.4, 8.6);//ph
 
             ProtData protData = new ProtData();
-            protData.setLoctionType(i);
+
             protData.setCreateDate(new Date());
             if (i < 4) {
+                protData.setLoctionType(i);
                 protData.setFarmId(21);
+            } else if (i < 7) {
+                protData.setLoctionType(i - 3);
+                protData.setFarmId(24);//东阳
             } else {
-                protData.setFarmId(24);
+                protData.setLoctionType(i - 6);
+                protData.setFarmId(23);//浦江
             }
 
             protData.setPh(num);
 
             QueryWrapper<ProtThreshold> queryWrapper = new QueryWrapper<>();
-            if (i == 1||i==4) {
+            if (i == 1||i==4||i==7) {
                 String num1 = NumberUtils.getNum(8000, 20001,0);//cod
                 String num2 = NumberUtils.getNumFloat(1000.0, 1501.0);//nh3n
                 String num3 = NumberUtils.getNumFloat(100.0, 260.0);//tp
@@ -61,10 +66,12 @@ public class ProtTimer {
                 protData.setFlow(num5);
                 protDataMapper.insert(protData);
 
-                if (i==1) {
+                if (i == 1) {
                     queryWrapper.eq("farm_id", 21).eq("prot_type", 1);
-                } else {
+                } else if (i == 4) {
                     queryWrapper.eq("farm_id", 24).eq("prot_type", 1);
+                } else {
+                    queryWrapper.eq("farm_id", 23).eq("prot_type", 1);
                 }
                 ProtThreshold protThreshold = protThresholdMapper.selectOne(queryWrapper);//进污口
                 if (Double.parseDouble(num) > Double.parseDouble(protThreshold.getPh2()) || Double.parseDouble(num) < Double.parseDouble(protThreshold.getOther3())) {
@@ -201,8 +208,8 @@ public class ProtTimer {
                 }
 
             }
-            if (i == 2||i==5) {
-                String num1 = NumberUtils.getNum(0, 310,0);//cod
+            if (i == 2 || i == 5 || i == 8) {
+                String num1 = NumberUtils.getNum(0, 310, 0);//cod
                 String num2 = NumberUtils.getNumFloat(0.0, 31.0);//nh3n
                 String num3 = NumberUtils.getNumFloat(0.0, 3.6);//tp
                 String num4 = NumberUtils.getNum(0, 32, 0);//tn
@@ -215,10 +222,12 @@ public class ProtTimer {
                 protData.setFlow(num5);
                 protDataMapper.insert(protData);
 
-                if (i==2) {
+                if (i == 2) {
                     queryWrapper.eq("farm_id", 21).eq("prot_type", 2);
-                } else {
+                } else if (i == 5) {
                     queryWrapper.eq("farm_id", 24).eq("prot_type", 2);
+                } else {
+                    queryWrapper.eq("farm_id", 23).eq("prot_type", 2);
                 }
                 ProtThreshold protThreshold = protThresholdMapper.selectOne(queryWrapper);//污口
                 if (Double.parseDouble(num) > Double.parseDouble(protThreshold.getPh2()) || Double.parseDouble(num) < Double.parseDouble(protThreshold.getOther3())) {
@@ -355,7 +364,7 @@ public class ProtTimer {
                 }
 
             }
-            if (i == 3||i==6) {
+            if (i == 3 || i == 6 || i == 9) {
                 //排污口专用数据
                 String ph = NumberUtils.getNumFloat(6.6, 8.4);//ph
                 String cod = NumberUtils.getNum(0, 380, 0);//cod
@@ -373,10 +382,12 @@ public class ProtTimer {
 
                 protDataMapper.insert(protData);
 
-                if (i==3) {
+                if (i == 3) {
                     queryWrapper.eq("farm_id", 21).eq("prot_type", 3);
-                } else {
+                } else if (i == 6) {
                     queryWrapper.eq("farm_id", 24).eq("prot_type", 3);
+                } else {
+                    queryWrapper.eq("farm_id", 23).eq("prot_type", 3);
                 }
                 ProtThreshold protThreshold = protThresholdMapper.selectOne(queryWrapper);//进污口
                 if (Double.parseDouble(ph) > Double.parseDouble(protThreshold.getPh2()) || Double.parseDouble(ph) < Double.parseDouble(protThreshold.getOther3())) {

huimv-admin/src/main/java/com/huimv/admin/timer/ShenChanTimer.java

@@ -130,6 +130,37 @@ public class ShenChanTimer {
 
             }
         }
+        for (List stock : stockData) {
+            if ("正康".equals(stock.get(0))){
+                if (ObjectUtil.isNotEmpty(prodStock)){
+                    prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
+                    prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
+                    prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
+                    prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+                    prodStock.setCreatTime(new Date());
+                    prodStock.setFarmId(23);
+                    prodStockService.updateById(prodStock);
+                }else {
+                    prodStock = new ProdStock();
+                    prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
+                    prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
+                    prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
+                    prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+                    prodStock.setMzcl(100);
+                    prodStock.setGzcl(200);
+                    prodStock.setBrzcl(452);
+                    prodStock.setHbzcl(100);
+                    prodStock.setRszcl(30);
+                    prodStock.setBrmzcl(20);
+                    prodStock.setKhzcl(212);
+                    prodStock.setSpzcl(1020);
+                    prodStock.setCreatTime(new Date());
+                    prodStock.setFarmId(23);
+                    prodStockService.save(prodStock);
+                }
+
+            }
+        }
 
     }