|
|
@@ -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.IIotDeviceconfigService;
|
|
|
import com.yunfeiyun.agmp.iots.service.IIotDevicelasteddataService;
|
|
|
+import com.yunfeiyun.agmp.iots.service.IotDeviceAddressService;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.http.util.TextUtils;
|
|
|
import org.eclipse.paho.client.mqttv3.MqttException;
|
|
|
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
/**
|
|
|
* 云飞性诱 III:不带拍照
|
|
|
@@ -48,6 +50,9 @@ public class YfXycbIIIDeviceImpl extends DeviceAbstractImpl implements IYfXycbII
|
|
|
@Autowired
|
|
|
private IIotDevicelasteddataService iIotDevicelasteddataService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IotDeviceAddressService iotDeviceAddressService;
|
|
|
+
|
|
|
/**
|
|
|
* 根据topic、设备发来的消息,查询对应设备实体
|
|
|
*
|
|
|
@@ -97,6 +102,12 @@ public class YfXycbIIIDeviceImpl extends DeviceAbstractImpl implements IYfXycbII
|
|
|
}
|
|
|
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
|
|
|
iIotDeviceService.updateIotDevice(newIotDevice);
|
|
|
// 创建或更新设备配置信息
|