From 1804cf69bdbfeb49233f63125c3313167e0a4a18 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Tue, 8 Oct 2024 16:19:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E5=86=97=E4=BD=99=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/access/handler/MqttMessageHandler.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java index 633eea1..7a71cd6 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java @@ -333,9 +333,12 @@ public class MqttMessageHandler { csDeviceOnlineLogs.setNdid(nDid); csDeviceOnlineLogs.setOnlineTime(LocalDateTime.now()); onlineLogsService.save(csDeviceOnlineLogs); + } else { + record.setOnlineTime(LocalDateTime.now()); + onlineLogsService.updateById(record); } } - //接入后系统模拟装置心跳 + //接入后系统重置装置心跳 redisUtil.saveByKeyWithExpire("MQTT:" + nDid, Instant.now().toEpochMilli(),300L); //修改redis的mid redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1); @@ -346,6 +349,8 @@ public class MqttMessageHandler { askDevData(nDid,version,2,(res.getMid()+1)); //更新电网侧、负载侧监测点信息 askDevData(nDid,version,3,(res.getMid()+1)); + //录波任务倒计时 + redisUtil.saveByKeyWithExpire("startFile",null,120L); } else { log.info(AccessResponseEnum.ACCESS_RESPONSE_ERROR.getMessage()); logDto.setResult(0); @@ -384,8 +389,6 @@ public class MqttMessageHandler { csSoftInfoFeignClient.removeSoftInfo(soft); } equipmentFeignClient.updateSoftInfo(nDid,csSoftInfoPo.getId()); - //询问设备容量信息 - //askDevData(nDid,version,2,(res.getMid()+1)); break; case 2: List devInfo = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.LdevInfo.class); @@ -435,6 +438,7 @@ public class MqttMessageHandler { break; case 48: log.info("询问装置项目列表"); + logDto.setUserName("询问装置项目列表"); logDto.setOperate("监测点:" + (nDid + rspDataDto.getClDid()) + "询问项目列表"); List projectInfoList = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.ProjectInfo.class); String key = AppRedisKey.PROJECT_INFO + nDid + rspDataDto.getClDid(); @@ -590,7 +594,7 @@ public class MqttMessageHandler { log.info("获取文件流信息"); FileRedisDto dto = new FileRedisDto(); dto.setCode(fileDto.getCode()); - redisUtil.saveByKeyWithExpire(AppRedisKey.DOWNLOAD + fileDto.getMsg().getName() + fileDto.getMid(),dto,10L); + redisUtil.saveByKeyWithExpire(AppRedisKey.DOWNLOAD + fileDto.getMsg().getName() + fileDto.getMid(),dto,60L); if (Objects.equals(fileDto.getCode(),AccessEnum.SUCCESS.getCode())){ appFileStreamMessageTemplate.sendMember(appFileMessage); } @@ -645,13 +649,13 @@ public class MqttMessageHandler { private void saveDirectoryInfo(List dirInfo, String key) { if (!CollectionUtil.isEmpty(dirInfo)) { - redisUtil.saveByKeyWithExpire(key, dirInfo, 20L); + redisUtil.saveByKeyWithExpire(key, dirInfo, 60L); } } private void saveFileInfo(FileDto.FileInfo fileInfo, String key) { if (!Objects.isNull(fileInfo)) { - redisUtil.saveByKeyWithExpire(key, fileInfo, 20L); + redisUtil.saveByKeyWithExpire(key, fileInfo, 60L); } }