From b9045659827364452aa2ccdc339b93fafec02baf Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Wed, 16 Oct 2024 10:33:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=BF=E6=90=BA=E5=BC=8F=E6=8E=A5=E5=85=A5?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../access/service/ICsEquipmentDeliveryService.java   |  6 ++++++
 .../njcn/access/service/impl/CsDeviceServiceImpl.java |  8 +++++---
 .../service/impl/CsEquipmentDeliveryServiceImpl.java  | 11 +++++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsEquipmentDeliveryService.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsEquipmentDeliveryService.java
index cb07553..a77eab2 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsEquipmentDeliveryService.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsEquipmentDeliveryService.java
@@ -36,6 +36,12 @@ public interface ICsEquipmentDeliveryService extends IService<CsEquipmentDeliver
      */
     void updateRunStatusBynDid(String nDid,Integer id);
 
+    /**
+     * 根据网关id修改设备当前流程
+     * @param nDid 网关id
+     */
+    void updateProcessBynDid(String nDid,Integer processId);
+
     /**
      * 根据ndid查询装置信息
      * @param nDid
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 9298512..297fa37 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
@@ -438,9 +438,11 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             csDevModelRelationService.addDevModelRelation(csDevModelRelationAddParm);
             //5.发起自动接入请求
             devAccessAskTemplate(nDid,version,1);
-            //6.存储日志
+            //6.修改流程,便携式设备接入成功即为实际环境
+            csEquipmentDeliveryService.updateProcessBynDid(nDid,4);
+            //7.存储日志
             csLogsFeignClient.addUserLog(logDto);
-            //7.存储设备调试日志表
+            //8.存储设备调试日志表
             CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO();
             csEquipmentProcess.setDevId(nDid);
             csEquipmentProcess.setOperator(RequestUtil.getUserIndex());
@@ -449,7 +451,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             csEquipmentProcess.setProcess(4);
             csEquipmentProcess.setStatus(1);
             processFeignClient.add(csEquipmentProcess);
-            //8.删除redis监测点模板信息
+            //9.删除redis监测点模板信息
             redisUtil.delete(AppRedisKey.MODEL + nDid);
             redisUtil.delete(AppRedisKey.LINE + nDid);
             //判断接入状态
diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsEquipmentDeliveryServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsEquipmentDeliveryServiceImpl.java
index ad318be..bde0ae7 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -28,9 +28,9 @@ import java.util.Objects;
 public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliveryMapper, CsEquipmentDeliveryPO> implements ICsEquipmentDeliveryService {
 
     @Override
-    public void updateStatusBynDid(String nDId,Integer status) {
+    public void updateStatusBynDid(String nDid,Integer status) {
         LambdaUpdateWrapper<CsEquipmentDeliveryPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-        lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getStatus,status).eq(CsEquipmentDeliveryPO::getNdid,nDId);
+        lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getStatus,status).eq(CsEquipmentDeliveryPO::getNdid,nDid);
         this.update(lambdaUpdateWrapper);
     }
 
@@ -48,6 +48,13 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         this.update(lambdaUpdateWrapper);
     }
 
+    @Override
+    public void updateProcessBynDid(String nDid, Integer processId) {
+        LambdaUpdateWrapper<CsEquipmentDeliveryPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getProcess,processId).eq(CsEquipmentDeliveryPO::getNdid,nDid);
+        this.update(lambdaUpdateWrapper);
+    }
+
     @Override
     public CsEquipmentDeliveryVO queryEquipmentBynDid(String nDid) {
         CsEquipmentDeliveryVO result = new CsEquipmentDeliveryVO();