q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(device): 添加空值检查避免空指针异常- 在设置设备在线状态时添加对 lastActiveTime 和 clientIP 的空值检查
All checks were successful
ZhenTu-BE/pipeline/head This commit looks good
Details

Browse Source 
- 在判断设备是否在线时，增加对 keepaliveAt 时间的空值判断
- 防止因空值导致的 NullPointerException 异常- 提高代码健壮性和稳定性
This commit is contained in:
Jerry Yan
2025-09-25 15:52:16 +08:00
parent 3c700a42f9
commit 4a05773860
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/ycwl/basic/repository/DeviceRepository.java
View File

@@ -75,8 +75,13 @@ public class DeviceRepository {
if (statusDto != null) {
// Boolean转Integer: true→1, false→0
entity.setOnline(statusDto.getIsOnline() != null && statusDto.getIsOnline() ? 1 : 0);
entity.setKeepaliveAt(statusDto.getLastActiveTime());
entity.setIpAddr(statusDto.getClientIP());
// 添加空值检查，避免NullPointerException
if (statusDto.getLastActiveTime() != null) {
entity.setKeepaliveAt(statusDto.getLastActiveTime());
}
if (statusDto.getClientIP() != null) {
entity.setIpAddr(statusDto.getClientIP());
}
} else {
// 默认离线状态
entity.setOnline(0);

4
src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java
View File

@@ -294,7 +294,9 @@ public class AppScenicServiceImpl implements AppScenicService {
if (onlineStatus != null) {
deviceRespVO.setUpdateAt(onlineStatus.getKeepaliveAt());
deviceRespVO.setKeepaliveAt(onlineStatus.getKeepaliveAt());
if (new Date().getTime() - onlineStatus.getKeepaliveAt().getTime() > 300000) {
if (onlineStatus.getKeepaliveAt() == null) {
deviceRespVO.setOnline(0);
} else if (new Date().getTime() - onlineStatus.getKeepaliveAt().getTime() > 300000) {
deviceRespVO.setOnline(0);
} else {
deviceRespVO.setOnline(onlineStatus.getOnline());