Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码合并终端模块

Browse Source
This commit is contained in:
雨木c
2023-01-17 15:37:50 +08:00
parent 0949b1ee34
commit 61c0a100a4
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml
View File

@@ -42,8 +42,8 @@
SELECT SELECT
pss.Org_Id AS orgid, pss.Org_Id AS orgid,
pss.Org_Name AS orgName, pss.Org_Name AS orgName,
pg.Generatrix_Id AS busbarId, pg.id AS busbarId,
pg.Generatrix_Name AS busbarName, pg.name AS busbarName,
pg.Scale AS generatrixVoltageLevel, pg.Scale AS generatrixVoltageLevel,
pss.Power_Id AS subId, pss.Power_Id AS subId,
pss.Power_Name AS subName, pss.Power_Name AS subName,
@@ -71,15 +71,15 @@
<select id="getGeneratrixAndPowerStationInfo" <select id="getGeneratrixAndPowerStationInfo"
resultType="com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO"> resultType="com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO">
SELECT SELECT
pg.Generatrix_Id AS generatrixId, pg.id AS generatrixId,
pg.Generatrix_Name AS generatrixName, pg.name AS generatrixName,
pg.Scale AS generatrixVoltageLevel, pg.Scale AS generatrixVoltageLevel,
pss.Power_Id AS powerId, pss.Power_Id AS powerId,
pss.Power_Name AS powerName, pss.Power_Name AS powerName,
pss.Voltage_Level AS powerVoltageLevel pss.Voltage_Level AS powerVoltageLevel
FROM FROM
pms_generatrix_wire AS pg 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 WHERE
pg.`Status` = 1 pg.`Status` = 1
AND pss.`Status` = 1 AND pss.`Status` = 1

5
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
View File

@@ -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.param.UniversalFrontEndParam;
import com.njcn.device.pms.pojo.po.RStatBusbarHarmonicYPO; import com.njcn.device.pms.pojo.po.RStatBusbarHarmonicYPO;
import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicYVO; 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.IPmsGeneralDeviceService;
import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService; import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService;
import com.njcn.device.pms.service.majornetwork.RStatBusbarHarmonicService; import com.njcn.device.pms.service.majornetwork.RStatBusbarHarmonicService;
@@ -39,7 +40,7 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
private final RStatBusbarHarmonicMapper rStatBusbarHarmonicMapper; private final RStatBusbarHarmonicMapper rStatBusbarHarmonicMapper;
private final IPmsGeneratrixService pmsGeneratrixService; private final IGeneratrixWireService generatrixWireService;
private final IPmsGeneralDeviceService iPmsGeneralDeviceService; 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()); List<String> busbarIds = result.stream().map(RStatBusbarHarmonicYVO::getBusbarId).collect(Collectors.toList());
PmsGeneratrixParam pmsGeneratrixParam = new PmsGeneratrixParam(); PmsGeneratrixParam pmsGeneratrixParam = new PmsGeneratrixParam();
pmsGeneratrixParam.setGeneratrixIds(busbarIds); pmsGeneratrixParam.setGeneratrixIds(busbarIds);
List<GeneratrixAndPowerStationDTO> dtoS = pmsGeneratrixService.getGeneratrixAndPowerStationInfo(pmsGeneratrixParam); List<GeneratrixAndPowerStationDTO> dtoS = generatrixWireService.getGeneratrixAndPowerStationInfo(pmsGeneratrixParam);
for (GeneratrixAndPowerStationDTO dto : dtoS) { for (GeneratrixAndPowerStationDTO dto : dtoS) {
for (RStatBusbarHarmonicYVO vo : result) { for (RStatBusbarHarmonicYVO vo : result) {