From f1a71e8855c8d9c1e0f20bd6847d7d0cbf825b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 15 Jun 2023 09:38:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/api/PmsGeneralDeviceInfoClient.java | 2 +- .../majornetwork/impl/MonitorServiceImpl.java | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneralDeviceInfoClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneralDeviceInfoClient.java index ec1a46d63..8d3e74ec9 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneralDeviceInfoClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneralDeviceInfoClient.java @@ -31,7 +31,7 @@ public interface PmsGeneralDeviceInfoClient { HttpResult> getPmsDeviceInfoWithInOrg(@RequestBody PmsDeviceInfoParam pmsDeviceInfoParam); /*** - * 获取指定组织下台账综合信息 + * 获取配网指定组织下台账综合信息 * @author cdf * @date 2022/10/18 10:12 * @param pmsDeviceInfoParam 查询条件 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index a4a3a175e..ef05eb5b4 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -915,8 +915,23 @@ public class MonitorServiceImpl extends ServiceImpl impl monitorMapper.updateById(monitorPO); }else if(Objects.isNull(monitor)){ monitorMapper.deleteById(lineBak.getId()); + overlimitMapper.deleteById(lineBak.getId()); monitorPO.setId(lineBak.getId()); monitorMapper.insert(monitorPO); + }else{ + monitorMapper.deleteById(monitor.getId()); + overlimitMapper.deleteById(monitor.getId()); + monitorPO.setId(lineBak.getId()); + monitorMapper.insert(monitorPO); + } + + Overlimit overlimit = COverlimitUtil.globalAssemble(Float.parseFloat(scale.getValue()), oracleTerminalExcel.getDealCapacity(), oracleTerminalExcel.getDevCapacity(), oracleTerminalExcel.getShortCapacity(), 0, 0); + overlimit.setId(monitorPO.getId()); + Overlimit overlimitRes = overlimitMapper.selectById(monitorPO.getId()); + if (Objects.isNull(overlimitRes)) { + overlimitMapper.insert(overlimit); + } else { + overlimitMapper.updateById(overlimit); } }