https

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvElectricityMonthServiceImpl.java

@@ -106,8 +106,10 @@ public class EnvElectricityMonthServiceImpl extends ServiceImpl<EnvElectricityMo
     private Object _getDayElectricityList(Map<String, String> paramsMap) throws ParseException {
         String farmCode = paramsMap.get("farmCode");
         String days = paramsMap.get("days");
+        String unitId = paramsMap.get("unitId");
         QueryWrapper<EnvElectricityDay> queryWrapper = new QueryWrapper();
         queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq(StringUtils.isNotBlank(unitId),"unit_id", unitId);
         queryWrapper.orderByDesc("add_date");
         queryWrapper.last("LIMIT "+days);
         List<EnvElectricityDay> envElectricityDayList = envElectricityDayMapper.selectList(queryWrapper);
@@ -120,15 +122,17 @@ public class EnvElectricityMonthServiceImpl extends ServiceImpl<EnvElectricityMo
             map.put("electricity",envElectricityDay.getDayElectricity());
             monthList.add(map);
         }
-        return new Result(ResultCode.SUCCESS,monthList);
+        return monthList;
     }
 
     //月份历史用电列表
     private Object _getMonthElectricityList(Map<String, String> paramsMap) {
         String farmCode = paramsMap.get("farmCode");
         String months = paramsMap.get("months");
+        String unitId = paramsMap.get("unitId");
         QueryWrapper<EnvElectricityMonth> queryWrapper = new QueryWrapper();
         queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq(StringUtils.isNotBlank(unitId),"unit_id", unitId);
         queryWrapper.orderByDesc("year").orderByDesc("month");
         queryWrapper.last("LIMIT "+months);
         List<EnvElectricityMonth> envElectricityMonthList = envElectricityMonthMapper.selectList(queryWrapper);
@@ -140,7 +144,7 @@ public class EnvElectricityMonthServiceImpl extends ServiceImpl<EnvElectricityMo
             map.put("electricity",envElectricityMonth.getMonthElectricity());
             monthList.add(map);
         }
-        return new Result(ResultCode.SUCCESS,monthList);
+        return monthList;
     }
 
     //读取环比

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvWaterMonthServiceImpl.java

@@ -54,13 +54,14 @@ public class EnvWaterMonthServiceImpl extends ServiceImpl<EnvWaterMonthMapper, E
     public Result getDayAndMonthWaterList(Map<String, String> paramsMap) throws ParseException {
         String farmCode = paramsMap.get("farmCode");
         String months = paramsMap.get("months");
+        String unitId = paramsMap.get("unitId");
         String days = paramsMap.get("days");
         if(StringUtils.isNotBlank(months) && StringUtils.isBlank(days)){
             //查看12个月用水记录
-            return new Result(ResultCode.SUCCESS,_getMonthWaterList(farmCode,months));
+            return new Result(ResultCode.SUCCESS,_getMonthWaterList(farmCode,months,unitId));
         }else if(StringUtils.isBlank(months) && StringUtils.isNotBlank(days)){
             //查看30天用水记录
-            return new Result(ResultCode.SUCCESS,_getDayWaterList(farmCode,days));
+            return new Result(ResultCode.SUCCESS,_getDayWaterList(farmCode,days,unitId));
         }else{
             System.out.println("months="+months);
             System.out.println("days="+days);
@@ -69,10 +70,11 @@ public class EnvWaterMonthServiceImpl extends ServiceImpl<EnvWaterMonthMapper, E
     }
 
     //查看30天用水记录
-    private Object _getDayWaterList(String farmCode, String days) throws ParseException {
+    private Object _getDayWaterList(String farmCode, String days,String unitId) throws ParseException {
         QueryWrapper<EnvWaterDay> queryWrapper = new QueryWrapper();
         queryWrapper.eq("farm_code", farmCode);
         queryWrapper.orderByDesc("add_date");
+        queryWrapper.eq(StringUtils.isNotBlank(unitId),"unit_id", unitId);
         queryWrapper.last("LIMIT "+days);
         List<EnvWaterDay> envWaterDayList = envWaterDayMapper.selectList(queryWrapper);
         List dayList = new ArrayList();
@@ -88,9 +90,10 @@ public class EnvWaterMonthServiceImpl extends ServiceImpl<EnvWaterMonthMapper, E
     }
 
     //查看12个月用水记录
-    private Object _getMonthWaterList(String farmCode, String months) {
+    private Object _getMonthWaterList(String farmCode, String months,String unitId) {
         QueryWrapper<EnvWaterMonth> queryWrapper = new QueryWrapper();
         queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq(StringUtils.isNotBlank(unitId),"unit_id", unitId);
         queryWrapper.orderByDesc("year").orderByDesc("month");
         queryWrapper.last("LIMIT "+months);
 //        List<Map<String,Object>> envWaterMonthList = envWaterMonthMapper.getWaterList();

huimv-env-platform/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -40,10 +40,8 @@ com\huimv\env\common\dao\repo\EnvDeviceEqipmentRepo.class
 com\huimv\env\common\service\EnvElectricityMonthService.class
 com\huimv\env\common\dao\entity\EnvTempEntity.class
 com\huimv\env\common\dao\entity\BasePigpenEntity.class
-com\huimv\env\common\controller\EnvWaterDayController.class
 com\huimv\env\common\dao\repo\EnvAmmoniaEntityRepo.class
 com\huimv\env\common\dao\repo\EnvSprayTimeEntityRepo.class
-com\huimv\env\common\controller\EnvElectricityMonthController.class
 com\huimv\env\common\dao\entity\EnvAmmoniaEntity.class
 com\huimv\env\common\service\impl\TempThresholdServiceImpl.class
 com\huimv\env\common\service\ISensorRegisterService.class
@@ -57,7 +55,6 @@ com\huimv\env\common\entity\EnvElectricityDay.class
 com\huimv\env\common\utils\MathUtil2.class
 com\huimv\env\common\dao\entity\LampTempEntity.class
 com\huimv\env\common\mapper\EnvElectricityDayMapper.class
-com\huimv\env\common\controller\EnvWaterMonthController.class
 com\huimv\env\common\mapper\EnvWaterDayMapper.class
 com\huimv\env\common\dao\repo\EnvElectricityMeterRepo.class
 com\huimv\env\common\service\ISprayConfigService.class

huimv-env-platform/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,83 +1,82 @@
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\EnvElectricityMonthMapper.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvPushMessageEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvAlarmTypeEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\entity\EnvElectricityDay.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvPushMessageEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\BasePigpenEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvDeviceEquipment.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvWaterMeter.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayStatusEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayTimeService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\EnvElectricityMonthService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvElectricityMeterRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\Const.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvWaterGege.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayTimeEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\DeviceRegisterServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayStatusServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvAlarmTypeEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\EnvElectricityDayService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\PigpenServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSensorRegisterEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\controller\EnvElectricityMonthController.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\LampTempEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvPhEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\EnvWaterDayService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayStatusService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\LampConfigEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvTempThresholdEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\PushMessageServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayConfigEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\EnvWaterMonthService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\LampTempServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayConfigServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvDeviceEqipmentRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\EnvWaterMonthServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvWaterMeterRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\MathUtil.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSensorRegisterEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\EnvWaterMonthMapper.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\EnvElectricityDayMapper.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\TempThresholdServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvDeviceRegisterEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ILampTempService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\entity\EnvElectricityMonth.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\BasePigpenEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvTempEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvDeviceRegisterEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ITempThresholdService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\LampConfigEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\EnvWaterDayServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayConfigEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayTimeEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvTempThresholdEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\DateUtil.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\controller\EnvWaterDayController.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayStatusEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvElectricityMeter.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\controller\EnvWaterMonthController.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\EnvElectricityMonthServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\EnvElectricityDayServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\LampConfig.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IPushMessageService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\EnvWaterDayMapper.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\RegexUtil.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\SMSManager.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SensorRegisterServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\entity\EnvWaterMonth.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\BaseDeviceCofig.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayTimeServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISensorRegisterService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvPh.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvTempEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvAmmoniaEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvWaterGegeEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IDeviceRegisterService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayConfigService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvAmmoniaEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\LampTempEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IPigpenService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\entity\EnvWaterDay.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvHumiEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvHumiEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\MathUtil2.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvAlarmTypeEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\PigpenServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\LampConfigEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\EnvElectricityDayMapper.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISensorRegisterService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvPushMessageEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvHumiEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\entity\EnvWaterDay.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvAmmoniaEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\LampTempServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\RegexUtil.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\entity\EnvWaterMonth.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\BasePigpenEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayStatusEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayConfigService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvWaterGegeEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\BaseDeviceCofig.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvTempThresholdEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ILampTempService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvTempEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\EnvWaterDayServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvDeviceRegisterEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSensorRegisterEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\entity\LampTemp.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\LampTempMapper.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\MathUtil2.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayTimeService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvElectricityMeter.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayTimeEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\EnvElectricityDayService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayStatusServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\EnvWaterMonthServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\DateUtil.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayTimeServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\TempThresholdServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IPushMessageService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\MathUtil.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvElectricityMeterRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ITempThresholdService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvAlarmTypeEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvPh.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\SMSManager.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IDeviceRegisterService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayTimeEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvDeviceRegisterEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvPhEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\EnvElectricityMonthMapper.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SensorRegisterServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\entity\EnvElectricityDay.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\EnvElectricityMonthServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvWaterMeterRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\LampTempEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\EnvWaterDayMapper.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvWaterGege.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\PushMessageServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\LampConfig.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayConfigServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\EnvWaterDayService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayStatusService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayStatusEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvWaterMeter.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayConfigEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\DeviceRegisterServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\BasePigpenEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvAmmoniaEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvDeviceEquipment.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayConfigEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\EnvWaterMonthMapper.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IPigpenService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSensorRegisterEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\entity\EnvElectricityMonth.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\LampTempEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvTempEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\EnvWaterMonthService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\LampConfigEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvTempThresholdEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvPushMessageEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\EnvElectricityDayServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\Const.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\EnvElectricityMonthService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvHumiEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvDeviceEqipmentRepo.java

huimv-env-platform/huimv-env-device/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-env-device
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-env-platform/huimv-env-device/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-env-device
 
   datasource:
-    url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform-qingshan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-env-platform/huimv-env-device/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-#spring.profiles.active=prod
-spring.profiles.active=dev
+spring.profiles.active=prod
+#spring.profiles.active=dev
 
 #\u5F00\u542F\u5065\u5EB7\u76D1\u63A7
 management.endpoints.web.exposure.include=*

huimv-env-platform/huimv-env-input/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-env-input
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-env-platform/huimv-env-input/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-env-input
 
   datasource:
-    url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform-qingshan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-env-platform/huimv-env-input/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-#spring.profiles.active=prod
-spring.profiles.active=dev
+spring.profiles.active=prod
+#spring.profiles.active=dev
 
 #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 management.endpoints.web.exposure.include=*

huimv-env-platform/huimv-env-input/target/classes/application-dev.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-env-input
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-env-platform/huimv-env-input/target/classes/application.properties

@@ -1,5 +1,5 @@
-#spring.profiles.active=prod
-spring.profiles.active=dev
+spring.profiles.active=prod
+#spring.profiles.active=dev
 
 #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 management.endpoints.web.exposure.include=*

huimv-env-platform/huimv-env-lamp/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-env-input
 
   datasource:
-    url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform-qingshan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-env-platform/huimv-env-lamp/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=prod
+#spring.profiles.active=dev
+spring.profiles.active=prod
 
 #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 management.endpoints.web.exposure.include=*

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/HuimvEnvManageApplication.java

@@ -47,7 +47,7 @@ public class HuimvEnvManageApplication {
      * http重定向到https
      * @return
      */
-  /*  @Bean
+    @Bean
     public TomcatServletWebServerFactory servletContainer() {
         TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory() {
             @Override
@@ -74,5 +74,5 @@ public class HuimvEnvManageApplication {
         //监听到http的端口号后转向到的https的端口号,也就是项目配置的port
         connector.setRedirectPort(8097);
         return connector;
-    }*/
+    }
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvElectricityDayController.java

@@ -5,11 +5,7 @@ import com.huimv.common.utils.Result;
 import com.huimv.env.common.service.EnvElectricityDayService;
 import com.huimv.env.common.service.EnvElectricityMonthService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.text.ParseException;
@@ -25,6 +21,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/envElectricity")
+@CrossOrigin
 public class EnvElectricityDayController {
     @Autowired
     private EnvElectricityDayService envElectricityDayService;

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvWaterDayController.java

@@ -5,11 +5,7 @@ import com.huimv.common.utils.Result;
 import com.huimv.env.common.service.EnvWaterDayService;
 import com.huimv.env.common.service.EnvWaterMonthService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.text.ParseException;
@@ -25,6 +21,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/envWater")
+@CrossOrigin
 public class EnvWaterDayController {
     @Autowired
     private EnvWaterDayService envWaterDayService;

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/EnvPhMapper.java

@@ -1,7 +1,12 @@
 package com.huimv.env.manage.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.env.manage.saas.dao.entity.EnvPh;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,5 @@ import com.huimv.env.manage.saas.dao.entity.EnvPh;
  */
 public interface EnvPhMapper extends BaseMapper<EnvPh> {
 
+    List<EnvPh> groupByTimeList(@Param(Constants.WRAPPER)QueryWrapper<EnvPh> queryWrapper);
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/xml/EnvDeviceEquipmentMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.env.manage.mapper.EnvDeviceEquipmentMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.env.manage.entity.EnvDeviceEquipment">
-        <id column="id" property="id" />
-        <result column="equipment_name" property="equipmentName" />
-        <result column="unit_id" property="unitId" />
-        <result column="open_start" property="openStart" />
-        <result column="equipment_port" property="equipmentPort" />
-        <result column="device_code" property="deviceCode" />
-        <result column="upload_start" property="uploadStart" />
-        <result column="binding" property="binding" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, equipment_name, unit_id, open_start, equipment_port, device_code, upload_start, binding
-    </sql>
-
-</mapper>

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/xml/EnvPhMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.env.manage.mapper.EnvPhMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.env.manage.entity.EnvPh">
-        <id column="id" property="id" />
-        <result column="device_code" property="deviceCode" />
-        <result column="sensor_sn" property="sensorSn" />
-        <result column="ph" property="ph" />
-        <result column="ask_time" property="askTime" />
-        <result column="add_time" property="addTime" />
-        <result column="add_date" property="addDate" />
-        <result column="pigpen_id" property="pigpenId" />
-        <result column="unit_id" property="unitId" />
-        <result column="farm_code" property="farmCode" />
-        <result column="data_unit" property="dataUnit" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, device_code, sensor_sn, ph, ask_time, add_time, add_date, pigpen_id, unit_id, farm_code, data_unit
-    </sql>
-
-</mapper>

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/xml/EnvWaterMonthMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.env.manage.mapper.EnvWaterMonthMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.env.manage.entity.EnvWaterMonth">
-        <id column="id" property="id" />
-        <result column="device_code" property="deviceCode" />
-        <result column="sensor_sn" property="sensorSn" />
-        <result column="month_water" property="monthWater" />
-        <result column="pigpen_id" property="pigpenId" />
-        <result column="unit_id" property="unitId" />
-        <result column="farm_code" property="farmCode" />
-        <result column="data_unit" property="dataUnit" />
-        <result column="month" property="month" />
-        <result column="year" property="year" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="start_water" property="startWater" />
-        <result column="end_water" property="endWater" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, device_code, sensor_sn, month_water, pigpen_id, unit_id, farm_code, data_unit, month, year, start_time, end_time, start_water, end_water
-    </sql>
-
-</mapper>

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/dao/entity/EnvPh.java

@@ -7,6 +7,7 @@ import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -40,11 +41,11 @@ public class EnvPh implements Serializable {
 
     private String askTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private LocalDateTime addTime;
+    @JsonFormat(pattern = "MM-dd HH",timezone = "GMT+8")
+    private Date addTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private LocalDate addDate;
+//    @JsonFormat(pattern = "MM-dd HH",timezone = "GMT+8")
+    private Date addDate;
 
     private String pigpenId;
 

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/EnvPhServiceImpl.java

@@ -56,7 +56,8 @@ public class EnvPhServiceImpl extends ServiceImpl<EnvPhMapper, EnvPh> implements
         queryWrapper.eq(StringUtils.isNotBlank(unitId),"unit_id",unitId);
         queryWrapper.ge("add_time", DateUtil.beginOfDay(new Date()));
         queryWrapper.orderByDesc("add_time");
-        List<EnvPh> list = this.list(queryWrapper);
+        queryWrapper.groupBy("DATE_FORMAT(add_time,'%Y-%m-%d %H') ");
+        List<EnvPh> list = envPhMapper.selectList(queryWrapper);
         if (ObjectUtil.isNotEmpty(list)){
             return new Result(ResultCode.SUCCESS,list);
         }else {

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/EnvTempServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.env.manage.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.env.common.utils.DateUtil;
@@ -48,7 +49,11 @@ public class EnvTempServiceImpl extends ServiceImpl<EnvTempMapper, EnvTemp> impl
         }
 
         //获取最后24小时的温度数据曲线
-        List<Map<String, Object>> envTempList = _getLast24HourTemp(farmCode, Integer.parseInt(hours), lastEnvTemp, unitId);
+        List<Map<String, Object>> envTempList =new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(lastEnvTemp)){
+            envTempList =_getLast24HourTemp(farmCode, Integer.parseInt(hours), lastEnvTemp, unitId);
+        }
+
 
         //获取当前最新湿度
         EnvHumi lastEnvHumi = _getLastHumi2(farmCode, unitId);
@@ -57,7 +62,10 @@ public class EnvTempServiceImpl extends ServiceImpl<EnvTempMapper, EnvTemp> impl
             lastHumiBd = lastEnvHumi.getHumi();
         }
         //获取最后24小时的湿度数据曲线
-        List<Map<String, Object>> envHumiList = _getLast24HourHumi(farmCode, Integer.parseInt(hours), lastEnvHumi, unitId);
+        List<Map<String, Object>> envHumiList = new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(lastEnvHumi)){
+             envHumiList = _getLast24HourHumi(farmCode, Integer.parseInt(hours), lastEnvHumi, unitId);
+        }
 
         //合并温度和湿度
         List<Map<String, Object>> mergeList = _mergeTempAndHumi(envTempList, envHumiList);

huimv-env-platform/huimv-env-manage/src/main/resources/application-prod.yml

@@ -1,15 +1,15 @@
 server:
   port: 8097
   ssl:
-    key-store: classpath:8391578_kdmc.ifarmcloud.com.jks
+    key-store: classpath:8717089_qingshan.ifarmcloud.com.jks
     key-store-type: jks
-    key-store-password: RLKkWail
+    key-store-password: QYCEc3uL
 spring:
   application:
     name: huimv-env-manage
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform-qingshan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-env-platform/huimv-env-manage/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=prod
+#spring.profiles.active=dev
+spring.profiles.active=prod
 
 # mysql:/cache:
 device.online.access_mode=mysql

huimv-env-platform/huimv-env-manage/src/main/resources/com/huimv/env/manage/mapper/EnvPhMapper.xml

@@ -16,5 +16,11 @@
         <result column="farm_code" property="farmCode" />
         <result column="data_unit" property="dataUnit" />
     </resultMap>
+    <select id="groupByTimeList" resultType="com.huimv.env.manage.saas.dao.entity.EnvPh">
+         SELECT * FROM `env_ph`
+
+          GROUP BY  DATE_FORMAT(add_time,'%Y-%m-%d %H')
+
+    </select>
 
 </mapper>

huimv-env-platform/huimv-env-produce/src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@ spring:
     name: huimv-env-produce
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-produce-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv-produce-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-env-platform/huimv-env-produce/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=prod
+#spring.profiles.active=dev
+spring.profiles.active=prod
 
 # mysql:/cache:
 device.online.access_mode=mysql