服务调整

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

@@ -5,7 +5,7 @@ package com.gyee.common.contant;
  */
 
 public class ContantXk {
-
+    public static final String  AQTS= "AQTS";//安全天数
     public static final String  CZZT= "CZZT";//场站状态
     public static final String  SBJRZT= "SBJRZT";//场站设备接入状态
     public static final String  DQJRZT= "DQJRZT";//场站电气接入状态

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-executorWPGD.properties")
+@PropertySource("classpath:xxl-job-executor.properties")
+//@PropertySource("classpath:xxl-job-executorWPGD.properties")
 //@PropertySource("classpath:xxl-job-executorRG.properties")
 public class XxlJobConfig implements EnvironmentAware {
     private Environment env;

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

@@ -7,6 +7,7 @@ import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
 import com.gyee.generation.model.auto.ProEconWtwindDayInfo;
+import com.gyee.generation.model.vo.WpType;
 import com.gyee.generation.service.auto.IProEconWtwindDayInfoService;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.realtimesource.IEdosUtil;

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

@@ -13,10 +13,7 @@ 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;
@@ -90,7 +87,7 @@ public class RegionCalreService  {
             zsspjfsPoint = powerstationPointMap.get(ContantXk.SSPJFS);
             zsspjgzdPoint = powerstationPointMap.get(ContantXk.SSPJGZD);
         }
-
+        ProBasicPowerstationPoint zaqtsPoint = powerstationPointMap.get(ContantXk.AQTS);
         ProBasicPowerstationPoint zsszglPoint = powerstationPointMap.get(ContantXk.SSZGL);
         ProBasicPowerstationPoint zsszllglPoint = powerstationPointMap.get(ContantXk.SSZLLGL);
         ProBasicPowerstationPoint zsszbzglPoint = powerstationPointMap.get(ContantXk.SSZBZGL);
@@ -156,6 +153,8 @@ public class RegionCalreService  {
         AtomicInteger gcComCount = new AtomicInteger();
         AtomicInteger finalGcComCount = gcComCount;
         AtomicInteger finalFcComCount = fcComCount;
+
+        List<Double> aqtsList = new ArrayList<>();
         companys.stream().forEach(company->{
             if (company.getJrCapacity()>0){
                 finalGcComCount.getAndIncrement();
@@ -179,6 +178,8 @@ public class RegionCalreService  {
                     sspjgzdPoint = powerstationPointMap1.get(ContantXk.SSPJGZD);
 
                 }
+
+                ProBasicPowerstationPoint aqtsPoint = powerstationPointMap1.get(ContantXk.AQTS);
                 ProBasicPowerstationPoint sszglPoint = powerstationPointMap1.get(ContantXk.SSZGL);
                 ProBasicPowerstationPoint sszllglPoint = powerstationPointMap1.get(ContantXk.SSZLLGL);
                 ProBasicPowerstationPoint sszbzglPoint = powerstationPointMap1.get(ContantXk.SSZBZGL);
@@ -209,6 +210,13 @@ public class RegionCalreService  {
                 ProBasicPowerstationPoint sltsPoint = powerstationPointMap1.get(ContantXk.SLTS);
                 ProBasicPowerstationPoint lxtsPoint = powerstationPointMap1.get(ContantXk.TXZDTS);
 
+                try {
+                    double temp = edosUtil.getSectionData(aqtsPoint, currentDate.getTime()).getPointValueInDouble();
+                    aqtsList.add(temp);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
                 if (type.equals("-1")){
                     ProBasicPowerstationPoint finalSspjfsfsPoint = sspjfsPoint;
                     sspjfs.updateAndGet(v -> {
@@ -498,6 +506,9 @@ public class RegionCalreService  {
             resultList.add(PointUtil.createPointData(currentDate,sspjfs.get()/fcComCount.doubleValue(),zsspjfsPoint.getNemCode(),zsspjfsPoint.getName()));
             resultList.add(PointUtil.createPointData(currentDate,sspjgzd.get()/gcComCount.doubleValue(),zsspjgzdPoint.getNemCode(),zsspjgzdPoint.getName()));
         }
+        Double aqts = Collections.max(aqtsList);
+
+        resultList.add(PointUtil.createPointData(currentDate,aqts,zaqtsPoint.getNemCode(),zaqtsPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,sszgl.get(),zsszglPoint.getNemCode(),zsszglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,zllgl.get(),zsszllglPoint.getNemCode(),zsszllglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,zbzgl.get(),zsszbzglPoint.getNemCode(),zsszbzglPoint.getName()));
@@ -550,6 +561,8 @@ public class RegionCalreService  {
             zsspjgzdPoint = powerstationPointMap.get(ContantXk.SSPJGZD);
         }
 
+        ProBasicPowerstationPoint zaqtsPoint = powerstationPointMap.get(ContantXk.AQTS);
+
         ProBasicPowerstationPoint zsszglPoint = powerstationPointMap.get(ContantXk.SSZGL);
         ProBasicPowerstationPoint zsszllglPoint = powerstationPointMap.get(ContantXk.SSZLLGL);
         ProBasicPowerstationPoint zsszbzglPoint = powerstationPointMap.get(ContantXk.SSZBZGL);
@@ -611,8 +624,10 @@ public class RegionCalreService  {
         AtomicReference<Double> slts = new AtomicReference<>((double) 0);
         AtomicReference<Double> djts = new AtomicReference<>((double) 0);
 
-
+        List<Double> aqtsList = new ArrayList<>();
         wps.stream().forEach(wp->{
+
+
             Map<String, ProBasicPowerstationPoint> powerstationPointMap1 = wppointmap.get(wp.getId());
 
             ProBasicPowerstationPoint sspjfsPoint = null;
@@ -625,6 +640,7 @@ public class RegionCalreService  {
                 sspjgzdPoint = powerstationPointMap1.get(ContantXk.SSPJGZD);
 
             }
+            ProBasicPowerstationPoint aqtsPoint = powerstationPointMap1.get(ContantXk.AQTS);
 
             ProBasicPowerstationPoint sszglPoint = powerstationPointMap1.get(ContantXk.SSZGL);
             ProBasicPowerstationPoint sszllglPoint = powerstationPointMap1.get(ContantXk.SSZLLGL);
@@ -656,6 +672,14 @@ public class RegionCalreService  {
             ProBasicPowerstationPoint sltsPoint = powerstationPointMap1.get(ContantXk.SLTS);
             ProBasicPowerstationPoint lxtsPoint = powerstationPointMap1.get(ContantXk.TXZDTS);
 
+
+            try {
+                double temp = edosUtil.getSectionData(aqtsPoint, currentDate.getTime()).getPointValueInDouble();
+                aqtsList.add(temp);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
             if (wp.getId().contains("_FDC_")){
                 ProBasicPowerstationPoint finalSspjfsPoint = sspjfsPoint;
                 sspjfs.updateAndGet(v -> {
@@ -917,6 +941,9 @@ public class RegionCalreService  {
             resultList.add(PointUtil.createPointData(currentDate,sspjfs.get()/fdcsize,zsspjfsPoint.getNemCode(),zsspjfsPoint.getName()));
             resultList.add(PointUtil.createPointData(currentDate,sspjgzd.get()/gdcsize,zsspjgzdPoint.getNemCode(),zsspjgzdPoint.getName()));
         }
+
+        Double aqts = Collections.max(aqtsList);
+        resultList.add(PointUtil.createPointData(currentDate,aqts,zaqtsPoint.getNemCode(),zaqtsPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,sszgl.get(),zsszglPoint.getNemCode(),zsszglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,zllgl.get(),zsszllglPoint.getNemCode(),zsszllglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,zbzgl.get(),zsszbzglPoint.getNemCode(),zsszbzglPoint.getName()));

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

@@ -0,0 +1,56 @@
+package com.gyee.generation.service.realtimelibrary;
+
+import com.gyee.common.contant.ContantXk;
+import com.gyee.common.model.PointData;
+import com.gyee.common.model.StringUtils;
+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.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;
+
+/*
+@author   谢生杰
+@date   2022/12/7-15:54
+*/
+@Service
+public class SafetyDayService {
+    @Resource
+    private IEdosUtil edosUtil;
+
+    public void saveSafetyday() throws Exception {
+
+        Date currentDate = DateUtils.getCurrentDate();
+
+        List<ProBasicPowerstation> wpls = CacheContext.wpls;
+        Map<String, Map<String, ProBasicPowerstationPoint>> wppointmap = CacheContext.wppointmap;
+
+        List<PointData> resultList = new ArrayList<>();
+
+        wpls.stream().forEach(wp->{
+            Map<String, ProBasicPowerstationPoint> powerstationPointMap = wppointmap.get(wp.getId());
+            ProBasicPowerstationPoint powerstationPoint = powerstationPointMap.get(ContantXk.AQTS);
+            if (StringUtils.isNotNull(powerstationPoint)){
+                double aqts = 0;
+                try {
+                    aqts = edosUtil.getSectionData(powerstationPoint, currentDate.getTime()).getPointValueInDouble();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                aqts ++;
+                PointData pointData = PointUtil.createPointData(currentDate, aqts, powerstationPoint.getNemCode(), powerstationPoint.getName());
+                resultList.add(pointData);
+            }
+        });
+
+        edosUtil.sendMultiPoint(resultList);
+    }
+}

realtime/generationXK-service/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: gd
+    active: xk
 #    active: yun
 
 #    active: td

realtime/generationXK-service/src/test/java/com/gyee/generation/GenerationTest.java

@@ -48,6 +48,8 @@ public class GenerationTest {
     private AccessStatusService accessStatusService;
     @Resource
     private CalculationService calculationService;
+    @Resource
+    private SafetyDayService safetyDayService;
 
     @Test
     public void test1() throws Exception {
@@ -80,9 +82,9 @@ public class GenerationTest {
 //        accessStatusService.fullFieldState();
 
 
-        statusService.powerRationing();
-        statusService.statusReal();
-        statusService.calculateStatusNumber();
+//        statusService.powerRationing();
+//        statusService.statusReal();
+//        statusService.calculateStatusNumber();
 
 //         realtimeService.savaRealtimeTarget();
 //        cycleCalculationService.saveCyle();
@@ -96,5 +98,7 @@ public class GenerationTest {
 
 //        regionCalreService.companyCal();
 //        regionCalreService.RegionCal();
+
+        safetyDayService.saveSafetyday();
     }
 }