代码优化

iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java

@@ -100,6 +100,8 @@ public class AccessApplicationRunner implements ApplicationRunner {
                     csDeviceService.devAccessAskTemplate(item.getNdid(),version,1);
                 }
                 redisUtil.saveByKey(AppRedisKey.DEVICE_MID + item.getNdid(),1);
+            } else {
+                log.info("{},装置主题缺少版本信息", item.getNdid());
             }
         });
     }

iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java

@@ -95,6 +95,8 @@ public class AutoAccessTimer implements ApplicationRunner {
                     csDeviceService.devAccessAskTemplate(item.getNdid(),version,1);
                 }
                 redisUtil.saveByKey(AppRedisKey.DEVICE_MID + item.getNdid(),1);
+            } else {
+                log.info("{},装置主题缺少版本信息", item.getNdid());
             }
         });
     }

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

@@ -38,6 +38,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -370,7 +371,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Async
     public String wlDevRegister(String nDid) {
         String result = "fail";
         // 设备状态判断
@@ -386,7 +387,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         logDto.setOperate("便携式设备"+nDid+"注册、接入");
         logDto.setResult(1);
         try {
-            Thread.sleep(5000);
+            Thread.sleep(2000);
             //获取版本
             String version = csTopicService.getVersion(nDid);
             CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(nDid).getData();
@@ -439,7 +440,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             csDevModelRelationAddParm.setDid(modelList.get(0).getDid());
             csDevModelRelationService.addDevModelRelation(csDevModelRelationAddParm);
             //5.发起自动接入请求
-            Thread.sleep(5000);
+            Thread.sleep(2000);
             devAccessAskTemplate(nDid,version,1);
             //6.修改流程,便携式设备接入成功即为实际环境
             csEquipmentDeliveryService.updateProcessBynDid(nDid,4);