Browse Source

处理device中,保存每天用电用水的数据问题。

zhuoning 2 years ago
parent
commit
bb97b5332b

+ 1 - 0
huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvElectricityDayServiceImpl.java

@@ -148,6 +148,7 @@ public class EnvElectricityDayServiceImpl extends ServiceImpl<EnvElectricityDayM
         envElectricityDay.setUnitId(envDeviceRegisterEntity.getUnitId());
         envElectricityDay.setLinkRelativeRatio(linkRelativeRatioBd);
         envElectricityDay.setFarmCode(farmCode);
+        System.out.println("保存每天电量 envElectricityDay >> "+envElectricityDay);
         int rows = envElectricityDayMapper.insert(envElectricityDay);
         System.out.println("添加记录数="+rows);
     }

+ 1 - 0
huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvWaterDayServiceImpl.java

@@ -151,6 +151,7 @@ public class EnvWaterDayServiceImpl extends ServiceImpl<EnvWaterDayMapper, EnvWa
         envWaterDay.setUnitId(envDeviceRegisterEntity.getUnitId());
         envWaterDay.setLinkRelativeRatio(linkRelativeRatioBd);
         envWaterDay.setFarmCode(farmCode);
+        System.out.println("保存每天水量 envWaterDay >> "+envWaterDay);
         int rows = envWaterDayMapper.insert(envWaterDay);
         System.out.println("添加记录数="+rows);
     }

+ 3 - 0
huimv-env-platform/huimv-env-device/src/main/java/com/huimv/env/device/service/impl/DeviceServiceImpl.java

@@ -81,6 +81,7 @@ public class DeviceServiceImpl implements IDeviceService {
         String sensorSn = dataJo.getString("sensorSn");
         //查询每天的用水量数据
         EnvWaterDay envWaterDay = envWaterDayService.getDayWaterConsumption(farmCode,deviceCode,sensorSn,todayDate);
+        System.out.println("envWaterDay="+envWaterDay);
         if(envWaterDay == null){
             envWaterDayService.saveDayWater(dataJo,envDeviceRegisterEntity,nowTimestamp,todayDate,farmCode);
         }else{
@@ -138,6 +139,7 @@ public class DeviceServiceImpl implements IDeviceService {
         String sensorSn = dataJo.getString("sensorSn");
         //查询每天的用电量数据
         EnvElectricityDay envElectricityDay = envElectricityDayService.getDayElectricityConsumption(farmCode,deviceCode,sensorSn,todayDate);
+        System.out.println("envElectricityDay="+envElectricityDay);
         if(envElectricityDay == null){
             envElectricityDayService.saveDayElectricity(dataJo,envDeviceRegisterEntity,nowTimestamp,todayDate,farmCode);
         }else{
@@ -150,6 +152,7 @@ public class DeviceServiceImpl implements IDeviceService {
     //累计当天所有电量
     private float getSumTodayElectricityMeter(String farmCode, String deviceCode, Date todayDate) {
         List<Object[]> sumList =  envElectricityMeterRepo.getSumElectricityMeter(farmCode,deviceCode,todayDate);
+        System.out.println("00000000000000000000 sumList.size="+sumList.size());
         Object[] sumObj = (Object[]) sumList.get(0);
         return Float.parseFloat(sumObj[0].toString());
     }

+ 3 - 0
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/StockDetailController.java

@@ -82,12 +82,15 @@ public class StockDetailController {
         if (dsStatu == null) {
             dsStatu = 0;
         }
+        //dsStatu=1,dsStatu=2
         if (dsStatu == 1) {
+            //dsStatu=1 ,真实数据
             System.out.println("大屏-存栏结构-读取远程数据");
             //读取远程数据
             return getRemoteStock(paramsMap);
         } else {
             System.out.println("大屏-存栏结构-读取本地填报数据");
+            //dsStatu=0 ,填报数据
             //读取填报数据
             return stockDetailService.getCurrentStock(paramsMap);
         }