|
|
@@ -295,7 +295,7 @@ public class YfQxzDeviceImpl extends DeviceAbstractImpl implements IYfQxzDevice
|
|
|
iotYfqxzdataList.add(iotYfqxzdata);
|
|
|
|
|
|
// 如果有累计雨量,则计算单次雨量
|
|
|
- if(YfqxzEnumFactor.TYPE14.getCode().equals(eNum.replace("e",""))){
|
|
|
+ if(YfqxzEnumFactor.TYPE14.getCode().equals(eNum)){
|
|
|
Date selectTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.dateNow());
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("devBid",iotDeviceOld.getDevBid());
|
|
|
@@ -310,7 +310,7 @@ public class YfQxzDeviceImpl extends DeviceAbstractImpl implements IYfQxzDevice
|
|
|
IotYfqxzdata iotYfqxzdata2 = new IotYfqxzdata();
|
|
|
iotYfqxzdata2.setCId(iotDeviceOld.getTid());
|
|
|
iotYfqxzdata2.setDevBid(iotDeviceOld.getDevBid());
|
|
|
- iotYfqxzdata2.setENum(eNum);
|
|
|
+ iotYfqxzdata2.setENum(YfqxzEnumFactor.TYPE4.getCode());
|
|
|
iotYfqxzdata2.setEName(EnumCommonDataFactor.TYPE_104.getCode());
|
|
|
iotYfqxzdata2.setEKey("e" + YfqxzEnumFactor.TYPE4.getCode());
|
|
|
iotYfqxzdata2.setEValue(new DecimalFormat("0.00").format(ev));
|