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

1.bug调整

Browse Source
This commit is contained in:
chendaofei
2026-07-20 16:45:00 +08:00
parent 00839668d8
commit b51119daa0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
View File

@@ -12,6 +12,7 @@ import com.njcn.device.pq.api.GeneralDeviceInfoClient;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.pojo.bo.BaseLineInfo;
import com.njcn.device.pq.pojo.po.LineDetail;
import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
import com.njcn.harmonic.mapper.*;
import com.njcn.harmonic.pojo.param.hebeinorth.AssessParam;
import com.njcn.harmonic.pojo.po.PQSComAssesPO;
@@ -662,7 +663,7 @@ public class GridServiceImpl implements IGridService {
.distinct()
.collect(Collectors.toList());
//获取基础台账信息
List<BaseLineInfo> baseLineInfos = generalDeviceInfoClient.getBaseLineInfo(lineList).getData();
List<AreaLineInfoVO> baseLineInfos = lineFeignClient.getBaseLineAreaInfo(lineList).getData();
//获取越限详情
List<RStatLimitRateDPO> overLimitList = rStatLimitRateDMapper.getAssessTargetRate(lineList, param.getStartTime(), param.getEndTime());
Map<String, RStatLimitRateDPO> map = overLimitList.stream().collect(Collectors.toMap(RStatLimitRateDPO::getLineId, Function.identity()));
@@ -671,8 +672,8 @@ public class GridServiceImpl implements IGridService {
qualifiedDetail.setAreaName(item.getGdName());
qualifiedDetail.setLineName(item.getLineName());
qualifiedDetail.setSubstationName(item.getSubName());
if (map.containsKey(item.getId())) {
RStatLimitRateDPO item2 = map.get(item.getId());
if (map.containsKey(item.getLineId())) {
RStatLimitRateDPO item2 = map.get(item.getLineId());
if (!Objects.isNull(item2) && item2.getAllTime() > 0) {
addQualifiedDetail(qualifiedDetail, item2);
}