经济运行性能损失率、限电损失率bug

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/BenchmarkingService.java

@@ -12,13 +12,9 @@ import com.gyee.benchmarkingimpala.model.vo.*;
 import com.gyee.benchmarkingimpala.service.auto.*;
 import com.gyee.benchmarkingimpala.util.*;
 import com.gyee.benchmarkingimpala.util.taos.EdosUtil;
-import com.gyee.benchmarkingimpala.util.taos.StringUtil;
-import org.apache.poi.ss.formula.functions.T;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.lang.annotation.Target;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -2335,33 +2331,23 @@ public class BenchmarkingService  {
             foreigntype = "风电";
         }
         QueryWrapper<Benchmark> qw = new QueryWrapper<>();
-        qw.select("foreignkeyid,avg(mark) mark," +
-                "avg(capacity) capacity," +
-                "avg(units) units," +
+        qw.select("max(foreignkeyid) foreignkeyid," +
                 "sum(theoreticalpower) theoreticalpower," +
                 "sum(actualpower) actualpower," +
-                "sum(daynhgzssdl) daynhgzssdl, " +
+                "sum(daynhgzssdl) daynhgzssdl," +
                 "sum(daynhwhssdl) daynhwhssdl," +
                 "sum(daynhxdssdl) daynhxdssdl," +
                 "sum(daynhqfdl) daynhqfdl," +
-                "sum(daynhcfdl) daynhcfdl, " +
-                "isnull(sum(actualpower)/nullif(sum(theoreticalpower),0),0)*100 windenergy, " +
-                "isnull(sum(daynhxdssdl)/nullif(sum(theoreticalpower),0),0)*100 powerlossrate, " +
-                "isnull(sum(daynhqfdl)/nullif(sum(theoreticalpower),0),0)*100 performancelossrate, " +
-                "isnull(sum(daynhgzssdl)/nullif(sum(theoreticalpower),0),0)*100 failurelossrate, " +
+                "sum(daynhcfdl) daynhcfdl," +
+                "isnull(sum(actualpower)/nullif(sum(theoreticalpower),0),0)*100 windenergy," +
+                "isnull(sum(daynhxdssdl)/nullif(sum(theoreticalpower),0),0)*100 powerlossrate," +
+                "isnull(sum(daynhqfdl)/nullif(sum(theoreticalpower),0),0)*100 performancelossrate," +
+                "isnull(sum(daynhgzssdl)/nullif(sum(theoreticalpower),0),0)*100 failurelossrate," +
                 "isnull(sum(daynhwhssdl)/nullif(sum(theoreticalpower),0),0)*100 mainlossrate," +
-                "avg(comprehensiverate) comprehensiverate,sum(actualpower)/avg(capacity) utilizationhours," +
-                "avg(windpoweraccuracy) windpoweraccuracy," +
-                "avg(agccurvefollowing) agccurvefollowing," +
-                "avg(mtbf) mtbf,avg(mttr) mttr,avg(mttf) mttf," +
-                "avg(availability) availability,avg(availabilityfactor) availabilityfactor," +
-                "avg(hiddentimely) hiddentimely," +
-                "avg(resettimelyrate) resettimelyrate," +
-                "avg(statetransitionrate) statetransitionrate," +
-                "avg(eliminationrate) eliminationrate," +
-                "avg(speed) speed," +
-                "avg(staticwindfrequency) staticwindfrequency," +
-                "avg(effectivewindhourrate) effectivewindhourrate");if (foreigntype.equals("风电")){
+                "avg(resettimelyrate) resettimelyrate,avg(statetransitionrate) statetransitionrate," +
+                "avg(eliminationrate) eliminationrate,avg(comprehensiverate) comprehensiverate," +
+                "avg(windpoweraccuracy) windpoweraccuracy,avg(agccurvefollowing) agccurvefollowing");
+        if (foreigntype.equals("风电")){
             qw.like("foreignkeyid","_FDC");
         }else {
             qw.like("foreignkeyid","_GDC");