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

辽宁功能调整

Browse Source
This commit is contained in:
chendaofei
2025-04-27 08:47:41 +08:00
parent 9d6a5875f6
commit cb94792a57
16 changed files with 306 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/enums/LineBaseEnum.java
View File

@@ -20,7 +20,7 @@ public enum LineBaseEnum {
PROVINCE_LEVEL(1, "省份"),
GD_LEVEL(2, "供电公司"),
SUB_LEVEL(3, "变电站"),
DEVICE_LEVEL(4, "设备"),
DEVICE_LEVEL(4, "终端"),
SUB_V_LEVEL(5, "母线"),
LINE_LEVEL(6, "监测点"),
USER_LEVEL(7,"用户"),

48
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/MonitorPowerDTO.java Normal file
View File

@@ -0,0 +1,48 @@
package com.njcn.device.pq.pojo.dto;
import lombok.Data;
import java.util.List;
/**
* @Author: cdf
* @CreateTime: 2025-04-25
* @Description: 区分电网侧非电网侧信息台账信息
*/
@Data
public class MonitorPowerDTO {
private List<MonitorBase> userMonitorList;
private List<MonitorBase> powerMonitorList;
private List<MonitorBase> userStationList;
private List<MonitorBase> powerStationList;
@Data
public static class MonitorBase{
private String id;
private String pid;
private String pids;
private String name;
private Integer sort;
private String objId;
private String bigObjType;
private String smallObjType;
}
}

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/OverLimitLineDTO.java
View File

@@ -24,6 +24,8 @@ public class OverLimitLineDTO {
private String lineObjectName;
private String objId;
private String monitorNumber;
private String subName;

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
View File

@@ -738,7 +738,7 @@
A1.Name lineName,
C1.Name lineScale,
C2.Name loadType,
D.Obj_Name lineObjectName,
D.Obj_Id objId,
D.Monitor_Id monitorNumber,
A4.Name subName,
C3.Name subScale,

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
View File

@@ -25,6 +25,7 @@ import com.njcn.device.pq.enums.LineBaseEnum;
import com.njcn.device.pq.mapper.*;
import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
import com.njcn.device.biz.pojo.dto.PollutionLineDTO;
import com.njcn.device.pq.pojo.dto.MonitorPowerDTO;
import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
import com.njcn.device.pq.pojo.param.*;
@@ -772,6 +773,8 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
return pollutionLineInfoDTOList;
}
@Override
public List<Overlimit> getOverLimitByList(PollutionParamDTO pollutionParamDTO) {
return overlimitMapper.selectBatchIds(pollutionParamDTO.getLineList());

11
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
View File

@@ -230,6 +230,12 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
if (CollectionUtil.isNotEmpty(generalDeviceDTOList)) {
// 创建集合
List<TerminalTree> taiZhang = new ArrayList<>();
// 获取用户
UserReportParam userReportParam = new UserReportParam();
List<UserLedgerVO> userReportPOList = userLedgerFeignClient.selectUserList(userReportParam).getData();
userReportPOList = userReportPOList.stream().filter(it -> StrUtil.isNotBlank(it.getStationId())).collect(Collectors.toList());
Map<String, UserLedgerVO> userMap = userReportPOList.stream().collect(Collectors.toMap(UserLedgerVO::getId, Function.identity()));
// 遍历集合
for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
// 创建实体类
@@ -253,10 +259,6 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
Map<String,List<TerminalTree>> temMap = new HashMap<>();
if(CollUtil.isNotEmpty(userLineList)) {
Map<String, List<TerminalTree>> objMap = userLineList.stream().collect(Collectors.groupingBy(TerminalTree::getObjId));
UserReportParam userReportParam = new UserReportParam();
List<UserLedgerVO> userReportPOList = userLedgerFeignClient.selectUserList(userReportParam).getData();
userReportPOList = userReportPOList.stream().filter(it -> StrUtil.isNotBlank(it.getStationId())).collect(Collectors.toList());
Map<String, UserLedgerVO> userMap = userReportPOList.stream().collect(Collectors.toMap(UserLedgerVO::getId, Function.identity()));
List<TerminalTree> temList = new ArrayList<>();
objMap.forEach((objId, monitorList) -> {
UserLedgerVO userLedgerVO = userMap.get(objId);
@@ -275,7 +277,6 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
tree.setPids(String.valueOf(devSize));
temList.add(tree);
});
temMap = temList.stream().collect(Collectors.groupingBy(TerminalTree::getPid));
}