feat(client): 家属端设备列表返回在线状态与最后心跳时间

- 批量查询 Redis 心跳状态,避免逐台查询
- 修正心跳时间 Redis 序列化格式,防止读取时解析失败导致状态恒为离线
This commit is contained in:
tongtong committed 2026-11-07 11:21:49 +08:00
1 parent 0f99abb876
commit 3f2b07ddd0
4 files changed
+68

No files matched your search

@@ -20,12 +20,14 @@ import com.youlai.boot.device.model.vo.DevicePictureVO;
import com.youlai.boot.device.model.vo.WallpaperUploadVO;
import com.youlai.boot.device.model.vo.DeviceBriefVO;
import com.youlai.boot.device.model.vo.DeviceLocationVO;
import com.youlai.boot.device.model.vo.DeviceOnlineVO;
import com.youlai.boot.device.model.vo.DevicePolicyVO;
import com.youlai.boot.device.model.vo.DeviceSystemInfoVO;
import com.youlai.boot.device.model.vo.DeviceWallpaperVO;
import com.youlai.boot.device.model.vo.ScreenshotVO;
import com.youlai.boot.device.service.ApkInstallService;
import com.youlai.boot.device.service.DeviceAlarmService;
import com.youlai.boot.device.service.DeviceOnlineService;
import com.youlai.boot.device.service.DevicePictureService;
import com.youlai.boot.device.service.DevicePolicyService;
import com.youlai.boot.device.service.DeviceService;
@@ -58,6 +60,7 @@ import com.youlai.boot.support.file.service.FileService;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 客户端(家属端)控制层
@@ -85,6 +88,7 @@ public class ClientController {
private final DeviceWallpaperService deviceWallpaperService;
private final DevicePictureService devicePictureService;
private final DeviceAlarmService deviceAlarmService;
private final DeviceOnlineService deviceOnlineService;
private final FileService fileService;
/**
@@ -215,6 +219,13 @@ public class ClientController {
.orderByDesc(SnDeviceInfo::getCreateTime)
);
// 批量查询在线状态(Redis 心跳 TTL 判定),避免逐台查询
List<String> sns = devices.stream()
.map(SnDeviceInfo::getSerialno)
.filter(StringUtils::hasText)
.toList();
Map<String, DeviceOnlineVO> onlineMap = deviceOnlineService.getOnlineStatusBySns(sns);
List<DeviceBriefVO> list = devices.stream().map(d -> {
DeviceBriefVO vo = new DeviceBriefVO();
vo.setSerialno(d.getSerialno());
@@ -223,6 +234,9 @@ public class ClientController {
vo.setSnMobile(d.getSnMobile());
vo.setStatus(d.getStatus());
vo.setActivateTime(d.getActivateTime());
DeviceOnlineVO online = onlineMap.get(d.getSerialno());
vo.setOnline(online != null ? online.getOnline() : 0);
vo.setLastHeartbeatTime(online != null ? online.getLastHeartbeatTime() : null);
return vo;
}).toList();
@@ -33,4 +33,10 @@ public class DeviceBriefVO implements Serializable {
@Schema(description = "激活时间")
private LocalDateTime activateTime;
@Schema(description = "在线状态(1:在线;0:离线)")
private Integer online;
@Schema(description = "最后心跳时间")
private LocalDateTime lastHeartbeatTime;
}
@@ -1,5 +1,6 @@
package com.youlai.boot.device.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -21,6 +22,8 @@ public class DeviceOnlineVO {
@Schema(description = "在线状态(1:在线;0:离线)")
private Integer online;
// 显式指定格式,否则 Redis 序列化器写入 ISO 带 T/纳秒,全局 ObjectMapper 按空格格式反序列化会失败
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "最后心跳时间")
private LocalDateTime lastHeartbeatTime;
@@ -0,0 +1,45 @@
package com.youlai.boot.device;
import com.youlai.boot.config.JacksonConfig;
import com.youlai.boot.device.model.vo.DeviceOnlineVO;
import org.junit.jupiter.api.Test;
import org.springframework.data.redis.serializer.JacksonJsonRedisSerializer;
import tools.jackson.databind.cfg.DateTimeFeature;
import tools.jackson.databind.json.JsonMapper;
import java.time.LocalDateTime;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* 设备在线状态在 Redis 写入与全局 ObjectMapper 读取之间的格式一致性校验
* <p>
* RedisConfig 的序列化器与 JacksonConfig 的全局时间格式不一致时,
* convertValue 会抛 DateTimeParseException,导致在线状态永远读成离线。
*/
class DeviceOnlineRedisRoundTripTest {
@Test
void redisValueCanBeConvertedByGlobalObjectMapper() {
JsonMapper redisMapper = JsonMapper.builder()
.disable(DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS)
.build();
JacksonJsonRedisSerializer<Object> serializer = new JacksonJsonRedisSerializer<>(redisMapper, Object.class);
LocalDateTime heartbeat = LocalDateTime.of(2026, 11, 7, 10, 37, 22);
DeviceOnlineVO vo = new DeviceOnlineVO();
vo.setSerialno("895Y044WC");
vo.setOnline(1);
vo.setIp("192.168.100.141");
vo.setScreenState(0);
vo.setLastHeartbeatTime(heartbeat);
Object cached = serializer.deserialize(serializer.serialize(vo));
DeviceOnlineVO converted = new JacksonConfig().objectMapper().convertValue(cached, DeviceOnlineVO.class);
assertEquals("895Y044WC", converted.getSerialno());
assertEquals(1, converted.getOnline());
assertEquals(heartbeat, converted.getLastHeartbeatTime());
}
}