From 090286d25a861145ba6de4889d7888f7cbae9b66 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Thu, 14 Sep 2023 11:09:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E6=97=A5=E5=BF=97=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/access/param/DevAccessParam.java |  4 ++++
 .../access/service/impl/CsDeviceServiceImpl.java   | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/iot-access/access-api/src/main/java/com/njcn/access/param/DevAccessParam.java b/iot-access/access-api/src/main/java/com/njcn/access/param/DevAccessParam.java
index f50309e..c2a4e4d 100644
--- a/iot-access/access-api/src/main/java/com/njcn/access/param/DevAccessParam.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/param/DevAccessParam.java
@@ -37,6 +37,10 @@ public class DevAccessParam implements Serializable {
     @NotNull(message = "监测点集合不能为空")
     private List<LineParam> list;
 
+    @ApiModelProperty("注册方式(2:功能调试 3:出厂调试 4:设备注册)")
+    @NotNull(message = "注册方式不能为空")
+    private Integer process;
+
     @Data
     public static class LineParam {
 
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 e3d98a4..69c6238 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
@@ -23,10 +23,12 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.CsLogsFeignClient;
 import com.njcn.csdevice.api.EquipmentFeignClient;
+import com.njcn.csdevice.api.ProcessFeignClient;
 import com.njcn.csdevice.pojo.param.CsDevModelRelationAddParm;
 import com.njcn.csdevice.pojo.param.CsLedgerParam;
 import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
 import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
+import com.njcn.csdevice.pojo.po.CsEquipmentProcessPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
 import com.njcn.redis.pojo.enums.AppRedisKey;
@@ -44,6 +46,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -93,6 +97,8 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
 
     private final CsLogsFeignClient csLogsFeignClient;
 
+    private final ProcessFeignClient processFeignClient;
+
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public void devRegister(String nDid) {
@@ -335,6 +341,14 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             redisUtil.delete(AppRedisKey.SOFTINFO + devAccessParam.getNDid());
             //存储日志
             csLogsFeignClient.addUserLog(logDto);
+            //存储设备调试日志表
+            CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO();
+            csEquipmentProcess.setDevId(devAccessParam.getNDid());
+            csEquipmentProcess.setOperator(RequestUtil.getUserIndex());
+            csEquipmentProcess.setStartTime(LocalDateTime.now());
+            csEquipmentProcess.setProcess(devAccessParam.getProcess());
+            csEquipmentProcess.setStatus(1);
+            processFeignClient.add(csEquipmentProcess);
         } catch (Exception e) {
             logDto.setResult(0);
             logDto.setFailReason(e.getMessage());