|
@@ -226,34 +226,34 @@ public class EnvTimer {
|
|
|
envDataService.save(envData);
|
|
|
}
|
|
|
|
|
|
-// Integer farmId3 = 26;
|
|
|
-// List<BasePigpen> list3 = basePigpenService.list(new QueryWrapper<BasePigpen>().eq("farm_id", farmId3).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 : list3) {
|
|
|
-// EnvData envData = new EnvData();
|
|
|
-// envData.setCreateTime(new Date());
|
|
|
-// envData.setFarmId(farmId3);
|
|
|
-// envData.setUnitId(basePigpen.getId());
|
|
|
-// EnvDevice envDevice = new EnvDevice();
|
|
|
-// envDevice.setUnitName(basePigpen.getBuildName());
|
|
|
-// envDevice.setUnitId(basePigpen.getId());
|
|
|
-// envDevice.setFarmId(farmId3);
|
|
|
-//
|
|
|
-// String tem = NumberUtils.getNum(17, 23, 1);
|
|
|
-// String hum = NumberUtils.getNum(65, 80, 0);
|
|
|
-// saveTemWarning(tem, envWarningThreshold2, envDevice, farmId3);
|
|
|
-// envData.setEnvTemp(tem);
|
|
|
-// saveHumWarning(hum, envWarningThreshold2, envDevice, farmId3);
|
|
|
-// envData.setEnvHum(hum);
|
|
|
-// envDataService.save(envData);
|
|
|
-// }
|
|
|
+ Integer farmId3 = 26;
|
|
|
+ List<BasePigpen> list3 = basePigpenService.list(new QueryWrapper<BasePigpen>().eq("farm_id", farmId3).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 : list3) {
|
|
|
+ EnvData envData = new EnvData();
|
|
|
+ envData.setCreateTime(new Date());
|
|
|
+ envData.setFarmId(farmId3);
|
|
|
+ envData.setUnitId(basePigpen.getId());
|
|
|
+ EnvDevice envDevice = new EnvDevice();
|
|
|
+ envDevice.setUnitName(basePigpen.getBuildName());
|
|
|
+ envDevice.setUnitId(basePigpen.getId());
|
|
|
+ envDevice.setFarmId(farmId3);
|
|
|
+
|
|
|
+ String tem = NumberUtils.getNum(17, 23, 1);
|
|
|
+ String hum = NumberUtils.getNum(65, 80, 0);
|
|
|
+ saveTemWarning(tem, envWarningThreshold2, envDevice, farmId3);
|
|
|
+ envData.setEnvTemp(tem);
|
|
|
+ saveHumWarning(hum, envWarningThreshold2, envDevice, farmId3);
|
|
|
+ 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));
|