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

1.数据质量统计算法->台账质量统计算法

Browse Source
This commit is contained in:
wr
2023-10-11 14:01:42 +08:00
parent 759e2d2015
commit 52aa0cfd6f
20 changed files with 398 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,8 +37,8 @@
DISTINCT
pq_dept_line.id unitId,
dic.value voltageLevel,
voltage.id pointId
voltage.id pointId,
point.id devId
</if>
<!--装置-->
<if test="type == 3">
@@ -73,7 +73,8 @@
select
DISTINCT
pq_dept_line.id unitId,
substation.id ledgerId
substation.id ledgerId,
point.id lineId
from pq_dept_line pq_dept_line
inner join pq_line point on pq_dept_line.line_id = point.id
inner join pq_line_detail lineDetail on point.id = lineDetail.id

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

@@ -2,6 +2,7 @@ package com.njcn.device.pq.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
import com.njcn.device.biz.pojo.dto.TerminalGetBase;
import com.njcn.device.pq.pojo.po.DeptLine;
import com.njcn.web.pojo.param.DeptLineParam;
@@ -89,7 +90,7 @@ public interface DeptLineService extends IService<DeptLine> {
* @author cdf
* @date 2023/5/10
*/
Map<String, List<String>> orgSubStationGet(List<Integer> devType);
Map<String, List<TerminalGetBase>> orgSubStationGet(List<Integer> devType);
/**

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

@@ -115,7 +115,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
public List<DeptGetSubStationDTO> deptSubStation(DeptGetLineParam deptGetLineParam) {
List<DeptGetSubStationDTO> result = new ArrayList<>();
List<DeptGetBase> temDept = getDeptChildrenByParent(deptGetLineParam);
Map<String, List<String>> map = deptLineService.orgSubStationGet(filterDataTypeNew(deptGetLineParam.getServerName()));
Map<String, List<TerminalGetBase>> map = deptLineService.orgSubStationGet(filterDataTypeNew(deptGetLineParam.getServerName()));
temDept.forEach(item -> {
DeptGetSubStationDTO deptGetSubStationDTO = new DeptGetSubStationDTO();
deptGetSubStationDTO.setUnitId(item.getUnitId());
@@ -123,13 +123,16 @@ public class CommTerminalServiceImpl implements CommTerminalService {
deptGetSubStationDTO.setUnitChildrenList(item.getUnitChildrenList());
List<String> deptIds = item.getUnitChildrenList();
if (CollectionUtil.isNotEmpty(deptIds)) {
List<String> subList = new ArrayList<>();
List<String> lineList = new ArrayList<>();
deptIds.forEach(i -> {
if (map.containsKey(i)) {
lineList.addAll(map.get(i));
subList.addAll(map.get(i).stream().map(TerminalGetBase::getLedgerId).collect(Collectors.toList()));
lineList.addAll(map.get(i).stream().map(TerminalGetBase::getLineId).collect(Collectors.toList()));
}
});
deptGetSubStationDTO.setStationIds(lineList);
deptGetSubStationDTO.setStationIds(subList);
deptGetSubStationDTO.setStationAndMonitorIDs(lineList);
}
result.add(deptGetSubStationDTO);
});
@@ -148,13 +151,16 @@ public class CommTerminalServiceImpl implements CommTerminalService {
deptGetBusBarDTO.setUnitChildrenList(item.getUnitChildrenList());
List<String> deptIds = item.getUnitChildrenList();
if (CollectionUtil.isNotEmpty(deptIds)) {
List<String> busBarList = new ArrayList<>();
List<String> lineList = new ArrayList<>();
deptIds.forEach(i -> {
if (map.containsKey(i)) {
lineList.addAll(map.get(i).stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()));
busBarList.addAll(map.get(i).stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()));
lineList.addAll(map.get(i).stream().map(LineDevGetDTO::getDevId).collect(Collectors.toList()));
}
});
deptGetBusBarDTO.setBusBarIds(lineList);
deptGetBusBarDTO.setBusBarIds(busBarList);
deptGetBusBarDTO.setBusBarAndMonitorIDs(lineList);
}
result.add(deptGetBusBarDTO);
});

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

@@ -99,9 +99,9 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
}
@Override
public Map<String, List<String>> orgSubStationGet(List<Integer> devDataType) {
public Map<String, List<TerminalGetBase>> orgSubStationGet(List<Integer> devDataType) {
List<TerminalGetBase> deptLines = deptLineMapper.orgSubStationGet(devDataType);
return deptLines.stream ().collect (Collectors.groupingBy (TerminalGetBase::getUnitId, Collectors.mapping (TerminalGetBase::getLedgerId,Collectors.toList ())));
return deptLines.stream ().collect (Collectors.groupingBy (TerminalGetBase::getUnitId));
}
@Override