From e1d731c774274e1bdd37e68ab1d459ccf561dc46 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Mon, 29 Jun 2026 13:27:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(service):=20=E4=BC=98=E5=8C=96=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增设备访问方式判断条件，仅对CLD协议设备记录台账日志
- 在更新线路信息时添加设备访问方式校验
- 在删除线路信息时添加设备访问方式校验
- 避免非CLD协议设备产生不必要的台账日志记录
---
 .../service/impl/CsLinePOServiceImpl.java     | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
index 6ca180f..cc256bc 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
@@ -261,12 +261,16 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
         csLedger.setName(param.getName());
         csLedgerMapper.updateById(csLedger);
 
-        //新增台账日志
-        CsTerminalLogs csTerminalLogs = new CsTerminalLogs();
-        csTerminalLogs.setDeviceId(param.getDevId());
-        csTerminalLogs.setOperateType(1);
-        csTerminalLogs.setIsPush(0);
-        csTerminalLogsMapper.insert(csTerminalLogs);
+        //新增台账日志 1056协议记录，其他协议不记录
+        String devId = param.getDevId();
+        CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(devId);
+        if (Objects.equals(po.getDevAccessMethod(), "CLD")) {
+            CsTerminalLogs csTerminalLogs = new CsTerminalLogs();
+            csTerminalLogs.setDeviceId(devId);
+            csTerminalLogs.setOperateType(1);
+            csTerminalLogs.setIsPush(0);
+            csTerminalLogsMapper.insert(csTerminalLogs);
+        }
     }
 
     @Override
@@ -279,12 +283,16 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
         csHarmonicPlanLineFeignClient.deleteByLineIds(Collections.singletonList(id));
         //删除装置注册表数据
         csDeviceRegistryService.delete(id);
-        //新增台账日志
-        CsTerminalLogs csTerminalLogs = new CsTerminalLogs();
-        csTerminalLogs.setDeviceId(po.getDeviceId());
-        csTerminalLogs.setOperateType(1);
-        csTerminalLogs.setIsPush(0);
-        csTerminalLogsMapper.insert(csTerminalLogs);
+        //新增台账日志 1056协议记录，其他协议不记录
+        String devId = po.getDeviceId();
+        CsEquipmentDeliveryPO devPo = csEquipmentDeliveryMapper.selectById(devId);
+        if (Objects.equals(devPo.getDevAccessMethod(), "CLD")) {
+            CsTerminalLogs csTerminalLogs = new CsTerminalLogs();
+            csTerminalLogs.setDeviceId(devId);
+            csTerminalLogs.setOperateType(1);
+            csTerminalLogs.setIsPush(0);
+            csTerminalLogsMapper.insert(csTerminalLogs);
+        }
     }
 
     @Override