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

Merge remote-tracking branch 'origin/liaoning' into liaoning

Browse Source
This commit is contained in:
wr
2025-05-08 13:53:32 +08:00
parent 1d1e82fea2 a8d9272e7c
commit 1d594e0810
9 changed files with 93 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java
View File

@@ -76,7 +76,6 @@ public class HarmonicServiceImpl implements IHarmonicService {
if (StringUtils.isBlank(RequestUtil.getDeptIndex())) {
return list;
}
Map<String, UserLedgerVO> userLedgerVOMap;
if (Objects.isNull(harmonicPublicParam.getPowerFlag()) || !PowerFlagEnum.GRID_SIDE.getCode().equals(harmonicPublicParam.getPowerFlag())) {
List<UserLedgerVO> userLedgerVOList = userLedgerFeignClient.selectUserList(new UserReportParam()).getData();
@@ -85,7 +84,6 @@ public class HarmonicServiceImpl implements IHarmonicService {
userLedgerVOMap = new HashMap<>();
}
List<GeneralDeviceDTO> deptList = generalDeviceInfoClient.getPracticalRunDeviceInfo(harmonicPublicParam).getData();
deptList.forEach(dept -> lineList.addAll(dept.getLineIndexes()));
//获取所有的数据信息