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

1.配网三类用户调整

Browse Source 
2.国网上送接口调整
This commit is contained in:
cdf
2024-10-15 14:37:42 +08:00
parent e38a653e3c
commit 5676c736a5
7 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/pwUser/PwUserMonitorParam.java
View File

@@ -22,4 +22,6 @@ public class PwUserMonitorParam extends BaseParam {
private List<String> ids;
private String monitorState;
}

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

@@ -519,7 +519,8 @@
pms_distribution_monitor
inner join pms_power_client on pms_distribution_monitor.Monitor_Id = pms_power_client.id
left join pms_real_data on pms_power_client.id = pms_real_data.line_id and pms_real_data.value_type = "AVG"
WHERE pms_power_client.org_id in
WHERE pms_distribution_monitor.Monitor_State = #{param.monitorState}
and pms_power_client.org_id in
<foreach collection="deptIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>

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

@@ -478,6 +478,8 @@ public class DistributionMonitorServiceImpl extends MppServiceImpl<DistributionM
@Override
public List<PwUserMonitorDataVO> getPwUserIds(PwUserMonitorParam pwUserMonitorParam) {
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(pwUserMonitorParam.getOrgId()).getData();
DictData dictData = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.RUN.getCode(), DicDataTypeEnum.LINE_STATE.getCode()).getData();
pwUserMonitorParam.setMonitorState(dictData.getId());
return this.distributionMonitorMapper.getDistributionList(deptIds,pwUserMonitorParam);
}