|
@@ -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());
|
|
|
}
|