预测功率取值调整

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

@@ -580,6 +580,49 @@ public class MatrixService {
         wpPoints.add(pointMap.get(ContantXk.ZYCGL).getNemCode());
 
         List<PointData> realData = edosUtil.getRealData(wpPoints);
+
+
+        //预测功率取值
+//        List<ProBasicPowerstation> collect = CacheContext.wpls.stream().filter(cc -> wpId.equals(cc.getId())).collect(Collectors.toList());
+        QueryWrapper<ProBasicPowerPoint> qw1 = new QueryWrapper<>();
+        List<ProBasicPowerPoint> powerls = new ArrayList<>();
+        List<ProBasicPowerPoint> qyls = null;
+        List<ProBasicProject> qcls = null;
+        powerls = powerPointService.getBaseMapper().selectList(qw1);
+
+        qyls = powerls.stream().filter(c-> c.getWindpowerstationId().equals(powerstation.getId())).collect(Collectors.toList());
+
+        if (qyls.isEmpty() || qyls.size()<=0){
+            qcls = CacheContext.pjls.stream().filter(p->powerstation.getId().equals(p.getWindpowerstationId())).collect(Collectors.toList());
+            for (ProBasicProject p : qcls) {
+                for (ProBasicPowerPoint a : powerls)
+                {
+                    if (a.getWindpowerstationId().equals(p.getId())){
+                        qyls.add(a);
+                    }
+                }
+            }
+        }
+
+        ProBasicPowerstationPoint ycglcd = null;
+        double ycgl = 0.0;
+        double sum = 0.0;
+        for (ProBasicPowerPoint pp: qyls){
+
+            if (powerstation.getId().contains("MLJ_FDC_STA") || powerstation.getId().contains("FS_GDC_STA"))continue;
+            ycglcd = proBasicPowerstationPointService.getPowerstationPoint(pp.getWindpowerstationId(), ContantXk.GLYC);
+
+            double aDouble = 0.0;
+            try {
+                aDouble = edosUtil.getHistMatrix(ycglcd.getNemCode(), new Date().getTime() / 1000).getPointValueInDouble();
+                ycgl = (aDouble + sum);
+                sum += aDouble;
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+
         resultMap.put("wpid", powerstation.getId());
         resultMap.put("wpname", powerstation.getAname());
         resultMap.put("jrts", powerstation.getJrquantityJz() + powerstation.getJrquantityZc() + powerstation.getJrwindQuantityLd() + powerstation.getJrwindQuantityHs());
@@ -615,7 +658,7 @@ public class MatrixService {
         resultMap.put("bzgl", realData.get(15).getPointValueInDouble());
         resultMap.put("llgl", realData.get(16).getPointValueInDouble());
         resultMap.put("sjgl", realData.get(17).getPointValueInDouble());
-        resultMap.put("ycgl", realData.get(18).getPointValueInDouble());
+        resultMap.put("ycgl", ycgl);
         AtomicReference<Double> cxgl = new AtomicReference<>((double) 0);
         AtomicReference<Double> agc = new AtomicReference<>((double) 0);
         List<ProBasicSubStation> subStations = subwpls.stream().filter(sub -> sub.getWindpowerstationId().equals(powerstation.getId())).collect(Collectors.toList());

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

@@ -8,6 +8,7 @@ import com.gyee.runeconomy.dto.EquipmentJzVo;
 import com.gyee.runeconomy.dto.EquipmentZcVo;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.service.auto.IProBasicPowerPointService;
 import com.gyee.runeconomy.service.auto.impl.ProBasicEquipmentPointServiceImpl;
 import com.gyee.runeconomy.service.auto.impl.ProBasicPowerstationPointServiceImpl;
 import com.gyee.runeconomy.service.auto.impl.ProBasicSquareServiceImpl;
@@ -34,6 +35,9 @@ public class PhotovoltaicmatrixService {
     private ProBasicSquareServiceImpl proBasicSquareService;
 
 
+    @Resource
+    private IProBasicPowerPointService powerPointService;
+
     public Map getcockpit(String wpId, String type) throws Exception {
         Map<String, Object> map = new HashMap<>();
         List<ProBasicPowerstation> wpls = CacheContext.wplsG;
@@ -132,9 +136,9 @@ public class PhotovoltaicmatrixService {
 
                                 vo.setName(wt.getAname());
                                 vo.setId(wt.getId());
-//                                vo.setJldl(MathUtil.twoBit(jzjldl));
-//                                vo.setJldy(MathUtil.twoBit(jzjldy));
-//                                vo.setSsgl(MathUtil.twoBit(ssgl));
+                                vo.setJldl(MathUtil.twoBit(jzjldl));
+                                vo.setJldy(MathUtil.twoBit(jzjldy));
+                                vo.setSsgl(MathUtil.twoBit(ssgl));
                                 vo.setYxzt(MathUtil.twoBit(jzmxzt));
                                 jzlisttemp.add(vo);
                             }
@@ -142,7 +146,7 @@ public class PhotovoltaicmatrixService {
                         jzmap.put(jz.getAname(), jzlisttemp);
                     }
 
-                    qtsjmap.put("zjsl", wp.getJrquantityJz());
+                    qtsjmap.put("zjsl", wp.getJrquantityJz() + wp.getJrquantityZc());
                     qtsjmap.put("czmc", wp.getName());
                     qtsjmap.put("czid", wp.getId());
                     map.put("jzzqsl", sqls.size());
@@ -169,9 +173,9 @@ public class PhotovoltaicmatrixService {
 
                                 vo.setName(wt.getAname());
                                 vo.setId(wt.getId());
-//                                vo.setJldl(MathUtil.twoBit(zcjldl));
-//                                vo.setJldy(MathUtil.twoBit(zcjldy));
-//                                vo.setSsgl(MathUtil.twoBit(ssgl));
+                                vo.setJldl(MathUtil.twoBit(zcjldl));
+                                vo.setJldy(MathUtil.twoBit(zcjldy));
+                                vo.setSsgl(MathUtil.twoBit(ssgl));
                                 vo.setYxzt(MathUtil.twoBit(zcmxzt));
                                 zclist.add(vo);
 //                                totalRfdl += zcrfdl;
@@ -181,7 +185,7 @@ public class PhotovoltaicmatrixService {
                         }
                         zcmap.put(zc.getAname(), zclist);
                     }
-                    qtsjmap.put("zjsl", wp.getJrquantityJz());
+                    qtsjmap.put("zjsl", wp.getJrquantityJz() + wp.getJrquantityZc());
                     qtsjmap.put("czmc", wp.getName());
                     qtsjmap.put("czid", wp.getId());
                     map.put("zczqsl", sqls.size());
@@ -210,8 +214,50 @@ public class PhotovoltaicmatrixService {
         gzqd = edosUtil.getRealData(gzqdvalue).getPointValueInDouble();
         ProBasicPowerstationPoint bzglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZBZGL);
         bzgl = edosUtil.getRealData(bzglvalue).getPointValueInDouble();
-        ProBasicPowerstationPoint ycglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZNHGLZS);
-        ycgl = edosUtil.getRealData(ycglvalue).getPointValueInDouble();
+//        ProBasicPowerstationPoint ycglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZNHGLZS);
+//        ycgl = edosUtil.getRealData(ycglvalue).getPointValueInDouble();
+
+
+        //预测功率取值
+        List<ProBasicPowerstation> collect = CacheContext.wpls.stream().filter(cc -> wpId.equals(cc.getId())).collect(Collectors.toList());
+        QueryWrapper<ProBasicPowerPoint> qw1 = new QueryWrapper<>();
+        List<ProBasicPowerPoint> powerls = new ArrayList<>();
+        List<ProBasicPowerPoint> qyls = null;
+        List<ProBasicProject> qcls = null;
+        powerls = powerPointService.getBaseMapper().selectList(qw1);
+
+        qyls = powerls.stream().filter(c-> c.getWindpowerstationId().equals(collect.get(0).getId())).collect(Collectors.toList());
+
+        if (qyls.isEmpty() || qyls.size()<=0){
+            qcls = CacheContext.pjls.stream().filter(p->collect.get(0).getId().equals(p.getWindpowerstationId())).collect(Collectors.toList());
+            for (ProBasicProject p : qcls) {
+                for (ProBasicPowerPoint a : powerls)
+                {
+                    if (a.getWindpowerstationId().equals(p.getId())){
+                        qyls.add(a);
+                    }
+                }
+            }
+        }
+
+        ProBasicPowerstationPoint ycglcd = null;
+
+        double sum = 0.0;
+        for (ProBasicPowerPoint pp: qyls){
+
+            if (collect.get(0).getId().contains("MLJ_FDC_STA") ||collect.get(0).getId().contains("FS_GDC_STA"))continue;
+            ycglcd = proBasicPowerstationPointService.getPowerstationPoint(pp.getWindpowerstationId(), ContantXk.GLYC);
+
+            double aDouble = 0.0;
+            try {
+                aDouble = edosUtil.getHistMatrix(ycglcd.getNemCode(), new Date().getTime() / 1000).getPointValueInDouble();
+                ycgl = (aDouble + sum);
+                sum += aDouble;
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
         ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
         sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble();