系统效率部分代码

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/PVSystemEfficiencyCalculator/PVSystemEfficiencyCalculatorController.java

@@ -1,8 +1,13 @@
 package com.gyee.runeconomy.controller.PVSystemEfficiencyCalculator;
 
 import com.gyee.runeconomy.dto.AjaxResult;
+import com.gyee.runeconomy.dto.PrAnalysisVo;
 import com.gyee.runeconomy.service.Comprehensive.PVSystemEfficiencyCalculator;
+import com.gyee.runeconomy.service.Pranalysis.PrAnalysisService;
+import com.gyee.runeconomy.util.StringUtils;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -10,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 @Controller
 @RequestMapping("//PVSystemEfficiency")
@@ -19,6 +26,9 @@ public class PVSystemEfficiencyCalculatorController {
     @Resource
     private PVSystemEfficiencyCalculator calculator;
 
+    @Resource
+    private PrAnalysisService prAnalysisService;
+
     @GetMapping("/statistics")
     @ResponseBody
     @ApiOperation(value = "光伏系统效率计算", notes = "光伏系统效率计算")
@@ -36,4 +46,30 @@ public class PVSystemEfficiencyCalculatorController {
 
         return AjaxResult.successData(200, null);
     }
+
+
+    @GetMapping("/pranalysis")
+    @ResponseBody
+    @ApiOperation(value = "pr分析", notes = "pr分析")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "场站编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "target", value = "值", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "sort", value = "a", required = false, dataType = "String", paramType = "query")
+    })
+
+    public AjaxResult prfx(String wpId,String month,String target,String sort) throws Exception {
+
+        List<PrAnalysisVo> resultList = new ArrayList<>();
+        if (StringUtils.notEmp(wpId)) {
+            resultList = prAnalysisService.Comprehensive(wpId,month,target,sort);
+        }
+
+        if (null != resultList) {
+            return AjaxResult.successData(200, resultList);
+        } else {
+            return AjaxResult.error(500, "操作失败");
+        }
+
+    }
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/specific/SpecificController.java

@@ -131,6 +131,47 @@ public class SpecificController {
     }
 
     /**
+     * 查询购网电量
+     *
+     * @return
+     */
+    @GetMapping("/gwdlList")
+    @ResponseBody
+    @ApiOperation(value = "专题分析-购网电量", notes = "专题分析-购网电量")
+    public R gwdldlList(@RequestParam(value = "companys", required = true) String companys,
+                        @RequestParam(value = "type", required = true) String type,
+                        @RequestParam(value = "year", required = true) String year) throws ParseException {
+
+        List<SpecificTarget> resultList = specificService.gwdlList(companys, type, year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.data(ResultMsg.ok(resultList));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
+
+    /**
+     * 查询上网电量
+     *
+     * @return
+     */
+    @GetMapping("/swdlList")
+    @ResponseBody
+    @ApiOperation(value = "专题分析-购网电量", notes = "专题分析-购网电量")
+    public R swdldlList(@RequestParam(value = "companys", required = true) String companys,
+                        @RequestParam(value = "type", required = true) String type,
+                        @RequestParam(value = "year", required = true) String year) throws ParseException {
+
+        List<SpecificTarget> resultList = specificService.swdlList(companys, type, year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.data(ResultMsg.ok(resultList));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
+    /**
      * 查询故障损失率
      *
      * @return

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

@@ -0,0 +1,133 @@
+package com.gyee.runeconomy.dto;
+
+public class PrAnalysisVo {
+
+    /**
+     * 设备编号
+     */
+    private String wtid;
+
+    /**
+     * pr值
+     */
+
+    private Double pr = 0.0;
+
+    /**
+     * pr环比
+     */
+    private Double prhb = 0.0;
+
+    /**
+     * pr环比增长率
+     */
+    private Double prhbzzl = 0.0;
+
+
+    /**
+     * pr同比
+     */
+    private Double prtb = 0.0;
+
+    /**
+     * pr同比增长率
+     */
+    private Double prtbzzl = 0.0;
+
+    private Integer prpm;
+
+
+//    private Integer wtidpm;
+    private Integer prhbpm;
+    private Integer prtbpm;
+    private Integer prhbzzlpm;
+    private Integer prtbzzlpm;
+
+    public Integer getPrhbpm() {
+        return prhbpm;
+    }
+
+    public void setPrhbpm(Integer prhbpm) {
+        this.prhbpm = prhbpm;
+    }
+
+    public Integer getPrtbpm() {
+        return prtbpm;
+    }
+
+    public void setPrtbpm(Integer prtbpm) {
+        this.prtbpm = prtbpm;
+    }
+
+    public Integer getPrhbzzlpm() {
+        return prhbzzlpm;
+    }
+
+    public void setPrhbzzlpm(Integer prhbzzlpm) {
+        this.prhbzzlpm = prhbzzlpm;
+    }
+
+    public Integer getPrtbzzlpm() {
+        return prtbzzlpm;
+    }
+
+    public void setPrtbzzlpm(Integer prtbzzlpm) {
+        this.prtbzzlpm = prtbzzlpm;
+    }
+
+    public String getWtid() {
+        return wtid;
+    }
+
+    public void setWtid(String wtid) {
+        this.wtid = wtid;
+    }
+
+    public Double getPr() {
+        return pr;
+    }
+
+    public void setPr(Double pr) {
+        this.pr = pr;
+    }
+
+    public Double getPrhb() {
+        return prhb;
+    }
+
+    public void setPrhb(Double prhb) {
+        this.prhb = prhb;
+    }
+
+    public Double getPrhbzzl() {
+        return prhbzzl;
+    }
+
+    public void setPrhbzzl(Double prhbzzl) {
+        this.prhbzzl = prhbzzl;
+    }
+
+    public Double getPrtb() {
+        return prtb;
+    }
+
+    public void setPrtb(Double prtb) {
+        this.prtb = prtb;
+    }
+
+    public Double getPrtbzzl() {
+        return prtbzzl;
+    }
+
+    public void setPrtbzzl(Double prtbzzl) {
+        this.prtbzzl = prtbzzl;
+    }
+
+    public Integer getPrpm() {
+        return prpm;
+    }
+
+    public void setPrpm(Integer prpm) {
+        this.prpm = prpm;
+    }
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/ProEconSystemEfficiencyEquipment.java

@@ -94,5 +94,10 @@ public class ProEconSystemEfficiencyEquipment extends Model {
      */
     private Double efficiency;
 
+    /**
+     * 顺序
+     */
+
+    private Integer orderNum;
 
 }

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

@@ -414,7 +414,7 @@ public class PVSystemEfficiencyCalculator {
 
                 ProEconSystemEfficiencyEquipment power = new ProEconSystemEfficiencyEquipment();
                 power.setId(StringUtils.getUUID());
-                power.setForeignKeyId(wt.getId());
+                power.setForeignKeyId(wt.getNemCode());
                 power.setStationId(wt.getWindpowerstationId());
                 power.setProjectId(wt.getProjectId());
                 power.setLineId(wt.getLineId());
@@ -423,6 +423,7 @@ public class PVSystemEfficiencyCalculator {
                 power.setDataDate(date);
                 power.setRzqd(solarRadiationWattsPerSquareMeter);
                 power.setEfficiency(pr);
+                power.setOrderNum(wt.getOrderNum());
                 stringList.add(power);
                 if (date!=null) {
                     efficiencyEquipmentService.batchAdd(stringList);
@@ -445,7 +446,7 @@ public class PVSystemEfficiencyCalculator {
         double hoursOfDaylight = 12.0; // 假设日照时间为12小时
         //辐照度*容量
         //
-        return (solarRadiationWattsPerSquareMeter * moduleCapacityKilowatts * hoursOfDaylight) / 1000;
+        return (solarRadiationWattsPerSquareMeter * moduleCapacityKilowatts);
     }
 
     // 计算光伏系统效率PR的方法

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

@@ -400,7 +400,8 @@ public class Electricityservice {
                     byrzqdhjsum = rzqdls.get(0).getYpjfs().doubleValue();
                 }
                 //等效发电小时数算法
-                dxxss = (bysjdlhjsum) / (wpls.getJrCapacity() * ts * 8) * ts * 24;
+//                dxxss = (bysjdlhjsum) / (wpls.getJrCapacity() * ts * 8) * ts * 24;
+                dxxss = (bysjdlhjsum) / wpls.getJrCapacity();
                 dxxsssum += StringUtils.round(dxxss,0);
             }
 

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Pranalysis/PrAnalysisService.java

@@ -0,0 +1,114 @@
+package com.gyee.runeconomy.service.Pranalysis;
+
+import com.gyee.common.model.StringUtils;
+import com.gyee.common.util.SortUtils;
+import com.gyee.runeconomy.dto.PrAnalysisVo;
+import com.gyee.runeconomy.model.auto.ProEconSystemEfficiencyEquipment;
+import com.gyee.runeconomy.service.auto.impl.ProEconSystemEfficiencyEquipmentServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Service
+public class PrAnalysisService {
+
+    @Resource
+    private ProEconSystemEfficiencyEquipmentServiceImpl efficiencyEquipmentService;
+
+    public   List<PrAnalysisVo>  Comprehensive(String wpId, String month,String target,String sort) throws Exception {
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM");
+        Date date = dateFormat.parse(month);
+
+
+        List<PrAnalysisVo> vos = new ArrayList<PrAnalysisVo>();
+
+        List<ProEconSystemEfficiencyEquipment> bqls = efficiencyEquipmentService.getbq(wpId, date);
+        List<ProEconSystemEfficiencyEquipment> hbls = efficiencyEquipmentService.gethb(wpId, date);
+        List<ProEconSystemEfficiencyEquipment> tbls = efficiencyEquipmentService.gettb(wpId, date);
+
+        if (bqls!=null && bqls.size()>1){
+            for(ProEconSystemEfficiencyEquipment eq : bqls){
+                PrAnalysisVo vo = new PrAnalysisVo();
+                vo.setWtid(eq.getForeignKeyId());
+                vo.setPr(eq.getEfficiency());
+                vos.add(vo);
+            }
+        }
+        if (hbls!=null && hbls.size()>1) {
+            vos.stream().forEach(i -> {
+                Optional<ProEconSystemEfficiencyEquipment> optional = hbls.stream()
+                        .filter(j -> j.getForeignKeyId().equals(i.getWtid()))
+                        .findFirst();
+                if (optional.isPresent()) {
+                    ProEconSystemEfficiencyEquipment tqinfoday = optional.get();
+                    i.setPrhb(tqinfoday.getEfficiency());
+                    if (i.getPrhb() !=0) {
+                        i.setPrhbzzl((i.getPr() - i.getPrhb()) / i.getPrhb() * 100);
+                    } else {
+                        i.setPrhbzzl(0.0);
+                    }
+                } else {
+                    i.setPrhb(0.0);
+                }
+            });
+        }
+
+        if (tbls!=null && tbls.size()>1) {
+            vos.stream().forEach(i -> {
+                Optional<ProEconSystemEfficiencyEquipment> optional = tbls.stream()
+                        .filter(j -> j.getForeignKeyId().equals(i.getWtid()))
+                        .findFirst();
+                if (optional.isPresent()) {
+                    ProEconSystemEfficiencyEquipment tqinfoday = optional.get();
+                    i.setPrtb(tqinfoday.getEfficiency());
+                    i.setPrtbzzl((i.getPr() - i.getPrtb()) / i.getPrtb() * 100);
+                } else {
+                    i.setPrtb(0.0);
+                }
+            });
+        }
+
+
+        SortUtils.sort(vos, "pr", SortUtils.DESC);
+        for (int i = 0; i < vos.size(); i++) {
+            vos.get(i).setPrpm(i + 1);
+        }
+
+        SortUtils.sort(vos, "prhb", SortUtils.DESC);
+        for (int i = 0; i < vos.size(); i++) {
+            vos.get(i).setPrhbpm(i + 1);
+        }
+
+        SortUtils.sort(vos, "prhbzzl", SortUtils.DESC);
+        for (int i = 0; i < vos.size(); i++) {
+            vos.get(i).setPrhbzzlpm(i + 1);
+        }
+
+        if (tbls.size() > 0) {
+            SortUtils.sort(vos, "prtb", SortUtils.DESC);
+            for (int i = 0; i < vos.size(); i++) {
+                vos.get(i).setPrtbpm(i + 1);
+            }
+
+            SortUtils.sort(vos, "prtbzzl", SortUtils.DESC);
+            for (int i = 0; i < vos.size(); i++) {
+                vos.get(i).setPrtbzzlpm(i + 1);
+            }
+        }
+
+
+        if (StringUtils.isNotEmpty(target) && StringUtils.isNotEmpty(sort)) {
+            if (sort.equals("1")) {
+                SortUtils.sort(vos, target, SortUtils.ASC);
+            } else {
+                SortUtils.sort(vos, target, SortUtils.DESC);
+            }
+        } else {
+            SortUtils.sort(vos, "prpm", SortUtils.ASC);
+        }
+        return vos;
+    }
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/analysis/AnalysisNewService.java

@@ -66,7 +66,7 @@ public class AnalysisNewService {
         calendar.set(Calendar.MILLISECOND, 0);
 
         // 设置 beginDate 为前一天的0点
-        calendar.add(Calendar.DAY_OF_MONTH, -9);
+        calendar.add(Calendar.DAY_OF_MONTH, -11);
         Date beginDate = calendar.getTime();
 
         // 设置 endDate 为当天的0点
@@ -79,7 +79,7 @@ public class AnalysisNewService {
 //            补充数据可将其打开
             if (wp.getId().equals("SXJ_KGDL_GJY_FDC_STA")) {
 
-                for (int g = 0; g <= 45; g++) {
+                for (int g = 0; g <= 42; g++) {
 
             List<ProBasicMeterPoint> meterPoints = proBasicMeterPointService.getBaseMapper().selectList(null);
 

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

@@ -3,6 +3,7 @@ package com.gyee.runeconomy.service.auto;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gyee.runeconomy.model.auto.ProEconSystemEfficiencyEquipment;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -15,4 +16,8 @@ import java.util.List;
  */
 public interface IProEconSystemEfficiencyEquipmentService extends IService<ProEconSystemEfficiencyEquipment> {
     boolean batchAdd (List<ProEconSystemEfficiencyEquipment> proEconStationPowers);
+
+    List<ProEconSystemEfficiencyEquipment> getbq(String foreignKeyId , Date date);
+    List<ProEconSystemEfficiencyEquipment> gethb(String foreignKeyId , Date date);
+    List<ProEconSystemEfficiencyEquipment> gettb(String foreignKeyId , Date date);
 }

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

@@ -2,11 +2,16 @@ package com.gyee.runeconomy.service.auto.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.mapper.auto.ProEconSystemEfficiencyEquipmentMapper;
 import com.gyee.runeconomy.model.auto.ProEconSystemEfficiencyEquipment;
 import com.gyee.runeconomy.service.auto.IProEconSystemEfficiencyEquipmentService;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -42,4 +47,85 @@ public class ProEconSystemEfficiencyEquipmentServiceImpl extends ServiceImpl<Pro
 
         return true;
     }
+
+    @Override
+    public List<ProEconSystemEfficiencyEquipment> getbq(String foreignKeyId, Date date) {
+        QueryWrapper<ProEconSystemEfficiencyEquipment> qw = null;
+        // 当前数据
+        List<ProEconSystemEfficiencyEquipment> currlist = new ArrayList<>();
+        if (null != date) {
+            qw = new QueryWrapper<>();
+            if (StringUtils.isNotEmpty(foreignKeyId)) {
+                qw.lambda().eq(ProEconSystemEfficiencyEquipment::getStationId, foreignKeyId);
+            }
+            // 获取传入日期的年月
+            String yearMonth = new SimpleDateFormat("yyyy-MM").format(date);
+            // 设置日期为固定的一天（如1日）
+            String fixedDate = yearMonth + "-01";
+            qw.lambda().apply("to_char(data_date, 'YYYY-MM-DD')::timestamp without time zone >= to_timestamp('" + fixedDate + "', 'YYYY-MM-DD')");
+            qw.lambda().apply("to_char(data_date, 'YYYY-MM-DD')::timestamp without time zone < to_timestamp('" + fixedDate + "', 'YYYY-MM-DD') + interval '1 month'");
+            qw.lambda().orderByAsc(ProEconSystemEfficiencyEquipment::getOrderNum);
+            currlist = baseMapper.selectList(qw);
+        }
+        return currlist;
+    }
+
+    @Override
+    public List<ProEconSystemEfficiencyEquipment> gethb(String foreignKeyId, Date date) {
+        QueryWrapper<ProEconSystemEfficiencyEquipment> qw = null;
+        // 当前数据
+        List<ProEconSystemEfficiencyEquipment> currlist = new ArrayList<>();
+        if (null != date) {
+            qw = new QueryWrapper<>();
+            if (StringUtils.isNotEmpty(foreignKeyId)) {
+                qw.lambda().eq(ProEconSystemEfficiencyEquipment::getStationId, foreignKeyId);
+            }
+
+            // 将日期减去一个月
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(date);
+            cal.add(Calendar.MONTH, -1);
+            Date previousMonth = cal.getTime();
+
+            // 获取传入日期的年月
+            String yearMonth = new SimpleDateFormat("yyyy-MM").format(previousMonth);
+
+            // 设置日期为固定的一天（如1日）
+            String fixedDate = yearMonth + "-01";
+            qw.lambda().apply("to_char(data_date, 'YYYY-MM-DD')::timestamp without time zone >= to_timestamp('" + fixedDate + "', 'YYYY-MM-DD')");
+            qw.lambda().apply("to_char(data_date, 'YYYY-MM-DD')::timestamp without time zone < to_timestamp('" + fixedDate + "', 'YYYY-MM-DD') + interval '1 month'");
+            qw.lambda().orderByAsc(ProEconSystemEfficiencyEquipment::getOrderNum);
+            currlist = baseMapper.selectList(qw);
+        }
+        return currlist;
+    }
+
+
+    @Override
+    public List<ProEconSystemEfficiencyEquipment> gettb(String foreignKeyId, Date date) {
+        QueryWrapper<ProEconSystemEfficiencyEquipment> qw = null;
+        // 当前数据
+        List<ProEconSystemEfficiencyEquipment> currlist = new ArrayList<>();
+        if (null != date) {
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(date);
+            cal.add(Calendar.YEAR, -1);
+            Date oneYearAgo = cal.getTime();
+
+            qw = new QueryWrapper<>();
+            if (StringUtils.isNotEmpty(foreignKeyId)) {
+                qw.lambda().eq(ProEconSystemEfficiencyEquipment::getStationId, foreignKeyId);
+            }
+            // 获取传入日期的年月
+            String yearMonth = new SimpleDateFormat("yyyy-MM").format(oneYearAgo);
+            // 设置日期为固定的一天（如1日）
+            String fixedDate = yearMonth + "-01";
+            qw.lambda().apply("to_char(data_date, 'YYYY-MM-DD')::timestamp without time zone >= to_timestamp('" + fixedDate + "', 'YYYY-MM-DD')");
+            qw.lambda().apply("to_char(data_date, 'YYYY-MM-DD')::timestamp without time zone < to_timestamp('" + fixedDate + "', 'YYYY-MM-DD') + interval '1 month'");
+            qw.lambda().orderByAsc(ProEconSystemEfficiencyEquipment::getOrderNum);
+            currlist = baseMapper.selectList(qw);
+        }
+        return currlist;
+    }
+
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -883,8 +883,8 @@ public class SpecificService {
 
     public List<SpecificTarget> fdlList(String companys, String type, String year) {
         //获取年份所有当月的数据
-        QueryWrapper<ProEconPowerstationInfoDay1> currentqw = new QueryWrapper<>();
-        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rfdl) yfdl");
+        QueryWrapper<ProEconPowerstationInfoDay5> currentqw = new QueryWrapper<>();
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rfdldb) yfdldb");
         currentqw.eq("location", "wp");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         if (type.equals("-1")) {
@@ -898,17 +898,17 @@ public class SpecificService {
             currentqw.eq("region_id", companys);
         }
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
-        List<ProEconPowerstationInfoDay1> currentList = proEconPowerstationInfoDay1Service.list(currentqw);
+        List<ProEconPowerstationInfoDay5> currentList = proEconPowerstationInfoDay5Service.list(currentqw);
         currentqw.clear();
-        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rfdl) yfdl");
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rfdldb) yfdldb");
         currentqw.eq("foreign_key_id", companys + type);
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
-        currentList.addAll(proEconPowerstationInfoDay1Service.list(currentqw));
+        currentList.addAll(proEconPowerstationInfoDay5Service.list(currentqw));
 
         int subYear = Integer.parseInt(year) - 1;
-        QueryWrapper<ProEconPowerstationInfoDay1> sameperiodqw = new QueryWrapper<>();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rfdl) yfdl");
+        QueryWrapper<ProEconPowerstationInfoDay5> sameperiodqw = new QueryWrapper<>();
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rfdldb) yfdldb");
         sameperiodqw.eq("location", "wp");
         if (type.equals("-1")) {
             currentqw.like("foreign_key_id", "_FDC_");
@@ -922,13 +922,13 @@ public class SpecificService {
         }
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
-        List<ProEconPowerstationInfoDay1> sameperiodList = proEconPowerstationInfoDay1Service.list(sameperiodqw);
+        List<ProEconPowerstationInfoDay5> sameperiodList = proEconPowerstationInfoDay5Service.list(sameperiodqw);
         sameperiodqw.clear();
-        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rfdl) yfdl");
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rfdldb) yfdldb");
         sameperiodqw.eq("foreign_key_id", companys + type);
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
-        sameperiodList.addAll(proEconPowerstationInfoDay1Service.list(sameperiodqw));
+        sameperiodList.addAll(proEconPowerstationInfoDay5Service.list(sameperiodqw));
 
         //合并当月与同期数据为返回结果
         List<SpecificTargetVo> resultList = new ArrayList<>();
@@ -946,16 +946,18 @@ public class SpecificService {
             }
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
-            vo.setCurrent(DoubleUtils.keepPrecision(i.getYfdl().doubleValue() / 10000, 2));
+            vo.setCurrent(DoubleUtils.keepPrecision(i.getYfdldb().doubleValue() / 10000, 2));
             resultList.add(vo);
         });
         resultList.stream().forEach(i -> {
-            Optional<ProEconPowerstationInfoDay1> optional = sameperiodList.stream()
-                    .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && String.valueOf(DateUtils.getMonth(j.getRecordDate())).equals(i.getMonth()))
+            Optional<ProEconPowerstationInfoDay5> optional = sameperiodList.stream()
+                    .filter(j -> i.getWpid().equals(j.getForeignKeyId())
+                            && i.getMonth().equals(DateUtils.getMonthFromDate(j.getRecordDate())))
                     .findFirst();
+
             if (optional.isPresent()) {
-                ProEconPowerstationInfoDay1 tqinfoday = optional.get();
-                i.setSameperiod(DoubleUtils.keepPrecision(tqinfoday.getYfdl().doubleValue() / 10000, 2));
+                ProEconPowerstationInfoDay5 tqinfoday = optional.get();
+                i.setSameperiod(DoubleUtils.keepPrecision(tqinfoday.getYfdldb().doubleValue() / 10000, 2));
                 i.setCompare(i.getCurrent().compareTo(i.getSameperiod()));
             } else {
                 i.setSameperiod(0.0);
@@ -1097,7 +1099,8 @@ public class SpecificService {
         });
         resultList.stream().forEach(i -> {
             Optional<ProEconPowerstationInfoDay5> optional = sameperiodList.stream()
-                    .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && String.valueOf(DateUtils.getMonth(j.getRecordDate())).equals(i.getMonth()))
+//                    .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && String.valueOf(DateUtils.getMonth(j.getRecordDate())).equals(i.getMonth()))
+                    .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && i.getMonth().equals(DateUtils.getMonthFromDate(j.getRecordDate())))
                     .findFirst();
             if (optional.isPresent()) {
                 ProEconPowerstationInfoDay5 tqinfoday = optional.get();
@@ -1174,6 +1177,305 @@ public class SpecificService {
 
     }
 
+
+    public List<SpecificTarget> gwdlList(String companys, String type, String year) {
+        //获取年份所有当月的数据
+        QueryWrapper<ProEconPowerstationInfoDay5> currentqw = new QueryWrapper<>();
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rgwgwdldb) ygwgwdldb");
+        currentqw.eq("location", "wp");
+        currentqw.eq("to_char(record_date,'yyyy')", year);
+        if (type.equals("-1")) {
+            currentqw.like("foreign_key_id", "_FDC_");
+        } else {
+            currentqw.like("foreign_key_id", "_GDC_");
+        }
+        if (companys.endsWith("ZGS")) {
+            currentqw.eq("company_id", companys);
+        } else {
+            currentqw.eq("region_id", companys);
+        }
+        currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
+        List<ProEconPowerstationInfoDay5> currentList = proEconPowerstationInfoDay5Service.list(currentqw);
+        currentqw.clear();
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rgwgwdldb) ygwgwdldb");
+        currentqw.eq("foreign_key_id", companys + type);
+        currentqw.eq("to_char(record_date,'yyyy')", year);
+        currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
+        currentList.addAll(proEconPowerstationInfoDay5Service.list(currentqw));
+
+        int subYear = Integer.parseInt(year) - 1;
+        QueryWrapper<ProEconPowerstationInfoDay5> sameperiodqw = new QueryWrapper<>();
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rgwgwdldb) ygwgwdldb");
+        sameperiodqw.eq("location", "wp");
+        if (type.equals("-1")) {
+            currentqw.like("foreign_key_id", "_FDC_");
+        } else {
+            currentqw.like("foreign_key_id", "_GDC_");
+        }
+        if (companys.endsWith("ZGS")) {
+            currentqw.eq("company_id", companys);
+        } else {
+            currentqw.eq("region_id", companys);
+        }
+        sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
+        sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
+        List<ProEconPowerstationInfoDay5> sameperiodList = proEconPowerstationInfoDay5Service.list(sameperiodqw);
+        sameperiodqw.clear();
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rgwgwdldb) ygwgwdldb");
+        sameperiodqw.eq("foreign_key_id", companys + type);
+        sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
+        sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
+        sameperiodList.addAll(proEconPowerstationInfoDay5Service.list(sameperiodqw));
+
+        //合并当月与同期数据为返回结果
+        List<SpecificTargetVo> resultList = new ArrayList<>();
+
+        currentList.stream().forEach(i -> {
+            SpecificTargetVo vo = new SpecificTargetVo();
+            String wpid = i.getForeignKeyId();
+            vo.setWpid(wpid);
+            if (wpid.contains("_ZGS")) {
+                vo.setWpname(CacheContext.cpmap.get(companys).getAname());
+            } else if (wpid.contains("_RGN")) {
+                vo.setWpname(CacheContext.rgmap.get(companys).getAname());
+            } else {
+                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+            }
+            vo.setYear(DateUtils.getYear(i.getRecordDate()));
+            vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
+            vo.setCurrent(DoubleUtils.keepPrecision(i.getYgwgwdldb().doubleValue() / 10000, 2));
+            resultList.add(vo);
+        });
+        resultList.stream().forEach(i -> {
+            Optional<ProEconPowerstationInfoDay5> optional = sameperiodList.stream()
+                    .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && i.getMonth().equals(DateUtils.getMonthFromDate(j.getRecordDate())))
+                    .findFirst();
+            if (optional.isPresent()) {
+                ProEconPowerstationInfoDay5 tqinfoday = optional.get();
+                i.setSameperiod(DoubleUtils.keepPrecision(tqinfoday.getYgwgwdldb().doubleValue() / 10000, 2));
+                i.setCompare(i.getCurrent().compareTo(i.getSameperiod()));
+            } else {
+                i.setSameperiod(0.0);
+                i.setCompare(0);
+            }
+        });
+        List<SpecificTarget> resultendList = new ArrayList<>();
+
+        Map<String, Map<Integer, SpecificTargetVo>> map = new HashMap<>();
+
+        resultList.stream().forEach(i -> {
+            if (map.containsKey(i.getWpid())) {
+                Map<Integer, SpecificTargetVo> integerListMap = map.get(i.getWpid());
+                if (!integerListMap.containsKey(i.getMonth())) {
+                    map.get(i.getWpid()).put(i.getMonth(), i);
+                } else {
+
+                }
+            } else {
+                Map<Integer, SpecificTargetVo> tempMap = new HashMap<>();
+                tempMap.put(i.getMonth(), i);
+                map.put(i.getWpid(), tempMap);
+            }
+        });
+        Set<String> wpids = map.keySet();
+        if (StringUtils.isNotNull(wpids)) {
+            wpids.stream().forEach(wpid -> {
+                SpecificTarget vo = new SpecificTarget();
+                vo.setWpid(wpid);
+                int orderNum = 100;
+                if (wpid.contains("_ZGS")) {
+                    vo.setWpname(CacheContext.cpmap.get(companys).getAname());
+                } else if (wpid.contains("_RGN")) {
+                    vo.setWpname(CacheContext.rgmap.get(companys).getAname());
+                } else {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                }
+                vo.setOrderNum(orderNum);
+                List<SpecificTargetVo> tempList = new ArrayList<>();
+
+                Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
+                for (int x = 1; x <= 12; x++) {
+                    if (listMap.containsKey(x)) {
+                        tempList.add(listMap.get(x));
+                    } else {
+                        SpecificTargetVo vo1 = new SpecificTargetVo();
+                        vo1.setWpid(wpid);
+                        if (wpid.contains("_ZGS")) {
+                            vo1.setWpname(CacheContext.cpmap.get(companys).getAname());
+                        } else if (wpid.contains("_RGN")) {
+                            vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
+                        } else {
+                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        }
+                        vo1.setYear(Integer.parseInt(year));
+                        vo1.setMonth(x);
+                        tempList.add(vo1);
+                    }
+                }
+
+
+                vo.setTargetList(tempList);
+                resultendList.add(vo);
+            });
+        }
+        SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
+
+        return resultendList;
+
+    }
+
+
+
+
+    public List<SpecificTarget> swdlList(String companys, String type, String year) {
+        //获取年份所有当月的数据
+        QueryWrapper<ProEconPowerstationInfoDay5> currentqw = new QueryWrapper<>();
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rswdldb) yswdldb");
+        currentqw.eq("location", "wp");
+        currentqw.eq("to_char(record_date,'yyyy')", year);
+        if (type.equals("-1")) {
+            currentqw.like("foreign_key_id", "_FDC_");
+        } else {
+            currentqw.like("foreign_key_id", "_GDC_");
+        }
+        if (companys.endsWith("ZGS")) {
+            currentqw.eq("company_id", companys);
+        } else {
+            currentqw.eq("region_id", companys);
+        }
+        currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
+        List<ProEconPowerstationInfoDay5> currentList = proEconPowerstationInfoDay5Service.list(currentqw);
+        currentqw.clear();
+        currentqw.select("foreign_key_id,max(record_date) record_date,sum(rswdldb) yswdldb");
+        currentqw.eq("foreign_key_id", companys + type);
+        currentqw.eq("to_char(record_date,'yyyy')", year);
+        currentqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
+        currentList.addAll(proEconPowerstationInfoDay5Service.list(currentqw));
+
+        int subYear = Integer.parseInt(year) - 1;
+        QueryWrapper<ProEconPowerstationInfoDay5> sameperiodqw = new QueryWrapper<>();
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rswdldb) yswdldb");
+        sameperiodqw.eq("location", "wp");
+        if (type.equals("-1")) {
+            currentqw.like("foreign_key_id", "_FDC_");
+        } else {
+            currentqw.like("foreign_key_id", "_GDC_");
+        }
+        if (companys.endsWith("ZGS")) {
+            currentqw.eq("company_id", companys);
+        } else {
+            currentqw.eq("region_id", companys);
+        }
+        sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
+        sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
+        List<ProEconPowerstationInfoDay5> sameperiodList = proEconPowerstationInfoDay5Service.list(sameperiodqw);
+        sameperiodqw.clear();
+        sameperiodqw.select("foreign_key_id,max(record_date) record_date,sum(rswdldb) yswdldb");
+        sameperiodqw.eq("foreign_key_id", companys + type);
+        sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
+        sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),foreign_key_id");
+        sameperiodList.addAll(proEconPowerstationInfoDay5Service.list(sameperiodqw));
+
+        //合并当月与同期数据为返回结果
+        List<SpecificTargetVo> resultList = new ArrayList<>();
+
+        currentList.stream().forEach(i -> {
+            SpecificTargetVo vo = new SpecificTargetVo();
+            String wpid = i.getForeignKeyId();
+            vo.setWpid(wpid);
+            if (wpid.contains("_ZGS")) {
+                vo.setWpname(CacheContext.cpmap.get(companys).getAname());
+            } else if (wpid.contains("_RGN")) {
+                vo.setWpname(CacheContext.rgmap.get(companys).getAname());
+            } else {
+                vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+            }
+            vo.setYear(DateUtils.getYear(i.getRecordDate()));
+            vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
+            vo.setCurrent(DoubleUtils.keepPrecision(i.getYswdldb().doubleValue() / 10000, 2));
+            resultList.add(vo);
+        });
+        resultList.stream().forEach(i -> {
+            Optional<ProEconPowerstationInfoDay5> optional = sameperiodList.stream()
+                    .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && i.getMonth().equals(DateUtils.getMonthFromDate(j.getRecordDate())))
+                    .findFirst();
+            if (optional.isPresent()) {
+                ProEconPowerstationInfoDay5 tqinfoday = optional.get();
+                i.setSameperiod(DoubleUtils.keepPrecision(tqinfoday.getYswdldb().doubleValue() / 10000, 2));
+                i.setCompare(i.getCurrent().compareTo(i.getSameperiod()));
+            } else {
+                i.setSameperiod(0.0);
+                i.setCompare(0);
+            }
+        });
+        List<SpecificTarget> resultendList = new ArrayList<>();
+
+        Map<String, Map<Integer, SpecificTargetVo>> map = new HashMap<>();
+
+        resultList.stream().forEach(i -> {
+            if (map.containsKey(i.getWpid())) {
+                Map<Integer, SpecificTargetVo> integerListMap = map.get(i.getWpid());
+                if (!integerListMap.containsKey(i.getMonth())) {
+                    map.get(i.getWpid()).put(i.getMonth(), i);
+                } else {
+
+                }
+            } else {
+                Map<Integer, SpecificTargetVo> tempMap = new HashMap<>();
+                tempMap.put(i.getMonth(), i);
+                map.put(i.getWpid(), tempMap);
+            }
+        });
+        Set<String> wpids = map.keySet();
+        if (StringUtils.isNotNull(wpids)) {
+            wpids.stream().forEach(wpid -> {
+                SpecificTarget vo = new SpecificTarget();
+                vo.setWpid(wpid);
+                int orderNum = 100;
+                if (wpid.contains("_ZGS")) {
+                    vo.setWpname(CacheContext.cpmap.get(companys).getAname());
+                } else if (wpid.contains("_RGN")) {
+                    vo.setWpname(CacheContext.rgmap.get(companys).getAname());
+                } else {
+                    vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
+                }
+                vo.setOrderNum(orderNum);
+                List<SpecificTargetVo> tempList = new ArrayList<>();
+
+                Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
+                for (int x = 1; x <= 12; x++) {
+                    if (listMap.containsKey(x)) {
+                        tempList.add(listMap.get(x));
+                    } else {
+                        SpecificTargetVo vo1 = new SpecificTargetVo();
+                        vo1.setWpid(wpid);
+                        if (wpid.contains("_ZGS")) {
+                            vo1.setWpname(CacheContext.cpmap.get(companys).getAname());
+                        } else if (wpid.contains("_RGN")) {
+                            vo1.setWpname(CacheContext.rgmap.get(companys).getAname());
+                        } else {
+                            vo1.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                        }
+                        vo1.setYear(Integer.parseInt(year));
+                        vo1.setMonth(x);
+                        tempList.add(vo1);
+                    }
+                }
+
+
+                vo.setTargetList(tempList);
+                resultendList.add(vo);
+            });
+        }
+        SortUtils.sort(resultendList, "orderNum", SortUtils.ASC);
+
+        return resultendList;
+
+    }
+
+
     public List<SpecificTarget> gzsslList(String companys, String type, String year) {
         //获取年份所有当月的数据
         QueryWrapper<ProEconPowerstationInfoDay1> currentqw = new QueryWrapper<>();