首页bug修复

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

@@ -140,13 +140,8 @@ public class SingleAnalysisController {
             sav.setDjxs(NumberUtil.round(day.getDjMin() / 60, 2).doubleValue());
             sav.setLyxs(day.getLyxs());
             sav.setSbklyl(day.getKlyl());
-            //                    "dxklyxs": 26.0,
-            //                    "rlxs": 384.0,
             sav.setXfqr(day.getXfqrfs());
-//            sav.setGlyzxxs(day.getGlyzxxs());
             sav.setYxfss(day.getYxfss());
-            //                    "xfqrhgl": 24.14,
-            //                    "fjrl": 2000.0,
             sav.setJfpl(day.getJfpl());
         });
 
@@ -232,10 +227,14 @@ public class SingleAnalysisController {
             SingleAnalysisVo byzb = singleAnalysisService.SingleAnalysisListByWtId(wtId, recordDate);
 
             byzb.setWtcode(wtcode);
+            SingleAnalysisVo singleAnalysisVo = singleAnalysisService.SingleAnalysisTurbineinfoday(wtId, year, month, byzb);
+
             cal.add(Calendar.YEAR, -1);
             Date lastYear = DateUtils.truncate(cal.getTime());
 
             SingleAnalysisVo tqzb = singleAnalysisService.SingleAnalysisListByWtId(wtId, lastYear);
+            SingleAnalysisVo tqzbNew = singleAnalysisService.SingleAnalysisTurbineinfoday(wtId, lastYear.toString(), month, tqzb);
+
             SingleAnalysisVo tbzb = singleAnalysisService.SingleAnalysisListByWtId(byzb, tqzb);
 
             tqzb.setWtcode(wtcode);

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/homepage/EconomyPointHomePageService.java

@@ -2040,23 +2040,39 @@ public class EconomyPointHomePageService {
                 .like("station_id", "_FDC_%")
                 .groupBy("station_id");
         List<TurbineInfoDay> yearData = iTurbineInfoDayService.list(currentqw);
-        Integer intYear = LocalDate.now().getYear();
-        Double nfdlc = calDivide(yearData.get(0).getRfdl(), 1000.0);
-        Double nllfdlc = calDivide(yearData.get(0).getLlfdl(), 1000.0);
-        nfdlCal.put(intYear, new BigDecimal(nfdlc));
-        nllfdlCal.put(intYear, new BigDecimal(nllfdlc));
+        if (yearData.isEmpty()) {
+            Integer intYear = LocalDate.now().getYear();
+            double nfdlc = 0.0;
+            double nllfdlc = 0.0;
+            nfdlCal.put(intYear, new BigDecimal(nfdlc));
+            nllfdlCal.put(intYear, new BigDecimal(nllfdlc));
+        } else {
+            Integer intYear = LocalDate.now().getYear();
+            Double nfdlc = calDivide(yearData.get(0).getRfdl(), 1000.0);
+            Double nllfdlc = calDivide(yearData.get(0).getLlfdl(), 1000.0);
+            nfdlCal.put(intYear, new BigDecimal(nfdlc));
+            nllfdlCal.put(intYear, new BigDecimal(nllfdlc));
+        }
         currentqw.clear();
         currentqw.select("station_id,MAX(record_date) AS record_date,SUM(rfdl) AS rfdl,SUM(llfdl) as llfdl")
                 .ge("record_date", LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()))  // 大于等于本月的第一天
                 .lt("record_date", yesterday)  // 小于今天0点的日期
-                .like("station_id", "_FDC_%")
+                .like("station_id", "_FDC_")
                 .groupBy("station_id");
         List<TurbineInfoDay> monthData = iTurbineInfoDayService.list(currentqw);
-        String yearAndMonth = LocalDate.now().getYear() + "-" + LocalDate.now().getMonthValue();
-        Double yfdlc = calDivide(monthData.get(0).getRfdl(), 1000.0);
-        Double yllfdlc = calDivide(monthData.get(0).getLlfdl(), 1000.0);
-        yfdlCal.put(yearAndMonth, new BigDecimal(yfdlc));
-        yllfdlCal.put(yearAndMonth, new BigDecimal(yllfdlc));
+        if (monthData.isEmpty()) {
+            String yearAndMonth = LocalDate.now().getYear() + "-" + LocalDate.now().getMonthValue();
+            double yfdlc = 0.0;
+            double yllfdlc = 0.0;
+            yfdlCal.put(yearAndMonth, new BigDecimal(yfdlc));
+            yllfdlCal.put(yearAndMonth, new BigDecimal(yllfdlc));
+        } else {
+            String yearAndMonth = LocalDate.now().getYear() + "-" + LocalDate.now().getMonthValue();
+            Double yfdlc = calDivide(monthData.get(0).getRfdl(), 1000.0);
+            Double yllfdlc = calDivide(monthData.get(0).getLlfdl(), 1000.0);
+            yfdlCal.put(yearAndMonth, new BigDecimal(yfdlc));
+            yllfdlCal.put(yearAndMonth, new BigDecimal(yllfdlc));
+        }
         currentqw.clear();
         lastCalDate = LocalDate.now();
     }

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

@@ -1,5 +1,6 @@
 package com.gyee.runeconomy.service.singleanalysis;
 
+import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.init.CacheContext;
@@ -31,6 +32,9 @@ public class SingleAnalysisService {
     @Resource
     private IProEconPowerstationInfoDay5Service proEconPowerstationInfoDay5Service;
 
+    @Resource
+    private ITurbineInfoDayService turbineInfoDayService;
+
     private Map<String, ProEconInOrOutSpeedTotal> queryInOrOutSpeedTotal(String cmId, String type, String wpId, Date recordDate) {
 
         List<ProEconInOrOutSpeedTotal> iostls = null;
@@ -1366,4 +1370,42 @@ public class SingleAnalysisService {
     }
 
 
+    public SingleAnalysisVo SingleAnalysisTurbineinfoday(String wtId, String year, String month, SingleAnalysisVo byzb) {
+        String date = year + "-" + month;
+        QueryWrapper<TurbineInfoDay> qw = new QueryWrapper<>();
+        qw.lambda().eq(TurbineInfoDay::getTurbineId, wtId)
+                .apply("to_char(record_date,'YYYY-MM')='" + date + "'");
+        List<TurbineInfoDay> list = turbineInfoDayService.list(qw);
+        double rfdl = list.stream().mapToDouble(TurbineInfoDay::getRfdl).sum();
+        byzb.setFdl(NumberUtil.round(rfdl/1000,2).doubleValue());
+        double pjfs = list.stream().mapToDouble(TurbineInfoDay::getPjfs).average().orElse(0.0);
+        byzb.setFs(NumberUtil.round(pjfs,2).doubleValue());
+        double gzss = list.stream().mapToDouble(TurbineInfoDay::getGzss).sum();
+        byzb.setGzss(NumberUtil.round(gzss/1000,2).doubleValue());
+        double jhjxss = list.stream().mapToDouble(TurbineInfoDay::getJhjxss).sum();
+        byzb.setJxss(NumberUtil.round(jhjxss/1000,2).doubleValue());
+        double xdss = list.stream().mapToDouble(TurbineInfoDay::getXdss).sum();
+        byzb.setXdss(NumberUtil.round(xdss/1000,2).doubleValue());
+        double xnss = list.stream().mapToDouble(TurbineInfoDay::getXnss).sum();
+        byzb.setXnss(NumberUtil.round(xnss/1000,2).doubleValue());
+        double slss = list.stream().mapToDouble(TurbineInfoDay::getXnss).sum();
+        byzb.setSlss(NumberUtil.round(slss/1000,2).doubleValue());
+        double llfdl = list.stream().mapToDouble(TurbineInfoDay::getXnss).sum();
+        byzb.setLlfdl(NumberUtil.round(llfdl/1000,2).doubleValue());
+        double gzmin = list.stream().mapToDouble(TurbineInfoDay::getGzMin).sum();
+        byzb.setGzxs(NumberUtil.round(gzmin/60,2).doubleValue());
+        double jxmin = list.stream().mapToDouble(TurbineInfoDay::getJxMin).sum();
+        byzb.setJxxs(NumberUtil.round(jxmin/60,2).doubleValue());
+        double lxmin = list.stream().mapToDouble(TurbineInfoDay::getLxMin).sum();
+        byzb.setZdxs(NumberUtil.round(lxmin/60,2).doubleValue());
+        double yxmin = list.stream().mapToDouble(TurbineInfoDay::getYxMin).sum();
+        byzb.setYxxs(NumberUtil.round(yxmin/60,2).doubleValue());
+        double djmin = list.stream().mapToDouble(TurbineInfoDay::getDjMin).sum();
+        byzb.setDjxs(NumberUtil.round(djmin/60,2).doubleValue());
+        double sblyxs = list.stream().mapToDouble(TurbineInfoDay::getLyxs).sum();
+        byzb.setLyxs(NumberUtil.round(sblyxs,2).doubleValue());
+        double sbklyl = list.stream().mapToDouble(TurbineInfoDay::getKlyl).average().orElse(0.0);
+        byzb.setSbklyl(NumberUtil.round(sbklyl,2).doubleValue());
+        return byzb;
+    }
 }