综合厂用电量页面

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/Electricity/ElectricityController.java

@@ -1,6 +1,9 @@
 package com.gyee.runeconomy.controller.Electricity;
 
 import com.gyee.runeconomy.dto.AjaxResult;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
+import com.gyee.runeconomy.service.Comprehensive.ComprehensiveelectricityService;
 import com.gyee.runeconomy.service.Electricity.Electricityservice;
 import com.gyee.runeconomy.service.StudyElectricity.StudyElectricityService;
 import com.gyee.runeconomy.util.StringUtils;
@@ -15,7 +18,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("/electricity")
@@ -27,20 +32,25 @@ public class ElectricityController {
 
     @Resource
     private StudyElectricityService studyelectricity;
+
+    @Resource
+    private ComprehensiveelectricityService comprehensiveelectricityService;
+
     @GetMapping("/statistics")
     @ResponseBody
-    @ApiOperation(value = "首页", notes = "首页")
+    @ApiOperation(value = "功率预测分析", notes = "功率预测分析")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wpId", value = "场站编号", required = true, dataType = "string", paramType = "query"),
-            @ApiImplicitParam(name = "String timetype", value = "场站编号", required = true, dataType = "string", paramType = "query")
+            @ApiImplicitParam(name = "timetype", value = "场站编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "场站编号", required = true, dataType = "string", paramType = "query")
     })
 
-    public AjaxResult forecast(String wpId,String timetype) throws Exception {
+    public AjaxResult forecast(String wpId, String timetype,String year) throws Exception {
 
 
         Map<String, Object> resultList = new LinkedHashMap<>();
         if (StringUtils.notEmp(wpId)) {
-            resultList = electricityservice.planvalue(wpId,timetype);
+            resultList = electricityservice.planvalue(wpId, timetype,year);
         }
 
         if (null != resultList) {
@@ -54,17 +64,18 @@ public class ElectricityController {
 
     @GetMapping("/coulometric")
     @ResponseBody
-    @ApiOperation(value = "电量分析", notes = "电量分析")
+    @ApiOperation(value = "光伏电量分析", notes = "光伏电量分析")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "wpId", value = "场站编号", required = true, dataType = "string", paramType = "query")
+            @ApiImplicitParam(name = "wpId", value = "场站编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "场站编号", required = true, dataType = "string", paramType = "query")
     })
 
-    public AjaxResult coulometricgf(String wpId) throws Exception {
+    public AjaxResult coulometricgf(String wpId,String year) throws Exception {
 
 
         Map<String, Object> resultList = new LinkedHashMap<>();
         if (StringUtils.notEmp(wpId)) {
-            resultList = electricityservice.coulometric(wpId);
+            resultList = electricityservice.coulometric(wpId,year);
         }
 
         if (null != resultList) {
@@ -97,4 +108,50 @@ public class ElectricityController {
         }
 
     }
+
+    @GetMapping("/Comprehensive")
+    @ResponseBody
+    @ApiOperation(value = "可研电量分析", notes = "可研电量分析")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "场站编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "场站编号", required = true, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult cydlfx(String wpId,String year) throws Exception {
+
+
+        Map<String, Object> resultList = new LinkedHashMap<>();
+        if (StringUtils.notEmp(wpId)) {
+            resultList = comprehensiveelectricityService.Comprehensive(wpId,year);
+        }
+
+        if (null != resultList) {
+            return AjaxResult.successData(200, resultList);
+        } else {
+            return AjaxResult.error(500, "操作失败");
+        }
+
+    }
+
+    @GetMapping("/czlist")
+    @ResponseBody
+    @ApiOperation(value = "可研电量分析", notes = "可研电量分析")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "场站编号", required = false, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult czlb(String wpId) throws Exception {
+        List<ProBasicPowerstation> list = null;
+        if (wpId!= null && wpId.isEmpty()) {
+            String[] split = wpId.split(",");
+            list = CacheContext.wpls.stream().filter(w -> wpId.equals(w.getId())).collect(Collectors.toList());
+        }else {
+            list = CacheContext.wpls;
+        }
+        if (null != list) {
+            return AjaxResult.successData(200, list);
+        } else {
+            return AjaxResult.error(500, "操作失败");
+        }
+    }
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/ComprehensiveVo.java

@@ -0,0 +1,212 @@
+package com.gyee.runeconomy.dto;
+
+public class ComprehensiveVo {
+
+    /**
+     * 小时
+     */
+
+    private Integer hours;
+    /**
+     * 综合厂用电量
+     */
+    private Double zhcydl;
+
+    /**
+     * 综合厂用电量同比
+     */
+    private Double zhcydltb;
+
+    /**
+     * 综合厂用电量环比
+     */
+    private Double zhcydlhb;
+
+    /**
+     * 实际电量
+     */
+    private Double sjdl;
+
+    /**
+     * 实际电量同比
+     */
+    private Double sjdltb;
+
+    /**
+     * 实际电量环比
+     */
+    private Double sjdlhb;
+
+    /**
+     * 上网电量
+     */
+    private Double swdl;
+
+    /**
+     * 上网电量同比
+     */
+    private Double swdltb;
+
+    /**
+     * 上网电量环比
+     */
+    private Double swdlhb;
+
+    /**
+     * 购网电量
+     */
+    private Double gwdl;
+
+    /**
+     * 购网电量同比
+     */
+    private Double gwdltb;
+
+    /**
+     * 购网电量环比
+     */
+    private Double gwdlhb;
+
+    /**
+     * 综合厂用电率
+     */
+    private Double zhcydll;
+
+    /**
+     * 综合厂用电率同比
+     */
+    private Double zhcydlltb;
+
+    /**
+     * 综合厂用电率环比
+     */
+    private Double zhcydllhb;
+
+    public Integer getHours() {
+        return hours;
+    }
+
+    public void setHours(Integer hours) {
+        this.hours = hours;
+    }
+
+    public Double getSjdl() {
+        return sjdl;
+    }
+
+    public Double getZhcydl() {
+        return zhcydl;
+    }
+
+    public void setZhcydl(Double zhcydl) {
+        this.zhcydl = zhcydl;
+    }
+
+    public Double getZhcydltb() {
+        return zhcydltb;
+    }
+
+    public void setZhcydltb(Double zhcydltb) {
+        this.zhcydltb = zhcydltb;
+    }
+
+    public Double getZhcydlhb() {
+        return zhcydlhb;
+    }
+
+    public void setZhcydlhb(Double zhcydlhb) {
+        this.zhcydlhb = zhcydlhb;
+    }
+
+    public void setSjdl(Double sjdl) {
+        this.sjdl = sjdl;
+    }
+
+    public Double getSjdltb() {
+        return sjdltb;
+    }
+
+    public void setSjdltb(Double sjdltb) {
+        this.sjdltb = sjdltb;
+    }
+
+    public Double getSjdlhb() {
+        return sjdlhb;
+    }
+
+    public void setSjdlhb(Double sjdlhb) {
+        this.sjdlhb = sjdlhb;
+    }
+
+    public Double getSwdl() {
+        return swdl;
+    }
+
+    public void setSwdl(Double swdl) {
+        this.swdl = swdl;
+    }
+
+    public Double getSwdltb() {
+        return swdltb;
+    }
+
+    public void setSwdltb(Double swdltb) {
+        this.swdltb = swdltb;
+    }
+
+    public Double getSwdlhb() {
+        return swdlhb;
+    }
+
+    public void setSwdlhb(Double swdlhb) {
+        this.swdlhb = swdlhb;
+    }
+
+    public Double getGwdl() {
+        return gwdl;
+    }
+
+    public void setGwdl(Double gwdl) {
+        this.gwdl = gwdl;
+    }
+
+    public Double getGwdltb() {
+        return gwdltb;
+    }
+
+    public void setGwdltb(Double gwdltb) {
+        this.gwdltb = gwdltb;
+    }
+
+    public Double getGwdlhb() {
+        return gwdlhb;
+    }
+
+    public void setGwdlhb(Double gwdlhb) {
+        this.gwdlhb = gwdlhb;
+    }
+
+    public Double getZhcydll() {
+        return zhcydll;
+    }
+
+    public void setZhcydll(Double zhcydll) {
+        this.zhcydll = zhcydll;
+    }
+
+    public Double getZhcydlltb() {
+        return zhcydlltb;
+    }
+
+    public void setZhcydlltb(Double zhcydlltb) {
+        this.zhcydlltb = zhcydlltb;
+    }
+
+    public Double getZhcydllhb() {
+        return zhcydllhb;
+    }
+
+    public void setZhcydllhb(Double zhcydllhb) {
+        this.zhcydllhb = zhcydllhb;
+    }
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Comprehensive/ComprehensiveelectricityService.java

@@ -0,0 +1,243 @@
+package com.gyee.runeconomy.service.Comprehensive;
+
+
+import com.gyee.common.model.StringUtils;
+import com.gyee.common.util.DateUtils;
+import com.gyee.common.util.SortUtils;
+import com.gyee.runeconomy.dto.ComprehensiveVo;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay5;
+import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay5Service;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class ComprehensiveelectricityService {
+    @Resource
+    private IProEconPowerstationInfoDay5Service proEconPowerstationInfoDay5Service;
+
+    public Map<String, Object> Comprehensive(String wpId, String year) throws Exception {
+
+        List<ProBasicPowerstation> wpls = CacheContext.wpls.stream().filter(g -> wpId.equals(g.getId())).collect(Collectors.toList());
+        List<ComprehensiveVo> vos = new ArrayList<ComprehensiveVo>();
+        Map<String, Object> map = new LinkedHashMap<>();
+
+        //当前年份
+        Calendar cal = Calendar.getInstance();
+        int dqnf = cal.get(Calendar.YEAR);//本年
+        
+        //参数所传年份
+        int currentyear = Integer.parseInt(year);
+
+
+        // 设置为本年一月一号0点
+        Calendar calendar1 = Calendar.getInstance();
+        calendar1.setTime(new Date());
+        calendar1.set(Calendar.YEAR, currentyear); // 根据当前年份变化
+        calendar1.set(Calendar.MONTH, Calendar.JANUARY); // 0表示一月
+        calendar1.set(Calendar.DAY_OF_MONTH, 1);
+        calendar1.set(Calendar.HOUR_OF_DAY, 0);
+        calendar1.set(Calendar.MINUTE, 0);
+        calendar1.set(Calendar.SECOND, 0);
+        calendar1.set(Calendar.MILLISECOND, 0);
+        Date firstDayZeroHour = calendar1.getTime();
+
+
+        // 设置为年初一月一号0点，同比计算取值时间(减去一年，比今年计算少一年)
+        Calendar calendar3 = Calendar.getInstance();
+        calendar3.setTime(new Date());
+        calendar3.set(Calendar.YEAR, currentyear - 1); // 根据当前年份变化
+        calendar3.set(Calendar.MONTH, Calendar.JANUARY); // 0表示一月
+        calendar3.set(Calendar.DAY_OF_MONTH, 1);
+        calendar3.set(Calendar.HOUR_OF_DAY, 0);
+        calendar3.set(Calendar.MINUTE, 0);
+        calendar3.set(Calendar.SECOND, 0);
+        calendar3.set(Calendar.MILLISECOND, 0);
+        Date tbjssj = calendar3.getTime();
+
+
+        // 去年十二月一号0点值,环比计算取值时间(初始设置为去年十二月，每循环一次增加一月)
+        Calendar calendar2 = Calendar.getInstance();
+        calendar2.setTime(new Date());
+        // 设置年份为传递的currentyear的前一年
+        calendar2.set(Calendar.YEAR, currentyear - 1);
+        // 设置月份为十二月
+        calendar2.set(Calendar.MONTH, Calendar.DECEMBER); // 11表示十二月
+        // 设置日期为每月的第一天
+        calendar2.set(Calendar.DAY_OF_MONTH, 1);
+        calendar2.set(Calendar.HOUR_OF_DAY, 0);
+        calendar2.set(Calendar.MINUTE, 0);
+        calendar2.set(Calendar.SECOND, 0);
+        calendar2.set(Calendar.MILLISECOND, 0);
+        Date hbjssj = calendar2.getTime();
+
+        double zhcydlsum = 0.0;
+        double sjdlsum = 0.0;
+        double swdlsum = 0.0;
+        double gwdlsum = 0.0;
+        double zhcydllsum = 0.0;
+
+        for (int i = 1; i <= 12; i++) {
+
+            //综合场用电量
+            double zhcydl = 0.0;
+            double zhcydltb = 0.0;
+            double zhcydlhb = 0.0;
+
+            //实际电量
+            double sjdl = 0.0;
+            double sjdltb = 0.0;
+            double sjdlhb = 0.0;
+
+            //上网电量
+            double swdl = 0.0;
+            double swdltb = 0.0;
+            double swdlhb = 0.0;
+
+            //购网电量
+            double gwdl = 0.0;
+            double gwdltb = 0.0;
+            double gwdlhb = 0.0;
+
+            //综合场用电率
+            double zhcydll = 0.0;
+            double zhcydlltb = 0.0;
+            double zhcydllhb = 0.0;
+
+
+            for (ProBasicPowerstation wp : wpls) {
+                //当前场站本年循环所有指标取值集合
+                List<ProEconPowerstationInfoDay5> zbls = proEconPowerstationInfoDay5Service.getmax(wp.getId(), firstDayZeroHour);
+                List<ProEconPowerstationInfoDay5> tbzbls = proEconPowerstationInfoDay5Service.getmax(wp.getId(), tbjssj);
+                List<ProEconPowerstationInfoDay5> hbzbls = proEconPowerstationInfoDay5Service.getmax(wp.getId(), hbjssj);
+
+                if (!zbls.isEmpty() && zbls != null) {
+                    //综合场用电量取值
+                    zhcydl = zbls.get(0).getYzhcydldb().doubleValue() / 10000;
+                    zhcydlsum += zhcydl;
+                    //发电量取值
+                    sjdl = zbls.get(0).getYfdldb().doubleValue() / 10000;
+                    sjdlsum += sjdl;
+                    //上网电量取值
+                    swdl = zbls.get(0).getYswdldb().doubleValue() / 10000;
+                    swdlsum += swdl;
+                    //购网电量取值
+                    gwdl = zbls.get(0).getYgwgwdldb().doubleValue() / 10000;
+                    gwdlsum += gwdl;
+                    //综合场用电率计算 —— 综合场用电率=(发电量-上网电量+购网电量)/发电量
+                    zhcydll = (sjdl - swdl + gwdl) / sjdl;
+                    zhcydllsum += zhcydll;
+                }
+                if (!tbzbls.isEmpty() && tbzbls != null) {
+                    zhcydltb = tbzbls.get(0).getYzhcydldb().doubleValue() / 10000;
+                    sjdltb = tbzbls.get(0).getYfdldb().doubleValue() / 10000;
+                    swdltb = tbzbls.get(0).getYswdldb().doubleValue() / 10000;
+                    gwdltb = tbzbls.get(0).getYgwgwdldb().doubleValue() / 10000;
+                    zhcydlltb = (sjdltb - swdltb + gwdltb) / sjdltb;
+                }
+                if (!hbzbls.isEmpty() && hbzbls != null) {
+                    zhcydlhb = hbzbls.get(0).getYzhcydldb().doubleValue() / 10000;
+                    sjdlhb = hbzbls.get(0).getYfdldb().doubleValue() / 10000;
+                    swdlhb = hbzbls.get(0).getYswdldb().doubleValue() / 10000;
+                    gwdlhb = hbzbls.get(0).getYgwgwdldb().doubleValue() / 10000;
+                    zhcydlltb = (sjdlhb - swdlhb + gwdlhb) / sjdlhb;
+                }
+
+
+                //添加各指标
+                ComprehensiveVo vo = new ComprehensiveVo();
+
+                //添加综合厂用电量数据
+                vo.setZhcydl(StringUtils.round(zhcydl, 2));
+                if (zhcydltb != 0) {
+                    vo.setZhcydltb(StringUtils.round((zhcydl - zhcydltb) / zhcydltb * 100, 0));
+                } else {
+                    vo.setZhcydltb(0.0);
+                }
+
+                if (zhcydlhb != 0) {
+                    vo.setZhcydlhb(StringUtils.round((zhcydl - zhcydlhb) / zhcydlhb * 100, 0));
+                } else {
+                    vo.setZhcydlhb(0.0);
+                }
+
+                //添加时间戳
+                vo.setHours(i);
+
+                //添加实际电量数据
+                vo.setSjdl(StringUtils.round(sjdl, 2));
+
+                if (sjdltb != 0) {
+                    vo.setSjdltb(StringUtils.round((sjdl - sjdltb) / sjdltb * 100, 0));
+                } else {
+                    vo.setSjdltb(0.0);
+                }
+                if (sjdlhb != 0) {
+                    vo.setSjdlhb(StringUtils.round((sjdl - sjdlhb) / sjdlhb * 100, 0));
+                } else {
+                    vo.setSjdlhb(0.0);
+                }
+
+                //添加上网电量数据
+                vo.setSwdl(StringUtils.round(swdl, 2));
+                if (swdltb != 0) {
+                    vo.setSwdltb(StringUtils.round((swdl - swdltb) / swdltb * 100, 0));
+                } else {
+                    vo.setSwdltb(0.0);
+                }
+                if (swdlhb != 0) {
+                    vo.setSwdlhb(StringUtils.round((swdl - swdlhb) / swdlhb * 100, 0));
+                } else {
+                    vo.setSwdlhb(0.0);
+                }
+
+                //添加购网电量数据
+                vo.setGwdl(StringUtils.round(gwdl, 2));
+                if (gwdltb != 0) {
+                    vo.setGwdltb(StringUtils.round((gwdl - gwdltb) / gwdltb * 100, 0));
+                } else {
+                    vo.setGwdltb(0.0);
+                }
+
+                if (gwdlhb != 0) {
+                    vo.setGwdlhb(StringUtils.round((gwdl - gwdlhb) / gwdlhb * 100, 0));
+                } else {
+                    vo.setGwdlhb(0.0);
+                }
+
+                //添加综合厂用电率数据
+                vo.setZhcydll(StringUtils.round(zhcydll * 100, 0));
+
+                if (zhcydlltb != 0) {
+                    vo.setZhcydlltb(StringUtils.round((zhcydll - zhcydlltb) / zhcydlltb * 100, 0));
+                } else {
+                    vo.setZhcydlltb(0.0);
+                }
+
+                if (zhcydllhb != 0) {
+                    vo.setZhcydllhb(StringUtils.round((zhcydll - zhcydllhb) / zhcydllhb * 100, 0));
+                } else {
+                    vo.setZhcydllhb(0.0);
+                }
+                vos.add(vo);
+                SortUtils.sort(vos, "hours", SortUtils.ASC);
+                map.put("value", vos);
+
+            }
+            firstDayZeroHour = DateUtils.addMonths(firstDayZeroHour, 1);
+            hbjssj = DateUtils.addMonths(hbjssj, 1);
+            tbjssj = DateUtils.addMonths(tbjssj, 1);
+        }
+        map.put("zhcydlsum",StringUtils.round(zhcydlsum,2));
+        map.put("sjdlsum",StringUtils.round(sjdlsum,2));
+        map.put("swdlsum",StringUtils.round(swdlsum,2));
+        map.put("gwdlsum",StringUtils.round(gwdlsum,2));
+        map.put("zhcydllsum",StringUtils.round(zhcydllsum * 100,0));
+
+        return map;
+    }
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Electricity/Electricityservice.java

@@ -1,6 +1,5 @@
 package com.gyee.runeconomy.service.Electricity;
 
-import com.gyee.common.contant.ContantXk;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.SortUtils;
 import com.gyee.runeconomy.dto.CoulometricVo;
@@ -50,13 +49,10 @@ public class Electricityservice {
     private final String FD = "-1";
     private final String GF = "-2";
 
-    public Map<String, Object> planvalue(String wpId, String timetype) throws Exception {
+    public Map<String, Object> planvalue(String wpId, String timetype,String year) throws Exception {
 
         List<ElectricityVo> vos = new ArrayList<ElectricityVo>();
         Map<String, Object> map = new LinkedHashMap<>();
-        Map<String, Object> map1 = new LinkedHashMap<>();
-
-        List<String> hjlist = new ArrayList<>();
         if (wpId.endsWith(QS) || wpId.endsWith(FD) || wpId.endsWith(GF) || CacheContext.wpmapls.containsKey(wpId)) {
 
             List<ProBasicPowerstation> wplist = new ArrayList<>();
@@ -79,41 +75,22 @@ public class Electricityservice {
                 }
             }
 
-            Map<String, ProBasicPowerstationPoint> wtpointmap = null;
-            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap = CacheContext.wppointmap;
-            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap1 = CacheContext.companypointmap;
-            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap2 = CacheContext.regionpointmap;
-            Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap3 = CacheContext.grouppointmap;
-
-            if (pointwpmap.containsKey(wpId)) {
-                wtpointmap = pointwpmap.get(wpId);
-            } else if (pointwpmap1.containsKey(wpId)) {
-                wtpointmap = pointwpmap1.get(wpId);
-            } else if (pointwpmap2.containsKey(wpId)) {
-                wtpointmap = pointwpmap2.get(wpId);
-            } else if (pointwpmap3.containsKey(wpId)) {
-                wtpointmap = pointwpmap3.get(wpId);
-            }
-
-            String month = wtpointmap.get(ContantXk.YFDL).getNemCode();
-            String rfdl = wtpointmap.get(ContantXk.RFDL).getNemCode();
-            String nfdl = wtpointmap.get(ContantXk.NFDL).getNemCode();
-
 
             if (timetype.contains("month")) {
 
                 if (!wplist.isEmpty()) {
                     int day = 0;
-                    //当前天数
-                    int month2 = DateUtils.getMonth(new Date());
-                    //当前年份
-                    Calendar cal = Calendar.getInstance();
-                    int currentyear = cal.get(Calendar.YEAR);//本年
 
+//                    // 当前年份
+//                    Calendar cal = Calendar.getInstance();
+//                    int currentyear = cal.get(Calendar.YEAR);
+                    int currentyear = Integer.parseInt(year);
 
-                    //当月第一天0点值
+                    // 当月第一天0点值
                     Calendar calendar = Calendar.getInstance();
                     calendar.setTime(new Date());
+                    // 设置年份为传递的currentyear
+                    calendar.set(Calendar.YEAR, currentyear);
                     calendar.set(Calendar.DAY_OF_MONTH, 1);
                     calendar.set(Calendar.HOUR_OF_DAY, 0);
                     calendar.set(Calendar.MINUTE, 0);
@@ -125,7 +102,7 @@ public class Electricityservice {
                     // 获取当前日期
                     Calendar calendar2 = Calendar.getInstance();
                     calendar2.setTime(new Date());
-
+                    calendar2.set(Calendar.YEAR, currentyear); // 根据当前年份变化
                     // 设置为本年一月一号0点
                     calendar2.set(Calendar.MONTH, Calendar.JANUARY); // 0表示一月
                     calendar2.set(Calendar.DAY_OF_MONTH, 1);
@@ -143,12 +120,11 @@ public class Electricityservice {
                         double bysjdlhjsum = 0.0;
                         BigDecimal dqzqlsum = null;
                         BigDecimal rfdlyclsum = null;
-                        double number = 100;
                         day = i;
                         for (ProBasicPowerstation wpls : wplist) {
 
                             //计划电量
-                            List<ProBasicProjectPlan> currentls = proBasicProjectPlanService.getmonthList(String.valueOf(day)); //本月所有集合
+                            List<ProBasicProjectPlan> currentls = proBasicProjectPlanService.getmonthList1(String.valueOf(day),currentyear); //本月所有集合
 
                             List<ProBasicProjectPlan> yearls = proBasicProjectPlanService.getList(String.valueOf(currentyear));
                             List<ProBasicProjectPlan> yearjh = yearls.stream().filter(wp -> wp.getWindpowerstationId().equals(wpls.getId())).collect(Collectors.toList());
@@ -199,11 +175,18 @@ public class Electricityservice {
 
 
                         //添加当月占比
-                        vo.setDyzb(StringUtils.round(((bysjdlhjsum / 10000) / bnjhdlsum) * 100, 0));
+                        if (bnjhdlsum != 0) {
+                            vo.setDyzb(StringUtils.round(((bysjdlhjsum / 10000) / bnjhdlsum) * 100, 0));
+                        }else {
+                            vo.setDyzb(0.0);
+                        }
 
                         //添加全年占比
-                        vo.setQnzb(StringUtils.round(((bysjdlhjsum / 10000) / yeardlsum) * 100, 0));
-
+                        if (yeardlsum != 0) {
+                            vo.setQnzb(StringUtils.round(((bysjdlhjsum / 10000) / yeardlsum) * 100, 0));
+                        } else {
+                            vo.setQnzb(0.0);
+                        }
                         //添加超短期准确率
                         vo.setDqzql(dqzqlsum);
 
@@ -221,8 +204,6 @@ public class Electricityservice {
                     double bnsjdlhjsum = 0.0;
                     BigDecimal dqzqlhjsum = null;
                     BigDecimal rfdlychjsum = null;
-                    double cdqyc = 0.0;
-
 
                     //计算合计
                     for (ProBasicPowerstation wpls : wplist) {
@@ -237,9 +218,12 @@ public class Electricityservice {
 //                        bnsjdlhjsum += bnsjdlhj.getPointValueInDouble();
 
                         List<ProEconPowerstationInfoDay5> sjdlls = proEconPowerstationInfoDay5Service.getmax(wpls.getId(), yearHour);
-                        bnsjdlhjsum += sjdlls.get(0).getNfdldb().doubleValue();
+                        if (!sjdlls.isEmpty() && sjdlls != null) {
+                            bnsjdlhjsum += sjdlls.get(0).getNfdldb().doubleValue();
+                        }
 
                         Calendar calendar1 = Calendar.getInstance();
+                        calendar1.set(Calendar.YEAR, currentyear);  // 设置年份为当前传入的年份
                         calendar1.set(Calendar.DAY_OF_YEAR, 1);
                         calendar1.set(Calendar.HOUR_OF_DAY, 0);
                         calendar1.set(Calendar.MINUTE, 0);
@@ -248,7 +232,7 @@ public class Electricityservice {
 
                         Date firstDayOfYearZeroHour = calendar1.getTime();
 
-                        List<ProEconStationPower> dqyc = powerService.getlist1(wpls.getId(), firstDayOfYearZeroHour);
+                        List<ProEconStationPower> dqyc = powerService.getlist2(wpls.getId(), firstDayOfYearZeroHour,currentyear);
                         if (!dqyc.isEmpty() && dqyc != null) {
                             dqzqlhjsum = dqyc.stream().map(ProEconStationPower::getPowerAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
                             rfdlychjsum = dqyc.stream().map(ProEconStationPower::getDayPowerForecast).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -256,7 +240,11 @@ public class Electricityservice {
                         map.put("bnjhdlhj", MathUtil.twoBit(yeardlsum));
                         map.put("rfdlychj", rfdlychjsum);
                         map.put("bnsjdlhj", MathUtil.twoBit(bnsjdlhjsum / 10000));
-                        map.put("qnzbhj", StringUtils.round(((bnsjdlhjsum / 10000) / yeardlsum) * 100, 0));
+                        if (yeardlsum!=0) {
+                            map.put("qnzbhj", StringUtils.round(((bnsjdlhjsum / 10000) / yeardlsum) * 100, 0));
+                        } else {
+                            map.put("qnzbhj",0.0);
+                        }
                         map.put("dqzqlhj", dqzqlhjsum);
 
                     }
@@ -270,7 +258,7 @@ public class Electricityservice {
 
     }
 
-    public Map<String, Object> coulometric(String wpId) throws Exception {
+    public Map<String, Object> coulometric(String wpId,String year) throws Exception {
 
         List<ProBasicPowerstation> wplsG = CacheContext.wplsG.stream().filter(g -> wpId.equals(g.getId())).collect(Collectors.toList());
         List<CoulometricVo> vos = new ArrayList<CoulometricVo>();
@@ -280,12 +268,15 @@ public class Electricityservice {
         int ts = 1;
         //当前年份
         Calendar cal = Calendar.getInstance();
-        int currentyear = cal.get(Calendar.YEAR);//本年
+        int dqnf = cal.get(Calendar.YEAR);//本年
+        int currentyear = Integer.parseInt(year);//本年
 
 
         //当月第一天0点值
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
+        // 设置年份为传递的currentyear
+        calendar.set(Calendar.YEAR, currentyear);
         calendar.set(Calendar.DAY_OF_MONTH, 1);
         calendar.set(Calendar.HOUR_OF_DAY, 0);
         calendar.set(Calendar.MINUTE, 0);
@@ -296,7 +287,7 @@ public class Electricityservice {
         // 获取当前日期
         Calendar calendar2 = Calendar.getInstance();
         calendar2.setTime(new Date());
-
+        calendar2.set(Calendar.YEAR, currentyear); // 根据当前年份变化
         // 设置为本年一月一号0点
         calendar2.set(Calendar.MONTH, Calendar.JANUARY); // 0表示一月
         calendar2.set(Calendar.DAY_OF_MONTH, 1);
@@ -342,7 +333,7 @@ public class Electricityservice {
             //本月可研电量合计
             double bykydlhjsum = 0.0;
 
-            if (calFirstMonth == currentMonth) {
+            if (calFirstMonth == currentMonth && dqnf==currentyear) {
                 Calendar calendar5 = Calendar.getInstance();
                 ts = calendar5.get(Calendar.DAY_OF_MONTH);
             } else {
@@ -354,14 +345,14 @@ public class Electricityservice {
             for (ProBasicPowerstation wpls : wplsG) {
 
                 //计划电量-循环所有场站当前月集合
-                List<ProBasicProjectPlan> currentls = proBasicProjectPlanService.getmonthList(String.valueOf(day));
+                List<ProBasicProjectPlan> currentls = proBasicProjectPlanService.getmonthList1(String.valueOf(day),currentyear);
 
                 //当前场站循环当前月
                 List<ProBasicProjectPlan> currentjh = currentls.stream().filter(wp -> wp.getWindpowerstationId().equals(wpls.getId())).collect(Collectors.toList());
                 byjhdlsum = currentjh.stream().mapToDouble(ProBasicProjectPlan::getGeneratingCapacity).sum(); //本月计划电量合
 
                 //可研电量-循环所有场站当前月集合
-                List<ProBasicFeasibilityStudy> currentkyls = proBasicFeasibilityStudyService.getmonthList(String.valueOf(day));
+                List<ProBasicFeasibilityStudy> currentkyls = proBasicFeasibilityStudyService.getmonthList1(String.valueOf(day),currentyear);
 
                 //当前场站循环当前月
                 List<ProBasicFeasibilityStudy> currentky = currentkyls.stream().filter(wp -> wp.getWindpowerstationId().equals(wpls.getId())).collect(Collectors.toList());
@@ -393,9 +384,17 @@ public class Electricityservice {
             vo.setSjdl(StringUtils.round(bysjdlhjsum / 10000, 2));
             vo.setKydl(StringUtils.round(bykydlhjsum,2));
             //添加完成情况
-            vo.setWcqk(StringUtils.round(((bysjdlhjsum / 10000) / byjhdlsum) * 100, 0));
+            if (byjhdlsum != 0) {
+                vo.setWcqk(StringUtils.round(((bysjdlhjsum / 10000) / byjhdlsum) * 100, 0));
+            } else {
+                vo.setWcqk(0.0);
+            }
             //添加完成情况
-            vo.setKywcqk(StringUtils.round(((bysjdlhjsum / 10000) / bykydlhjsum) * 100, 0));
+            if (bykydlhjsum != 0) {
+                vo.setKywcqk(StringUtils.round(((bysjdlhjsum / 10000) / bykydlhjsum) * 100, 0));
+            } else {
+                vo.setKywcqk(0.0);
+            }
             //等效小时数
             vo.setDxfdxs(StringUtils.round(dxxss,0));
 
@@ -423,16 +422,28 @@ public class Electricityservice {
         kyyeardlsum = kyyearjh.stream().mapToDouble(ProBasicFeasibilityStudy::getGeneratingCapacity).sum();
 
         List<ProEconPowerstationInfoDay5> sjdlls = proEconPowerstationInfoDay5Service.getmax(wpId, yearHour);
-        bnsjdlhjsum += sjdlls.get(0).getNfdldb().doubleValue();
+        if (!sjdlls.isEmpty() && sjdlls != null) {
+            bnsjdlhjsum += sjdlls.get(0).getNfdldb().doubleValue();
+        }
 
         List<ProEconPowerstationInfoDay1> rzqddlls = proEconPowerstationInfoDay1Service.getmax(wpId, yearHour);
-        bnrzqdhjsum += rzqddlls.get(0).getNpjfs().doubleValue();
+        if (!rzqddlls.isEmpty() && rzqddlls != null) {
+            bnrzqdhjsum += rzqddlls.get(0).getNpjfs().doubleValue();
+        }
 
         map.put("jhdlhj",yeardlsum);
         map.put("kydlhj",kyyeardlsum);
         map.put("sjdlhj",StringUtils.round((bnsjdlhjsum / 10000),2));
-        map.put("wcqkhj",StringUtils.round(((bnsjdlhjsum / 10000) / yeardlsum) * 100,0));
-        map.put("kywcqkhj",StringUtils.round(((bnsjdlhjsum / 10000) / kyyeardlsum) * 100,0));
+        if (yeardlsum != 0) {
+            map.put("wcqkhj", StringUtils.round(((bnsjdlhjsum / 10000) / yeardlsum) * 100, 0));
+        }else {
+            map.put("wcqkhj",0.0);
+        }
+        if (kyyeardlsum != 0) {
+            map.put("kywcqkhj", StringUtils.round(((bnsjdlhjsum / 10000) / kyyeardlsum) * 100, 0));
+        } else {
+            map.put("kywcqkhj",0.0);
+        }
         map.put("rzqdhj",StringUtils.round(bnrzqdhjsum,2));
         map.put("dxxsshj",StringUtils.round(dxxsssum,0));
 

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/IProBasicFeasibilityStudyService.java

@@ -17,6 +17,8 @@ public interface IProBasicFeasibilityStudyService extends IService<ProBasicFeasi
 
     List<ProBasicFeasibilityStudy> getmonthList(String month);
 
+    List<ProBasicFeasibilityStudy> getmonthList1(String month , int currentyear);
+
     List<ProBasicFeasibilityStudy> getList(String year);
 
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/IProBasicProjectPlanService.java

@@ -20,6 +20,7 @@ public interface IProBasicProjectPlanService extends IService<ProBasicProjectPla
     List<ProBasicProjectPlan> getList(String year);
 
     List<ProBasicProjectPlan> getmonthList(String month);
+    List<ProBasicProjectPlan> getmonthList1(String month , int currentyear);
 
     IPage<ProBasicProjectPlan> List(String id, String projectId, String windpowerstationId, String year, String month, String modificationTime, String pageNum, String pageSize);
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/IProEconStationPowerService.java

@@ -17,4 +17,5 @@ import java.util.List;
 public interface IProEconStationPowerService extends IService<ProEconStationPower> {
     List<ProEconStationPower> getlist(String Station , Date begindate);
     List<ProEconStationPower> getlist1(String Station , Date begindate);
+    List<ProEconStationPower> getlist2(String Station , Date begindate,int currentyear);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.mapper.auto.ProBasicFeasibilityStudyMapper;
 import com.gyee.runeconomy.model.auto.ProBasicFeasibilityStudy;
+import com.gyee.runeconomy.model.auto.ProBasicProjectPlan;
 import com.gyee.runeconomy.service.auto.IProBasicFeasibilityStudyService;
 import org.springframework.stereotype.Service;
 
@@ -35,6 +36,17 @@ public class ProBasicFeasibilityStudyServiceImpl extends ServiceImpl<ProBasicFea
         return list;
     }
 
+    public List<ProBasicFeasibilityStudy> getmonthList1(String month, int currentyear) {
+        QueryWrapper<ProBasicFeasibilityStudy> qw = new QueryWrapper<>();
+        Calendar cal = Calendar.getInstance();
+        if (StringUtils.isNotEmpty(month)) {
+            qw.eq("month", month);
+            qw.like("year", currentyear);
+        }
+        List<ProBasicFeasibilityStudy> list = baseMapper.selectList(qw);
+        return list;
+    }
+
     @Override
     public List<ProBasicFeasibilityStudy> getList(String year) {
         QueryWrapper<ProBasicFeasibilityStudy> qw = new QueryWrapper<>();

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

@@ -64,6 +64,17 @@ public class ProBasicProjectPlanServiceImpl extends ServiceImpl<ProBasicProjectP
     }
 
     @Override
+    public List<ProBasicProjectPlan> getmonthList1(String month,int currentyear) {
+        QueryWrapper<ProBasicProjectPlan> qw = new QueryWrapper<>();
+        Calendar cal = Calendar.getInstance();
+        if (StringUtils.isNotEmpty(month)) {
+            qw.eq("month", month);
+            qw.like("year", currentyear);
+        }
+        List<ProBasicProjectPlan> list = baseMapper.selectList(qw);
+        return list;
+    }
+    @Override
     public IPage<ProBasicProjectPlan> List(String id, String projectId, String windpowerstationId, String year, String month, String modificationTime, String pageNum, String pageSize) {
         QueryWrapper<ProBasicProjectPlan> qw = new QueryWrapper<>();
 

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

@@ -57,7 +57,6 @@ public class ProEconStationPowerServiceImpl extends ServiceImpl<ProEconStationPo
 
         // 获取当前日期
         Calendar calendar = Calendar.getInstance();
-        Date currentDate = calendar.getTime();
 
         // 设置为当前月份的最后一天
         calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
@@ -79,4 +78,38 @@ public class ProEconStationPowerServiceImpl extends ServiceImpl<ProEconStationPo
 
         return currlist;
     }
+    @Override
+    public List<ProEconStationPower> getlist2(String Station, Date begindate,int currentyear) {
+        QueryWrapper<ProEconStationPower> qw = null;
+
+        // 获取当前日期
+        Calendar calendar = Calendar.getInstance();
+
+        // 设置为当前月份的最后一天
+        calendar.set(Calendar.MONTH, calendar.getActualMaximum(Calendar.MONTH));
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+        calendar.set(Calendar.HOUR_OF_DAY, calendar.getActualMaximum(Calendar.HOUR_OF_DAY));
+        calendar.set(Calendar.MINUTE, calendar.getActualMaximum(Calendar.MINUTE));
+        calendar.set(Calendar.SECOND, calendar.getActualMaximum(Calendar.SECOND));
+
+        // 设置年份为传递的currentyear
+        calendar.set(Calendar.YEAR, currentyear);
+
+        Date endOfDayOfLastDayOfMonth = calendar.getTime();
+
+        //当前数据
+        List<ProEconStationPower> currlist = new ArrayList<>();
+
+        qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(Station)) {
+            qw.lambda().eq(ProEconStationPower::getWindpowerstationId, Station);
+        }
+        qw.lambda().between(ProEconStationPower::getRecordDate, DateUtils.getMonthFirst(begindate), endOfDayOfLastDayOfMonth);
+        qw.lambda().orderByDesc(ProEconStationPower::getRecordDate);
+
+        currlist = baseMapper.selectList(qw);
+
+        return currlist;
+    }
+
 }