From 61c0a100a436efd61aedc7167c9d7eb44a926292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Tue, 17 Jan 2023 15:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../majornetwork/mapping/PmsGeneratrixWireMapper.xml   | 10 +++++-----
 .../impl/RStatBusbarHarmonicServiceImpl.java           |  7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml
index 2f5826997..19b0679c9 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml
@@ -42,8 +42,8 @@
         SELECT
         pss.Org_Id  AS orgid,
         pss.Org_Name AS orgName,
-        pg.Generatrix_Id AS busbarId,
-        pg.Generatrix_Name AS busbarName,
+        pg.id AS busbarId,
+        pg.name AS busbarName,
         pg.Scale AS generatrixVoltageLevel,
         pss.Power_Id AS subId,
         pss.Power_Name AS subName,
@@ -71,15 +71,15 @@
      <select id="getGeneratrixAndPowerStationInfo"
             resultType="com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO">
         SELECT
-        pg.Generatrix_Id AS generatrixId,
-        pg.Generatrix_Name AS generatrixName,
+        pg.id AS generatrixId,
+        pg.name AS generatrixName,
         pg.Scale AS generatrixVoltageLevel,
         pss.Power_Id AS powerId,
         pss.Power_Name AS powerName,
         pss.Voltage_Level AS powerVoltageLevel
         FROM
         pms_generatrix_wire AS pg
-        LEFT JOIN pms_statation_stat AS pss ON pg.station = pss.Power_Id
+        LEFT JOIN pms_statation_stat AS pss ON pg.station_id = pss.Power_Id
         WHERE
         pg.`Status` = 1
         AND pss.`Status` = 1
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
index 53e3f07e3..ad4d69535 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
@@ -13,6 +13,7 @@ import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
 import com.njcn.device.pms.pojo.param.UniversalFrontEndParam;
 import com.njcn.device.pms.pojo.po.RStatBusbarHarmonicYPO;
 import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicYVO;
+import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService;
 import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService;
 import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService;
 import com.njcn.device.pms.service.majornetwork.RStatBusbarHarmonicService;
@@ -39,7 +40,7 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
 
     private final RStatBusbarHarmonicMapper rStatBusbarHarmonicMapper;
 
-    private final IPmsGeneratrixService pmsGeneratrixService;
+    private final IGeneratrixWireService generatrixWireService;
 
     private final IPmsGeneralDeviceService iPmsGeneralDeviceService;
 
@@ -99,7 +100,7 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
         List<String> busbarIds = result.stream().map(RStatBusbarHarmonicYVO::getBusbarId).collect(Collectors.toList());
         PmsGeneratrixParam pmsGeneratrixParam = new PmsGeneratrixParam();
         pmsGeneratrixParam.setGeneratrixIds(busbarIds);
-        List<GeneratrixAndPowerStationDTO> dtoS = pmsGeneratrixService.getGeneratrixAndPowerStationInfo(pmsGeneratrixParam);
+        List<GeneratrixAndPowerStationDTO> dtoS = generatrixWireService.getGeneratrixAndPowerStationInfo(pmsGeneratrixParam);
 
         for (GeneratrixAndPowerStationDTO dto : dtoS) {
             for (RStatBusbarHarmonicYVO vo : result) {
@@ -115,4 +116,4 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
         return result;
     }
 
-}
\ No newline at end of file
+}