东阳牧场能耗数据修改

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

@@ -45,11 +45,11 @@ public class EnergyTimer {
             queryWrapper.eq("id", basePigpen1.getParentId());
             BasePigpen basePigpen = basePigpenMapper.selectOne(queryWrapper);
 
-            String feed = NumberUtils.getNumFloat2(6.00,6.50);
-            String water = NumberUtils.getNumFloat2(0.08,0.15);
+            String feed = NumberUtils.getNumFloat2(6.00, 6.50);
+            String water = NumberUtils.getNumFloat2(0.08, 0.15);
 //            String gas = NumberUtils.getNum(200, 280, 1);
             String gas = "0";
-            String electricity = NumberUtils.getNumFloat2(1.0, 1.45 );
+            String electricity = NumberUtils.getNumFloat2(1.0, 1.45);
 
             EnergyData energyData = new EnergyData();
             energyData.setCreateDate(new Date());
@@ -64,10 +64,18 @@ public class EnergyTimer {
             energyData.setWaterValue(water);
             energyData.setGasValue(gas);
             energyData.setElectricityValue(electricity);
+            if (energyEnvDevice.getFarmId() == 24) {
+                String feed1 = NumberUtils.getNumFloat2(1.40, 1.50);
+                String water1 = NumberUtils.getNumFloat2(20.80, 20.84);
+                String electricity1 = NumberUtils.getNumFloat2(333.30, 333.34);
+                energyData.setElectricityValue(electricity1);
+                energyData.setWaterValue(water1);
+                energyData.setFeedValue(feed1);
+            }
             dataMapper.insert(energyData);
 
             QueryWrapper<EnergyWarningThreshold> wrapper = new QueryWrapper<>();
-            wrapper.eq("other1", basePigpen.getStageCode()).eq("farm_id",energyEnvDevice.getFarmId());
+            wrapper.eq("other1", basePigpen.getStageCode()).eq("farm_id", energyEnvDevice.getFarmId());
             EnergyWarningThreshold threshold = warningThresholdMapper.selectOne(wrapper);
 
             QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
@@ -76,7 +84,7 @@ public class EnergyTimer {
             dataQueryWrapper.ge("create_date", dateTime);
             EnergyData energyData1 = dataMapper.listDataCount(dataQueryWrapper);
 
-            if (Float.parseFloat(energyData1.getWaterValue())+Float.parseFloat(water) >Float.parseFloat(threshold.getMaxWater())) {
+            if (Float.parseFloat(energyData1.getWaterValue()) + Float.parseFloat(water) > Float.parseFloat(threshold.getMaxWater())) {
                 float waterCount = Float.parseFloat(energyData1.getWaterValue()) + Float.parseFloat(water);
                 DecimalFormat df = new DecimalFormat("#.00");
                 String format = df.format(waterCount);
@@ -91,7 +99,7 @@ public class EnergyTimer {
                 warningInfo.setUserIds(threshold.getUserIds());
                 infoMapper.insert(warningInfo);
             }
-            if (Float.parseFloat(energyData1.getElectricityValue())+Float.parseFloat(electricity) >Float.parseFloat(threshold.getMaxElectricity())) {
+            if (Float.parseFloat(energyData1.getElectricityValue()) + Float.parseFloat(electricity) > Float.parseFloat(threshold.getMaxElectricity())) {
                 float electricityCount = Float.parseFloat(energyData1.getElectricityValue()) + Float.parseFloat(electricity);
                 DecimalFormat df = new DecimalFormat("#.00");
                 String format = df.format(electricityCount);
@@ -106,7 +114,7 @@ public class EnergyTimer {
                 warningInfo.setUserIds(threshold.getUserIds());
                 infoMapper.insert(warningInfo);
             }
-            if (Float.parseFloat(energyData1.getFeedValue())+Float.parseFloat(feed) >Float.parseFloat(threshold.getMaxFeed())) {
+            if (Float.parseFloat(energyData1.getFeedValue()) + Float.parseFloat(feed) > Float.parseFloat(threshold.getMaxFeed())) {
                 float feedCount = Float.parseFloat(energyData1.getFeedValue()) + Float.parseFloat(feed);
                 DecimalFormat df = new DecimalFormat("#.00");
                 String format = df.format(feedCount);
@@ -121,7 +129,7 @@ public class EnergyTimer {
                 warningInfo.setUserIds(threshold.getUserIds());
                 infoMapper.insert(warningInfo);
             }
-            if (Float.parseFloat(energyData1.getGasValue())+Float.parseFloat(gas) >Float.parseFloat(threshold.getMaxGas())) {
+            if (Float.parseFloat(energyData1.getGasValue()) + Float.parseFloat(gas) > Float.parseFloat(threshold.getMaxGas())) {
                 float gasCount = Float.parseFloat(energyData1.getGasValue()) + Float.parseFloat(gas);
                 DecimalFormat df = new DecimalFormat("#.00");
                 String format = df.format(gasCount);

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

@@ -254,6 +254,35 @@ public class EnvTimer {
             envData.setEnvHum(hum);
             envDataService.save(envData);
         }
+
+        Integer farmId4 = 27;
+        List<BasePigpen> list4 = basePigpenService.list(new QueryWrapper<BasePigpen>().eq("farm_id", farmId4).eq("f_type", 3));
+//        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 : list4) {
+            EnvData envData = new EnvData();
+            envData.setCreateTime(new Date());
+            envData.setFarmId(farmId4);
+            envData.setUnitId(basePigpen.getId());
+            EnvDevice envDevice = new EnvDevice();
+            envDevice.setUnitName(basePigpen.getBuildName());
+            envDevice.setUnitId(basePigpen.getId());
+            envDevice.setFarmId(farmId4);
+
+            String tem = NumberUtils.getNum(17, 23, 1);
+            String hum = NumberUtils.getNum(65, 80, 0);
+            saveTemWarning(tem, envWarningThreshold2, envDevice, farmId4);
+            envData.setEnvTemp(tem);
+            saveHumWarning(hum, envWarningThreshold2, envDevice, farmId4);
+            envData.setEnvHum(hum);
+            envDataService.save(envData);
+        }
     }
 
     public void saveHumWarning(String val, EnvWarningThreshold envWarningThreshold, EnvDevice envDevice, Integer farmId) {

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 < 17; i++) {
+        for (int i = 1; i < 21; i++) {
 
             String nh3n = NumberUtils.getNumFloat(0.0, 10.5);//NH3N
             String jlm = NumberUtils.getNumFloat(0.0, 10.5);//jlm
@@ -52,7 +52,10 @@ public class  GasTimer {
             gasData.setByx(byx);
             gasData.setCh3sh(ch3);
             gasData.setSja(sja);
-            if (i > 12) {
+            if (i > 16) {
+                gasData.setLoctionType(i - 16);//天台
+                gasData.setFarmId(27);
+            } else if (i > 12) {
                 gasData.setLoctionType(i - 12);//横路
                 gasData.setFarmId(26);
             } else if (i > 8) {
@@ -70,7 +73,7 @@ public class  GasTimer {
 
             QueryWrapper<GasThreshold> queryWrapper = new QueryWrapper<>();
             GasWarningInfo warningInfo = new GasWarningInfo();
-            if (i==1||i==5||i==9||i==13) {
+            if (i==1||i==5||i==9||i==13||i==17) {
                 String cq = NumberUtils.getNumFloat(0.0, 1000.5);//cq
                 gasData.setCq(cq);
                 if (i == 1) {
@@ -79,8 +82,10 @@ public class  GasTimer {
                     queryWrapper.eq("farm_id", 24).eq("gas_type", 1);
                 } else if (i == 9) {
                     queryWrapper.eq("farm_id", 23).eq("gas_type", 1);
-                } else {
+                } else if (i == 13) {
                     queryWrapper.eq("farm_id", 26).eq("gas_type", 1);
+                } else {
+                    queryWrapper.eq("farm_id", 27).eq("gas_type", 1);
                 }
                 GasThreshold gasThreshold = thresholdMapper.selectOne(queryWrapper);
                 if (Double.parseDouble(nh3n) > Double.parseDouble(gasThreshold.getNh3N())) {
@@ -165,7 +170,7 @@ public class  GasTimer {
                     warningInfoMapper.insert(warningInfo);
                 }
 
-            } else if (i==2||i==6||i==10||i==14) {
+            } else if (i==2||i==6||i==10||i==14||i==18) {
                 String cq = NumberUtils.getNumFloat(0.0, 5000.5);//cq
                 gasData.setCq(cq);
                 if (i == 2) {
@@ -174,8 +179,10 @@ public class  GasTimer {
                     queryWrapper.eq("farm_id", 24).eq("gas_type", 2);
                 } else if (i == 10) {
                     queryWrapper.eq("farm_id", 23).eq("gas_type", 2);
-                } else {
+                } else if (i == 14) {
                     queryWrapper.eq("farm_id", 26).eq("gas_type", 2);
+                } else {
+                    queryWrapper.eq("farm_id", 27).eq("gas_type", 2);
                 }
                 GasThreshold gasThreshold = thresholdMapper.selectOne(queryWrapper);
                 if (Double.parseDouble(nh3n) > Double.parseDouble(gasThreshold.getNh3N())) {
@@ -261,7 +268,7 @@ public class  GasTimer {
                     warningInfoMapper.insert(warningInfo);
                 }
 
-            } else if (i==3||i==7||i==11||i==15) {
+            } else if (i==3||i==7||i==11||i==15||i==19) {
                 String cq = NumberUtils.getNumFloat(0.0, 1000.5);//cq
                 gasData.setCq(cq);
                 if (i == 3) {
@@ -270,9 +277,10 @@ public class  GasTimer {
                     queryWrapper.eq("farm_id", 24).eq("gas_type", 3);
                 } else if (i == 11) {
                     queryWrapper.eq("farm_id", 23).eq("gas_type", 3);
-                } else {
+                } else if (i == 15) {
                     queryWrapper.eq("farm_id", 26).eq("gas_type", 3);
-
+                } else {
+                    queryWrapper.eq("farm_id", 27).eq("gas_type", 3);
                 }
                 GasThreshold gasThreshold = thresholdMapper.selectOne(queryWrapper);
                 if (Double.parseDouble(nh3n) > Double.parseDouble(gasThreshold.getNh3N())) {
@@ -358,7 +366,7 @@ public class  GasTimer {
                     warningInfoMapper.insert(warningInfo);
                 }
 
-            } else if (i==4||i==8||i==12||i==16) {
+            } else if (i==4||i==8||i==12||i==16||i==20) {
                 String cq = NumberUtils.getNumFloat(0.0, 10000.5);//cq
                 gasData.setCq(cq);
                 if (i == 4) {
@@ -367,8 +375,10 @@ public class  GasTimer {
                     queryWrapper.eq("farm_id", 24).eq("gas_type", 4);
                 } else if (i == 12) {
                     queryWrapper.eq("farm_id", 23).eq("gas_type", 4);
-                } else {
+                } else if (i == 16) {
                     queryWrapper.eq("farm_id", 26).eq("gas_type", 4);
+                } else {
+                    queryWrapper.eq("farm_id", 27).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,7 +31,7 @@ public class ProtTimer {
     private void getShenChan() throws Exception {
 
 
-        for (int i = 1; i < 13; i++) {
+        for (int i = 1; i < 16; i++) {
             //假设已经拿到了数据
             String num = NumberUtils.getNumFloat(6.4, 8.6);//ph
 
@@ -47,15 +47,18 @@ public class ProtTimer {
             } else if (i < 10) {
                 protData.setLoctionType(i - 6);
                 protData.setFarmId(23);//浦江
-            } else {
+            } else if (i < 13) {
                 protData.setLoctionType(i - 9);
                 protData.setFarmId(26);//横路
+            } else {
+                protData.setLoctionType(i - 12);
+                protData.setFarmId(27);//天台
             }
 
             protData.setPh(num);
 
             QueryWrapper<ProtThreshold> queryWrapper = new QueryWrapper<>();
-            if (i == 1||i==4||i==7||i==10) {
+            if (i == 1||i==4||i==7||i==10||i==13) {
                 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
@@ -75,8 +78,10 @@ public class ProtTimer {
                     queryWrapper.eq("farm_id", 24).eq("prot_type", 1);
                 } else if (i == 7) {
                     queryWrapper.eq("farm_id", 23).eq("prot_type", 1);
-                } else {
+                } else if (i == 10) {
                     queryWrapper.eq("farm_id", 26).eq("prot_type", 1);
+                } else {
+                    queryWrapper.eq("farm_id", 27).eq("prot_type", 1);
                 }
                 ProtThreshold protThreshold = protThresholdMapper.selectOne(queryWrapper);//进污口
                 if (Double.parseDouble(num) > Double.parseDouble(protThreshold.getPh2()) || Double.parseDouble(num) < Double.parseDouble(protThreshold.getOther3())) {
@@ -213,7 +218,7 @@ public class ProtTimer {
                 }
 
             }
-            if (i == 2 || i == 5 || i == 8||i==11) {
+            if (i == 2 || i == 5 || i == 8||i==11||i==14) {
                 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
@@ -233,8 +238,10 @@ public class ProtTimer {
                     queryWrapper.eq("farm_id", 24).eq("prot_type", 2);
                 } else if (i == 8) {
                     queryWrapper.eq("farm_id", 23).eq("prot_type", 2);
-                } else {
+                } else if (i == 11) {
                     queryWrapper.eq("farm_id", 26).eq("prot_type", 2);
+                } else {
+                    queryWrapper.eq("farm_id", 27).eq("prot_type", 2);
                 }
                 ProtThreshold protThreshold = protThresholdMapper.selectOne(queryWrapper);//污口
                 if (Double.parseDouble(num) > Double.parseDouble(protThreshold.getPh2()) || Double.parseDouble(num) < Double.parseDouble(protThreshold.getOther3())) {
@@ -371,7 +378,7 @@ public class ProtTimer {
                 }
 
             }
-            if (i == 3 || i == 6 || i == 9||i==12) {
+            if (i == 3 || i == 6 || i == 9||i==12||i==15) {
                 //排污口专用数据
                 String ph = NumberUtils.getNumFloat(6.6, 8.4);//ph
                 String cod = NumberUtils.getNum(0, 380, 0);//cod
@@ -395,8 +402,10 @@ public class ProtTimer {
                     queryWrapper.eq("farm_id", 24).eq("prot_type", 3);
                 } else if (i == 9) {
                     queryWrapper.eq("farm_id", 23).eq("prot_type", 3);
-                } else {
+                } else if (i == 12) {
                     queryWrapper.eq("farm_id", 26).eq("prot_type", 3);
+                } else {
+                    queryWrapper.eq("farm_id", 27).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

@@ -46,8 +46,9 @@ public class ShenChanTimer {
         List<Integer> farmIds = new ArrayList();
         farmIds.add(21);
         farmIds.add(23);
-        farmIds.add(24);
+//        farmIds.add(24);
         farmIds.add(26);
+        farmIds.add(27);
         String time = LocalDate.now().toString();
         String token = login();
 //        System.out.println("token"+token);
@@ -106,7 +107,7 @@ public class ShenChanTimer {
 
                 }
 
-                if ("东阳".equals(stock.get(0))){
+              /*  if ("东阳".equals(stock.get(0))){
                     if (ObjectUtil.isNotEmpty(prodStock)){
 //                    prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
                         prodStock.setZzcl(5433);
@@ -143,7 +144,7 @@ public class ShenChanTimer {
                         prodStockService.save(prodStock);
                         System.out.println("东阳");
                     }
-                }
+                }*/
                 if ("浦江".equals(stock.get(0))){
                     if (ObjectUtil.isNotEmpty(prodStock)){
 //                        prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
@@ -223,6 +224,45 @@ public class ShenChanTimer {
                     }
 
                 }
+                if ("天台".equals(stock.get(0))){
+                    if (ObjectUtil.isNotEmpty(prodStock)){
+//                        prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
+                        prodStock.setZzcl(9980);
+//                        prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
+                        prodStock.setByzcl(16384);
+//                        prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
+                        prodStock.setYfzcl(32999);
+//                        prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+                        prodStock.setZcl(66381);
+                        prodStock.setCreatTime(new Date());
+                        prodStock.setFarmId(27);
+                        prodStockService.updateById(prodStock);
+                        System.out.println("天台--》");
+                    }else {
+                        prodStock = new ProdStock();
+//                        prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
+                        prodStock.setZzcl(9980);
+//                        prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
+                        prodStock.setByzcl(16384);
+//                        prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
+                        prodStock.setYfzcl(32999);
+//                        prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+                        prodStock.setZcl(66381);
+                        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(27);
+                        prodStockService.save(prodStock);
+                        System.out.println("天台--》");
+                    }
+
+                }
             }
         }
     }