无线接入bug调整

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

@@ -385,17 +385,14 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         logDto.setOperate("便携式设备"+nDid+"注册、接入");
         logDto.setResult(1);
         try {
-            Thread.sleep(5000);
-            resetFactory(nDid);
             // 设备状态判断
             checkDeviceStatus(nDid);
             // 询问设备支持的主题信息，并将支持的主题入库
             askAndStoreTopics(nDid);
+            Thread.sleep(2000);
             // MQTT询问装置用的模板，并判断库中是否存在模板
             checkDeviceModel(nDid);
             Thread.sleep(2000);
-            //获取版本
-            String version = csTopicService.getVersion(nDid);
             CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(nDid).getData();
             List<CsLinePO> csLinePoList = new ArrayList<>();
             //1.录入装置台账信息
@@ -447,6 +444,9 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             csDevModelRelationService.addDevModelRelation(csDevModelRelationAddParm);
             //5.发起自动接入请求
             Thread.sleep(2000);
+            //先获取版本
+//            String version = csTopicService.getVersion(nDid);
+            String version = "V1";
             devAccessAskTemplate(nDid,version,1);
             //6.修改流程,便携式设备接入成功即为实际环境
             csEquipmentDeliveryService.updateProcessBynDid(nDid,4);