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 bbf5b7f..08cef38 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 @@ -328,17 +328,18 @@ public class MqttMessageHandler { 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,2,(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); } else { diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java index b4377d1..4c48127 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java @@ -386,7 +386,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService { logDto.setOperate("便携式设备"+nDid+"注册、接入"); logDto.setResult(1); try { - Thread.sleep(2000); + Thread.sleep(5000); //获取版本 String version = csTopicService.getVersion(nDid); CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(nDid).getData(); @@ -445,15 +445,6 @@ public class CsDeviceServiceImpl implements ICsDeviceService { csEquipmentDeliveryService.updateProcessBynDid(nDid,4); //7.存储日志 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监测点模板信息 redisUtil.delete(AppRedisKey.MODEL + nDid); redisUtil.delete(AppRedisKey.LINE + nDid);