|
|
@@ -296,7 +296,7 @@ public class YfQxzDeviceImpl extends DeviceAbstractImpl implements IYfQxzDevice
|
|
|
Date selectTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.dateNow());
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("devBid",iotDeviceOld.getDevBid());
|
|
|
- map.put("lte_time", selectTime);
|
|
|
+ map.put("gte_time", selectTime);
|
|
|
map.put("eNum", eNum);
|
|
|
IotYfqxzdata resultData = (IotYfqxzdata) mongoService.findOne(IotYfqxzdata.class, map, "time", "desc");
|
|
|
double ev = Double.parseDouble(eValue);
|
|
|
@@ -304,6 +304,9 @@ public class YfQxzDeviceImpl extends DeviceAbstractImpl implements IYfQxzDevice
|
|
|
String oldEValue = resultData.getEValue();
|
|
|
ev = ev - Double.parseDouble(oldEValue);
|
|
|
}
|
|
|
+ if(ev < 0){
|
|
|
+ ev = 0.0;
|
|
|
+ }
|
|
|
IotYfqxzdata iotYfqxzdata2 = new IotYfqxzdata();
|
|
|
iotYfqxzdata2.setCId(iotDeviceOld.getTid());
|
|
|
iotYfqxzdata2.setDevBid(iotDeviceOld.getDevBid());
|