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 71ae53a..b4377d1 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 @@ -439,21 +439,21 @@ public class CsDeviceServiceImpl implements ICsDeviceService { csDevModelRelationAddParm.setDid(modelList.get(0).getDid()); csDevModelRelationService.addDevModelRelation(csDevModelRelationAddParm); //5.发起自动接入请求 - Thread.sleep(2000); + Thread.sleep(5000); devAccessAskTemplate(nDid,version,1); //6.修改流程,便携式设备接入成功即为实际环境 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); + //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); diff --git a/iot-message/message-boot/src/main/java/com/njcn/message/consumer/AppAutoDataConsumer.java b/iot-message/message-boot/src/main/java/com/njcn/message/consumer/AppAutoDataConsumer.java index 842ad6d..afcc328 100644 --- a/iot-message/message-boot/src/main/java/com/njcn/message/consumer/AppAutoDataConsumer.java +++ b/iot-message/message-boot/src/main/java/com/njcn/message/consumer/AppAutoDataConsumer.java @@ -59,7 +59,7 @@ public class AppAutoDataConsumer extends EnhanceConsumerMessageHandler