From 2f909e100cfa9b5a90031f843a7b3c27c81865d6 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Wed, 23 Apr 2025 15:22:01 +0800 Subject: [PATCH] =?UTF-8?q?sql=E5=85=BC=E5=AE=B9=E8=BE=BE=E6=A2=A6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/device/pq/service/DeptLineService.java | 4 ++-- .../device/pq/service/impl/CommTerminalServiceImpl.java | 2 +- .../device/pq/service/impl/TerminalBaseServiceImpl.java | 6 +++--- .../device/pq/service/impl/TerminalMaintainServiceImpl.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java index 350973cc6..48ac3ae1d 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java @@ -97,8 +97,8 @@ public interface DeptLineService extends IService { /** * 获取根据单位分组的监测点集合信息 - * param devType 装置类型 0暂态 1稳态 2 双类型 - * param type 装置类型 1监测点 2母线 3 装置 + * param 系统类型 0暂态 1稳态 2 双类型 + * param type 台账类型 1监测点 2母线 3 装置 * @author cdf * @date 2023/5/10 */ diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java index f96f54a1f..5fd51d5a1 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java @@ -102,7 +102,7 @@ public class CommTerminalServiceImpl implements CommTerminalService { List lineList = new ArrayList<>(); deptIds.forEach(i -> { if (map.containsKey(i)) { - map.get(i).stream().forEach(x->{ + map.get(i).forEach(x->{ if(deptMap.containsKey(x.getUnitId())){ x.setUnitName(deptMap.get(x.getUnitId())); } 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 06b7e8175..3b88bb3ff 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 @@ -1003,7 +1003,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple terminalLogsNew.setTerminalType(LineBaseEnum.LINE_LEVEL.getCode()); terminalLogsNew.setLogsType(data.getId()); terminalLogsNew.setState(DataStateEnum.ENABLE.getCode()); - terminalLogsNew.setIsPush(DataStateEnum.ENABLE.getCode()); + terminalLogsNew.setIsPush(0); terminalLogsNew.setOperateType(Param.UPDATE); pqsTerminalLogsMapper.insert(terminalLogsNew); } @@ -3772,7 +3772,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple String tem = String.format(temLos,name,op,levelOperate,levelOperate,subName+"_"+line.getName()); pqsTerminalLogs.setTerminalDescribe(tem); pqsTerminalLogs.setState(DataStateEnum.ENABLE.getCode()); - pqsTerminalLogs.setIsPush(DataStateEnum.ENABLE.getCode()); + pqsTerminalLogs.setIsPush(0); pqsTerminalLogs.setOperateType(operate); pqsTerminalLogs.setObjIndex(line.getId()); pqsTerminalLogsMapper.insert(pqsTerminalLogs); @@ -3812,7 +3812,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple pqsTerminalLogs.setTerminalType(DEVICE_LEVEL.getCode()); pqsTerminalLogs.setState(DataStateEnum.ENABLE.getCode()); pqsTerminalLogs.setObjIndex(devicePO.getId()); - pqsTerminalLogs.setIsPush(DataStateEnum.ENABLE.getCode()); + pqsTerminalLogs.setIsPush(0); pqsTerminalLogs.setLogsType(dicDataByCode.getId()); pqsTerminalLogs.setTerminalDescribe(stringBuilder.toString()); pqsTerminalLogsList.add(pqsTerminalLogs); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java index ace320464..4a4da5fd3 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java @@ -192,7 +192,7 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService { PqsTerminalLogs terminalLogsNew = new PqsTerminalLogs(); terminalLogsNew.setObjIndex(device.getId()); terminalLogsNew.setTerminalDescribe(sb.toString()); - terminalLogsNew.setIsPush(DataStateEnum.ENABLE.getCode()); + terminalLogsNew.setIsPush(0); terminalLogsNew.setOperateType("update"); terminalLogsNew.setLogsType(data.getId()); terminalLogsNew.setTerminalType(LineBaseEnum.DEVICE_LEVEL.getCode());