Merge branch 'master' of http://124.70.43.205:3000/xieshengjie/sis

realtime/generationXK-service/src/main/java/com/gyee/generation/config/XxlJobConfig.java

@@ -18,8 +18,8 @@ import org.springframework.core.env.Environment;
 
 
 @Configuration
-@PropertySource("classpath:xxl-job-executor.properties")
-//@PropertySource("classpath:xxl-job-executor2.properties")
+//@PropertySource("classpath:xxl-job-executor.properties")
+@PropertySource("classpath:xxl-job-executor2.properties")
 //@PropertySource("classpath:xxl-job-executor3.properties")
 //@PropertySource("classpath:xxl-job-executor4.properties")
 //@PropertySource("classpath:xxl-job-executorWPLY.properties")

realtime/generationXK-service/src/main/java/com/gyee/generation/service/InitialRedisService.java

@@ -0,0 +1,381 @@
+package com.gyee.generation.service;
+
+import com.alibaba.fastjson.JSON;
+import com.gyee.common.contant.ContantXk;
+import com.gyee.common.model.PointData;
+import com.gyee.common.util.DateUtils;
+import com.gyee.generation.init.CacheContext;
+import com.gyee.generation.model.auto.*;
+import com.gyee.generation.util.realtimesource.IEdosUtil;
+import com.gyee.generation.util.redis.RedisService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.DecimalFormat;
+import java.util.*;
+
+@Service
+public  class InitialRedisService {
+
+
+    @Resource
+    private IEdosUtil edosUtil;
+
+    @Resource
+    private RedisService redisService;
+
+
+    public  void initialRedisAll() throws Exception {
+
+        System.out.println("初始化开始！");
+        intialWpScatter();
+        intialPjScatter();
+        intialLnScatter();
+        intialWtScatter();
+        System.out.println("初始化完成！");
+
+    }
+
+
+
+
+    public  void intialWpScatter() throws Exception {
+
+
+
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+
+        int month=cal.get(Calendar.MONTH)+1;
+
+
+        cal.set(Calendar.MONTH, 0);
+
+        for(int j=0;j<month;j++)
+        {
+            List<List<Double>> vos = new ArrayList<List<Double>>();
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+            Date beginDate = cal.getTime();
+            Date endDate =null;
+            if(month-1==cal.get(Calendar.MONTH))
+            {
+                cal = Calendar.getInstance();
+               //cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+                endDate = cal.getTime();
+            }else
+            {
+                cal.add(Calendar.MONTH,1);;
+                endDate = cal.getTime();
+            }
+
+
+            for(ProBasicPowerstation wp: CacheContext.wpls)
+            {
+                String wpId=wp.getId();
+                if(CacheContext.wppointmap.containsKey(wpId))
+                {
+                    Map<String, ProBasicPowerstationPoint> pointMap=CacheContext.wppointmap.get(wpId);
+
+                    if(pointMap.containsKey(ContantXk.SSZGL) && pointMap.containsKey(ContantXk.SSPJFS))
+                    {
+                        ProBasicPowerstationPoint gl = pointMap.get(ContantXk.SSZGL);
+                        ProBasicPowerstationPoint fs = pointMap.get(ContantXk.SSPJFS);
+
+                        int daynum = DateUtils.daysDiff(beginDate, endDate);
+                        long pried = 600 ;
+                        long count = 6 * 24 * daynum;
+
+                        DecimalFormat dcmFmt = new DecimalFormat("0.00");
+                        List<PointData> gls = edosUtil.getHistoryDatasSnap(gl, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+
+                        List<PointData> fss = edosUtil.getHistoryDatasSnap(fs, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+
+
+                        if (!gls.isEmpty() && !fss.isEmpty()) {
+                            for (int i = 0; i < fss.size(); i++) {
+
+                                List<Double> ds = new ArrayList<Double>();
+
+                                double f = fss.get(i).getPointValueInDouble();
+                                ds.add(Double.valueOf(dcmFmt.format(f)));
+                                f = gls.get(i).getPointValueInDouble();
+                                ds.add(Double.valueOf(dcmFmt.format(f)));
+                                vos.add(ds);
+                            }
+                        }
+
+                        // cal.add(Calendar.MONTH,1);
+                        StringBuilder sb=new StringBuilder();
+                        sb.append("scatter_").append(wpId).append("_").append(j+1);
+                        redisService.set(String.valueOf(sb), JSON.toJSONString(vos));
+                        System.out.println(String.valueOf(sb.append("完成")));
+                    }
+
+                    
+                }
+               
+            
+            }
+        }
+    }
+
+
+
+    public  void intialPjScatter() throws Exception {
+
+
+
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+
+        int month=cal.get(Calendar.MONTH)+1;
+
+
+        cal.set(Calendar.MONTH, 0);
+
+        for(int j=0;j<month;j++)
+        {
+            List<List<Double>> vos = new ArrayList<List<Double>>();
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+            Date beginDate = cal.getTime();
+            Date endDate =null;
+            if(month-1==cal.get(Calendar.MONTH))
+            {
+                cal = Calendar.getInstance();
+                //cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+                endDate = cal.getTime();
+            }else
+            {
+                cal.add(Calendar.MONTH,1);;
+                endDate = cal.getTime();
+            }
+
+
+            for(ProBasicProject pj:CacheContext.pjls)
+            {
+                String pjId=pj.getId();
+                if(CacheContext.propointmap.containsKey(pjId)) {
+                    Map<String, ProBasicPowerstationPoint> pointMap = CacheContext.propointmap.get(pjId);
+
+                    if (pointMap.containsKey(ContantXk.SSZGL) && pointMap.containsKey(ContantXk.SSPJFS)) {
+
+                        ProBasicPowerstationPoint gl = pointMap.get(ContantXk.SSZGL);
+                        ProBasicPowerstationPoint fs = pointMap.get(ContantXk.SSPJFS);
+
+                        int daynum = DateUtils.daysDiff(beginDate, endDate);
+                        long pried = 600 ;
+                        long count = 6 * 24 * daynum;
+
+                        DecimalFormat dcmFmt = new DecimalFormat("0.00");
+                        List<PointData> gls = edosUtil.getHistoryDatasSnap(gl, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+
+                        List<PointData> fss = edosUtil.getHistoryDatasSnap(fs, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+
+
+                        if (!gls.isEmpty() && !fss.isEmpty()) {
+                            for (int i = 0; i < fss.size(); i++) {
+
+                                List<Double> ds = new ArrayList<Double>();
+
+                                double f = fss.get(i).getPointValueInDouble();
+                                ds.add(Double.valueOf(dcmFmt.format(f)));
+                                f = gls.get(i).getPointValueInDouble();
+                                ds.add(Double.valueOf(dcmFmt.format(f)));
+                                vos.add(ds);
+                            }
+                        }
+
+                        // cal.add(Calendar.MONTH,1);
+                        StringBuilder sb=new StringBuilder();
+                        sb.append("scatter_").append(pjId).append("_").append(j+1);
+                        redisService.set(String.valueOf(sb), JSON.toJSONString(vos));
+                        System.out.println(String.valueOf(sb.append("完成")));
+                    }
+                }
+
+            }
+        }
+
+
+
+    }
+
+
+
+    public  void intialLnScatter() throws Exception {
+
+
+
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+
+        int month=cal.get(Calendar.MONTH)+1;
+
+
+        cal.set(Calendar.MONTH, 0);
+
+        for(int j=0;j<month;j++)
+        {
+            List<List<Double>> vos = new ArrayList<List<Double>>();
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+            Date beginDate = cal.getTime();
+            Date endDate =null;
+            if(month-1==cal.get(Calendar.MONTH))
+            {
+                cal = Calendar.getInstance();
+                //cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+                endDate = cal.getTime();
+            }else
+            {
+                cal.add(Calendar.MONTH,1);;
+                endDate = cal.getTime();
+            }
+
+
+            for(ProBasicLine ln:CacheContext.lnls)
+            {
+                String lnId=ln.getId();
+                if(CacheContext.linepointmap.containsKey(lnId)) {
+                    Map<String, ProBasicPowerstationPoint> pointMap = CacheContext.linepointmap.get(lnId);
+
+                    if (pointMap.containsKey(ContantXk.SSZGL) && pointMap.containsKey(ContantXk.SSPJFS)) {
+
+                        ProBasicPowerstationPoint gl = pointMap.get(ContantXk.SSZGL);
+                        ProBasicPowerstationPoint fs = pointMap.get(ContantXk.SSPJFS);
+
+                        int daynum = DateUtils.daysDiff(beginDate, endDate);
+                        long pried = 600 ;
+                        long count = 6 * 24 * daynum;
+
+                        DecimalFormat dcmFmt = new DecimalFormat("0.00");
+                        List<PointData> gls = edosUtil.getHistoryDatasSnap(gl, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+
+                        List<PointData> fss = edosUtil.getHistoryDatasSnap(fs, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+
+
+                        if (!gls.isEmpty() && !fss.isEmpty()) {
+                            for (int i = 0; i < fss.size(); i++) {
+
+                                List<Double> ds = new ArrayList<Double>();
+
+                                double f = fss.get(i).getPointValueInDouble();
+                                ds.add(Double.valueOf(dcmFmt.format(f)));
+                                f = gls.get(i).getPointValueInDouble();
+                                ds.add(Double.valueOf(dcmFmt.format(f)));
+                                vos.add(ds);
+                            }
+                        }
+
+                        // cal.add(Calendar.MONTH,1);
+                        StringBuilder sb=new StringBuilder();
+                        sb.append("scatter_").append(lnId).append("_").append(j+1);
+                        redisService.set(String.valueOf(sb), JSON.toJSONString(vos));
+                        System.out.println(String.valueOf(sb.append("完成")));
+                    }
+                }
+
+            }
+        }
+
+
+
+    }
+
+
+    public  void intialWtScatter() throws Exception {
+
+
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+
+        int month=cal.get(Calendar.MONTH)+1;
+
+
+        cal.set(Calendar.MONTH, 0);
+
+
+            List<List<Double>> vos = new ArrayList<List<Double>>();
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+            Date beginDate = cal.getTime();
+            Date endDate =null;
+            if(month-1==cal.get(Calendar.MONTH))
+            {
+                cal = Calendar.getInstance();
+                //cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+                endDate = cal.getTime();
+            }else
+            {
+                cal.add(Calendar.MONTH,1);;
+                endDate = cal.getTime();
+            }
+
+
+            for(ProBasicEquipment wt:CacheContext.wtls)
+            {
+                String wtId=wt.getId();
+                if(CacheContext.wtpAimap.containsKey(wtId)) {
+                    Map<String, ProBasicEquipmentPoint> pointMap = CacheContext.wtpAimap.get(wtId);
+
+                    if (pointMap.containsKey(ContantXk.CJ_SSGL) && pointMap.containsKey(ContantXk.CJ_SSFS)) {
+
+                        ProBasicEquipmentPoint gl = pointMap.get(ContantXk.CJ_SSGL);
+                        ProBasicEquipmentPoint fs = pointMap.get(ContantXk.CJ_SSFS);
+
+                        int daynum = DateUtils.daysDiff(beginDate, endDate);
+                        long pried = 600 ;
+                        long count = 6 * 24 * daynum;
+
+                        DecimalFormat dcmFmt = new DecimalFormat("0.00");
+                        List<PointData> gls = edosUtil.getHistoryDatasSnap(gl, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+
+                        List<PointData> fss = edosUtil.getHistoryDatasSnap(fs, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+
+
+                        if (!gls.isEmpty() && !fss.isEmpty()) {
+                            for (int i = 0; i < fss.size(); i++) {
+
+                                List<Double> ds = new ArrayList<Double>();
+
+                                double f = fss.get(i).getPointValueInDouble();
+                                ds.add(Double.valueOf(dcmFmt.format(f)));
+                                f = gls.get(i).getPointValueInDouble();
+                                ds.add(Double.valueOf(dcmFmt.format(f)));
+                                vos.add(ds);
+                            }
+                        }
+
+                        // cal.add(Calendar.MONTH,1);
+                        StringBuilder sb=new StringBuilder();
+                        sb.append("scatter_").append(wtId).append("_").append(month);
+                        redisService.set(String.valueOf(sb), JSON.toJSONString(vos));
+                        System.out.println(String.valueOf(sb.append("完成")));
+                    }
+                }
+
+            }
+
+
+
+
+    }
+
+    public static void main(String[]args) throws Exception {
+
+//        SpringApplication.run(SpringbootStart.class, args);
+//
+//        InitialRedis initialRedis=new InitialRedis();
+//        //初始化风机拟合功率
+//      // initialRedis.intialWindturbinepowercurvefitting();
+//
+//        //初始化场站没有散点图
+//        initialRedis.intialWpScatter();
+    }
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/task/SaticSchedulePgTask.java

@@ -81,6 +81,29 @@ public class SaticSchedulePgTask {
     private WindDeviationService windDeviationService;
 
 
+    @Resource
+    private InitialRedisService initialRedisService;
+
+
+    /**
+     * 缓存Redis散点图数据
+     * 每天执行一次
+     */
+
+    @XxlJob("initialRedis_PG")
+    public void initialRedis_PG()  {
+
+
+        XxlJobHelper.log("缓存Redis散点图数据调度程序执行开始!........");
+        try {
+            initialRedisService.initialRedisAll();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        XxlJobHelper.log("缓存Redis散点图数据调度任务处理完成!........");
+    }
+
+
     /**
      * 故障转换率
      * 每15钟执行一次

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/ProEconCleaningInputController.java

@@ -0,0 +1,94 @@
+package com.gyee.runeconomy.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.common.config.R;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.model.auto.ProEconCleaningInput;
+import com.gyee.runeconomy.service.auto.IProEconCleaningInputService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.Date;
+
+/**
+ * <p>
+ * 清洗录入表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-05
+ */
+@RestController
+@RequestMapping("//pro-econ-cleaning-input")
+public class ProEconCleaningInputController {
+
+    @Resource
+    private IProEconCleaningInputService proEconCleaningInputService;
+
+    /**
+     * 查询
+     * @param windpowerstationId
+     * @param windpowerstationName
+     * @param begindate
+     * @param planEnddate
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "清洗录入-列表", notes = "清洗录入-列表")
+    public R findList(@RequestParam(value = "windpowerstationId", required = false) String windpowerstationId,
+                      @RequestParam(value = "windpowerstationName", required = false) String windpowerstationName,
+                      @RequestParam(value = "begindate", required = false) Date begindate,
+                      @RequestParam(value = "planEnddate", required = false) Date planEnddate,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProEconCleaningInput> list = proEconCleaningInputService.getList(windpowerstationId, windpowerstationName, begindate, planEnddate, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     *
+     * @param ProEconCleaningInput
+     * @return
+     */
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "清洗录入-新增or修改", notes = "清洗录入-新增or修改")
+    public R addAll(@RequestBody ProEconCleaningInput ProEconCleaningInput) {
+
+        boolean b = proEconCleaningInputService.saveOrUpdate(ProEconCleaningInput);
+        if (b) {
+            CacheContext.initPowerstationList();
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+
+    }
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "清洗录入-删除", notes = "清洗录入-删除")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proEconCleaningInputService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            CacheContext.initPowerstationList();
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+
+}

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/ProEconFaultFaultController.java

@@ -0,0 +1,93 @@
+package com.gyee.runeconomy.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.common.config.R;
+import com.gyee.runeconomy.model.auto.ProEconFaultFault;
+import com.gyee.runeconomy.service.auto.IProEconFaultFaultService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.Date;
+
+/**
+ * <p>
+ *  故障录入表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-05
+ */
+@RestController
+@RequestMapping("//pro-econ-fault-fault")
+public class ProEconFaultFaultController {
+
+    @Resource
+    private IProEconFaultFaultService proEconFaultFaultService;
+    /**
+     * 查询
+     * @param windpowerstationId
+     * @param windpowerstationName
+     * @param begindate
+     * @param planEnddate
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "清洗录入-列表", notes = "清洗录入-列表")
+    public R findList(@RequestParam(value = "windpowerstationId", required = false) String windpowerstationId,
+                      @RequestParam(value = "windpowerstationName", required = false) String windpowerstationName,
+                      @RequestParam(value = "begindate", required = false) Date begindate,
+                      @RequestParam(value = "planEnddate", required = false) Date planEnddate,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProEconFaultFault> list = proEconFaultFaultService.getList(windpowerstationId, windpowerstationName, begindate, planEnddate, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     *
+     * @param ProEconFaultFault
+     * @return
+     */
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "清洗录入-新增or修改", notes = "清洗录入-新增or修改")
+    public R addAll(@RequestBody ProEconFaultFault ProEconFaultFault) {
+
+        boolean b = proEconFaultFaultService.saveOrUpdate(ProEconFaultFault);
+        if (b) {
+//            CacheContext.initPowerstationList();
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+
+    }
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "清洗录入-删除", notes = "清洗录入-删除")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proEconFaultFaultService.removeByIds(Arrays.asList(strings));
+        if (b) {
+//            CacheContext.initPowerstationList();
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+
+}
+

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

@@ -531,22 +531,30 @@ public class BenchmarkingController {
 
     @GetMapping("/ppdb")
     @ResponseBody
-    @ApiOperation(value = "品牌对标", notes = "品牌对标")
+    @ApiOperation(value = "场际对标", notes = "场际对标")
     public R ppdb(@RequestParam(value = "companys",required = true) String companys,
                   @RequestParam(value = "type",required = true) String type,
                   @RequestParam(value = "wpids",required = true) String wpids,
                   @RequestParam(value = "model",required = true) String model,
-                  @RequestParam(value = "projectids",required = true) String projectids,
-                  @RequestParam(value = "lineids",required = true) String lineids,
-                  @RequestParam(value = "squareids",required = true) String squareids,
-                  @RequestParam(value = "windturbineids",required = false) String windturbineids,
                   @RequestParam(value = "beginDate",required = true) String beginDate,
                   @RequestParam(value = "endDate",required = true) String endDate,
-                  @RequestParam(value = "target",required = false) String target,
-                  @RequestParam(value = "sort",required = false) String sort
+                  @RequestParam(value = "target",required = true) String target,
+                  @RequestParam(value = "sort",required = true) String sort
     ){
-        List<WxsslVo> resultList = benchmarkingService.ppdb(companys,type,wpids,model,projectids,lineids,squareids,windturbineids,beginDate,endDate,target,sort);
+        List<WxsslVo> resultList = benchmarkingService.ppdb(companys,type,wpids,model,beginDate,endDate,target,sort);
+
+        if (StringUtils.isNotNull(resultList)) {
+            return R.data(ResultMsg.ok(resultList));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
+    @GetMapping(value = "/squarelist")
+    @ApiOperation(value = "阵区列表", notes = "阵区列表")
+    public R squarelist(@RequestParam(value = "wpids", required = true) String wpids)  {
 
+        List<ProBasicOrganizeEquipment> resultList = benchmarkingService.squarelist(wpids);
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
         } else {

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/mapper/auto/ProEconCleaningInputMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconCleaningInput;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 清洗录入表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-05
+ */
+public interface ProEconCleaningInputMapper extends BaseMapper<ProEconCleaningInput> {
+
+}

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/mapper/auto/ProEconFaultFaultMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconFaultFault;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-05
+ */
+public interface ProEconFaultFaultMapper extends BaseMapper<ProEconFaultFault> {
+
+}

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/model/auto/ProEconCleaningInput.java

@@ -0,0 +1,80 @@
+package com.gyee.runeconomy.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 清洗录入表
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconCleaningInput extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 场站编号
+     */
+    @TableId(value = "windpowerstation_id")
+    private String windpowerstationId;
+
+    /**
+     * 场站名称
+     */
+    private String windpowerstationName;
+
+    /**
+     * 阵区编号
+     */
+    private String squareId;
+
+    /**
+     * 阵区名称
+     */
+    private String squareName;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date begindate;
+
+    /**
+     * 计划结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date planEnddate;
+
+    /**
+     * 实际结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date actualEnddate;
+
+    /**
+     * 工具和材料
+     */
+    private String toolMaterials;
+
+    /**
+     * 清洗步骤
+     */
+    private String cleaningSteps;
+
+    /**
+     * 备注
+     */
+    private String spare1;
+
+
+}

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/model/auto/ProEconFaultFault.java

@@ -0,0 +1,80 @@
+package com.gyee.runeconomy.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 故障录入表
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconFaultFault extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 场站编号
+     */
+    @TableId(value = "windpowerstation_id")
+    private String windpowerstationId;
+
+    /**
+     * 场站名称
+     */
+    private String windpowerstationName;
+
+    /**
+     * 设备编号
+     */
+    private String equipmentId;
+
+    /**
+     * 设备名称
+     */
+    private String equipmentName;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date begindate;
+
+    /**
+     * 计划结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date planEnddate;
+
+    /**
+     * 实际结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date actualEnddate;
+
+    /**
+     * 故障描述
+     */
+    private String faultDescription;
+
+    /**
+     * 处理过程
+     */
+    private String processingProcess;
+
+    /**
+     * 备注
+     */
+    private String spare1;
+
+
+}

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/IProEconCleaningInputService.java

@@ -0,0 +1,21 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.runeconomy.model.auto.ProEconCleaningInput;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 清洗录入表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-05
+ */
+public interface IProEconCleaningInputService extends IService<ProEconCleaningInput> {
+
+    IPage<ProEconCleaningInput> getList(String windpowerstationId, String windpowerstationName, Date begindate, Date planEnddate, String pageNum, String pageSize);
+
+}

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/IProEconFaultFaultService.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.runeconomy.model.auto.ProEconFaultFault;
+
+import java.util.Date;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-05
+ */
+public interface IProEconFaultFaultService extends IService<ProEconFaultFault> {
+    IPage<ProEconFaultFault> getList(String windpowerstationId, String windpowerstationName, Date begindate, Date planEnddate, String pageNum, String pageSize);
+
+}

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconCleaningInputServiceImpl.java

@@ -0,0 +1,51 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import com.gyee.runeconomy.mapper.auto.ProEconCleaningInputMapper;
+import com.gyee.runeconomy.model.auto.ProEconCleaningInput;
+import com.gyee.runeconomy.service.auto.IProEconCleaningInputService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 清洗录入表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-05
+ */
+@Service
+public class ProEconCleaningInputServiceImpl extends ServiceImpl<ProEconCleaningInputMapper, ProEconCleaningInput> implements IProEconCleaningInputService {
+
+    @Override
+    public IPage<ProEconCleaningInput> getList(String windpowerstationId, String windpowerstationName, Date begindate, Date planEnddate, String pageNum, String pageSize) {
+        QueryWrapper<ProEconCleaningInput> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(windpowerstationId)){
+            qw.eq("windpowerstation_id",windpowerstationId);
+        }
+
+        if (StringUtils.isNotEmpty(windpowerstationName)){
+            qw.like("windpowerstation_name",windpowerstationName);
+        }
+
+        if (begindate != null){
+            qw.like("begindate",begindate);
+        }
+
+        if (planEnddate != null){
+            qw.eq("plan_enddate",planEnddate);
+        }
+
+        Page<ProEconCleaningInput> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<ProEconCleaningInput> InputPage = getBaseMapper().selectPage(page, qw);
+//        List<Windpowerstation> list = companysPage.getRecords();
+        return InputPage;
+    }
+}

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconFaultFaultServiceImpl.java

@@ -0,0 +1,51 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import com.gyee.runeconomy.mapper.auto.ProEconFaultFaultMapper;
+import com.gyee.runeconomy.model.auto.ProEconFaultFault;
+import com.gyee.runeconomy.service.auto.IProEconFaultFaultService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-05
+ */
+@Service
+public class ProEconFaultFaultServiceImpl extends ServiceImpl<ProEconFaultFaultMapper, ProEconFaultFault> implements IProEconFaultFaultService {
+
+    @Override
+    public IPage<ProEconFaultFault> getList(String windpowerstationId, String windpowerstationName, Date begindate, Date planEnddate, String pageNum, String pageSize) {
+        QueryWrapper<ProEconFaultFault> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(windpowerstationId)){
+            qw.eq("windpowerstation_id",windpowerstationId);
+        }
+
+        if (StringUtils.isNotEmpty(windpowerstationName)){
+            qw.like("windpowerstation_name",windpowerstationName);
+        }
+
+        if (begindate != null){
+            qw.like("begindate",begindate);
+        }
+
+        if (planEnddate != null){
+            qw.eq("plan_enddate",planEnddate);
+        }
+
+        Page<ProEconFaultFault> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<ProEconFaultFault> InputPage = getBaseMapper().selectPage(page, qw);
+//        List<Windpowerstation> list = companysPage.getRecords();
+        return InputPage;
+    }
+}

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -23,8 +23,10 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 @Service
@@ -115,33 +117,61 @@ public class BenchmarkingService {
 
     public List<ProBasicOrganizeEquipment> wtByWplist(String wpids) {
         return CacheContext.organizeEquipmentList.stream().filter(
-                oe -> wpids.contains(oe.getWindpowerstationId())&&(oe.getNemName().contains("逆变器") || oe.getNemName().contains("风机"))).collect(Collectors.toList());
+                oe -> wpids.contains(oe.getWindpowerstationId()) && (oe.getNemName().contains("逆变器") || oe.getNemName().contains("风机"))).collect(Collectors.toList());
     }
+
     public List<ProBasicOrganizeEquipment> wtByWplistxin(String wpids) {
         return CacheContext.organizeEquipmentList.stream().filter(
-                oe -> wpids.contains(oe.getWindpowerstationId())||(oe.getNemName().contains("风机"))).collect(Collectors.toList());
+                oe -> wpids.contains(oe.getWindpowerstationId()) || (oe.getNemName().contains("风机"))).collect(Collectors.toList());
     }
 
-//    public List<ProBasicOrganizeTree> modellist(String wpids) {
-//        if (CacheContext.wtls == null) {
-//            return new ArrayList<>();
-//        }
-//        return CacheContext.wtls.stream()
-//                .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getPcodes() != null && wt.getPcodes().contains(wpids))
-//                .collect(Collectors.toList());
+    //public List<ProBasicOrganizeTree> modellist(String wpids) {
+//    if (CacheContext.wtls == null) {
+//        return new ArrayList<>();
 //    }
-public List<ProBasicOrganizeTree> modellist(String wpids) {
-    if (CacheContext.wtls == null) {
-        return new ArrayList<>();
+//
+//    return CacheContext.wtls.stream()
+//            .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getPcodes() != null && wpids.contains(wt.getPcodes()))
+//            .collect(Collectors.toMap(ProBasicOrganizeTree::getModelId, Function.identity(), (a, b) -> a))
+//            .values()
+//            .stream()
+//            .collect(Collectors.toList());
+//}
+    public List<ProBasicOrganizeTree> modellist(String wpids) {
+        if (CacheContext.wtls == null) {
+            return new ArrayList<>();
+        }
+
+        List<String> wpidsList = Arrays.asList(wpids.split(","));
+
+        return CacheContext.wtls.stream()
+                .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getNemName().contains("逆变器") && wt.getPcodes() != null && containsAny(wt.getPcodes(), wpidsList))
+                .collect(Collectors.toMap(ProBasicOrganizeTree::getModelId, Function.identity(), (a, b) -> a))
+                .values()
+                .stream()
+                .collect(Collectors.toList());
     }
 
-    return CacheContext.wtls.stream()
-            .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getPcodes() != null && wt.getPcodes().contains(wpids))
-            .collect(Collectors.toMap(ProBasicOrganizeTree::getModelId, Function.identity(), (a, b) -> a))
-            .values()
-            .stream()
-            .collect(Collectors.toList());
-}
+    private boolean containsAny(String target, List<String> values) {
+        for (String value : values) {
+            if (target.contains(value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public List<ProBasicOrganizeEquipment> squarelist(String wpids) {
+        return CacheContext.organizeEquipmentList.stream()
+                .filter(oe -> wpids.contains(oe.getWindpowerstationId()) && (oe.getNemName().contains("逆变器") && oe.getSquareId()!= null || oe.getNemName().contains("风机")))
+                .filter(distinctByKey(ProBasicOrganizeEquipment::getSquareId))
+                .collect(Collectors.toList());
+    }
+
+    public static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
+        Set<Object> seen = ConcurrentHashMap.newKeySet();
+        return t -> seen.add(keyExtractor.apply(t));
+    }
 
     public List<FjjxbVo> performance(String companyid, String getype, String sttype, String beginDate, String endDate, String wpids, String projectids, String lineids, String target, String sort) {
         List<FjjxbVo> resultList = new ArrayList<>();
@@ -193,7 +223,7 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
 
         List<ProEconEquipmentInfoDay1> list = proEconEquipmentInfoDay1Service.list(qw);
         list = list.stream().filter(a -> a.getWindpowerstationId() != null || a.getProjectId() != null ||
-                a.getLineId() != null || a.getWindturbineId() != null ).collect(Collectors.toList());
+                a.getLineId() != null || a.getWindturbineId() != null).collect(Collectors.toList());
 
         AtomicReference<Double> llfdl = new AtomicReference<>((double) 0);
         AtomicReference<Double> sjfdl = new AtomicReference<>((double) 0);
@@ -323,7 +353,7 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
         }
         List<ProEconEquipmentInfoDay1> list = proEconEquipmentInfoDay1Service.list(qw);
         list = list.stream().filter(a -> a.getWindpowerstationId() != null || a.getProjectId() != null ||
-                a.getLineId() != null || a.getWindturbineId() != null ).collect(Collectors.toList());
+                a.getLineId() != null || a.getWindturbineId() != null).collect(Collectors.toList());
 
         AtomicReference<Double> llfdl = new AtomicReference<>((double) 0);
         AtomicReference<Double> sjfdl = new AtomicReference<>((double) 0);
@@ -941,11 +971,11 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
 
         List<WxsslVo> wxsslVoList;
         if (id.endsWith("ZGS")) {
-            qw.select("windpowerstation_id,"+sql);
+            qw.select("windpowerstation_id," + sql);
             qw.groupBy("windpowerstation_id");
             wxsslVoList = getWxsslSortVos(qw, resultList, TYPE_WIND);
         } else {
-            qw.select("windturbine_id,"+sql);
+            qw.select("windturbine_id," + sql);
             qw.groupBy("windturbine_id");
             wxsslVoList = getWxsslSortVos(qw, resultList, TYPE_WINDTURBINE);
         }
@@ -1202,30 +1232,19 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
     /**
      * 设备对标
      */
-    public List<WxsslVo> ppdb(String companys, String type, String wpids,String model, String projectids, String lineids, String squareids, String windturbineids, String beginDate, String endDate, String target, String sort) {
+    public List<WxsslVo> ppdb(String companys, String type, String wpids, String model, String beginDate, String endDate, String target, String sort) {
         List<WxsslVo> resultList = new ArrayList<>();
         QueryWrapper<ProEconEquipmentInfoDay1> qw = new QueryWrapper<>();
-        qw.select("windturbine_id,sum(rfdl) rfdl,sum(rllfdl) rllfdl,avg(rpjfs) rpjfs,sum(rjxssdl) rjxssdl,sum(rcnsljxssdl) rcnsljxssdl,sum(rgzssdl) rgzssdl,sum(rcnslgzssdl) rcnslgzssdl,sum(rxdtjssdl) rxdtjssdl,sum(rxdjclssdl) rxdjclssdl,sum(rdjssdl) rdjssdl,sum(rqxjclssdl) rqxjclssdl,sum(rsdtjssdl) rsdtjssdl,sum(rxnssdl) rxnssdl,sum(rcwsldwssdl) rcwsldwssdl,sum(rcwsltqssdl) rcwsltqssdl");
+        qw.select("windpowerstation_id,sum(rfdl) rfdl,sum(rllfdl) rllfdl,avg(rpjfs) rpjfs,sum(rjxssdl) rjxssdl,sum(rcnsljxssdl) rcnsljxssdl,sum(rgzssdl) rgzssdl,sum(rcnslgzssdl) rcnslgzssdl,sum(rxdtjssdl) rxdtjssdl,sum(rxdjclssdl) rxdjclssdl,sum(rdjssdl) rdjssdl,sum(rqxjclssdl) rqxjclssdl,sum(rsdtjssdl) rsdtjssdl,sum(rxnssdl) rxnssdl,sum(rcwsldwssdl) rcwsldwssdl,sum(rcwsltqssdl) rcwsltqssdl");
 
         qw.ge("record_date", DateUtils.parseDate(beginDate)).le("record_date", DateUtils.parseDate(endDate));
-
-        if (StringUtils.isNotEmpty(windturbineids)) {
-            List<String> equipmentidsList = Arrays.asList(windturbineids.split(","));
-            qw.in("windturbine_id", equipmentidsList);
-        } else if (StringUtils.isNotEmpty(squareids)) {
-            List<String> squareidList = Arrays.asList(squareids.split(","));
-            qw.in("square_id", squareidList);
-        } else if (StringUtils.isNotEmpty(lineids)) {
-            List<String> lineList = Arrays.asList(lineids.split(","));
-            qw.in("line_id", lineList).isNotNull("square_id").ne("square_id", "");
-        } else if (StringUtils.isNotEmpty(projectids)) {
-            List<String> projectList = Arrays.asList(projectids.split(","));
-            qw.in("project_id", projectList).isNotNull("square_id").ne("square_id", "");
-        } else if (StringUtils.isNotEmpty(wpids)) {
+        if (StringUtils.isNotEmpty(wpids)) {
             List<String> wpList = Arrays.asList(wpids.split(","));
-            qw.in("windpowerstation_id", wpList).isNotNull("square_id").ne("square_id", "");
+            qw.in("windpowerstation_id", wpList);
         } else if (StringUtils.isNotEmpty(companys)) {
+
             String[] split = companys.split(",");
+
             if (companys.contains("RGN")) {
                 for (String s : split) {
                     if (s.endsWith("RGN")) {
@@ -1242,8 +1261,8 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
         } else {
             qw.like("windturbine_id", "_IN_");
         }
-        qw.groupBy("windturbine_id");
-        List<WxsslVo> wxsslVoList = getxinWxsslSortVos(qw, resultList, TYPE_WINDTURBINE,model,wpids);
+        qw.groupBy("windpowerstation_id");
+        List<WxsslVo> wxsslVoList = getxinWxsslSortVos(qw, resultList, TYPE_WIND, wpids, model);
         if (StringUtils.isNotEmpty(target) && StringUtils.isNotEmpty(sort)) {
             if (sort.equals("1")) {
                 SortUtils.sort(resultList, target, SortUtils.ASC);
@@ -1257,74 +1276,109 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
     }
 
 
-    private List<WxsslVo> getxinWxsslSortVos(QueryWrapper<ProEconEquipmentInfoDay1> qw, List<WxsslVo> resultList, String type,String model,String wpids) {
-
+    private List<WxsslVo> getxinWxsslSortVos(QueryWrapper<ProEconEquipmentInfoDay1> qw, List<WxsslVo> resultList, String type, String wpids, String model) {
+
+        List<List<ProEconEquipmentInfoDay1>> peeidls = new ArrayList<>();
+        String[] splitWp = wpids.split(",");
+        for (String s : splitWp) {
+            String[] splitMd = model.split(",");
+            if (!model.isEmpty()) {
+                for (String s1 : splitMd) {
+                    List<String> wtls = CacheContext.wtls.stream().filter(c -> !Objects.isNull(c.getModelId()) && c.getNemName().contains("逆变器") && c.getPcodes().contains(s) &&
+                            s1.equals(c.getModelId())).map(ot -> ot.getId()).collect(Collectors.toList());
+                    if (wtls.size() == 0) continue;
+                    QueryWrapper<ProEconEquipmentInfoDay1> wiqw = qw.clone().in("windturbine_id", wtls);
+                    List<ProEconEquipmentInfoDay1> listls = proEconEquipmentInfoDay1Service.list(wiqw);
+                    for (ProEconEquipmentInfoDay1 listl : listls) {
+                        listl.setWindturbineId(s1);
+                    }
+                    peeidls.add(listls);
+                }
+            } else if (model.isEmpty()) {
+                List<String> wtls = CacheContext.wtls.stream().filter(c ->  c.getPcodes().contains(s) && c.getNemName().contains("逆变器")).map(ot -> ot.getId()).collect(Collectors.toList());
+                if (wtls.size() == 0) continue;
+                QueryWrapper<ProEconEquipmentInfoDay1> wiqw = qw.clone().in("windturbine_id", wtls);
+                List<ProEconEquipmentInfoDay1> listls = proEconEquipmentInfoDay1Service.list(wiqw);
+                for (ProBasicOrganizeTree t1: CacheContext.wtls){
+                    for (ProEconEquipmentInfoDay1 listl : listls) {
+                        if (t1.getId().equals(wtls.get(0)))
+                            listl.setWindturbineId(t1.getModelId());
+                    }
+                }
+                peeidls.add(listls);
+            }
+        }
         Map<String, Integer> station = CacheContext.wpls
                 .stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId, ProBasicOrganizeTree::getOrderNum));
 
-        List<ProBasicOrganizeTree> wtls = CacheContext.wtls.stream().filter(c -> model.equals(c.getModelId())).collect(Collectors.toList());
+//        List<String> wtls = CacheContext.wtls.stream().filter(c -> !Objects.isNull(c.getModelId()) && model.contains(c.getModelId()))
+//                .map(ot->ot.getId()).collect(Collectors.toList());
 
-        List<ProEconEquipmentInfoDay1> listls =proEconEquipmentInfoDay1Service.list(qw);
 
         List<ProEconEquipmentInfoDay1> list = new ArrayList<>();
-        for (ProBasicOrganizeTree wt : wtls){
-            for (ProEconEquipmentInfoDay1 lst : listls) {
-                if (lst.getWindturbineId().equals(wt.getId())){
-                    list.add(lst);
-                }
-            }
-        }
+
+//        for (ProBasicOrganizeTree wt : wtls){
+//            for (ProEconEquipmentInfoDay1 lst : listls) {
+//                if (lst.getWindturbineId().equals(wt.getId())){
+//                    list.add(lst);
+//                }
+//            }
+//        }
 
         if (!type.equals(TYPE_DATE))
-            list = list.stream().filter(a -> a.getWindpowerstationId() != null || a.getProjectId() != null ||
-                    a.getLineId() != null || a.getWindturbineId() != null || a.getSquareId() != null ||
-                    a.getId() != null).collect(Collectors.toList());
-        for (ProEconEquipmentInfoDay1 i : list) {
-            WxsslVo vo = new WxsslVo();
+//            peeidls = peeidls.stream().filter(a -> a.getWindpowerstationId() != null || a.getProjectId() != null ||
+//                    a.getLineId() != null || a.getWindturbineId() != null || a.getSquareId() != null ||
+//                    a.getId() != null).collect(Collectors.toList());
+
+            for (List<ProEconEquipmentInfoDay1> peeidl : peeidls) {
+                for (ProEconEquipmentInfoDay1 i : peeidl) {
+                    WxsslVo vo = new WxsslVo();
+
+                    if (type.equals(TYPE_WIND)) {
+                        vo.setId(i.getWindpowerstationId());
+                        vo.setName(i.getWindturbineId());
+                        vo.setOrdernum(station.get(i.getWindpowerstationId()).doubleValue());
+                    } else if (type.equals(TYPE_PROJECT)) {
+                        vo.setId(i.getProjectId());
+                        vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getModelId());
+                        vo.setOrdernum(CacheContext.pjmap.get(i.getProjectId().trim()).getOrderNum().doubleValue());
+                    } else if (type.equals(TYPE_LINE)) {
+                        vo.setId(i.getLineId());
+                        vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getModelId());
+                        vo.setOrdernum(CacheContext.lnmap.get(i.getLineId().trim()).getOrderNum().doubleValue());
+                    } else if (type.equals(TYPE_WINDTURBINE)) {
+                        vo.setId(i.getWindturbineId());
+                        vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getModelId());
+                        vo.setOrdernum(CacheContext.wtmap.get(i.getWindturbineId().trim()).getOrderNum().doubleValue());
+                    } else if (type.equals(TYPE_SQUARE)) {
+                        vo.setId(i.getSquareId());
+                        vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getModelId());
+                        vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getOrderNum().doubleValue());
+                    } else if (type.equals(TYPE_COMPANY)) {
+                        vo.setId(i.getId());
+                        vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getAname());
+                        vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getOrderNum().doubleValue());
+                    }
 
-            if (type.equals(TYPE_WIND)) {
-                vo.setId(i.getWindpowerstationId());
-                vo.setName(CacheContext.wpmap.get(i.getWindpowerstationId().trim()).getAname());
-                vo.setOrdernum(station.get(i.getWindpowerstationId()).doubleValue());
-            } else if (type.equals(TYPE_PROJECT)) {
-                vo.setId(i.getProjectId());
-                vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getAname());
-                vo.setOrdernum(CacheContext.pjmap.get(i.getProjectId().trim()).getOrderNum().doubleValue());
-            } else if (type.equals(TYPE_LINE)) {
-                vo.setId(i.getLineId());
-                vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getAname());
-                vo.setOrdernum(CacheContext.lnmap.get(i.getLineId().trim()).getOrderNum().doubleValue());
-            } else if (type.equals(TYPE_WINDTURBINE)) {
-                vo.setId(i.getWindturbineId());
-                vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getModelId());
-                vo.setOrdernum(CacheContext.wtmap.get(i.getWindturbineId().trim()).getOrderNum().doubleValue());
-            } else if (type.equals(TYPE_SQUARE)) {
-                vo.setId(i.getSquareId());
-                vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getAname());
-                vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getOrderNum().doubleValue());
-            } else if (type.equals(TYPE_COMPANY)) {
-                vo.setId(i.getId());
-                vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getAname());
-                vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getOrderNum().doubleValue());
-            }
+                    vo.setDate(i.getRecordDate());
+                    vo.setFdl(DoubleUtils.keepPrecision(i.getRfdl() / 10000, 2));
+                    vo.setLlfdl(DoubleUtils.keepPrecision(i.getRllfdl() / 10000, 2));
+                    vo.setJxssdl(DoubleUtils.keepPrecision((i.getRjxssdl() + i.getRcnsljxssdl()) / 10000, 2));
+                    vo.setGzssdl(DoubleUtils.keepPrecision((i.getRgzssdl() + i.getRcnslgzssdl()) / 10000, 2));
+                    vo.setXdssdl(DoubleUtils.keepPrecision((i.getRxdtjssdl() + i.getRxdjclssdl()) / 10000, 2));
+                    vo.setSlssdl(DoubleUtils.keepPrecision((i.getRcwsltqssdl() + i.getRcwsldwssdl()) / 10000, 2));
+                    vo.setXnssdl(DoubleUtils.keepPrecision((i.getRdjssdl() + i.getRsdtjssdl() + i.getRqxjclssdl() + i.getRxnssdl()) / 10000, 2));
+                    vo.setZssdl(DoubleUtils.keepPrecision(vo.getGzssdl() + vo.getJxssdl() + vo.getXdssdl() + vo.getXnssdl() + vo.getSlssdl(), 2));
+                    vo.setFnlyl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getFdl() / vo.getLlfdl() * 100, 2) : 0);
+                    vo.setGzssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getGzssdl() / vo.getLlfdl() * 100, 2) : 0);
+                    vo.setJxssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getJxssdl() / vo.getLlfdl() * 100, 2) : 0);
+                    vo.setQfl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getXdssdl() / vo.getLlfdl() * 100, 2) : 0);
+                    vo.setXnssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getXnssdl() / vo.getLlfdl() * 100, 2) : 0);
+                    vo.setSlssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getSlssdl() / vo.getLlfdl() * 100, 2) : 0);
+                    resultList.add(vo);
+                }
 
-            vo.setDate(i.getRecordDate());
-            vo.setFdl(DoubleUtils.keepPrecision(i.getRfdl() / 10000, 2));
-            vo.setLlfdl(DoubleUtils.keepPrecision(i.getRllfdl() / 10000, 2));
-            vo.setJxssdl(DoubleUtils.keepPrecision((i.getRjxssdl() + i.getRcnsljxssdl()) / 10000, 2));
-            vo.setGzssdl(DoubleUtils.keepPrecision((i.getRgzssdl() + i.getRcnslgzssdl()) / 10000, 2));
-            vo.setXdssdl(DoubleUtils.keepPrecision((i.getRxdtjssdl() + i.getRxdjclssdl()) / 10000, 2));
-            vo.setSlssdl(DoubleUtils.keepPrecision((i.getRcwsltqssdl() + i.getRcwsldwssdl()) / 10000, 2));
-            vo.setXnssdl(DoubleUtils.keepPrecision((i.getRdjssdl() + i.getRsdtjssdl() + i.getRqxjclssdl() + i.getRxnssdl()) / 10000, 2));
-            vo.setZssdl(DoubleUtils.keepPrecision(vo.getGzssdl() + vo.getJxssdl() + vo.getXdssdl() + vo.getXnssdl() + vo.getSlssdl(), 2));
-            vo.setFnlyl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getFdl() / vo.getLlfdl() * 100, 2) : 0);
-            vo.setGzssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getGzssdl() / vo.getLlfdl() * 100, 2) : 0);
-            vo.setJxssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getJxssdl() / vo.getLlfdl() * 100, 2) : 0);
-            vo.setQfl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getXdssdl() / vo.getLlfdl() * 100, 2) : 0);
-            vo.setXnssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getXnssdl() / vo.getLlfdl() * 100, 2) : 0);
-            vo.setSlssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getSlssdl() / vo.getLlfdl() * 100, 2) : 0);
-            resultList.add(vo);
-        }
+            }
         SortUtils.sort(resultList, "llfdl", SortUtils.DESC);
         for (int i = 0; i < resultList.size(); i++) {
             resultList.get(i).setZhpm(i + 1);

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/goodness/WindturbinegoodnessService.java

@@ -1,19 +1,16 @@
 package com.gyee.runeconomy.service.goodness;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.common.util.DoubleUtils;
 import com.gyee.common.util.SortUtils;
 import com.gyee.common.vo.benchmark.DataVo;
-import com.gyee.common.vo.benchmark.WxsslVo;
 import com.gyee.common.vo.threerate.PvVo;
 import com.gyee.runeconomy.dto.EchartDataVo;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
-import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDay5Service;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDay6Service;
 import com.gyee.runeconomy.service.auto.IProEconWindturbineGoodnessService;
 import com.gyee.runeconomy.util.DateUtils;
@@ -54,7 +51,7 @@ public class WindturbinegoodnessService {
         //构造分页构造器
         Page<ProEconWindturbineGoodness> pageInfo = new Page<>(pageNum, pageSize);
         if (StringUtils.notEmp(type) && StringUtils.notEmp(recorddate)) {
-            Date date = DateUtils.parseDate(recorddate);
+                Date date = com.gyee.common.util.DateUtils.parseDate(recorddate);
 
             //构造条件构造器
             LambdaQueryWrapper<ProEconWindturbineGoodness> queryWrapper = new LambdaQueryWrapper<>();

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MatrixService.java

@@ -178,7 +178,7 @@ public class MatrixService {
                     });
                     ycgl.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getRealData(ycglPoint).getPointValueInDouble()));
+                            return new Double((double) (v + edosUtil.getHistMatrix(ycglPoint.getNemCode(),new Date().getTime()/1000).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -392,7 +392,7 @@ public class MatrixService {
                     });
                     ycgl.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getRealData(ycglPoint).getPointValueInDouble()));
+                            return new Double((double) (v + edosUtil.getHistMatrix(ycglPoint.getNemCode(),new Date().getTime()/1000).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -255,23 +255,25 @@ public class MonitorService {
                 fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
                 fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.LXTSMX).getNemCode());//离线台数
                 fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
-
-                List<PointData> fjztlist = edosUtil.getRealData(fjztls);
-
-                fd_gztjnum += fjztlist.get(0).getPointValueInDouble();
-                fd_gzcnslnum += fjztlist.get(1).getPointValueInDouble();
-                fd_jxtjnum += fjztlist.get(2).getPointValueInDouble();
-                fd_jxclslnum += fjztlist.get(3).getPointValueInDouble();
-                fd_dfnum += fjztlist.get(4).getPointValueInDouble();
-                fd_jclyxnum += fjztlist.get(5).getPointValueInDouble();
-                fd_sdtjnum += fjztlist.get(6).getPointValueInDouble();
-                fd_zcfdnum += fjztlist.get(7).getPointValueInDouble();
-                fd_tjnum += fjztlist.get(8).getPointValueInDouble();
-                fd_xdjclnum += fjztlist.get(9).getPointValueInDouble();
-                fd_sldwnum += fjztlist.get(10).getPointValueInDouble();
-                fd_slhjnum += fjztlist.get(11).getPointValueInDouble();
-                fd_lxnum += fjztlist.get(12).getPointValueInDouble();
-                fd_wznum += fjztlist.get(13).getPointValueInDouble();
+                fjztls=fjztls.stream().filter(a->a!=null).collect(Collectors.toList());
+              if (StringUtils.isNotEmpty(fjztls) ) {
+                  List<PointData> fjztlist = edosUtil.getRealData(fjztls);
+
+                  fd_gztjnum += fjztlist.get(0).getPointValueInDouble();
+                  fd_gzcnslnum += fjztlist.get(1).getPointValueInDouble();
+                  fd_jxtjnum += fjztlist.get(2).getPointValueInDouble();
+                  fd_jxclslnum += fjztlist.get(3).getPointValueInDouble();
+                  fd_dfnum += fjztlist.get(4).getPointValueInDouble();
+                  fd_jclyxnum += fjztlist.get(5).getPointValueInDouble();
+                  fd_sdtjnum += fjztlist.get(6).getPointValueInDouble();
+                  fd_zcfdnum += fjztlist.get(7).getPointValueInDouble();
+                  fd_tjnum += fjztlist.get(8).getPointValueInDouble();
+                  fd_xdjclnum += fjztlist.get(9).getPointValueInDouble();
+                  fd_sldwnum += fjztlist.get(10).getPointValueInDouble();
+                  fd_slhjnum += fjztlist.get(11).getPointValueInDouble();
+                  fd_lxnum += fjztlist.get(12).getPointValueInDouble();
+                  fd_wznum += fjztlist.get(13).getPointValueInDouble();
+              }
                 String str2 = null;
                 if (wpId.endsWith(QS)) {
                     String str = wpId;
@@ -293,24 +295,25 @@ public class MonitorService {
                 gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
                 gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.LXTSMX).getNemCode());//离线台数
                 gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
-
-                List<PointData> gfztlist = edosUtil.getRealData(gfztls);
-
-                gf_gztjnum += gfztlist.get(0).getPointValueInDouble();
-                gf_gzcnslnum += gfztlist.get(1).getPointValueInDouble();
-                gf_jxtjnum += gfztlist.get(2).getPointValueInDouble();
-                gf_jxclslnum += gfztlist.get(3).getPointValueInDouble();
-                gf_dfnum += gfztlist.get(4).getPointValueInDouble();
-                gf_jclyxnum += gfztlist.get(5).getPointValueInDouble();
-                gf_sdtjnum += gfztlist.get(6).getPointValueInDouble();
-                gf_zcfdnum += gfztlist.get(7).getPointValueInDouble();
-                gf_tjnum += gfztlist.get(8).getPointValueInDouble();
-                gf_xdjclnum += gfztlist.get(9).getPointValueInDouble();
-                gf_sldwnum += gfztlist.get(10).getPointValueInDouble();
-                gf_slhjnum += gfztlist.get(11).getPointValueInDouble();
-                gf_lxnum += gfztlist.get(12).getPointValueInDouble();
-                gf_wznum += gfztlist.get(13).getPointValueInDouble();
-
+                gfztls=gfztls.stream().filter(a->a!=null).collect(Collectors.toList());
+                if (StringUtils.isNotEmpty(gfztls) ) {
+                    List<PointData> gfztlist = edosUtil.getRealData(gfztls);
+
+                    gf_gztjnum += gfztlist.get(0).getPointValueInDouble();
+                    gf_gzcnslnum += gfztlist.get(1).getPointValueInDouble();
+                    gf_jxtjnum += gfztlist.get(2).getPointValueInDouble();
+                    gf_jxclslnum += gfztlist.get(3).getPointValueInDouble();
+                    gf_dfnum += gfztlist.get(4).getPointValueInDouble();
+                    gf_jclyxnum += gfztlist.get(5).getPointValueInDouble();
+                    gf_sdtjnum += gfztlist.get(6).getPointValueInDouble();
+                    gf_zcfdnum += gfztlist.get(7).getPointValueInDouble();
+                    gf_tjnum += gfztlist.get(8).getPointValueInDouble();
+                    gf_xdjclnum += gfztlist.get(9).getPointValueInDouble();
+                    gf_sldwnum += gfztlist.get(10).getPointValueInDouble();
+                    gf_slhjnum += gfztlist.get(11).getPointValueInDouble();
+                    gf_lxnum += gfztlist.get(12).getPointValueInDouble();
+                    gf_wznum += gfztlist.get(13).getPointValueInDouble();
+                }
             } else {
                 for (ProBasicPowerstation wp : wplist) {
 
@@ -334,23 +337,25 @@ public class MonitorService {
                             fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
                             fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.LXTSMX).getNemCode());//离线台数
                             fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
-
-                            List<PointData> fjztlist = edosUtil.getRealData(fjztls);
-
-                            fd_gztjnum += fjztlist.get(0).getPointValueInDouble();
-                            fd_gzcnslnum += fjztlist.get(1).getPointValueInDouble();
-                            fd_jxtjnum += fjztlist.get(2).getPointValueInDouble();
-                            fd_jxclslnum += fjztlist.get(3).getPointValueInDouble();
-                            fd_dfnum += fjztlist.get(4).getPointValueInDouble();
-                            fd_jclyxnum += fjztlist.get(5).getPointValueInDouble();
-                            fd_sdtjnum += fjztlist.get(6).getPointValueInDouble();
-                            fd_zcfdnum += fjztlist.get(7).getPointValueInDouble();
-                            fd_tjnum += fjztlist.get(8).getPointValueInDouble();
-                            fd_xdjclnum += fjztlist.get(9).getPointValueInDouble();
-                            fd_sldwnum += fjztlist.get(10).getPointValueInDouble();
-                            fd_slhjnum += fjztlist.get(11).getPointValueInDouble();
-                            fd_lxnum += fjztlist.get(12).getPointValueInDouble();
-                            fd_wznum += fjztlist.get(13).getPointValueInDouble();
+                            fjztls = fjztls.stream().filter(a -> a != null).collect(Collectors.toList());
+                            if (StringUtils.isNotEmpty(fjztls)) {
+                                List<PointData> fjztlist = edosUtil.getRealData(fjztls);
+
+                                fd_gztjnum += fjztlist.get(0).getPointValueInDouble();
+                                fd_gzcnslnum += fjztlist.get(1).getPointValueInDouble();
+                                fd_jxtjnum += fjztlist.get(2).getPointValueInDouble();
+                                fd_jxclslnum += fjztlist.get(3).getPointValueInDouble();
+                                fd_dfnum += fjztlist.get(4).getPointValueInDouble();
+                                fd_jclyxnum += fjztlist.get(5).getPointValueInDouble();
+                                fd_sdtjnum += fjztlist.get(6).getPointValueInDouble();
+                                fd_zcfdnum += fjztlist.get(7).getPointValueInDouble();
+                                fd_tjnum += fjztlist.get(8).getPointValueInDouble();
+                                fd_xdjclnum += fjztlist.get(9).getPointValueInDouble();
+                                fd_sldwnum += fjztlist.get(10).getPointValueInDouble();
+                                fd_slhjnum += fjztlist.get(11).getPointValueInDouble();
+                                fd_lxnum += fjztlist.get(12).getPointValueInDouble();
+                                fd_wznum += fjztlist.get(13).getPointValueInDouble();
+                            }
                         }
 
                     } else if (wp.getId().endsWith("GDC_STA") && CacheContext.wpmapls.containsKey(wp.getId())) {
@@ -370,23 +375,25 @@ public class MonitorService {
                             gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
                             gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.LXTSMX).getNemCode());//离线台数
                             gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
-
-                            List<PointData> gfztlist = edosUtil.getRealData(gfztls);
-
-                            gf_gztjnum += gfztlist.get(0).getPointValueInDouble();
-                            gf_gzcnslnum += gfztlist.get(1).getPointValueInDouble();
-                            gf_jxtjnum += gfztlist.get(2).getPointValueInDouble();
-                            gf_jxclslnum += gfztlist.get(3).getPointValueInDouble();
-                            gf_dfnum += gfztlist.get(4).getPointValueInDouble();
-                            gf_jclyxnum += gfztlist.get(5).getPointValueInDouble();
-                            gf_sdtjnum += gfztlist.get(6).getPointValueInDouble();
-                            gf_zcfdnum += gfztlist.get(7).getPointValueInDouble();
-                            gf_tjnum += gfztlist.get(8).getPointValueInDouble();
-                            gf_xdjclnum += gfztlist.get(9).getPointValueInDouble();
-                            gf_sldwnum += gfztlist.get(10).getPointValueInDouble();
-                            gf_slhjnum += gfztlist.get(11).getPointValueInDouble();
-                            gf_lxnum += gfztlist.get(12).getPointValueInDouble();
-                            gf_wznum += gfztlist.get(13).getPointValueInDouble();
+                            gfztls = gfztls.stream().filter(a -> a != null).collect(Collectors.toList());
+                            if (StringUtils.isNotEmpty(gfztls)) {
+                                List<PointData> gfztlist = edosUtil.getRealData(gfztls);
+
+                                gf_gztjnum += gfztlist.get(0).getPointValueInDouble();
+                                gf_gzcnslnum += gfztlist.get(1).getPointValueInDouble();
+                                gf_jxtjnum += gfztlist.get(2).getPointValueInDouble();
+                                gf_jxclslnum += gfztlist.get(3).getPointValueInDouble();
+                                gf_dfnum += gfztlist.get(4).getPointValueInDouble();
+                                gf_jclyxnum += gfztlist.get(5).getPointValueInDouble();
+                                gf_sdtjnum += gfztlist.get(6).getPointValueInDouble();
+                                gf_zcfdnum += gfztlist.get(7).getPointValueInDouble();
+                                gf_tjnum += gfztlist.get(8).getPointValueInDouble();
+                                gf_xdjclnum += gfztlist.get(9).getPointValueInDouble();
+                                gf_sldwnum += gfztlist.get(10).getPointValueInDouble();
+                                gf_slhjnum += gfztlist.get(11).getPointValueInDouble();
+                                gf_lxnum += gfztlist.get(12).getPointValueInDouble();
+                                gf_wznum += gfztlist.get(13).getPointValueInDouble();
+                            }
                         }
                     }
                 }
@@ -761,56 +768,56 @@ public class MonitorService {
 
             for (ProBasicRegion reg : wpls) {
                 if (reg.getOrderNum().equals(1)) {
-                    sxcyfdcsl = reg.getWindNumber();
-                    sxcyfdzjrl = reg.getWindCapacity();
-                    sxcygfcsl = reg.getNumber();
-                    sxcygfzjrl = reg.getCapacity();
-
-                    sxgsfdcsl = reg.getJrWindNumber();
-                    sxgsfdzjrl = reg.getJrwindCapacity();
-                    sxgsgfcsl = reg.getJrNumber();
-                    sxgsgfzjrl = reg.getJrCapacity();
+                    sxcyfdcsl = reg.getWindNumber()!= null ? reg.getWindNumber() : 0;
+                    sxcyfdzjrl = reg.getWindCapacity() != null ? reg.getWindCapacity() : 0;
+                    sxcygfcsl = reg.getNumber()!= null ? reg.getNumber() : 0;
+                    sxcygfzjrl = reg.getCapacity() != null ? reg.getCapacity() : 0;
+
+                    sxgsfdcsl = reg.getJrWindNumber() != null ? reg.getJrWindNumber() : 0;
+                    sxgsfdzjrl = reg.getJrwindCapacity() != null ? reg.getJrwindCapacity() : 0;
+                    sxgsgfcsl = reg.getJrNumber() != null ? reg.getJrNumber() : 0;
+                    sxgsgfzjrl = reg.getJrCapacity() != null ? reg.getJrCapacity() : 0;
                 }
                 if (reg.getOrderNum().equals(4)) {
-                    hbcyfdcsl = reg.getWindNumber();
-                    hbcyfdzjrl = reg.getWindCapacity();
-                    hbcygfcsl = reg.getNumber();
-                    hbcygfzjrl = reg.getCapacity();
+                    hbcyfdcsl = reg.getWindNumber() != null ? reg.getWindNumber() : 0;
+                    hbcyfdzjrl = reg.getWindCapacity() != null ? reg.getWindCapacity() : 0;
+                    hbcygfcsl = reg.getNumber() != null ? reg.getNumber() : 0;
+                    hbcygfzjrl = reg.getCapacity() != null ? reg.getCapacity() : 0;
                 }
                 if (reg.getOrderNum().equals(3)) {
-                    xscyfdcsl = reg.getWindNumber();
-                    xscyfdzjrl = reg.getWindCapacity();
-                    xscygfcsl = reg.getNumber();
-                    xscygfzjrl = reg.getCapacity();
+                    xscyfdcsl = reg.getWindNumber() != null ? reg.getWindNumber() : 0;
+                    xscyfdzjrl = reg.getWindCapacity() != null ? reg.getWindCapacity() : 0;
+                    xscygfcsl = reg.getNumber() != null ? reg.getNumber() : 0;
+                    xscygfzjrl = reg.getCapacity() != null ? reg.getCapacity() : 0;
                 }
                 if (reg.getOrderNum().equals(5)) {
-                    sdcyfdcsl = reg.getWindNumber();
-                    sdcyfdzjrl = reg.getWindCapacity();
-                    sdcygfcsl = reg.getNumber();
-                    sdcygfzjrl = reg.getCapacity();
+                    sdcyfdcsl = reg.getWindNumber() != null ? reg.getWindNumber() : 0;
+                    sdcyfdzjrl = reg.getWindCapacity() != null ? reg.getWindCapacity() : 0;
+                    sdcygfcsl = reg.getNumber() != null ? reg.getNumber() : 0;
+                    sdcygfzjrl = reg.getCapacity() != null ? reg.getCapacity() : 0;
                 }
                 if (reg.getOrderNum().equals(6)) {
-                    xzcyfdcsl = reg.getWindNumber();
-                    xzcyfdzjrl = reg.getWindCapacity();
-                    xzcygfcsl = reg.getNumber();
-                    xzcygfzjrl = reg.getCapacity();
+                    xzcyfdcsl = reg.getWindNumber() != null ? reg.getWindNumber() : 0;
+                    xzcyfdzjrl = reg.getWindCapacity() != null ? reg.getWindCapacity() : 0;
+                    xzcygfcsl = reg.getNumber() != null ? reg.getNumber() : 0;
+                    xzcygfzjrl = reg.getCapacity() != null ? reg.getCapacity() : 0;
                 }
                 if (reg.getOrderNum().equals(2)) {
-                    nmcyfdcsl = reg.getWindNumber();
-                    nmcyfdzjrl = reg.getWindCapacity();
-                    nmcygfcsl = reg.getNumber();
-                    nmcygfzjrl = reg.getCapacity();
-
-                    nmgsfdcsl = reg.getJrWindNumber();
-                    nmgsfdzjrl = reg.getJrwindCapacity();
-                    nmgsgfcsl = reg.getJrNumber();
-                    nmgsgfzjrl = reg.getJrCapacity();
+                    sxcygfcsl = reg.getNumber() != null ? reg.getNumber() : 0;
+                    nmcyfdzjrl = reg.getWindCapacity() != null ? reg.getWindCapacity() : 0;
+                    nmcygfcsl = reg.getNumber() != null ? reg.getNumber() : 0;
+                    nmcygfzjrl = reg.getCapacity() != null ? reg.getCapacity() : 0;
+
+                    nmgsfdcsl = reg.getJrWindNumber() != null ? reg.getJrWindNumber() : 0;
+                    nmgsfdzjrl = reg.getJrwindCapacity() != null ? reg.getJrwindCapacity() : 0;
+                    nmgsgfcsl = reg.getJrNumber() != null ? reg.getJrNumber() : 0;
+                    nmgsgfzjrl = reg.getJrCapacity() != null ? reg.getJrCapacity() : 0;
                 }
                 if (reg.getOrderNum().equals(7)) {
-                    xjcyfdcsl = reg.getWindNumber();
-                    xjcyfdzjrl = reg.getWindCapacity();
-                    xjcygfcsl = reg.getNumber();
-                    xjcygfzjrl = reg.getCapacity();
+                    xjcyfdcsl = reg.getWindNumber() != null ? reg.getWindNumber() : 0;
+                    xjcyfdzjrl = reg.getWindCapacity() != null ? reg.getWindCapacity() : 0;
+                    xjcygfcsl = reg.getNumber() != null ? reg.getNumber() : 0;
+                    xjcygfzjrl = reg.getCapacity() != null ? reg.getCapacity() : 0;
                 }
 
             }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/StationMonitorService.java

@@ -16,6 +16,8 @@ import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -139,9 +141,15 @@ public class StationMonitorService {
         resultMap.put("lxts",realData.get(18).getPointValueInDouble());
         resultMap.put("zclxts",realData.get(19).getPointValueInDouble());
         resultMap.put("wzlxts",realData.get(20).getPointValueInDouble());
-        resultMap.put("rfdl",realData.get(21).getPointValueInDouble());
-        resultMap.put("yfdl",realData.get(22).getPointValueInDouble());
-        resultMap.put("nfdl",realData.get(23).getPointValueInDouble());
+        double rfdl=realData.get(21).getPointValueInDouble();
+        rfdl = new BigDecimal(rfdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("rfdl",rfdl);
+        double yfdl=realData.get(22).getPointValueInDouble();
+        yfdl = new BigDecimal(yfdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("yfdl",yfdl);
+        double nfdl=realData.get(23).getPointValueInDouble();
+        nfdl = new BigDecimal(nfdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("nfdl",nfdl);
         resultMap.put("sspjfsgzd",realData.get(24).getPointValueInDouble());
         resultMap.put("yggl",realData.get(25).getPointValueInDouble());
         resultMap.put("fhl",(proBasicPowerstation.getJrwindCapacity()+proBasicPowerstation.getJrCapacity())!=0?realData.get(25).getPointValueInDouble()/(proBasicPowerstation.getJrwindCapacity()+proBasicPowerstation.getJrCapacity())*100:0);
@@ -149,23 +157,53 @@ public class StationMonitorService {
         resultMap.put("nlyxs",realData.get(27).getPointValueInDouble());
         resultMap.put("yfgnlyl",realData.get(28).getPointValueInDouble());
         resultMap.put("ysbklyl",realData.get(29).getPointValueInDouble());
-        resultMap.put("rgzssdl",realData.get(30).getPointValueInDouble()+realData.get(31).getPointValueInDouble());
-        resultMap.put("rwhssdl",realData.get(32).getPointValueInDouble()+realData.get(33).getPointValueInDouble());
-        resultMap.put("rxnssdl",realData.get(34).getPointValueInDouble()+realData.get(35).getPointValueInDouble()+realData.get(36).getPointValueInDouble()+realData.get(37).getPointValueInDouble());
-        resultMap.put("rxdssdl",realData.get(38).getPointValueInDouble()+realData.get(39).getPointValueInDouble());
-        resultMap.put("rslssdl",realData.get(40).getPointValueInDouble()+realData.get(41).getPointValueInDouble());
+        double rgzssdl=realData.get(30).getPointValueInDouble()+realData.get(31).getPointValueInDouble();
+        rgzssdl = new BigDecimal(rgzssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("rgzssdl",rgzssdl);
+        double rwhssdl=realData.get(32).getPointValueInDouble()+realData.get(33).getPointValueInDouble();
+        rwhssdl = new BigDecimal(rwhssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("rwhssdl",rwhssdl);
+        double rxnssdl=realData.get(34).getPointValueInDouble()+realData.get(35).getPointValueInDouble()+realData.get(36).getPointValueInDouble()+realData.get(37).getPointValueInDouble();
+        rxnssdl = new BigDecimal(rxnssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("rxnssdl",rxnssdl);
+        double rxdssdl=realData.get(38).getPointValueInDouble()+realData.get(39).getPointValueInDouble();
+        rxdssdl = new BigDecimal(rxdssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("rxdssdl",rxdssdl);
+        double rslssdl=realData.get(40).getPointValueInDouble()+realData.get(41).getPointValueInDouble();
+        rslssdl = new BigDecimal(rslssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("rslssdl",rslssdl);
 
-        resultMap.put("ygzssdl",realData.get(42).getPointValueInDouble()+realData.get(43).getPointValueInDouble());
-        resultMap.put("ywhssdl",realData.get(44).getPointValueInDouble()+realData.get(45).getPointValueInDouble());
-        resultMap.put("yxnssdl",realData.get(46).getPointValueInDouble()+realData.get(47).getPointValueInDouble()+realData.get(48).getPointValueInDouble()+realData.get(49).getPointValueInDouble());
-        resultMap.put("yxdssdl",realData.get(50).getPointValueInDouble()+realData.get(51).getPointValueInDouble());
-        resultMap.put("yslssdl",realData.get(52).getPointValueInDouble()+realData.get(53).getPointValueInDouble());
+        double ygzssdl=realData.get(42).getPointValueInDouble()+realData.get(43).getPointValueInDouble();
+        ygzssdl = new BigDecimal(ygzssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("ygzssdl",ygzssdl);
+        double ywhssdl=realData.get(44).getPointValueInDouble()+realData.get(45).getPointValueInDouble();
+        ywhssdl = new BigDecimal(ywhssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("ywhssdl",ywhssdl);
+        double yxnssdl=realData.get(46).getPointValueInDouble()+realData.get(47).getPointValueInDouble()+realData.get(48).getPointValueInDouble()+realData.get(49).getPointValueInDouble();
+        yxnssdl = new BigDecimal(yxnssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("yxnssdl",yxnssdl);
+        double yxdssdl=realData.get(50).getPointValueInDouble()+realData.get(51).getPointValueInDouble();
+        yxdssdl = new BigDecimal(yxdssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("yxdssdl",yxdssdl);
+        double yslssdl=realData.get(52).getPointValueInDouble()+realData.get(53).getPointValueInDouble();
+        yslssdl = new BigDecimal(yslssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("yslssdl",yslssdl);
 
-        resultMap.put("ngzssdl",realData.get(54).getPointValueInDouble()+realData.get(55).getPointValueInDouble());
-        resultMap.put("nwhssdl",realData.get(56).getPointValueInDouble()+realData.get(57).getPointValueInDouble());
-        resultMap.put("nxnssdl",realData.get(58).getPointValueInDouble()+realData.get(59).getPointValueInDouble()+realData.get(60).getPointValueInDouble()+realData.get(61).getPointValueInDouble());
-        resultMap.put("nxdssdl",realData.get(62).getPointValueInDouble()+realData.get(63).getPointValueInDouble());
-        resultMap.put("nslssdl",realData.get(64).getPointValueInDouble()+realData.get(65).getPointValueInDouble());
+        double ngzssdl=realData.get(54).getPointValueInDouble()+realData.get(55).getPointValueInDouble();
+        ngzssdl = new BigDecimal(ngzssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("ngzssdl",ngzssdl);
+        double nwhssdl=realData.get(56).getPointValueInDouble()+realData.get(57).getPointValueInDouble();
+        nwhssdl = new BigDecimal(nwhssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("nwhssdl",nwhssdl);
+        double nxnssdl=realData.get(58).getPointValueInDouble()+realData.get(59).getPointValueInDouble()+realData.get(60).getPointValueInDouble()+realData.get(61).getPointValueInDouble();
+        nxnssdl = new BigDecimal(nxnssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("nxnssdl",nxnssdl);
+        double nxdssdl=realData.get(62).getPointValueInDouble()+realData.get(63).getPointValueInDouble();
+        nxdssdl = new BigDecimal(nxdssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("nxdssdl",nxdssdl);
+        double nslssdl=realData.get(64).getPointValueInDouble()+realData.get(65).getPointValueInDouble();
+        nslssdl = new BigDecimal(nslssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+        resultMap.put("nslssdl",nslssdl);
 
         resultMap.put("aqts",realData.get(66).getPointValueInDouble());
         resultMap.put("czmc",proBasicPowerstation.getAname());