123

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/service/benching/BenchmarkingService.java

@@ -1818,7 +1818,8 @@ public class BenchmarkingService {
             foreigntype = "风电";
         }
         QueryWrapper<Benchmark> qw = new QueryWrapper<>();
-        qw.select("foreignkeyid,avg(mark) mark,avg(capacity) capacity,avg(units) units,sum(theoreticalpower) theoreticalpower,sum(actualpower) actualpower,sum(daynhgzssdl) daynhgzssdl,sum(daynhwhssdl) daynhwhssdl,sum(daynhxdssdl) daynhxdssdl,sum(daynhqfdl) daynhqfdl,sum(daynhcfdl) daynhcfdl,sum(actualpower)/sum(theoreticalpower)*100 windenergy,sum(daynhxdssdl)/sum(theoreticalpower)*100 powerlossrate,sum(daynhqfdl)/sum(theoreticalpower)*100 performancelossrate,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,sum(daynhgzssdl)/sum(theoreticalpower)*100 failurelossrate,sum(daynhwhssdl)/sum(theoreticalpower)*100 mainlossrate,avg(hiddentimely) hiddentimely,avg(resettimelyrate) resettimelyrate,avg(statetransitionrate) statetransitionrate,avg(eliminationrate) eliminationrate,avg(speed) speed,avg(staticwindfrequency) staticwindfrequency,avg(effectivewindhourrate) effectivewindhourrate");
+        //qw.select("foreignkeyid,avg(mark) mark,avg(capacity) capacity,avg(units) units,sum(theoreticalpower) theoreticalpower,sum(actualpower) actualpower,sum(daynhgzssdl) daynhgzssdl,sum(daynhwhssdl) daynhwhssdl,sum(daynhxdssdl) daynhxdssdl,sum(daynhqfdl) daynhqfdl,sum(daynhcfdl) daynhcfdl,sum(actualpower)/sum(theoreticalpower)*100 windenergy,sum(daynhxdssdl)/sum(theoreticalpower)*100 powerlossrate,sum(daynhqfdl)/sum(theoreticalpower)*100 performancelossrate,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,sum(daynhgzssdl)/sum(theoreticalpower)*100 failurelossrate,sum(daynhwhssdl)/sum(theoreticalpower)*100 mainlossrate,avg(hiddentimely) hiddentimely,avg(resettimelyrate) resettimelyrate,avg(statetransitionrate) statetransitionrate,avg(eliminationrate) eliminationrate,avg(speed) speed,avg(staticwindfrequency) staticwindfrequency,avg(effectivewindhourrate) effectivewindhourrate");
+        qw.select("foreignkeyid,avg(mark) mark,avg(capacity) capacity,avg(units) units,sum(theoreticalpower) theoreticalpower,sum(actualpower) actualpower,sum(daynhgzssdl) daynhgzssdl,sum(daynhwhssdl) daynhwhssdl,sum(daynhxdssdl) daynhxdssdl,sum(daynhqfdl) daynhqfdl,sum(daynhcfdl) daynhcfdl,decode(sum(theoreticalpower),0,0,sum(actualpower)/sum(theoreticalpower)*100) windenergy,decode(sum(theoreticalpower),0,0,sum(daynhxdssdl)/sum(theoreticalpower)*100) powerlossrate,decode(sum(theoreticalpower),0,0,sum(daynhqfdl)/sum(theoreticalpower)*100) performancelossrate,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,decode(sum(theoreticalpower),0,0,sum(daynhgzssdl)/sum(theoreticalpower)*100) failurelossrate,decode(sum(theoreticalpower),0,0,sum(daynhwhssdl)/sum(theoreticalpower)*100) mainlossrate,avg(hiddentimely) hiddentimely,avg(resettimelyrate) resettimelyrate,avg(statetransitionrate) statetransitionrate,avg(eliminationrate) eliminationrate,avg(speed) speed,avg(staticwindfrequency) staticwindfrequency,avg(effectivewindhourrate) effectivewindhourrate");
         if (foreigntype.equals("风电")){
             qw.like("foreignkeyid","_FDC");
         }else {