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

1.pms3.0主网基准水平和统计报表代码调整

Browse Source
This commit is contained in:
wr
2024-02-01 16:31:39 +08:00
parent 40e881d91f
commit e8e0572485
17 changed files with 188 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml
View File

@@ -285,22 +285,22 @@
</select>
<select id="getPwMonitorDataNewList" resultType="com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO">
SELECT
pdm.Org_Id AS orgId,
ps.Org_Name AS orgName,
pdm.`Power_Station_Id` AS powerId,
ps.`Power_Name` AS powerName,
pdm.Monitor_Id AS monitorId,
pdm.Line_Id,
pdm.Monitor_Sort AS monitorSort,
pdm.Voltage_Level AS voltageLevel,
pdm.If_Power_User AS if_powerUser,
pdm.Monitor_State AS monitorState,
pdm.Created_Date AS createdDate,
pdm.Terminal_Id AS terminalId,
pdm.Terminal_Wiring_Method AS terminalWiringMethod
pdm.Org_Id AS orgId,
ps.Org_Name AS orgName,
pdm.`Power_Station_Id` AS powerId,
ps.`Power_Name` AS powerName,
pdm.Monitor_Id AS monitorId,
pdm.Line_Id,
pdm.Monitor_Sort AS monitorSort,
pdm.Voltage_Level AS voltageLevel,
pdm.If_Power_User AS if_powerUser,
pdm.Monitor_State AS monitorState,
pdm.Created_Date AS createdDate,
pdm.Terminal_Id AS terminalId,
pdm.Terminal_Wiring_Method AS terminalWiringMethod
FROM
pms_distribution_monitor pdm
INNER JOIN pms_statation_stat ps ON ps.Power_Id = pdm.Power_Station_Id
pms_distribution_monitor pdm
LEFT JOIN pms_statation_stat ps ON ps.Power_Id = pdm.Power_Station_Id
<where>
<if test="ids!=null and ids.size()!=0">
pdm.Monitor_Id IN

7
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java
View File

@@ -19,6 +19,7 @@ import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.dto.DeptDTO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.ListUtils;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -100,7 +101,11 @@ public class IPwMonitorServiceImpl implements IPwMonitorService {
List<String> orgCodeList= deptInfos.stream().map(DeptDTO::getCode).collect(Collectors.toList());
List<PwPmsMonitorDTO> pwPmsMonitorDTOS = pwMonitorMapper.getPwMonitorDataNewList(orgCodeList,pwPmsMonitorParam.getIds(),pwPmsMonitorParam.getMonitorTag(), pwPmsMonitorParam);
List<String> ids = pwPmsMonitorDTOS.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
List<PwPmsMonitorDTO> pwMonitorName = pwMonitorMapper.getPwMonitorName(ids, pwPmsMonitorParam.getMonitorName());
List<List<String>> pendingIds = ListUtils.partition(ids, 50000);
List<PwPmsMonitorDTO> pwMonitorName=new ArrayList<>();
for (List<String> pendingId : pendingIds) {
pwMonitorName.addAll(pwMonitorMapper.getPwMonitorName(pendingId, pwPmsMonitorParam.getMonitorName()));
}
Map<String, PwPmsMonitorDTO> monitorMap = pwPmsMonitorDTOS.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity()));
pwMonitorName.stream().forEach(x->{
if(monitorMap.containsKey(x.getMonitorId())){

4
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRMpMonitorAlarmCountMServiceImpl.java
View File

@@ -108,8 +108,8 @@ implements PwRMpMonitorAlarmCountMService {
lambdaQueryWrapper
.in(RMpMonitorAlarmCountM::getMeasurementPointId, pwMonitorIds)
.ge(RMpMonitorAlarmCountM::getDataDate, startTime)
.le(RMpMonitorAlarmCountM::getDataDate, endTime)
.eq(RMpMonitorAlarmCountM::getDataType, dataType);
.le(RMpMonitorAlarmCountM::getDataDate, endTime);
// .eq(RMpMonitorAlarmCountM::getDataType, dataType);
Page<RMpMonitorAlarmCountM> page = this.page(new Page<>(PageFactory.getPageNum(rMpMonitorAlarmCountMParam),PageFactory.getPageSize(rMpMonitorAlarmCountMParam)),lambdaQueryWrapper);
List<RMpMonitorAlarmCountM> alarmCountMList = page.getRecords();
List<PwRMpMonitorAlarmCountMVO> resultList;

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java
View File

@@ -83,7 +83,7 @@ implements RMpPwAlarmDetailDService{
//获取配网监测点
PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam();
pwPmsMonitorParam.setOrgId(deptIndex); //单位id
List<PwPmsMonitorDTO> pwMonitorList = iPwMonitorService.getPwMonitorList(pwPmsMonitorParam);
List<PwPmsMonitorDTO> pwMonitorList = iPwMonitorService.getPwNewMonitorList(pwPmsMonitorParam);
//配网监测点id集合
List<String> pwMonitorIds = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
//配网监测点Map集合

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

@@ -243,10 +243,10 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S
@Override
public List<StatationStat> getPowerInfo(PmsStatationStatInfoParam param) {
LambdaQueryWrapper<StatationStat> lqw = new LambdaQueryWrapper<>();
lqw.in(param.getOrgIds() != null, StatationStat::getOrgId, param.getOrgIds());
lqw.in(param.getPowerIds() != null, StatationStat::getPowerId, param.getPowerIds());
lqw.like(param.getPowerName() != null, StatationStat::getPowerName, param.getPowerName());
lqw.in(param.getPowerVoltageLevel() != null, StatationStat::getVoltageLevel, param.getPowerVoltageLevel());
lqw.in(CollUtil.isNotEmpty(param.getOrgIds()) , StatationStat::getOrgId, param.getOrgIds());
lqw.in(CollUtil.isNotEmpty(param.getPowerIds()), StatationStat::getPowerId, param.getPowerIds());
lqw.like(StrUtil.isNotBlank(param.getPowerName()), StatationStat::getPowerName, param.getPowerName());
lqw.in(CollUtil.isNotEmpty(param.getPowerVoltageLevel()), StatationStat::getVoltageLevel, param.getPowerVoltageLevel());
return this.list(lqw);
}