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-12-27 09:51:40 +08:00
parent b014aa7c8c
commit 04fd2409cf
1 changed files with 75 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java
View File

@@ -33,7 +33,6 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
@@ -98,77 +97,92 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
String expiredKey = message.toString();
if(expiredKey.startsWith("MQTT:")){
String nDid = expiredKey.split(":")[1];
String version = csTopicService.getVersion(nDid);
ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
executeMainTask(scheduler,nDid,version);
executeMainTask(nDid);
}
}
//主任务
//1.装置心跳断连
//2.MQTT客户端不在线
private void executeMainTask(ScheduledExecutorService scheduler, String nDid, String version) {
private void executeMainTask(String nDid) {
log.info("{}->装置离线", nDid);
DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserName("运维管理员");
logDto.setLoginName("njcnyw");
//判断mqtt
String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
//心跳异常，但是客户端在线，则发送接入请求
if (mqttClient) {
csDeviceService.devAccessAskTemplate(nDid,version,1);
redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1);
try {
Thread.sleep(5000);
Object object = redisUtil.getObjectByKey("online" + nDid);
if (Objects.nonNull(object)) {
scheduler.shutdown();
logDto.setOperate(nDid + "客户端在线重连成功");
} else {
//装置下线
csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
//装置调整为注册状态
csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.REGISTERED.getCode());
//startScheduledTask(scheduler,nDid,version);
//logDto.setOperate(nDid +"客户端离线进入定时任务");
logDto.setOperate(nDid +"装置离线");
sendMessage(nDid);
//记录装置掉线时间
CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
record.setOfflineTime(LocalDateTime.now());
onlineLogsService.updateById(record);
scheduler.shutdown();
}
} catch (InterruptedException e) {
scheduler.shutdown();
throw new RuntimeException(e);
}
csLogsFeignClient.addUserLog(logDto);
}
//客户端不在线则修改装置状态，进入定时任务
else {
//装置下线
csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
//装置调整为注册状态
csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.REGISTERED.getCode());
logDto.setOperate(nDid +"主任务执行失败，装置下线");
//logDto.setOperate(nDid +"主任务执行失败，装置下线，进入定时任务");
csLogsFeignClient.addUserLog(logDto);
//log.info("客户端离线进入定时任务...");
//startScheduledTask(scheduler,nDid,version);
sendMessage(nDid);
//记录装置掉线时间
CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
record.setOfflineTime(LocalDateTime.now());
onlineLogsService.updateById(record);
scheduler.shutdown();
}
}
//主任务
//1.装置心跳断连
//2.MQTT客户端不在线
// private void executeMainTask(String nDid, String version) {
// ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
// log.info("{}->装置离线", nDid);
// DeviceLogDTO logDto = new DeviceLogDTO();
// logDto.setUserName("运维管理员");
// logDto.setLoginName("njcnyw");
// //判断mqtt
// String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
// boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
// //心跳异常，但是客户端在线，则发送接入请求
// if (mqttClient) {
// csDeviceService.devAccessAskTemplate(nDid,version,1);
// redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1);
// try {
// Thread.sleep(5000);
// Object object = redisUtil.getObjectByKey("online" + nDid);
// if (Objects.nonNull(object)) {
// scheduler.shutdown();
// logDto.setOperate(nDid + "客户端在线重连成功");
// } else {
// //装置下线
// csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
// //装置调整为注册状态
// csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.REGISTERED.getCode());
// logDto.setOperate(nDid +"装置离线");
// sendMessage(nDid);
//
// //记录装置掉线时间
// CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
// record.setOfflineTime(LocalDateTime.now());
// onlineLogsService.updateById(record);
//
// scheduler.shutdown();
// }
// } catch (InterruptedException e) {
// scheduler.shutdown();
// throw new RuntimeException(e);
// }
// csLogsFeignClient.addUserLog(logDto);
// }
// //客户端不在线则修改装置状态，进入定时任务
// else {
// //装置下线
// csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
// //装置调整为注册状态
// csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.REGISTERED.getCode());
// logDto.setOperate(nDid +"主任务执行失败，装置下线");
// csLogsFeignClient.addUserLog(logDto);
// sendMessage(nDid);
//
// //记录装置掉线时间
// CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
// record.setOfflineTime(LocalDateTime.now());
// onlineLogsService.updateById(record);
//
// scheduler.shutdown();
// }
// }
private void startScheduledTask(ScheduledExecutorService scheduler, String nDid, String version) {
synchronized (lock) {