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

自定义报表优化处理

Browse Source
This commit is contained in:
雨木c
2023-10-24 11:00:15 +08:00
parent 964fb5675f
commit 21c3f3647d
2 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
View File

@@ -848,7 +848,6 @@ public class CustomReportServiceImpl implements CustomReportService {
System.out.println(sql); System.out.println(sql);
} }
List<Map<String, Object>> mapList = influxDbUtils.getMapResult(sql.toString()); List<Map<String, Object>> mapList = influxDbUtils.getMapResult(sql.toString());
if (CollUtil.isEmpty(mapList)) { if (CollUtil.isEmpty(mapList)) {
data = data.stream().peek(item -> item.setValue("/")).collect(Collectors.toList()); data = data.stream().peek(item -> item.setValue("/")).collect(Collectors.toList());
@@ -870,30 +869,26 @@ public class CustomReportServiceImpl implements CustomReportService {
} }
//判断是否越限 //判断是否越限
String key = item.getLimitName() + "#" + item.getStatMethod().toLowerCase() + "#pq_overlimit"; if(limitMap.size()!=0) {
if (limitMap.containsKey(key)) { String key = item.getLimitName() + "#" + item.getStatMethod().toLowerCase() + "#pq_overlimit";
ReportTemplateDTO tem = limitMap.get(key); if (limitMap.containsKey(key)) {
double limitVal = Double.parseDouble(tem.getValue()); ReportTemplateDTO tem = limitMap.get(key);
if (v > limitVal) { double limitVal = Double.parseDouble(tem.getValue());
tem.setOverLimitFlag(1); if (v > limitVal) {
tem.setValue(tem.getValue()); tem.setOverLimitFlag(1);
assNoPassMap.put(key, tem);
} else if (!assNoPassMap.containsKey(key)) { assNoPassMap.put(key, tem);
tem.setOverLimitFlag(0); } else if (!assNoPassMap.containsKey(key)) {
assNoPassMap.put(key, tem); tem.setOverLimitFlag(0);
tem.setValue(tem.getValue()); assNoPassMap.put(key, tem);
}
} }
} }
} else { } else {
item.setValue("/"); item.setValue("/");
} }
} }
} }
endList.addAll(data); endList.addAll(data);
} }
@@ -972,8 +967,13 @@ public class CustomReportServiceImpl implements CustomReportService {
}); });
}); });
//处理合格率
assNoPassMap.forEach((key, val) -> { assNoPassMap.forEach((key, val) -> {
limitTargetMapX.remove(key); limitTargetMapX.remove(key);
if("Voltage_Dev".equals(val.getTemplateName())||"Freq_Dev".equals(val.getTemplateName())){
val.setValue("±"+val.getValue());
}
if (val.getOverLimitFlag() == 1) { if (val.getOverLimitFlag() == 1) {
val.setValue("不合格 ("+val.getValue()+")"); val.setValue("不合格 ("+val.getValue()+")");
} else { } else {

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
View File

@@ -912,11 +912,7 @@ public class DayDataServiceImpl implements DayDataService {
dayPltMapper.insertBatch(dayPltList); dayPltMapper.insertBatch(dayPltList);
} }
} }
log.info(LocalDateTime.now() + "data表转day结束=====》"); log.info(LocalDateTime.now() + "data表转day结束=====》");
} }