From 6cc13da4f7356c291b471e96f0d72af5bc33a806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Mon, 16 Oct 2023 13:36:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=91=E5=8F=B0=E8=B4=A6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionMonitorServiceImpl.java        | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java
index d62c3ebb2..7e4dedf0a 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java
@@ -124,6 +124,9 @@ public class DistributionMonitorServiceImpl extends MppServiceImpl<DistributionM
                 distributionMonitor.setStatus(DataStateEnum.ENABLE.getCode());
                 distributionMonitor.setTerminalId(monitor.getTerminalId());
                 distributionMonitor.setTerminalWiringMethod(monitor.getTerminalWiringMethod());
+                distributionMonitor.setLineId(monitor.getLineId());
+                distributionMonitor.setPowerStationId(monitor.getPowerrId());
+                distributionMonitor.setStatisticalInterval(monitor.getStatisticalInterval());
                 distributionMonitor.setCt1(monitor.getCt1());
                 distributionMonitor.setCt2(monitor.getCt2());
                 distributionMonitor.setPt1(monitor.getPt1());
@@ -146,6 +149,9 @@ public class DistributionMonitorServiceImpl extends MppServiceImpl<DistributionM
                 distributionMonitor.setStatus(DataStateEnum.ENABLE.getCode());
 
                 distributionMonitor.setTerminalId(distributionMonitorParam.getTerminalId());
+                distributionMonitor.setStatisticalInterval(15);
+                distributionMonitor.setPowerStationId(powerDistributionareaTem.getPowerStationId());
+                distributionMonitor.setLineId(powerDistributionareaTem.getLineId());
                 distributionMonitor.setTerminalWiringMethod(distributionMonitorParam.getTerminalWiringMethod());
                 distributionMonitor.setCt1(distributionMonitorParam.getCt1());
                 distributionMonitor.setCt2(distributionMonitorParam.getCt2());
@@ -155,8 +161,6 @@ public class DistributionMonitorServiceImpl extends MppServiceImpl<DistributionM
 
                 //只有二三类需要填写限值，一类默认新建主网监测点时候已经新建限值
                 overLimitAdd(distributionMonitor.getVoltageLevel(), distributionMonitor.getMonitorId());
-
-
                 break;
             case DicDataConstant.THREE_LINE:
                 //三类监测点
@@ -169,6 +173,8 @@ public class DistributionMonitorServiceImpl extends MppServiceImpl<DistributionM
                     distributionMonitor.setIfPowerUser(1);
                     distributionMonitor.setVoltageLevel(powerGenerationUser.getVoltageLevel());
                     distributionMonitor.setOrgId(powerGenerationUser.getOrgId());
+                    distributionMonitor.setLineId(powerGenerationUser.getLineId());
+                    distributionMonitor.setPowerStationId(powerGenerationUser.getPowerStationId());
                 } else {
                     //用电
                     PowerClient powerClient = powerClientMapper.selectById(distributionMonitorParam.getMonitorId());
@@ -178,7 +184,8 @@ public class DistributionMonitorServiceImpl extends MppServiceImpl<DistributionM
                     distributionMonitor.setIfPowerUser(0);
                     distributionMonitor.setVoltageLevel(powerClient.getVoltageLevel());
                     distributionMonitor.setOrgId(powerClient.getOrgId());
-
+                    distributionMonitor.setLineId(powerClient.getLineId());
+                    distributionMonitor.setPowerStationId(powerClient.getPowerStationId());
                 }
                 distributionMonitor.setMonitorId(distributionMonitorParam.getMonitorId());
                 distributionMonitor.setCreatedDate(LocalDateTime.now());