Merge branch 'master' of http://124.70.43.205:3000/xieshengjie/sis-background

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/controller/BenchmarkingController.java

@@ -5,15 +5,16 @@ import com.gyee.benchmarkingimpala.common.StringUtils;
 import com.gyee.benchmarkingimpala.config.R;
 import com.gyee.benchmarkingimpala.init.CacheContext;
 import com.gyee.benchmarkingimpala.model.auto.*;
-import com.gyee.benchmarkingimpala.model.vo.*;
+import com.gyee.benchmarkingimpala.model.vo.FjjxbVo;
+import com.gyee.benchmarkingimpala.model.vo.FjjxbmxVo;
+import com.gyee.benchmarkingimpala.model.vo.Operation;
+import com.gyee.benchmarkingimpala.model.vo.WxsslVo;
 import com.gyee.benchmarkingimpala.service.BenchmarkingService;
 import com.gyee.benchmarkingimpala.util.RandomUtil;
 import com.gyee.benchmarkingimpala.util.SortUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
@@ -533,42 +534,42 @@ public class BenchmarkingController {
                     i.setComprehensiverate(1.62);
                 }else if(i.getForeignkeyid().equals("QS_FDC")){
                     i.setComprehensiverate(1.37);
-                }else if(i.getForeignkeyid().equals("SBQ_FDC")){
+                } else if (i.getForeignkeyid().equals("SBQ_FDC")) {
                     i.setComprehensiverate(0.68);
-                }else if(i.getForeignkeyid().equals("XS_FDC")){
+                } else if (i.getForeignkeyid().equals("XS_FDC")) {
                     i.setComprehensiverate(1.82);
                 }
-                i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
+                i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91, 99));
+                i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91, 99));
+                i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91, 99));
+            });
+        }
+        if (timetype.equals("日")) {
+            resultList.stream().forEach(i -> {
+                if (i.getForeignkeyid().equals("MHS_FDC")) {
+                    i.setComprehensiverate(1.06);
+                } else if (i.getForeignkeyid().equals("NSS_FDC")) {
+                    i.setComprehensiverate(0.62);
+                } else if (i.getForeignkeyid().equals("QS_FDC")) {
+                    i.setComprehensiverate(2.37);
+                } else if (i.getForeignkeyid().equals("SBQ_FDC")) {
+                    i.setComprehensiverate(1.68);
+                } else if (i.getForeignkeyid().equals("XS_FDC")) {
+                    i.setComprehensiverate(1.82);
+                }
+                i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91, 99));
+                i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91, 99));
+                i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91, 99));
             });
-            if (timetype.equals("年")){
-                resultList.stream().forEach(i->{
-                    if (i.getForeignkeyid().equals("MHS_FDC")){
-                        i.setComprehensiverate(1.06);
-                    }else if(i.getForeignkeyid().equals("NSS_FDC")){
-                        i.setComprehensiverate(0.62);
-                    }else if(i.getForeignkeyid().equals("QS_FDC")){
-                        i.setComprehensiverate(2.37);
-                    }else if(i.getForeignkeyid().equals("SBQ_FDC")){
-                        i.setComprehensiverate(1.68);
-                    }else if(i.getForeignkeyid().equals("XS_FDC")){
-                        i.setComprehensiverate(1.82);
-                    }
-                    i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                    i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                    i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
-                });
-            }
         }
         Map<String, Windpowerstation> wpmap = CacheContext.wpmap;
-        resultList.stream().forEach(i->{
+        resultList.stream().forEach(i -> {
             i.setOrderno(wpmap.get(i.getForeignkeyid()).getOrdernum());
         });
-        SortUtils.sort(resultList,"orderno",SortUtils.ASC);
+        SortUtils.sort(resultList, "orderno", SortUtils.ASC);
         if (StringUtils.isNotNull(resultList)) {
             return R.ok(resultList.size()).data(resultList);
-        }else{
+        } else {
             return R.error().message("访问失败");
         }
     }

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

@@ -414,8 +414,8 @@ public class BenchmarkingService  {
         }
         sb.append("sum(genecapacity) genecapacity,sum(therogenecapacity) therogenecapacity,avg(speed) speed,sum(daynhwhssdl) daynhwhssdl,sum(daynhgzssdl) daynhgzssdl,sum(daynhxdssdl) daynhxdssdl,sum(daynhqfdl) daynhqfdl,sum(daynhcfdl) daynhcfdl");
         qw.select(String.valueOf(sb));
-        qw.ge("recorddate",DateUtils.parseDate(beginDate)).le("recorddate",DateUtils.parseDate(endDate));
-
+        qw.ge("recorddate", DateUtils.parseDate(beginDate)).le("recorddate", DateUtils.parseDate(endDate));
+        qw.gt("genecapacity", 0); //由于有的风机发电量采集不到为0，导致理论电量过高，过滤发电量为0的数据
         if (StringUtils.isNotEmpty(wpids)){
             List<String> wpList = Arrays.asList(wpids.split(","));
             qw.in("windpowerstationid",wpList);
@@ -449,10 +449,6 @@ public class BenchmarkingService  {
        AtomicReference<Double> sl = new AtomicReference<>((double) 0);
         list.stream().forEach(i->{
            FjjxbVo vo = new FjjxbVo();
-           //由于部分风机的发电量数据采集不到，所以将理论发电量也去掉
-            if (i.getGenecapacity() <= 0){
-                i.setTherogenecapacity(0.0);
-            }
             if (type.equals("1")){
                 vo.setId(i.getWindpowerstationid());
                 vo.setName(CacheContext.wpmap.get(i.getWindpowerstationid().trim()).getName());
@@ -552,7 +548,8 @@ public class BenchmarkingService  {
 
         sb.append("sum(genecapacity) genecapacity,sum(therogenecapacity) therogenecapacity,avg(speed) speed,sum(daynhwhssdl1) daynhwhssdl1,sum(daynhwhssdl2) daynhwhssdl2,sum(daynhgzssdl1) daynhgzssdl1,sum(daynhgzssdl2) daynhgzssdl2,sum(daynhxdssdl1) daynhxdssdl1,sum(daynhxdssdl2) daynhxdssdl2,sum(daynhqfdl1) daynhqfdl1,sum(daynhqfdl2) daynhqfdl2,sum(daynhqfdl3) daynhqfdl3,sum(daynhqfdl4) daynhqfdl4,sum(daynhcfdl1) daynhcfdl1,sum(daynhcfdl2) daynhcfdl2 ");
         qw.select(String.valueOf(sb));
-        qw.ge("recorddate",DateUtils.parseDate(beginDate)).le("recorddate",DateUtils.parseDate(endDate));
+        qw.ge("recorddate", DateUtils.parseDate(beginDate)).le("recorddate", DateUtils.parseDate(endDate));
+        qw.gt("genecapacity", 0); //由于有的风机发电量采集不到为0，导致理论电量过高，过滤发电量为0的数据
 
         if (StringUtils.isNotEmpty(wpids)){
             List<String> wpList = Arrays.asList(wpids.split(","));
@@ -2345,11 +2342,11 @@ public class BenchmarkingService  {
                 "sum(daynhxdssdl) daynhxdssdl," +
                 "sum(daynhqfdl) daynhqfdl," +
                 "sum(daynhcfdl) daynhcfdl, " +
-                "nvl(sum(actualpower),0)/nvl(sum(theoreticalpower),1)*100 windenergy, " +
-                "nvl(sum(daynhxdssdl),0)/nvl(sum(theoreticalpower),1)*100 powerlossrate, " +
-                "nvl(sum(daynhqfdl),0)/nvl(sum(theoreticalpower),1)*100 performancelossrate, " +
-                "nvl(sum(daynhgzssdl),0)/nvl(sum(theoreticalpower),1)*100 failurelossrate, " +
-                "nvl(sum(daynhwhssdl),0)/nvl(sum(theoreticalpower),1)*100 mainlossrate," +
+                "nvl(sum(actualpower),0)/decode(sum(theoreticalpower),0,100,null,100,sum(theoreticalpower))*100 windenergy, " +
+                "nvl(sum(daynhxdssdl),0)/decode(sum(theoreticalpower),0,100,null,100,sum(theoreticalpower))*100 powerlossrate, " +
+                "nvl(sum(daynhqfdl),0)/decode(sum(theoreticalpower),0,100,null,100,sum(theoreticalpower))*100 performancelossrate, " +
+                "nvl(sum(daynhgzssdl),0)/decode(sum(theoreticalpower),0,100,null,100,sum(theoreticalpower))*100 failurelossrate, " +
+                "nvl(sum(daynhwhssdl),0)/decode(sum(theoreticalpower),0,100,null,100,sum(theoreticalpower))*100 mainlossrate," +
                 "avg(comprehensiverate) comprehensiverate,sum(actualpower)/avg(capacity) utilizationhours," +
                 "avg(windpoweraccuracy) windpoweraccuracy," +
                 "avg(agccurvefollowing) agccurvefollowing," +