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

代码优化

Browse Source
This commit is contained in:
xy
2025-01-13 14:58:00 +08:00
parent 2ec0024d0f
commit cc22afd877
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -328,17 +328,18 @@ public class MqttMessageHandler {
onlineLogsService.updateById(record); onlineLogsService.updateById(record);
} }
} }
//接入后系统重置装置心跳
redisUtil.saveByKeyWithExpire("MQTT:" + nDid, Instant.now().toEpochMilli(),180L);
//修改redis的mid
redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1);
redisUtil.saveByKeyWithExpire("online" + nDid,"online",10L);
//询问设备软件信息 //询问设备软件信息
askDevData(nDid,version,1,mid); askDevData(nDid,version,1,mid);
//更新治理监测点信息和设备容量 //更新治理监测点信息和设备容量
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("MQTT:" + nDid, Instant.now().toEpochMilli(),180L);
//修改redis的mid
redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1);
//接入成功标识
redisUtil.saveByKeyWithExpire("online" + nDid,"online",10L);
//录波任务倒计时 //录波任务倒计时
redisUtil.saveByKeyWithExpire("startFile:" + nDid,null,60L); redisUtil.saveByKeyWithExpire("startFile:" + nDid,null,60L);
} else { } else {

11
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
View File

@@ -386,7 +386,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
logDto.setOperate("便携式设备"+nDid+"注册、接入"); logDto.setOperate("便携式设备"+nDid+"注册、接入");
logDto.setResult(1); logDto.setResult(1);
try { try {
Thread.sleep(2000); Thread.sleep(5000);
//获取版本 //获取版本
String version = csTopicService.getVersion(nDid); String version = csTopicService.getVersion(nDid);
CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(nDid).getData(); CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(nDid).getData();
@@ -445,15 +445,6 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
csEquipmentDeliveryService.updateProcessBynDid(nDid,4); csEquipmentDeliveryService.updateProcessBynDid(nDid,4);
//7.存储日志 //7.存储日志
csLogsFeignClient.addUserLog(logDto); csLogsFeignClient.addUserLog(logDto);
//8.存储设备调试日志表
//CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO();
//csEquipmentProcess.setDevId(nDid);
//csEquipmentProcess.setOperator(RequestUtil.getUserIndex());
//csEquipmentProcess.setStartTime(LocalDateTime.now());
//csEquipmentProcess.setEndTime(LocalDateTime.now());
//csEquipmentProcess.setProcess(4);
//csEquipmentProcess.setStatus(1);
//processFeignClient.add(csEquipmentProcess);
//9.删除redis监测点模板信息 //9.删除redis监测点模板信息
redisUtil.delete(AppRedisKey.MODEL + nDid); redisUtil.delete(AppRedisKey.MODEL + nDid);
redisUtil.delete(AppRedisKey.LINE + nDid); redisUtil.delete(AppRedisKey.LINE + nDid);