Просмотр исходного кода

新增 所有物联网设备更新经纬度时候同时更新地理位置数据表

zhaiyifei 10 месяцев назад
Родитель
Сommit
5cded1c6cb

+ 1 - 0
src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/BzyDeviceImpl.java

@@ -187,6 +187,7 @@ public class BzyDeviceImpl extends DeviceAbstractImpl implements IBzyDevice {
 
         String devtypeBid = oldIotDevice.getDevtypeBid();
         IotDevice newIotDevice = new IotDevice();
+        newIotDevice.setTid(oldIotDevice.getTid());
         newIotDevice.setDevBid(oldIotDevice.getDevBid());
         newIotDevice.setDevtypeBid(devtypeBid);
         newIotDevice.setDevUpdateddate(devUpdateddate);

+ 2 - 0
src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/IYfXctDeviceImpl.java

@@ -148,7 +148,9 @@ public class  IYfXctDeviceImpl extends DeviceAbstractImpl implements IYfXctDevic
         }
 
         IotDevice newIotDevice = new IotDevice();
+        newIotDevice.setTid(oldIotDevice.getTid());
         newIotDevice.setDevBid(oldIotDevice.getDevBid());
+        newIotDevice.setDevtypeBid(oldIotDevice.getDevtypeBid());
         newIotDevice.setDevUpdateddate(devUpdateddate);
         newIotDevice.setDevStatus(IotDeviceStatusTypeEnum.ONLINE.getCode());
 

+ 1 - 0
src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/XphYfQxzDeviceImpl.java

@@ -254,6 +254,7 @@ public class XphYfQxzDeviceImpl extends DeviceAbstractImpl implements IXphYfQxzD
         String devCode = iotDeviceOld.getDevCode();
 
         IotDevice iotDevice = new IotDevice();
+        iotDevice.setTid(iotDeviceOld.getTid());
         iotDevice.setDevtypeBid(iotDeviceOld.getDevtypeBid());
         iotDevice.setFirmBid(iotDeviceOld.getFirmBid());
         iotDevice.setDevUpdateddate(devUpdateddate);

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

@@ -335,6 +335,7 @@ public class YfQxzDeviceImpl extends DeviceAbstractImpl implements IYfQxzDevice
         String devCode = iotDeviceOld.getDevCode();
 
         IotDevice iotDevice = new IotDevice();
+        iotDevice.setTid(iotDeviceOld.getTid());
         iotDevice.setDevtypeBid(iotDeviceOld.getDevtypeBid());
         iotDevice.setFirmBid(iotDeviceOld.getFirmBid());
         iotDevice.setDevUpdateddate(devUpdateddate);

+ 2 - 0
src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/YfScdDeviceImpl.java

@@ -133,6 +133,8 @@ public class YfScdDeviceImpl extends DeviceAbstractImpl implements IYfScdDevice
         }
 
         IotDevice iotDevice = new IotDevice();
+        iotDevice.setTid(oldIotDevice.getTid());
+        iotDevice.setDevtypeBid(oldIotDevice.getDevtypeBid());
         iotDevice.setDevBid(oldIotDevice.getDevBid());
         iotDevice.setDevUpdateddate(devUpdateddate);
         iotDevice.setDevStatus("1");//设备上线

+ 2 - 0
src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/YfXycb2DeviceImpl.java

@@ -84,6 +84,8 @@ public class YfXycb2DeviceImpl extends DeviceAbstractImpl implements IYfXycb2Dev
         }
 
         IotDevice newIotDevice = new IotDevice();
+        newIotDevice.setTid(oldIotDevice.getTid());
+        newIotDevice.setDevtypeBid(oldIotDevice.getDevtypeBid());
         newIotDevice.setDevBid(oldIotDevice.getDevBid());
         newIotDevice.setDevVersion("YF-XY-2.0");
         newIotDevice.setDevUpdateddate(devUpdateddate);

+ 2 - 0
src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/YfXycbIIIDeviceImpl.java

@@ -81,6 +81,8 @@ public class YfXycbIIIDeviceImpl extends DeviceAbstractImpl implements IYfXycbII
         }
 
         IotDevice newIotDevice = new IotDevice();
+        newIotDevice.setTid(oldIotDevice.getTid());
+        newIotDevice.setDevtypeBid(oldIotDevice.getDevtypeBid());
         newIotDevice.setDevBid(oldIotDevice.getDevBid());
         newIotDevice.setDevVersion("YF-XY-III");
         newIotDevice.setDevUpdateddate(devUpdateddate);

+ 1 - 0
src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/ZjsfXycbDeviceImpl.java

@@ -240,6 +240,7 @@ public class ZjsfXycbDeviceImpl extends HttpDeviceAbstractImpl implements ZjsfXy
             iotDevice.setDevUpdateddate(updatedDate);
             iotDevice.setDevStatus("1");
             iotDevice.setTid(oldIotDevice.getTid());
+            iotDevice.setDevtypeBid(iotDevice.getDevtypeBid());
 
             if (!Objects.equals(oldIotDevice.getDevPositionstatus(), "0")) {
                 iotDeviceAddressService.setDeviceAddress(iotDevice, lng, lat);

+ 2 - 2
src/main/java/com/yunfeiyun/agmp/iots/task/IotStatusService.java

@@ -110,8 +110,8 @@ public class IotStatusService {
         for (IotDeviceStatusResVo iotDeviceStatusResVo : iotDeviceStatusResVos) {
             try {
                 // 获取设备类型id,存在的在进行检查,因为有些设备不是基于device config 上报
-                String tid = iotDeviceStatusResVo.getDevtypeBid();
-                if (validateDeviceType.contains(tid)) {
+                String devtypeBid = iotDeviceStatusResVo.getDevtypeBid();
+                if (validateDeviceType.contains(devtypeBid)) {
                     // 获取最新上报时间
                     String updateTime = iotDeviceStatusResVo.getDevUpdateddate();
                     /**