新增 获取位置信息公共工具

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/CqCbdDeviceImpl.java

@@ -13,7 +13,7 @@ import com.yunfeiyun.agmp.iot.common.domain.IotBaseEntity;
 import com.yunfeiyun.agmp.iot.common.domain.IotCbddata;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
-import com.yunfeiyun.agmp.iot.common.service.IotAddressService;
+import com.yunfeiyun.agmp.common.service.LocationService;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.common.DeviceAbstractImpl;
@@ -55,7 +55,7 @@ public class CqCbdDeviceImpl extends DeviceAbstractImpl implements ICbdDevice {
     private MongoService<IotBaseEntity> mongoService;
 
     @Autowired
-    private IotAddressService iotAddressService;
+    private LocationService locationService;
 
     @Autowired
     private IotCbdImgService iotCbdImgService;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/XphYfQxzDeviceImpl.java

@@ -10,7 +10,7 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.constant.mqtt.IotMqttConstant;
 import com.yunfeiyun.agmp.iot.common.domain.*;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
-import com.yunfeiyun.agmp.iot.common.service.IotAddressService;
+import com.yunfeiyun.agmp.common.service.LocationService;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.common.DeviceAbstractImpl;
@@ -55,7 +55,7 @@ public class XphYfQxzDeviceImpl extends DeviceAbstractImpl implements IXphYfQxzD
     private MongoService<IotBaseEntity> mongoService;
 
     @Autowired
-    private IotAddressService iotAddressService;
+    private LocationService locationService;
 
     @Autowired
     private IIotDeviceService iIotDeviceService;

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.IotYfqxzdata;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
-import com.yunfeiyun.agmp.iot.common.service.IotAddressService;
+import com.yunfeiyun.agmp.common.service.LocationService;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.common.DeviceAbstractImpl;
@@ -61,7 +61,7 @@ public class YfQxzDeviceImpl extends DeviceAbstractImpl implements IYfQxzDevice
     private MongoService<IotBaseEntity> mongoService;
 
     @Autowired
-    private IotAddressService iotAddressService;
+    private LocationService locationService;
 
     @Autowired
     private IIotDeviceService iIotDeviceService;

src/main/java/com/yunfeiyun/agmp/iots/service/IotDeviceAddressService.java

@@ -1,8 +1,8 @@
 package com.yunfeiyun.agmp.iots.service;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
-import com.yunfeiyun.agmp.iot.common.model.address.IotAddressModel;
-import com.yunfeiyun.agmp.iot.common.service.IotAddressService;
+import com.yunfeiyun.agmp.common.service.modal.LocationAddressModel;
+import com.yunfeiyun.agmp.common.service.LocationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -14,7 +14,7 @@ import java.math.RoundingMode;
 @Slf4j
 public class IotDeviceAddressService {
     @Autowired
-    public IotAddressService iotAddressService;
+    public LocationService locationService;
 
     public void setDeviceAddress(IotDevice iotDevice, String lng, String lat){
         try {
@@ -24,12 +24,12 @@ public class IotDeviceAddressService {
 
             if (devLatBig.compareTo(oneBig) > 0 && devLngBig.compareTo(oneBig) > 0) {
                 // TODO 通过经纬度获取城市信息
-                IotAddressModel iotAddressModel = iotAddressService.getAddressByLngLat(devLngBig, devLatBig);
+                LocationAddressModel locationAddressModel = locationService.getAddressByLngLat(devLngBig, devLatBig);
 
-                if (iotAddressModel != null) {
-                    String devProvince = iotAddressModel.getProvince();
-                    String devCity = iotAddressModel.getCity();
-                    String devDistrict = iotAddressModel.getDistrict();
+                if (locationAddressModel != null) {
+                    String devProvince = locationAddressModel.getProvince();
+                    String devCity = locationAddressModel.getCity();
+                    String devDistrict = locationAddressModel.getDistrict();
 
                     iotDevice.setDevProvince(devProvince);
                     iotDevice.setDevCity(devCity);