计算服务开发

common/src/main/java/com/gyee/common/contant/ContantXk.java

@@ -18,6 +18,7 @@ public class ContantXk {
     public static final String  SSZLLGL= "SSZLLGL";//场站实时总理论功率
     public static final String  SSZBZGL= "SSZBZGL";//场站实时总保证功率
     public static final String  SSZNHGLZS= "SSZNHGLZS";//场站实时总拟合功率(自算)
+    public static final String  ZYCGL = "ZYCGL";   //总预测功率
     public static final String  SSZZYGL= "SSZZYGL";//场站实时总最优功率
     public static final String  SSZKYGL= "SSZKYGL";//场站实时总可用功率
     public static final String  RPJGL= "RPJGL";//日平均功率
@@ -192,7 +193,19 @@ public class ContantXk {
     public static final String INTERRUPTIONGF ="AIG013,AIG017,AIG009,AIG006";
 
 
-    public static final String QCZT = "QCZT";
+    public static final String QCZT = "QCZT";  //全场状态
+
+    public static final String JYM = "JYM";
+    public static final String JYS = "JYS";
+    public static final String JYEYHT = "CO2";
+    public static final String JYEYHL = "SO2";
+    public static final String RLYXS = "RLYXS";
+    public static final String YLYXS = "YLYXS";
+    public static final String NLYXS = "NLYXS";
+    public static final String SBKLYL = "SBKLYL";
+    public static final String DXKYXS = "DXKYXS";
+    public static final String FNLYL = "FNLYL";
+
 
 
 

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

@@ -27,7 +27,7 @@ public class AccessStatusService {
     private String second;
 
     /**
-     * 场站接入状态
+     * 场站接入状态,总预测功率
      * @throws Exception
      */
     public void accessStatus() throws Exception {
@@ -51,14 +51,30 @@ public class AccessStatusService {
             ProBasicPowerstationPoint sbjrpoint = powerstationPointMap.get(ContantXk.SBJRZT);
 
             ProBasicPowerstationPoint qcztPoint = powerstationPointMap.get(ContantXk.QCZT);
+
+            ProBasicPowerstationPoint zycglpoint = powerstationPointMap.get(ContantXk.ZYCGL);
             double djlzt = 0;
             double fjzt = 0;
             double agczt = 0;
             double glyczt = 0;
             double cftzt = 0;
+
+            double zycgl = 0;
             Optional<ProBasicMeterPoint> swdlOptional = meterpoints.stream().filter(me -> me.getUniformCode().equals("ZXYG") && me.getMeterType().equals("出线") && me.getMeterSort().equals("主")).findFirst();
             Optional<ProBasicSubStation> subStationOptional = subwpls.stream().filter(sub -> sub.getWindpowerstationId().equals(wp.getId())).findFirst();
             Optional<ProBasicWeatherStation> wsOptional = wswpls.stream().filter(ws -> ws.getWindpowerstationId().equals(wp.getId())).findFirst();
+            List<ProBasicSubStation> stations = subwpls.stream().filter(sub -> sub.getWindpowerstationId().equals(wp.getId())).collect(Collectors.toList());
+            List<String> pointList = new ArrayList<>();
+            stations.stream().forEach(station->{
+                pointList.add(subwppointmap.get(station.getId()).get(ContantXk.TPOINT_WP_YCGL).getNemCode());
+            });
+            try {
+                zycgl = edosUtil.getRealData(pointList).stream().mapToDouble(PointData::getPointValueInDouble).sum();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+
             try {
                 double qczt = edosUtil.getSectionData(qcztPoint, currentDate.getTime()).getPointValueInDouble();
                 if (qczt == 6){
@@ -112,6 +128,7 @@ public class AccessStatusService {
                     e.printStackTrace();
                 }
             }
+            resultList.add(PointUtil.createPointData(currentDate,zycgl,zycglpoint.getNemCode(),zycglpoint.getName()));
             resultList.add(PointUtil.createPointData(currentDate,djlzt,djlpoint.getNemCode(),djlpoint.getName()));
             resultList.add(PointUtil.createPointData(currentDate,agczt,agcpoint.getNemCode(),agcpoint.getName()));
             resultList.add(PointUtil.createPointData(currentDate,glyczt,glycpoint.getNemCode(),glycpoint.getName()));

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

@@ -0,0 +1,120 @@
+package com.gyee.generation.service.realtimelibrary;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.ProBasicPowerstation;
+import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
+import com.gyee.generation.model.auto.ProEconPowerstationInfoDay2;
+import com.gyee.generation.service.auto.IProEconPowerstationInfoDay2Service;
+import com.gyee.generation.util.PointUtil;
+import com.gyee.generation.util.realtimesource.EdosUtil;
+import com.gyee.generation.util.realtimesource.IEdosUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.smartcardio.CardChannel;
+import java.util.*;
+
+/*
+@author   谢生杰
+@date   2022/12/2-9:49
+后增加计算指标
+*/
+@Service
+public class CalculationService {
+    @Resource
+    private IEdosUtil edosUtil;
+    @Resource
+    private IProEconPowerstationInfoDay2Service proEconPowerstationInfoDay2Service;
+
+    public void calWp() throws Exception {
+
+        List<PointData> resultList = new ArrayList<>();
+
+        List<ProBasicPowerstation> wpls = CacheContext.wpls;
+        Map<String, Map<String, ProBasicPowerstationPoint>> wppointmap = CacheContext.wppointmap;
+        Date currentDate = DateUtils.getCurrentDate();
+        Date monthFirst = DateUtils.getMonthFirst(currentDate);
+        double hoursDiff = DateUtils.hoursDiff2(currentDate, monthFirst);
+
+        String toDate1 = DateUtils.toDate1(currentDate);
+        Map<String,ProEconPowerstationInfoDay2> tempMap = new HashMap<>();
+        QueryWrapper<ProEconPowerstationInfoDay2> qw = new QueryWrapper<>();
+        qw.eq("record_date",toDate1);
+        List<ProEconPowerstationInfoDay2> powerstationInfoDay2s = proEconPowerstationInfoDay2Service.list(qw);
+        powerstationInfoDay2s.stream().forEach(info->{
+            tempMap.put(info.getForeignKeyId(),info);
+        });
+
+        wpls.stream().forEach(wp->{
+            Map<String, ProBasicPowerstationPoint> powerstationPointMap = wppointmap.get(wp.getId());
+            ProBasicPowerstationPoint rfdlPoint = powerstationPointMap.get(ContantXk.RFDL);
+            ProBasicPowerstationPoint nfdlPoint = powerstationPointMap.get(ContantXk.NFDL);
+            ProBasicPowerstationPoint yfdlPoint = powerstationPointMap.get(ContantXk.YFDL);
+            ProBasicPowerstationPoint yllfdlPoint = powerstationPointMap.get(ContantXk.YLLFDL);
+
+            ProBasicPowerstationPoint jymPoint = powerstationPointMap.get(ContantXk.JYM);
+            ProBasicPowerstationPoint jysPoint = powerstationPointMap.get(ContantXk.JYS);
+            ProBasicPowerstationPoint jyeyhtPoint = powerstationPointMap.get(ContantXk.JYEYHT);
+            ProBasicPowerstationPoint jyeyhlPoint = powerstationPointMap.get(ContantXk.JYEYHL);
+            ProBasicPowerstationPoint rlyxsPoint = powerstationPointMap.get(ContantXk.RLYXS);
+            ProBasicPowerstationPoint ylyxsPoint = powerstationPointMap.get(ContantXk.YLYXS);
+            ProBasicPowerstationPoint nlyxsPoint = powerstationPointMap.get(ContantXk.NLYXS);
+            ProBasicPowerstationPoint sbklylPoint = powerstationPointMap.get(ContantXk.SBKLYL);
+            ProBasicPowerstationPoint dxkyxsPoint = powerstationPointMap.get(ContantXk.DXKYXS);
+            ProBasicPowerstationPoint fnlylPoint = powerstationPointMap.get(ContantXk.FNLYL);
+
+
+
+            double jym = 0;
+            double jys = 0;
+            double jyeyht = 0;
+            double jyeyhl = 0;
+            double rlyxs = 0;
+            double ylyxs = 0;
+            double nlyxs = 0;
+            double ysbklyl = 0;
+            double ydxkyxs = 0;
+            double yfnlyl = 0;
+            if (hoursDiff!=0){
+                if (tempMap.containsKey(wp.getId())){
+                    ProEconPowerstationInfoDay2 powerstationInfoDay2 = tempMap.get(wp.getId());
+                    ysbklyl = (hoursDiff - powerstationInfoDay2.getYhjgztjxs() - powerstationInfoDay2.getYhjjxtjxs())/hoursDiff*100;
+                    ydxkyxs = (hoursDiff - powerstationInfoDay2.getYhjgztjxs() )/hoursDiff*100;
+                }
+            }
+
+            try {
+                double yfdl = edosUtil.getSectionData(yfdlPoint, currentDate.getTime()).getPointValueInDouble();
+                double nfdl = edosUtil.getSectionData(nfdlPoint, currentDate.getTime()).getPointValueInDouble();
+                double yllfdl = edosUtil.getSectionData(yllfdlPoint, currentDate.getTime()).getPointValueInDouble();
+                double rfdl = edosUtil.getSectionData(rfdlPoint, currentDate.getTime()).getPointValueInDouble();
+                jym = yfdl * 0.37;
+                jys = yfdl * 3.05;
+                jyeyht = yfdl * 0.8568;
+                jyeyhl = yfdl * 0.0059;
+                rlyxs = rfdl / (wp.getJrwindCapacity()+wp.getJrCapacity());
+                ylyxs = yfdl / (wp.getJrwindCapacity()+wp.getJrCapacity());
+                nlyxs = nfdl / (wp.getJrwindCapacity()+wp.getJrCapacity());
+                yfnlyl = yllfdl != 0 ?yfdl / yllfdl * 100:0;
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            resultList.add(PointUtil.createPointData(currentDate,jym,jymPoint.getNemCode(),jymPoint.getName()));
+            resultList.add(PointUtil.createPointData(currentDate,jys,jysPoint.getNemCode(),jysPoint.getName()));
+            resultList.add(PointUtil.createPointData(currentDate,jyeyht,jyeyhtPoint.getNemCode(),jyeyhtPoint.getName()));
+            resultList.add(PointUtil.createPointData(currentDate,jyeyhl,jyeyhlPoint.getNemCode(),jyeyhlPoint.getName()));
+            resultList.add(PointUtil.createPointData(currentDate,rlyxs,rlyxsPoint.getNemCode(),rlyxsPoint.getName()));
+            resultList.add(PointUtil.createPointData(currentDate,ylyxs,ylyxsPoint.getNemCode(),ylyxsPoint.getName()));
+            resultList.add(PointUtil.createPointData(currentDate,nlyxs,nlyxsPoint.getNemCode(),nlyxsPoint.getName()));
+            resultList.add(PointUtil.createPointData(currentDate,ysbklyl,sbklylPoint.getNemCode(),sbklylPoint.getName()));
+            resultList.add(PointUtil.createPointData(currentDate,ydxkyxs,dxkyxsPoint.getNemCode(),dxkyxsPoint.getName()));
+            resultList.add(PointUtil.createPointData(currentDate,yfnlyl,fnlylPoint.getNemCode(),fnlylPoint.getName()));
+
+        });
+        edosUtil.sendMultiPoint(resultList);
+    }
+}

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

@@ -1,23 +1,19 @@
 package com.gyee.generation.service.realtimelibrary;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.ProBasicCompany;
-import com.gyee.generation.model.auto.ProBasicPowerstation;
-import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
-import com.gyee.generation.model.auto.ProBasicRegion;
+import com.gyee.generation.model.auto.*;
+import com.gyee.generation.service.auto.IProEconPowerstationInfoDay2Service;
 import com.gyee.generation.util.PointUtil;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -34,6 +30,8 @@ public class RegionCalService {
 
     @Resource
     private IEdosUtil edosUtil;
+    @Resource
+    private IProEconPowerstationInfoDay2Service proEconPowerstationInfoDay2Service;
     /**
      *
      */
@@ -201,6 +199,17 @@ public class RegionCalService {
         ProBasicPowerstationPoint zycydlPoint = powerstationPointMap.get(ContantXk.YCYDL);
         ProBasicPowerstationPoint zncydlPoint = powerstationPointMap.get(ContantXk.NCYDL);
 
+        ProBasicPowerstationPoint jymPoint = powerstationPointMap.get(ContantXk.JYM);
+        ProBasicPowerstationPoint jysPoint = powerstationPointMap.get(ContantXk.JYS);
+        ProBasicPowerstationPoint jyeyhtPoint = powerstationPointMap.get(ContantXk.JYEYHT);
+        ProBasicPowerstationPoint jyeyhlPoint = powerstationPointMap.get(ContantXk.JYEYHL);
+        ProBasicPowerstationPoint rlyxsPoint = powerstationPointMap.get(ContantXk.RLYXS);
+        ProBasicPowerstationPoint ylyxsPoint = powerstationPointMap.get(ContantXk.YLYXS);
+        ProBasicPowerstationPoint nlyxsPoint = powerstationPointMap.get(ContantXk.NLYXS);
+        ProBasicPowerstationPoint sbklylPoint = powerstationPointMap.get(ContantXk.SBKLYL);
+        ProBasicPowerstationPoint dxkyxsPoint = powerstationPointMap.get(ContantXk.DXKYXS);
+        ProBasicPowerstationPoint fnlylPoint = powerstationPointMap.get(ContantXk.FNLYL);
+
         AtomicReference<Double> rpjgl = new AtomicReference<>((double) 0);
         AtomicReference<Double> rpjfs = new AtomicReference<>((double) 0);
         AtomicReference<Double> rpjgzd = new AtomicReference<>((double) 0);
@@ -1536,6 +1545,68 @@ public class RegionCalService {
         resultList.add(PointUtil.createPointData(currentDate,ycydl.get(),zycydlPoint.getNemCode(),zycydlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,ncydl.get(),zncydlPoint.getNemCode(),zncydlPoint.getName()));
 
+        double jym = yfdl.get() * 0.37;
+        double jys = yfdl.get() * 3.05;
+        double jyeyht = yfdl.get() * 0.8568;
+        double jyeyhl = yfdl.get() * 0.0059;
+        double rlyxs = 0;
+        double ylyxs = 0;
+        double nlyxs = 0;
+        double ysbklyl = 0;
+        double ydxkyxs = 0;
+        if (type.equals("-1")){
+            rlyxs = rfdl.get() / region.getJrwindCapacity();
+            ylyxs = yfdl.get() / region.getJrwindCapacity();
+            nlyxs = nfdl.get() / region.getJrwindCapacity();
+        }else if(type.equals("-2")){
+            rlyxs = rfdl.get() / region.getJrCapacity();
+            ylyxs = yfdl.get() / region.getJrCapacity();
+            nlyxs = nfdl.get() / region.getJrCapacity();
+        }else {
+            rlyxs = rfdl.get() / (region.getJrwindCapacity()+region.getJrCapacity());
+            ylyxs = yfdl.get() / (region.getJrwindCapacity()+region.getJrCapacity());
+            nlyxs = nfdl.get() / (region.getJrwindCapacity()+region.getJrCapacity());
+        }
+        Date monthFirst = DateUtils.getMonthFirst(currentDate);
+        double hoursDiff = DateUtils.hoursDiff2(currentDate, monthFirst);
+
+        String toDate1 = DateUtils.toDate1(currentDate);
+        Map<String, ProEconPowerstationInfoDay2> tempMap = new HashMap<>();
+        QueryWrapper<ProEconPowerstationInfoDay2> qw = new QueryWrapper<>();
+        qw.eq("record_date",toDate1);
+        if (type.equals("-1")){
+            qw.eq("foreign_key_id",region+"-1");
+        }else if(type.equals("-2")){
+            qw.eq("foreign_key_id",region+"-2");
+        }else {
+            qw.eq("foreign_key_id",region+"0");
+        }
+        List<ProEconPowerstationInfoDay2> powerstationInfoDay2s = proEconPowerstationInfoDay2Service.list(qw);
+        powerstationInfoDay2s.stream().forEach(info->{
+            tempMap.put(info.getForeignKeyId(),info);
+        });
+
+        if (hoursDiff!=0){
+            if (tempMap.containsKey(region.getId())){
+                ProEconPowerstationInfoDay2 powerstationInfoDay2 = tempMap.get(region.getId());
+                ysbklyl = (hoursDiff - powerstationInfoDay2.getYhjgztjxs() - powerstationInfoDay2.getYhjjxtjxs())/hoursDiff*100;
+                ydxkyxs = (hoursDiff - powerstationInfoDay2.getYhjgztjxs() )/hoursDiff*100;
+            }
+        }
+
+        double yfnlyl = yllfdl.get() != 0 ?yfdl.get() / yllfdl.get() * 100:0;
+
+        resultList.add(PointUtil.createPointData(currentDate,jym,jymPoint.getNemCode(),jymPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,jys,jysPoint.getNemCode(),jysPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,jyeyht,jyeyhtPoint.getNemCode(),jyeyhtPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,jyeyhl,jyeyhlPoint.getNemCode(),jyeyhlPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,rlyxs,rlyxsPoint.getNemCode(),rlyxsPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,ylyxs,ylyxsPoint.getNemCode(),ylyxsPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,nlyxs,nlyxsPoint.getNemCode(),nlyxsPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,ysbklyl,sbklylPoint.getNemCode(),sbklylPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,ydxkyxs,dxkyxsPoint.getNemCode(),dxkyxsPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,yfnlyl,fnlylPoint.getNemCode(),fnlylPoint.getName()));
+
     }
     private void weightingCompany(Date currentDate, Map<String, Map<String, ProBasicPowerstationPoint>> companypointmap, Map<String, Map<String, ProBasicPowerstationPoint>> wppointmap, List<PointData> resultList, ProBasicCompany company, List<ProBasicPowerstation> wps,String type) {
         Map<String, ProBasicPowerstationPoint> powerstationPointMap = companypointmap.get(company.getId()+type);
@@ -1678,6 +1749,17 @@ public class RegionCalService {
         ProBasicPowerstationPoint zycydlPoint = powerstationPointMap.get(ContantXk.YCYDL);
         ProBasicPowerstationPoint zncydlPoint = powerstationPointMap.get(ContantXk.NCYDL);
 
+        ProBasicPowerstationPoint jymPoint = powerstationPointMap.get(ContantXk.JYM);
+        ProBasicPowerstationPoint jysPoint = powerstationPointMap.get(ContantXk.JYS);
+        ProBasicPowerstationPoint jyeyhtPoint = powerstationPointMap.get(ContantXk.JYEYHT);
+        ProBasicPowerstationPoint jyeyhlPoint = powerstationPointMap.get(ContantXk.JYEYHL);
+        ProBasicPowerstationPoint rlyxsPoint = powerstationPointMap.get(ContantXk.RLYXS);
+        ProBasicPowerstationPoint ylyxsPoint = powerstationPointMap.get(ContantXk.YLYXS);
+        ProBasicPowerstationPoint nlyxsPoint = powerstationPointMap.get(ContantXk.NLYXS);
+        ProBasicPowerstationPoint sbklylPoint = powerstationPointMap.get(ContantXk.SBKLYL);
+        ProBasicPowerstationPoint dxkyxsPoint = powerstationPointMap.get(ContantXk.DXKYXS);
+        ProBasicPowerstationPoint fnlylPoint = powerstationPointMap.get(ContantXk.FNLYL);
+
 
         AtomicReference<Double> rpjgl = new AtomicReference<>((double) 0);
         AtomicReference<Double> rpjfs = new AtomicReference<>((double) 0);
@@ -2927,6 +3009,69 @@ public class RegionCalService {
         resultList.add(PointUtil.createPointData(currentDate,ycydl.get(),zycydlPoint.getNemCode(),zycydlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,ncydl.get(),zncydlPoint.getNemCode(),zncydlPoint.getName()));
 
+
+        double jym = yfdl.get() * 0.37;
+        double jys = yfdl.get() * 3.05;
+        double jyeyht = yfdl.get() * 0.8568;
+        double jyeyhl = yfdl.get() * 0.0059;
+        double rlyxs = 0;
+        double ylyxs = 0;
+        double nlyxs = 0;
+        double ysbklyl = 0;
+        double ydxkyxs = 0;
+        if (type.equals("-1")){
+            rlyxs = rfdl.get() / company.getJrwindCapacity();
+            ylyxs = yfdl.get() / company.getJrwindCapacity();
+            nlyxs = nfdl.get() / company.getJrwindCapacity();
+        }else if(type.equals("-2")){
+            rlyxs = rfdl.get() / company.getJrCapacity();
+            ylyxs = yfdl.get() / company.getJrCapacity();
+            nlyxs = nfdl.get() / company.getJrCapacity();
+        }else {
+            rlyxs = rfdl.get() / (company.getJrwindCapacity()+company.getJrCapacity());
+            ylyxs = yfdl.get() / (company.getJrwindCapacity()+company.getJrCapacity());
+            nlyxs = nfdl.get() / (company.getJrwindCapacity()+company.getJrCapacity());
+        }
+        Date monthFirst = DateUtils.getMonthFirst(currentDate);
+        double hoursDiff = DateUtils.hoursDiff2(currentDate, monthFirst);
+
+        String toDate1 = DateUtils.toDate1(currentDate);
+        Map<String, ProEconPowerstationInfoDay2> tempMap = new HashMap<>();
+        QueryWrapper<ProEconPowerstationInfoDay2> qw = new QueryWrapper<>();
+        qw.eq("record_date",toDate1);
+        if (type.equals("-1")){
+            qw.eq("foreign_key_id",company+"-1");
+        }else if(type.equals("-2")){
+            qw.eq("foreign_key_id",company+"-2");
+        }else {
+            qw.eq("foreign_key_id",company+"0");
+        }
+        List<ProEconPowerstationInfoDay2> powerstationInfoDay2s = proEconPowerstationInfoDay2Service.list(qw);
+        powerstationInfoDay2s.stream().forEach(info->{
+            tempMap.put(info.getForeignKeyId(),info);
+        });
+
+        if (hoursDiff!=0){
+            if (tempMap.containsKey(company.getId())){
+                ProEconPowerstationInfoDay2 powerstationInfoDay2 = tempMap.get(company.getId());
+                ysbklyl = (hoursDiff - powerstationInfoDay2.getYhjgztjxs() - powerstationInfoDay2.getYhjjxtjxs())/hoursDiff*100;
+                ydxkyxs = (hoursDiff - powerstationInfoDay2.getYhjgztjxs() )/hoursDiff*100;
+            }
+        }
+
+        double yfnlyl = yllfdl.get() != 0 ?yfdl.get() / yllfdl.get() * 100:0;
+
+        resultList.add(PointUtil.createPointData(currentDate,jym,jymPoint.getNemCode(),jymPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,jys,jysPoint.getNemCode(),jysPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,jyeyht,jyeyhtPoint.getNemCode(),jyeyhtPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,jyeyhl,jyeyhlPoint.getNemCode(),jyeyhlPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,rlyxs,rlyxsPoint.getNemCode(),rlyxsPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,ylyxs,ylyxsPoint.getNemCode(),ylyxsPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,nlyxs,nlyxsPoint.getNemCode(),nlyxsPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,ysbklyl,sbklylPoint.getNemCode(),sbklylPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,ydxkyxs,dxkyxsPoint.getNemCode(),dxkyxsPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,yfnlyl,fnlylPoint.getNemCode(),fnlylPoint.getName()));
+
     }
 
 }

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

@@ -74,6 +74,7 @@ public class RegionCalreService  {
         });
         edosUtil.sendMultiPoint(resultList);
     }
+
     private void weightingRegion(Date currentDate, Map<String, Map<String, ProBasicPowerstationPoint>> companypointmap, Map<String, Map<String, ProBasicPowerstationPoint>> regionpointmap, List<PointData> resultList,ProBasicRegion region, List<ProBasicCompany> companys,String type) {
         Map<String, ProBasicPowerstationPoint> powerstationPointMap = regionpointmap.get(region.getId()+type);
         ProBasicPowerstationPoint zsspjfsPoint = null;
@@ -96,6 +97,7 @@ public class RegionCalreService  {
         ProBasicPowerstationPoint zssznhglzsPoint = powerstationPointMap.get(ContantXk.SSZNHGLZS);
         ProBasicPowerstationPoint zsszzyglPoint = powerstationPointMap.get(ContantXk.SSZZYGL);
         ProBasicPowerstationPoint zsszkyglPoint = powerstationPointMap.get(ContantXk.SSZKYGL);
+        ProBasicPowerstationPoint zycglPoint = powerstationPointMap.get(ContantXk.ZYCGL);
 
         ProBasicPowerstationPoint zgztsmxPoint = powerstationPointMap.get(ContantXk.GZTSMX);
         ProBasicPowerstationPoint zcnslmxPoint = powerstationPointMap.get(ContantXk.CNSLGZTSMX);
@@ -127,6 +129,7 @@ public class RegionCalreService  {
         AtomicReference<Double> znhglzs = new AtomicReference<>((double) 0);
         AtomicReference<Double> zzygl = new AtomicReference<>((double) 0);
         AtomicReference<Double> zkygl = new AtomicReference<>((double) 0);
+        AtomicReference<Double> zycgl = new AtomicReference<>((double) 0);
 
         AtomicReference<Double> gztsmx = new AtomicReference<>((double) 0);
         AtomicReference<Double> cngzmx = new AtomicReference<>((double) 0);
@@ -182,6 +185,7 @@ public class RegionCalreService  {
             ProBasicPowerstationPoint ssznhglzsPoint = powerstationPointMap1.get(ContantXk.SSZNHGLZS);
             ProBasicPowerstationPoint sszzyglPoint = powerstationPointMap1.get(ContantXk.SSZZYGL);
             ProBasicPowerstationPoint sszkyglPoint = powerstationPointMap1.get(ContantXk.SSZKYGL);
+            ProBasicPowerstationPoint sszycglPoint = powerstationPointMap1.get(ContantXk.ZYCGL);
 
             ProBasicPowerstationPoint gztsmxPoint = powerstationPointMap1.get(ContantXk.GZTSMX);
             ProBasicPowerstationPoint cnslmxPoint = powerstationPointMap1.get(ContantXk.CNSLGZTSMX);
@@ -296,6 +300,14 @@ public class RegionCalreService  {
                 }
                 return v;
             });
+            zycgl.updateAndGet(v -> {
+                try {
+                    return new Double((double) (v + edosUtil.getSectionData(sszycglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return v;
+            });
 
 
 
@@ -490,6 +502,8 @@ public class RegionCalreService  {
         resultList.add(PointUtil.createPointData(currentDate,znhglzs.get(),zssznhglzsPoint.getNemCode(),zssznhglzsPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,zzygl.get(),zsszzyglPoint.getNemCode(),zsszzyglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,zkygl.get(),zsszkyglPoint.getNemCode(),zsszkyglPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,zycgl.get(),zycglPoint.getNemCode(),zycglPoint.getName()));
+
 
         resultList.add(PointUtil.createPointData(currentDate,gztsmx.get(),zgztsmxPoint.getNemCode(),zgztsmxPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,cngzmx.get(),zcnslmxPoint.getNemCode(),zcnslmxPoint.getName()));
@@ -540,6 +554,7 @@ public class RegionCalreService  {
         ProBasicPowerstationPoint zssznhglzsPoint = powerstationPointMap.get(ContantXk.SSZNHGLZS);
         ProBasicPowerstationPoint zsszzyglPoint = powerstationPointMap.get(ContantXk.SSZZYGL);
         ProBasicPowerstationPoint zsszkyglPoint = powerstationPointMap.get(ContantXk.SSZKYGL);
+        ProBasicPowerstationPoint zycglPoint = powerstationPointMap.get(ContantXk.ZYCGL);
 
         ProBasicPowerstationPoint zgztsmxPoint = powerstationPointMap.get(ContantXk.GZTSMX);
         ProBasicPowerstationPoint zcnslmxPoint = powerstationPointMap.get(ContantXk.CNSLGZTSMX);
@@ -570,6 +585,7 @@ public class RegionCalreService  {
         AtomicReference<Double> znhglzs = new AtomicReference<>((double) 0);
         AtomicReference<Double> zzygl = new AtomicReference<>((double) 0);
         AtomicReference<Double> zkygl = new AtomicReference<>((double) 0);
+        AtomicReference<Double> zycgl = new AtomicReference<>((double) 0);
 
         AtomicReference<Double> gztsmx = new AtomicReference<>((double) 0);
         AtomicReference<Double> cngzmx = new AtomicReference<>((double) 0);
@@ -614,6 +630,7 @@ public class RegionCalreService  {
             ProBasicPowerstationPoint ssznhglzsPoint = powerstationPointMap1.get(ContantXk.SSZNHGLZS);
             ProBasicPowerstationPoint sszzyglPoint = powerstationPointMap1.get(ContantXk.SSZZYGL);
             ProBasicPowerstationPoint sszkyglPoint = powerstationPointMap1.get(ContantXk.SSZKYGL);
+            ProBasicPowerstationPoint sszycglPoint = powerstationPointMap1.get(ContantXk.ZYCGL);
 
             ProBasicPowerstationPoint gztsmxPoint = powerstationPointMap1.get(ContantXk.GZTSMX);
             ProBasicPowerstationPoint cnslmxPoint = powerstationPointMap1.get(ContantXk.CNSLGZTSMX);
@@ -707,6 +724,14 @@ public class RegionCalreService  {
                 }
                 return v;
             });
+            zycgl.updateAndGet(v -> {
+                try {
+                    return new Double((double) (v + edosUtil.getSectionData(sszycglPoint, currentDate.getTime() / 1000).getPointValueInDouble()));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return v;
+            });
 
 
 
@@ -896,6 +921,7 @@ public class RegionCalreService  {
         resultList.add(PointUtil.createPointData(currentDate,znhglzs.get(),zssznhglzsPoint.getNemCode(),zssznhglzsPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,zzygl.get(),zsszzyglPoint.getNemCode(),zsszzyglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,zkygl.get(),zsszkyglPoint.getNemCode(),zsszkyglPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,zycgl.get(),zycglPoint.getNemCode(),zycglPoint.getName()));
 
         resultList.add(PointUtil.createPointData(currentDate,gztsmx.get(),zgztsmxPoint.getNemCode(),zgztsmxPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,cngzmx.get(),zcnslmxPoint.getNemCode(),zcnslmxPoint.getName()));