code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-19 17:35:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

设备修改定位字段名称，添加设备摘要

Browse Source
This commit is contained in:
kerwincui
2022-06-06 13:11:06 +08:00
parent c9a036043e
commit 24f2e65f2b
8 changed files with 85 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
View File

@@ -472,7 +472,7 @@ public class DeviceServiceImpl implements IDeviceService {
device.setActiveTime(DateUtils.getNowDate());
device.setIsShadow(0);
device.setRssi(0);
device.setIsCustomLocation(1); // 1-自动定位，2-设备定位，3-自定义位置
device.setlocationWay(1); // 1-自动定位，2-设备定位，3-自定义位置
device.setCreateTime(DateUtils.getNowDate());
device.setThingsModelValue(JSONObject.toJSONString(getThingsModelDefaultValue(device.getProductId())));
// 随机位置
@@ -609,7 +609,7 @@ public class DeviceServiceImpl implements IDeviceService {
device.setActiveTime(DateUtils.getNowDate());
}
// 定位方式(1=ip自动定位，2=设备定位，3=自定义)
if (device.getIsCustomLocation() == 1) {
if (device.getlocationWay() == 1) {
device.setNetworkIp(ipAddress);
setLocation(ipAddress, device);
}