diff --git a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/controller/TestController.java b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/controller/TestController.java index b5d5cca..23b4c5c 100644 --- a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/controller/TestController.java +++ b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/controller/TestController.java @@ -170,10 +170,10 @@ public class TestController { tempEleEpdPqd.setHarmEnd(tempEleEpdPqd.getHarmEnd()+1); } for (int i = tempEleEpdPqd.getHarmStart(); i < tempEleEpdPqd.getHarmEnd() + 1; i++) { - influxQueryWrapperMax.min(tempEleEpdPqd.getName() + "_" + i, tempEleEpdPqd.getOtherName() + "_" + i); + influxQueryWrapperMax.max(tempEleEpdPqd.getName() + "_" + i, tempEleEpdPqd.getOtherName() + "_" + i); } } else { - influxQueryWrapperMax.min(tempEleEpdPqd.getName(), tempEleEpdPqd.getOtherName()); + influxQueryWrapperMax.max(tempEleEpdPqd.getName(), tempEleEpdPqd.getOtherName()); } }); @@ -232,7 +232,7 @@ public class TestController { influxQueryWrapperCp95.percentile(tempEleEpdPqd.getName() + "_" + i, tempEleEpdPqd.getOtherName() + "_" + i, 95); } } else { - influxQueryWrapperCp95.mean(tempEleEpdPqd.getName(), tempEleEpdPqd.getOtherName()); + influxQueryWrapperCp95.percentile(tempEleEpdPqd.getName(), tempEleEpdPqd.getOtherName(),95); } }); diff --git a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/job/ReportCovertJob.java b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/job/ReportCovertJob.java index dd3b67d..1dffb33 100644 --- a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/job/ReportCovertJob.java +++ b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/job/ReportCovertJob.java @@ -162,10 +162,10 @@ public class ReportCovertJob { tempEleEpdPqd.setHarmEnd(tempEleEpdPqd.getHarmEnd()+1); } for (int i = tempEleEpdPqd.getHarmStart(); i < tempEleEpdPqd.getHarmEnd() + 1; i++) { - influxQueryWrapperMax.min(tempEleEpdPqd.getName() + "_" + i, tempEleEpdPqd.getOtherName() + "_" + i); + influxQueryWrapperMax.max(tempEleEpdPqd.getName() + "_" + i, tempEleEpdPqd.getOtherName() + "_" + i); } } else { - influxQueryWrapperMax.min(tempEleEpdPqd.getName(), tempEleEpdPqd.getOtherName()); + influxQueryWrapperMax.max(tempEleEpdPqd.getName(), tempEleEpdPqd.getOtherName()); } }); @@ -220,7 +220,7 @@ public class ReportCovertJob { influxQueryWrapperCp95.percentile(tempEleEpdPqd.getName() + "_" + i, tempEleEpdPqd.getOtherName() + "_" + i, 95); } } else { - influxQueryWrapperCp95.mean(tempEleEpdPqd.getName(), tempEleEpdPqd.getOtherName()); + influxQueryWrapperCp95.percentile(tempEleEpdPqd.getName(), tempEleEpdPqd.getOtherName(),95); } });