From 7657269b333e9521340b9aef09dd2523c1b473a7 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Fri, 9 Aug 2024 14:29:35 +0800
Subject: [PATCH] =?UTF-8?q?bug=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CsDeviceServiceImpl.java     | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

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 0f02c83..e86080c 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
@@ -113,13 +113,6 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             csLogsFeignClient.addUserLog(logDto);
             throw new BusinessException(AccessResponseEnum.NDID_NO_FIND);
         }
-        //判断是否重复注册
-        if (!Objects.isNull(csEquipmentDeliveryVO.getNdid()) && Objects.equals(type,csEquipmentDeliveryVO.getProcess())){
-            logDto.setResult(0);
-            logDto.setFailReason(AccessResponseEnum.NDID_SAME_STEP.getMessage());
-            csLogsFeignClient.addUserLog(logDto);
-            throw new BusinessException(AccessResponseEnum.NDID_SAME_STEP);
-        }
         //2.判断设备是否是直连设备
         SysDicTreePO sysDicTreePo = dictTreeFeignClient.queryById(csEquipmentDeliveryVO.getDevType()).getData();
         if (Objects.isNull(sysDicTreePo)){
@@ -145,10 +138,14 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             throw new BusinessException(AccessResponseEnum.MISSING_CLIENT);
         }
         //4.判断当前流程是否是合法的
-        if (!Objects.equals(csEquipmentDeliveryVO.getProcess() + 1, type)){
+        if (csEquipmentDeliveryVO.getProcess() > type){
             logDto.setResult(0);
-            logDto.setFailReason(AccessResponseEnum.PROCESS_ERROR.getMessage());
-            throw new BusinessException(AccessResponseEnum.PROCESS_ERROR);
+            logDto.setFailReason(AccessResponseEnum.PROCESS_SAME_ERROR.getMessage());
+            throw new BusinessException(AccessResponseEnum.PROCESS_SAME_ERROR);
+        } else if (csEquipmentDeliveryVO.getProcess() < type){
+            logDto.setResult(0);
+            logDto.setFailReason(AccessResponseEnum.PROCESS_MISSING_ERROR.getMessage());
+            throw new BusinessException(AccessResponseEnum.PROCESS_MISSING_ERROR);
         }
         //5.询问设备支持的主题信息
         //将支持的主题入库
@@ -320,7 +317,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         param.setNDid(nDid);
         param.setStatus(1);
         param.setRunStatus(1);
-        param.setProcess(1);
+        param.setProcess(2);
         csEquipmentDeliveryService.devResetFactory(param);
         //清除关系表
         QueryWrapper<CsLedger> csLedgerQueryWrapper = new QueryWrapper<>();