chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新，待分成金额

Browse Source
This commit is contained in:
磷叶 2025-04-25 08:52:23 +08:00
parent 2f3d2407a0
commit 0f13f74374
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-service/src/main/java/com/ruoyi/bst/device/utils/DeviceUtil.java
View File

@ -1,10 +1,12 @@
package com.ruoyi.bst.device.utils;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import com.ruoyi.bst.device.domain.DeviceVO;
import com.ruoyi.bst.orderDevice.domain.enums.OrderDeviceStatus;
import com.ruoyi.common.utils.MathUtils;
import com.ruoyi.common.utils.map.GpsCoordinateUtils;
import com.ruoyi.iot.domain.IotDeviceInfo;
import com.ruoyi.iot.domain.IotDeviceSysInfo;
@ -17,7 +19,7 @@ public class DeviceUtil {
* @param device 设备
* @param sys 设备信息
*/
public static void setIotSysInfo(DeviceVO device, IotDeviceSysInfo sys) {
public static void setIotSysInfo(DeviceVO device, IotDeviceSysInfo sys, LocalDateTime at) {
if (device == null || sys == null) {
return;
}
@ -28,6 +30,11 @@ public class DeviceUtil {
if (coordinates != null && coordinates.size() >= 2) {
device.setLongitude(coordinates.get(1));
device.setLatitude(coordinates.get(0));
// 只有定位是正常的才认为是有获取到定位
if (!MathUtils.equals(device.getLongitude(), BigDecimal.ZERO) && !MathUtils.equals(device.getLatitude(), BigDecimal.ZERO)) {
device.setLastLocationTime(at);
}
}
}
@ -51,11 +58,10 @@ public class DeviceUtil {
IotDeviceSysInfo sys = iot.getSys();
if (sys != null) {
setIotSysInfo(device, sys);
setIotSysInfo(device, sys, iot.getAt());
}
device.setSoftwareVersion(iot.getVer());
device.setLastTime(iot.getAt());
device.setLastLocationTime(iot.getAt());
}
/**

6
ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotReceiveServiceImpl.java
View File

@ -95,7 +95,7 @@ public class IotReceiveServiceImpl implements IotReceiveService {
}
// 设置设备信息
DeviceUtil.setIotSysInfo(device, sys);
DeviceUtil.setIotSysInfo(device, sys, at);
device.setLastTime(at);
device.setLastLocationTime(at);
@ -153,8 +153,8 @@ public class IotReceiveServiceImpl implements IotReceiveService {
deviceIotService.reboot(device, reason, true);
return 1;
}
}
}
return 0;
}

2
ruoyi-web/src/main/java/com/ruoyi/web/common/LoginController.java
View File

@ -104,7 +104,7 @@ public class LoginController
Set<String> permissions = permissionService.getMenuPermission(user);
// 统计数据
StatQuery query = new StatQuery();
query.setScope(true);
query.setScope(false);
query.setUserId(user.getUserId());
query.setBonusUserId(user.getUserId());
query.setKeys(Arrays.asList(