功率一致性系数重新计算

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/SingleAnalysisController.java

@@ -130,6 +130,8 @@ public class SingleAnalysisController {
             sav.setYxfss(NumberUtil.round(yxfss, 2).doubleValue());
             double jfpl = list.stream().mapToDouble(TurbineInfoDay::getJfpl).sum();
             sav.setJfpl(NumberUtil.round(jfpl, 2).doubleValue());
+            double glyzxxs = list.stream().mapToDouble(TurbineInfoDay::getGlyzxxs).average().orElse(0.0);
+            sav.setGlyzxxs(NumberUtil.round(glyzxxs, 2).doubleValue());
         }
         subList2.forEach(sav -> {
             List<TurbineInfoDay> days = dayMap.get(sav.getWindturbineid());
@@ -152,6 +154,7 @@ public class SingleAnalysisController {
                 sum.setXfqrfs((null != sum.getXfqrfs() ? sum.getXfqrfs() : 0.0) + (null != day.getXfqrfs() ? day.getXfqrfs() : 0.0));
                 sum.setYxfss((null != sum.getYxfss() ? sum.getYxfss() : 0.0) + (null != day.getYxfss() ? day.getYxfss() : 0.0));
                 sum.setJfpl((null != sum.getJfpl() ? sum.getJfpl() : 0.0) + (null != day.getJfpl() ? day.getJfpl() : 0.0));
+                sum.setGlyzxxs((null != sum.getGlyzxxs() ? sum.getGlyzxxs() : 0.0) + (null != day.getGlyzxxs() ? day.getGlyzxxs() : 0.0));
                 return sum;
             });
             TurbineInfoDay tb;
@@ -175,6 +178,7 @@ public class SingleAnalysisController {
                 sav.setXfqr(NumberUtil.round(tb.getXfqrfs(), 2).doubleValue());
                 sav.setYxfss(NumberUtil.round(tb.getYxfss(), 2).doubleValue());
                 sav.setJfpl(NumberUtil.round(tb.getJfpl(), 2).doubleValue());
+                sav.setGlyzxxs(NumberUtil.round(tb.getGlyzxxs() / d, 2).doubleValue());
             }
         });
 

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconEquipmentInfoDayTopServiceImpl.java

@@ -79,6 +79,7 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
             peeidt.setDayxfqr(NumberUtil.round(day.getXfqrfs(), 2).doubleValue());
             peeidt.setDayRank(Integer.valueOf(day.getLevel()));
             peeidt.setDayLevel(level(day.getScore(), i - 1));
+            peeidt.setDayglyzxxs(NumberUtil.round(day.getGlyzxxs(), 2).doubleValue());
         });
         return peeidtRecords;
     }
@@ -223,8 +224,7 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
         QueryWrapper<TurbineInfoDay> qw = new QueryWrapper<>();
         qw.lambda().eq(TurbineInfoDay::getTurbineId, windturbineId).orderByAsc(TurbineInfoDay::getRecordDate)
                 .between(TurbineInfoDay::getRecordDate, DateUtils.parseDate(beginDate), DateUtils.parseDate(endDate));
-        List<TurbineInfoDay> list = turbineInfoDayService.list(qw);
-        return list;
+        return turbineInfoDayService.list(qw);
     }
 
     @Override
@@ -251,6 +251,7 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
             peeidt.setDaysbklyl(NumberUtil.round(day.getKlyl(), 2).doubleValue());
             peeidt.setDayyxfss(NumberUtil.round(day.getYxfss(), 2).doubleValue());
             peeidt.setDayjfpl(NumberUtil.round(day.getJfpl(), 2).doubleValue());
+            peeidt.setDayglyzxxs(NumberUtil.round(day.getGlyzxxs(), 2).doubleValue());
         });
         return peeidtRecords;
     }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/TurbineInfoDayServiceImpl.java

@@ -128,7 +128,8 @@ public class TurbineInfoDayServiceImpl extends ServiceImpl<TurbineInfoDayMapper,
                         "AVG(klyl) as klyl",
                         "AVG(fnlyl) as fnlyl",
                         "AVG(bll) as bll",
-                        "SUM(score) as score"
+                        "SUM(score) as score",
+                        "AVG(glyzxxs) as glyzxxs"
                         );
         return baseMapper.selectList(qw);
     }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/singleanalysis/SingleAnalysisService.java

@@ -1625,6 +1625,8 @@ public class SingleAnalysisService {
         byzb.setSbklyl(NumberUtil.round(sbklyl, 2).doubleValue());
         double yxfss = list.stream().mapToDouble(TurbineInfoDay::getYxfss).sum();
         byzb.setYxfss(NumberUtil.round(yxfss, 2).doubleValue());
+        double glyzxxs = list.stream().mapToDouble(TurbineInfoDay::getGlyzxxs).average().orElse(0.0);
+        byzb.setGlyzxxs(NumberUtil.round(glyzxxs, 2).doubleValue());
         return byzb;
     }
 }