Parcourir la source

新增 气象设备风力风速展示

zhaiyifei il y a 10 mois
Parent
commit
eda5615d6c

+ 4 - 4
src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/YfQxzDeviceImpl.java

@@ -14,7 +14,7 @@ import com.yunfeiyun.agmp.iot.common.domain.IotBzydata;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotYfqxzdata;
 import com.yunfeiyun.agmp.iot.common.domain.IotYfqxzdata;
 import com.yunfeiyun.agmp.iot.common.enums.EnumCommonDataFactor;
 import com.yunfeiyun.agmp.iot.common.enums.EnumCommonDataFactor;
-import com.yunfeiyun.agmp.iot.common.enums.YfqxzEnumFactor;
+import com.yunfeiyun.agmp.iot.common.enums.EnumYfQxzElement;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
@@ -292,7 +292,7 @@ public class YfQxzDeviceImpl extends DeviceAbstractImpl implements IYfQxzDevice
             iotYfqxzdataList.add(iotYfqxzdata);
             iotYfqxzdataList.add(iotYfqxzdata);
 
 
             // 如果有累计雨量,则计算单次雨量
             // 如果有累计雨量,则计算单次雨量
-            if(YfqxzEnumFactor.TYPE14.getCode().equals(eNum)){
+            if(EnumYfQxzElement.TYPE14.geteNum().equals(eNum)){
                 Date selectTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.dateNow());
                 Date selectTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.dateNow());
                 Map<String, Object> map = new HashMap<>();
                 Map<String, Object> map = new HashMap<>();
                 map.put("devBid",iotDeviceOld.getDevBid());
                 map.put("devBid",iotDeviceOld.getDevBid());
@@ -307,9 +307,9 @@ public class YfQxzDeviceImpl extends DeviceAbstractImpl implements IYfQxzDevice
                 IotYfqxzdata iotYfqxzdata2 = new IotYfqxzdata();
                 IotYfqxzdata iotYfqxzdata2 = new IotYfqxzdata();
                 iotYfqxzdata2.setCId(iotDeviceOld.getTid());
                 iotYfqxzdata2.setCId(iotDeviceOld.getTid());
                 iotYfqxzdata2.setDevBid(iotDeviceOld.getDevBid());
                 iotYfqxzdata2.setDevBid(iotDeviceOld.getDevBid());
-                iotYfqxzdata2.setENum(YfqxzEnumFactor.TYPE4.getCode());
+                iotYfqxzdata2.setENum(EnumYfQxzElement.TYPE4.geteNum());
                 iotYfqxzdata2.setEName(EnumCommonDataFactor.TYPE_104.getCode());
                 iotYfqxzdata2.setEName(EnumCommonDataFactor.TYPE_104.getCode());
-                iotYfqxzdata2.setEKey("e" + YfqxzEnumFactor.TYPE4.getCode());
+                iotYfqxzdata2.setEKey("e" + EnumYfQxzElement.TYPE4.geteNum());
                 iotYfqxzdata2.setEValue(new DecimalFormat("0.00").format(ev));
                 iotYfqxzdata2.setEValue(new DecimalFormat("0.00").format(ev));
                 iotYfqxzdata2.setTime(reportDt);
                 iotYfqxzdata2.setTime(reportDt);
 
 

Fichier diff supprimé car celui-ci est trop grand
+ 2245 - 2248
src/main/java/com/yunfeiyun/agmp/iots/service/impl/WarnServiceDelete.java