Prechádzať zdrojové kódy

修复 性诱测报设备没有获取经纬度的问题

zhaiyifei 1 rok pred
rodič
commit
6ff91d1083

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

@@ -16,6 +16,7 @@ import com.yunfeiyun.agmp.iots.device.service.IYfXycbIIIDevice;
 import com.yunfeiyun.agmp.iots.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iots.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iots.service.IIotDeviceconfigService;
 import com.yunfeiyun.agmp.iots.service.IIotDeviceconfigService;
 import com.yunfeiyun.agmp.iots.service.IIotDevicelasteddataService;
 import com.yunfeiyun.agmp.iots.service.IIotDevicelasteddataService;
+import com.yunfeiyun.agmp.iots.service.IotDeviceAddressService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;
 import org.apache.http.util.TextUtils;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Component;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
+import java.util.Objects;
 
 
 /**
 /**
  * 云飞性诱 III:不带拍照
  * 云飞性诱 III:不带拍照
@@ -48,6 +50,9 @@ public class YfXycbIIIDeviceImpl extends DeviceAbstractImpl implements IYfXycbII
     @Autowired
     @Autowired
     private IIotDevicelasteddataService iIotDevicelasteddataService;
     private IIotDevicelasteddataService iIotDevicelasteddataService;
 
 
+    @Autowired
+    private IotDeviceAddressService iotDeviceAddressService;
+
     /**
     /**
      * 根据topic、设备发来的消息,查询对应设备实体
      * 根据topic、设备发来的消息,查询对应设备实体
      *
      *
@@ -97,6 +102,12 @@ public class YfXycbIIIDeviceImpl extends DeviceAbstractImpl implements IYfXycbII
         }
         }
         String devConfig = JSONUtils.toJSONString(extConf);
         String devConfig = JSONUtils.toJSONString(extConf);
 
 
+        String lng = dataJson.getString("lng");
+        String lat = dataJson.getString("lat");
+        if (!Objects.equals(oldIotDevice.getDevPositionstatus(), "0") && StringUtils.isNotEmpty(lng) && StringUtils.isNotEmpty(lat)) {
+            iotDeviceAddressService.setDeviceAddress(newIotDevice, lng, lat);
+        }
+
         // 更新设备基础信息数据库 mysql
         // 更新设备基础信息数据库 mysql
         iIotDeviceService.updateIotDevice(newIotDevice);
         iIotDeviceService.updateIotDevice(newIotDevice);
         // 创建或更新设备配置信息
         // 创建或更新设备配置信息