From 08d83c8c1ec5e77fef0895ba3eb7d30fd7b9e8b8 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Fri, 17 Jul 2026 15:38:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(service):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=8D=8F=E8=AE=AE=E5=92=8CnDid=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在DevVersionVO中新增accessMethod和nDid属性
- 在CsEquipmentDeliveryServiceImpl中设置设备访问方法和nDid值
- 移除控制器中的多余空行以优化代码格式
---
 .../java/com/njcn/csdevice/pojo/vo/DevVersionVO.java     | 9 +++++++++
 .../controller/equipment/CsUpgradeLogsController.java    | 2 --
 .../service/impl/CsEquipmentDeliveryServiceImpl.java     | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevVersionVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevVersionVO.java
index 30d836b..e03ed70 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevVersionVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevVersionVO.java
@@ -56,6 +56,15 @@ public class DevVersionVO {
      */
     private String crc;
 
+    /**
+     * 设备通讯协议
+     */
+    private String accessMethod;
+
+    /**
+     * nDid
+     */
+    private String nDid;
 
     /**
      * 所属工程
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java
index 57a7770..a983732 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java
@@ -59,8 +59,6 @@ public class CsUpgradeLogsController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, re, methodDescribe);
     }
 
-
-
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
     @GetMapping("/getByDevId")
     @ApiOperation("查询指定devId的所有升级日志")
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
index 4c8034e..0a6e63f 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -1356,6 +1356,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     devVersionVO.setVersion(softInfoPO.getAppVersion());
                     devVersionVO.setVersionDate(softInfoPO.getAppDate());
                     devVersionVO.setCrc(softInfoPO.getAppCheck());
+                    devVersionVO.setAccessMethod(item.getDevAccessMethod());
+                    devVersionVO.setNDid(item.getNdid());
                     CsEdDataPO csEdDataPO = csEdDataService.findByDevTypeIdAndVersionNo(item.getDevModel(), softInfoPO.getAppVersion());
                     if (ObjectUtil.isNotNull(csEdDataPO)) {
                         devVersionVO.setProtocolVersion(csEdDataPO.getVersionAgreement());