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.api.LineFeignClient;
import com.njcn.device.pq.pojo.bo.BaseLineInfo; import com.njcn.device.pq.pojo.bo.BaseLineInfo;
import com.njcn.device.pq.pojo.po.LineDetail; 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.mapper.*;
import com.njcn.harmonic.pojo.param.hebeinorth.AssessParam; import com.njcn.harmonic.pojo.param.hebeinorth.AssessParam;
import com.njcn.harmonic.pojo.po.PQSComAssesPO; import com.njcn.harmonic.pojo.po.PQSComAssesPO;
@@ -662,7 +663,7 @@ public class GridServiceImpl implements IGridService {
.distinct() .distinct()
.collect(Collectors.toList()); .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()); List<RStatLimitRateDPO> overLimitList = rStatLimitRateDMapper.getAssessTargetRate(lineList, param.getStartTime(), param.getEndTime());
Map<String, RStatLimitRateDPO> map = overLimitList.stream().collect(Collectors.toMap(RStatLimitRateDPO::getLineId, Function.identity())); 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.setAreaName(item.getGdName());
qualifiedDetail.setLineName(item.getLineName()); qualifiedDetail.setLineName(item.getLineName());
qualifiedDetail.setSubstationName(item.getSubName()); qualifiedDetail.setSubstationName(item.getSubName());
if (map.containsKey(item.getId())) { if (map.containsKey(item.getLineId())) {
RStatLimitRateDPO item2 = map.get(item.getId()); RStatLimitRateDPO item2 = map.get(item.getLineId());
if (!Objects.isNull(item2) && item2.getAllTime() > 0) { if (!Objects.isNull(item2) && item2.getAllTime() > 0) {
addQualifiedDetail(qualifiedDetail, item2); addQualifiedDetail(qualifiedDetail, item2);
} }

4
pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/CustomReportTableServiceImpl.java
View File

@@ -1471,7 +1471,7 @@ public class CustomReportTableServiceImpl implements CustomReportTableService {
} }
} }
} else if (v.charAt(0) == '%' && v.contains(STR_ONE)) { } else if (v.charAt(0) == '%' && v.contains(STR_ONE)) {
//指标合格情况 //指标结论情况
String str = ""; String str = "";
List<ReportTemplateDTO> rDto = assMap.get(v.replace(STR_FOUR, "").toUpperCase()); List<ReportTemplateDTO> rDto = assMap.get(v.replace(STR_FOUR, "").toUpperCase());
if (Objects.nonNull(rDto)) { if (Objects.nonNull(rDto)) {
@@ -1481,7 +1481,7 @@ public class CustomReportTableServiceImpl implements CustomReportTableService {
str = "/"; str = "/";
} }
son.set(V, str); son.set(V, str);
if ("不合格".equals(str)) { if (str.contains("不合格")) {
son.set("fc", "#990000"); son.set("fc", "#990000");
} }
} }

3
pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java
View File

@@ -244,7 +244,6 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
// ======== 修复后的图片处理核心逻辑 ======== // ======== 修复后的图片处理核心逻辑 ========
Map<String, Object> header = handleImageData(file, picPathResource); Map<String, Object> header = handleImageData(file, picPathResource);
reportmap.put("$image$", header); reportmap.put("$image$", header);
reportmap.put("$image$", header);
getVirtualData(param); getVirtualData(param);
// 电压幅值 // 电压幅值
@@ -469,7 +468,7 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
reportmap.put("$TitleTime$", dayFormatter.format(currentTime)); reportmap.put("$TitleTime$", dayFormatter.format(currentTime));
// 报告标题 // 报告标题
reportmap.put("$ReportTitle$", reportmap.put("$ReportTitle$",
String.format("对该地区%s电能质量在线监测数据进行分析， 以判断电能质量指标是否满足国标。", new String[]{strLineBaseName})); String.format(" 对该地区%s电能质量在线监测数据进行分析， 以判断电能质量指标是否满足国标。", new String[]{strLineBaseName}));
// 报告分析时间段 // 报告分析时间段
reportmap.put("$ReportTime$", strTime); reportmap.put("$ReportTime$", strTime);
// 运行数据分析 // 运行数据分析