添加值际对标代码更新

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

@@ -40,7 +40,7 @@ public class ProEconBenchmarkingBetweenController {
                      @RequestParam(value = "endDate",required = true)String endDate){
         Date begin = DateUtils.parseDate(beginDate);
         Date end = DateUtils.parseDate(endDate);
-        List<ProEconBenchmarkingBetween> resultList =  proEconBenchmarkingBetweenService.findByBeginAndEnd(begin,end);
+        List<ProEconBenchmarkingBetween> resultList = proEconBenchmarkingBetweenService.findByBeginAndEnd(begin,end);
         if (null != resultList) {
             return R.data(ResultMsg.ok(resultList));
         } else {
@@ -48,4 +48,20 @@ public class ProEconBenchmarkingBetweenController {
         }
     }
 
+
+    /**
+     * 保存值际对标
+     * @param beginDate
+     * @return
+     */
+    @GetMapping("/savezjdb")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R savezjdb(@RequestParam(value = "beginDate",required = true)String beginDate) throws Exception {
+        Date begin = DateUtils.parseDate(beginDate);
+        String date = DateUtils.toDate1(begin);
+        proEconBenchmarkingBetweenService.saveBeanchmarkList(date,date);
+        return R.data(ResultMsg.ok());
+    }
+
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/bmk/BenchmarkingController.java

@@ -5,6 +5,7 @@ package com.gyee.runeconomy.controller.bmk;/*
 
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.DateUtils;
+import com.gyee.common.util.SortUtils;
 import com.gyee.common.vo.benchmark.FjjxbVo;
 import com.gyee.common.vo.benchmark.FjjxbmxVo;
 import com.gyee.common.vo.benchmark.WxsslVo;
@@ -176,18 +177,25 @@ public class BenchmarkingController {
         Date date = DateUtils.parseDate(endDate);
         String  beginDate = DateUtils.toDate1(DateUtils.getFirstAndLastDayOfMonth(date));
         List<WxsslVo> dateList = benchmarkingService.cndbthb(companys,type,wpid,beginDate,endDate);
+        WxsslVo vo = null;
         if(dateList != null && dateList.size()>0){
             dateList.get(0).setName("当月");
+        }else {
+            vo = new WxsslVo();
+            vo.setName("当月");
         }
-        resultList.add((dateList != null && dateList.size()>0)?dateList.get(0): null);
+        resultList.add((dateList != null && dateList.size()>0)?dateList.get(0): vo);
 
         String yestmonthLastday =  DateUtils.toDate1(DateUtils.getYestmonthLastday(date));
         String  yestmonthbeginday = DateUtils.toDate1(DateUtils.getFirstAndLastDayOfMonth(DateUtils.parseDate(yestmonthLastday)));
         List<WxsslVo> hbList = benchmarkingService.cndbthb(companys,type,wpid,yestmonthbeginday,yestmonthLastday);
         if(hbList != null && hbList.size()>0){
             hbList.get(0).setName("环比");
+        }else {
+            vo = new WxsslVo();
+            vo.setName("环比");
         }
-        resultList.add((hbList != null && hbList.size()>0)?hbList.get(0): null);
+        resultList.add((hbList != null && hbList.size()>0)?hbList.get(0): vo);
 
         Date  subOneYear = DateUtils.subOneYear(date);
         String tbbeginDate = DateUtils.toDate1(DateUtils.getMonthFirstZero(DateUtils.toDate1(subOneYear)));
@@ -195,8 +203,65 @@ public class BenchmarkingController {
         List<WxsslVo> tbList = benchmarkingService.cndbthb(companys,type,wpid,tbbeginDate,tbendDate);
         if(tbList != null && tbList.size()>0){
             tbList.get(0).setName("同比");
+        }else {
+            vo = new WxsslVo();
+            vo.setName("同比");
         }
-        resultList.add((tbList != null && tbList.size()>0)?tbList.get(0): null);
+        resultList.add((tbList != null && tbList.size()>0)?tbList.get(0): vo);
+
+        SortUtils.sort(resultList,"llfdl",SortUtils.DESC);
+        for (int i=0;i<resultList.size();i++){
+            resultList.get(i).setZhpm(i+1);
+        }
+        SortUtils.sort(resultList,"fdl",SortUtils.DESC);
+        for (int i=0;i<resultList.size();i++){
+            resultList.get(i).setFdlpm(i+1);
+        }
+        SortUtils.sort(resultList,"fnlyl",SortUtils.DESC);
+        for (int i=0;i<resultList.size();i++){
+            resultList.get(i).setFnlylpm(i+1);
+        }
+        SortUtils.sort(resultList,"gzssdl",SortUtils.ASC);
+        for (int i=0;i<resultList.size();i++){
+            resultList.get(i).setGzssdlpm(i+1);
+        }
+        SortUtils.sort(resultList,"gzssl",SortUtils.ASC);
+        for (int i=0;i<resultList.size();i++){
+            resultList.get(i).setGzsslpm(i+1);
+        }
+        SortUtils.sort(resultList,"jxssdl",SortUtils.ASC);
+        for (int i=0;i<resultList.size();i++){
+            resultList.get(i).setJxssdlpm(i+1);
+        }
+        SortUtils.sort(resultList,"jxssl",SortUtils.ASC);
+        for (int i=0;i<resultList.size();i++){
+            resultList.get(i).setJxsslpm(i+1);
+        }
+        SortUtils.sort(resultList,"xdssdl",SortUtils.ASC);
+        for (int i=0;i<resultList.size();i++){
+            resultList.get(i).setXdssdlpm(i+1);
+        }
+        SortUtils.sort(resultList,"qfl",SortUtils.ASC);
+        for (int i=0;i<resultList.size();i++){
+            resultList.get(i).setQflpm(i+1);
+        }
+        SortUtils.sort(resultList,"xnssdl",SortUtils.ASC);
+        for (int i=0;i<resultList.size();i++){
+            resultList.get(i).setXnssdlpm(i+1);
+        }
+        SortUtils.sort(resultList,"xnssl",SortUtils.ASC);
+        for (int i=0;i<resultList.size();i++){
+            resultList.get(i).setXnsslpm(i+1);
+        }
+        SortUtils.sort(resultList,"slssdl",SortUtils.ASC);
+        for (int i=0;i<resultList.size();i++){
+            resultList.get(i).setSlssdlpm(i+1);
+        }
+        SortUtils.sort(resultList,"slssl",SortUtils.ASC);
+        for (int i=0;i<resultList.size();i++){
+            resultList.get(i).setSlsslpm(i+1);
+        }
+
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
         } else {

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

@@ -2,6 +2,7 @@ package com.gyee.runeconomy.model.auto;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDate;
+import java.util.Date;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -33,17 +34,17 @@ public class ProEconDutySchedule extends Model {
     /**
      * 开始时间
      */
-    private String begin;
+    private String beginDate;
 
     /**
      * 结束时间
      */
-    private String end;
+    private String endDate;
 
     /**
      * 创建日期
      */
-    private LocalDate createdate;
+    private Date createDate;
 
 
 }

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

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface IProEconBenchmarkingBetweenService extends IService<ProEconBenchmarkingBetween> {
 
-    void saveBeanchmarkList(String beginDate,String endDate) throws ParseException, Exception;
+    void saveBeanchmarkList(String beginDate,String endDate) throws Exception;
 
     List<ProEconBenchmarkingBetween> findByBeginAndEnd(Date begin, Date end);
 

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

@@ -6,6 +6,7 @@ import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.DateUtils;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
+import com.gyee.runeconomy.model.auto.ProBasicRegion;
 import com.gyee.runeconomy.model.auto.ProEconBenchmarkingBetween;
 import com.gyee.runeconomy.mapper.auto.ProEconBenchmarkingBetweenMapper;
 import com.gyee.runeconomy.model.auto.ProEconDutySchedule;
@@ -38,23 +39,11 @@ public class ProEconBenchmarkingBetweenServiceImpl extends ServiceImpl<ProEconBe
     @Resource
     private ProEconBenchmarkingBetweenMapper proEconBenchmarkingBetweenMapper;
 
-    private EdosUtil edosUtil = new EdosUtil();
+    @Autowired
+    private EdosUtil edosUtil;
 
 
 
-    /**
-     * 值际五项损失
-     * @param beginDate
-     * @param endDate
-     * @return
-     */
-    public List<ProEconBenchmarkingBetween> findbenchlist(String beginDate, String endDate) {
-        Date begin = DateUtils.parseDate(beginDate);
-        Date end = DateUtils.parseDate(endDate);
-        List<ProEconBenchmarkingBetween> resuList =  proEconBenchmarkingBetweenMapper.findByBeginAndEnd(begin,end);
-        return resuList;
-    }
-
 
 
 
@@ -71,13 +60,17 @@ public class ProEconBenchmarkingBetweenServiceImpl extends ServiceImpl<ProEconBe
             params1.put("create_date", date);
             List<ProEconDutySchedule> dutyList = proEconDutyScheduleService.listByMap(params1);
 
-            String[] points = Contant.benchPoints.split(",");
-            Map<String, ProBasicPowerstationPoint> wpmap = CacheContext.wppointmap.get("0");
+            String[] points = Contant.fiveLossPoints.split(",");
+            if(null == CacheContext.rgls || CacheContext.rgls.size()<=0){
+                return;
+            }
+            ProBasicRegion region = CacheContext.rgls.get(0);
+            Map<String, ProBasicPowerstationPoint> wpmap = CacheContext.regionpointmap.get(region.getNemCode()+"0");
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Map<String, Map<String, Double>> remap = new HashMap<>();
             for (ProEconDutySchedule dutyschedule : dutyList) {
-                String[] begins = dutyschedule.getBegin().split(",");
-                String[] ends = dutyschedule.getEnd().split(",");
+                String[] begins = dutyschedule.getBeginDate().split(",");
+                String[] ends = dutyschedule.getEndDate().split(",");
                 Map<String, Double> map = new HashMap<>();
                 for (int i = 0; i < begins.length; i++) {
                     Date begin = df.parse(day + " " + begins[i] + ":00");
@@ -118,11 +111,11 @@ public class ProEconBenchmarkingBetweenServiceImpl extends ServiceImpl<ProEconBe
                 bench.setDutyName(duty);
                 bench.setTheday(date);
                 Map<String, Double> pointmap = remap.get(duty);
-                bench.setPerformanceLoss(pointmap.get("RSDJZSDL") + pointmap.get("RSSTZSDL") + pointmap.get("RXNZSDL") + pointmap.get("RSQXZSDL"));
-                bench.setFaultLoss(pointmap.get("RGZZSDL") + pointmap.get("RSZZSDL"));
-                bench.setMainLoss(pointmap.get("RJXZSDL") + pointmap.get("RLZZSDL"));
-                bench.setRationingLoss(pointmap.get("RQFZSDL") + pointmap.get("RXDZSDL"));
-                bench.setInvolvesLoss(pointmap.get("RWZZSDL") + pointmap.get("RTZZSDL"));
+                bench.setPerformanceLoss(pointmap.get("RXNSSDL") + pointmap.get("RDJSSDL") + pointmap.get("RQXJCLSSDL") + pointmap.get("RSDTJSSDL"));
+                bench.setFaultLoss(pointmap.get("RGZSSDL") + pointmap.get("RCNSLGZSSDL"));
+                bench.setMainLoss(pointmap.get("RJXSSDL") + pointmap.get("RCNSLJXSSDL"));
+                bench.setRationingLoss(pointmap.get("RXDTJSSDL") + pointmap.get("RQFDL"));
+                bench.setInvolvesLoss(pointmap.get("RCWSLTQSSDL") + pointmap.get("RCWSLDWSSDL"));
                 bench.setGeneratity(pointmap.get("RFDL"));
                 bench.setTheoreticalGeneratity(bench.getPerformanceLoss() + bench.getFaultLoss() + bench.getMainLoss() + bench.getRationingLoss() + bench.getInvolvesLoss() + bench.getGeneratity());
                 this.save(bench);
@@ -130,6 +123,9 @@ public class ProEconBenchmarkingBetweenServiceImpl extends ServiceImpl<ProEconBe
         }
     }
 
+    /**
+     * 值际五项损失
+     */
     @Override
     public List<ProEconBenchmarkingBetween> findByBeginAndEnd(Date begin, Date end) {
 

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/task/SaticScheduleTask.java

@@ -2,6 +2,7 @@ package com.gyee.runeconomy.task;
 
 import com.gyee.common.util.DateUtils;
 import com.gyee.runeconomy.service.auto.IProEconBenchmarkingBetweenService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -12,7 +13,8 @@ import java.util.Date;
 @EnableScheduling   // 2.开启定时任务
 public class SaticScheduleTask {
 
-   private  IProEconBenchmarkingBetweenService iProEconBenchmarkingBetweenService;
+    @Autowired
+    private  IProEconBenchmarkingBetweenService iProEconBenchmarkingBetweenService;
 
 
 
@@ -20,8 +22,9 @@ public class SaticScheduleTask {
      * 定时调度任务
      */
     @Scheduled(cron = "0 0 1 * * ?")
+    //@Scheduled(cron = "0 24 14 * * ?")
     //或直接指定时间间隔，例如：5秒
-    //@Scheduled(fixedRate=5000)
+//    @Scheduled(fixedRate=5000)
     private void configureTasks1()  {
         Date yestday = DateUtils.getYestday(new Date());
         String date = DateUtils.toDate1(yestday);