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

无线接入bug调整

Browse Source
This commit is contained in:
xy
2025-10-16 16:35:52 +08:00
parent c33490c4fc
commit 9ea6a00cb5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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