Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

bug修改

Browse Source
This commit is contained in:
chendaofei
2025-05-21 11:39:23 +08:00
parent d0fb52da6d
commit e130af4dcf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -704,7 +704,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> 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<LineMapper, Line> 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();