Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

接入冗余处理

Browse Source
This commit is contained in:
xy
2024-10-08 16:19:38 +08:00
parent 0e7d12ab93
commit 1804cf69bd
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
View File

@@ -333,9 +333,12 @@ public class MqttMessageHandler {
csDeviceOnlineLogs.setNdid(nDid); csDeviceOnlineLogs.setNdid(nDid);
csDeviceOnlineLogs.setOnlineTime(LocalDateTime.now()); csDeviceOnlineLogs.setOnlineTime(LocalDateTime.now());
onlineLogsService.save(csDeviceOnlineLogs); onlineLogsService.save(csDeviceOnlineLogs);
} else {
record.setOnlineTime(LocalDateTime.now());
onlineLogsService.updateById(record);
} }
} }
//接入后系统模拟装置心跳 //接入后系统重置装置心跳
redisUtil.saveByKeyWithExpire("MQTT:" + nDid, Instant.now().toEpochMilli(),300L); redisUtil.saveByKeyWithExpire("MQTT:" + nDid, Instant.now().toEpochMilli(),300L);
//修改redis的mid //修改redis的mid
redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1); redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1);
@@ -346,6 +349,8 @@ public class MqttMessageHandler {
askDevData(nDid,version,2,(res.getMid()+1)); askDevData(nDid,version,2,(res.getMid()+1));
//更新电网侧、负载侧监测点信息 //更新电网侧、负载侧监测点信息
askDevData(nDid,version,3,(res.getMid()+1)); askDevData(nDid,version,3,(res.getMid()+1));
//录波任务倒计时
redisUtil.saveByKeyWithExpire("startFile",null,120L);
} else { } else {
log.info(AccessResponseEnum.ACCESS_RESPONSE_ERROR.getMessage()); log.info(AccessResponseEnum.ACCESS_RESPONSE_ERROR.getMessage());
logDto.setResult(0); logDto.setResult(0);
@@ -384,8 +389,6 @@ public class MqttMessageHandler {
csSoftInfoFeignClient.removeSoftInfo(soft); csSoftInfoFeignClient.removeSoftInfo(soft);
} }
equipmentFeignClient.updateSoftInfo(nDid,csSoftInfoPo.getId()); equipmentFeignClient.updateSoftInfo(nDid,csSoftInfoPo.getId());
//询问设备容量信息
//askDevData(nDid,version,2,(res.getMid()+1));
break; break;
case 2: case 2:
List<RspDataDto.LdevInfo> devInfo = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.LdevInfo.class); List<RspDataDto.LdevInfo> devInfo = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.LdevInfo.class);
@@ -435,6 +438,7 @@ public class MqttMessageHandler {
break; break;
case 48: case 48:
log.info("询问装置项目列表"); log.info("询问装置项目列表");
logDto.setUserName("询问装置项目列表");
logDto.setOperate("监测点:" + (nDid + rspDataDto.getClDid()) + "询问项目列表"); logDto.setOperate("监测点:" + (nDid + rspDataDto.getClDid()) + "询问项目列表");
List<RspDataDto.ProjectInfo> projectInfoList = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.ProjectInfo.class); List<RspDataDto.ProjectInfo> projectInfoList = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.ProjectInfo.class);
String key = AppRedisKey.PROJECT_INFO + nDid + rspDataDto.getClDid(); String key = AppRedisKey.PROJECT_INFO + nDid + rspDataDto.getClDid();
@@ -590,7 +594,7 @@ public class MqttMessageHandler {
log.info("获取文件流信息"); log.info("获取文件流信息");
FileRedisDto dto = new FileRedisDto(); FileRedisDto dto = new FileRedisDto();
dto.setCode(fileDto.getCode()); 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())){ if (Objects.equals(fileDto.getCode(),AccessEnum.SUCCESS.getCode())){
appFileStreamMessageTemplate.sendMember(appFileMessage); appFileStreamMessageTemplate.sendMember(appFileMessage);
} }
@@ -645,13 +649,13 @@ public class MqttMessageHandler {
private void saveDirectoryInfo(List<FileDto.DirInfo> dirInfo, String key) { private void saveDirectoryInfo(List<FileDto.DirInfo> dirInfo, String key) {
if (!CollectionUtil.isEmpty(dirInfo)) { if (!CollectionUtil.isEmpty(dirInfo)) {
redisUtil.saveByKeyWithExpire(key, dirInfo, 20L); redisUtil.saveByKeyWithExpire(key, dirInfo, 60L);
} }
} }
private void saveFileInfo(FileDto.FileInfo fileInfo, String key) { private void saveFileInfo(FileDto.FileInfo fileInfo, String key) {
if (!Objects.isNull(fileInfo)) { if (!Objects.isNull(fileInfo)) {
redisUtil.saveByKeyWithExpire(key, fileInfo, 20L); redisUtil.saveByKeyWithExpire(key, fileInfo, 60L);
} }
} }