From e130af4dcf59df360c9f006493ddbb6da1dee79b Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Wed, 21 May 2025 11:39:23 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/service/impl/TerminalBaseServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index 17189d8b9..c32c787e1 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -704,7 +704,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple Line devicePO = this.getById(updateDeviceParam.getDevIndex()); Line sub = this.getById(devicePO.getPid()); Device devDetail = deviceMapper.selectById(updateDeviceParam.getDevIndex()); - devLogsCat(Param.UPDATE,updateDeviceParam,devicePO,sub,devDetail,pqsTerminalLogsList,dictDataMap,dicDataByCode,userName); + devLogsCat(Param.UPDATE_ZN,updateDeviceParam,devicePO,sub,devDetail,pqsTerminalLogsList,dictDataMap,dicDataByCode,userName); Line device = new Line(); BeanUtils.copyProperties(updateDeviceParam, device); @@ -4129,21 +4129,21 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple boolean flag = false; // 比较装置名称 - flag |= compareAndAppend(stringBuilder, devicePO.getName(), updateDeviceParam.getName(), "装置名称"); + flag |= compareAndAppend(stringBuilder, devicePO.getName(), updateDeviceParam.getName(), "终端名称"); // 比较装置 IP - flag |= compareAndAppend(stringBuilder, devDetail.getIp(), updateDeviceParam.getIp(), "装置ip"); + flag |= compareAndAppend(stringBuilder, devDetail.getIp(), updateDeviceParam.getIp(), "终端ip"); // 比较装置 所属前置 - flag |= compareAndAppend(stringBuilder, devDetail.getNodeId(), updateDeviceParam.getNodeId(), "装置所属前置机"); + flag |= compareAndAppend(stringBuilder, devDetail.getNodeId(), updateDeviceParam.getNodeId(), "终端所属前置机"); // 比较装置端口号 - flag |= compareAndAppend(stringBuilder, devDetail.getPort(), updateDeviceParam.getPort(), "装置端口号"); + flag |= compareAndAppend(stringBuilder, devDetail.getPort(), updateDeviceParam.getPort(), "终端端口号"); // 比较装置型号 if (updateDeviceParam.getDevType() != null) { String oldDevTypeName = dictDataMap.get(devDetail.getDevType()) != null ? dictDataMap.get(devDetail.getDevType()).getName() : null; String newDevTypeName = dictDataMap.get(updateDeviceParam.getDevType()) != null ? dictDataMap.get(updateDeviceParam.getDevType()).getName() : null; - compareAndAppend(stringBuilder, oldDevTypeName, newDevTypeName, "装置型号"); + compareAndAppend(stringBuilder, oldDevTypeName, newDevTypeName, "终端型号"); } if(flag){ PqsTerminalLogs pqsTerminalLogs = new PqsTerminalLogs();