From 3bc9bfca56a2667ae79e073ca730df38a43d47ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Tue, 10 Jan 2023 10:51:08 +0800
Subject: [PATCH] =?UTF-8?q?pms=E5=8F=B0=E5=8C=BA=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=94=B5=E5=8E=8B=E7=AD=89=E7=BA=A7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/pms/pojo/param/PowerDistributionareaParam.java    | 3 +++
 .../com/njcn/device/pms/pojo/po/PowerDistributionarea.java   | 5 +++++
 .../majornetwork/impl/DistributionMonitorServiceImpl.java    | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
index d4e5aa778..3ed978b89 100644
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
@@ -47,6 +47,9 @@ public class PowerDistributionareaParam {
     @NotBlank(message = "电站编号不可为空")
     private String powerStationId;
 
+    @ApiModelProperty(name = "voltageLevel", value = "电压等级")
+    private String voltageLevel;
+
     @ApiModelProperty(name = "lineName", value = "监测线路名称")
     @NotBlank(message = "监测线路名称不可为空")
     private String lineName;
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java
index ecd216f76..0f239731c 100644
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java
@@ -75,6 +75,11 @@ public class PowerDistributionarea extends BaseEntity {
      */
     private String lineId;
 
+    /**
+     * 电压等级
+     */
+    private String voltageLevel;
+
     /**
      * 配变容量
      */
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 1f5865349..3147d9874 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
@@ -109,12 +109,12 @@ public class DistributionMonitorServiceImpl extends ServiceImpl<DistributionMoni
                 if (Objects.isNull(powerDistributionarea)) {
                     throw new BusinessException(PmsDeviceResponseEnum.TWO_MONITOR_NOT_FIND);
                 }
-                Generatrix generatrix = powerDistributionareaMapper.getGeneratrixByDistributionId(powerDistributionarea.getId());
+                PowerDistributionarea powerDistributionareaTem = powerDistributionareaMapper.selectById(powerDistributionarea.getId());
                 distributionMonitor.setMonitorId(powerDistributionarea.getId());
                 distributionMonitor.setCreatedDate(LocalDateTime.now());
                 distributionMonitor.setIfPowerUser(0);
                 distributionMonitor.setMonitorState(distributionMonitorParam.getMonitorState());
-                distributionMonitor.setVoltageLevel(generatrix.getScale());
+                distributionMonitor.setVoltageLevel(powerDistributionareaTem.getVoltageLevel());
                 distributionMonitor.setStatus(DataStateEnum.ENABLE.getCode());
                 this.save(distributionMonitor);
                 break;