状态判定修改

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

@@ -34,7 +34,9 @@
 ////@PropertySource("classpath:xxl-job-executorGF003.properties")
 ////@PropertySource("classpath:xxl-job-executorGF004.properties")
 ////@PropertySource("classpath:xxl-job-executorGF005.properties")
-//@PropertySource("classpath:xxl-job-executorGF006.properties")
+////@PropertySource("classpath:xxl-job-executorGF006.properties")
+//
+//@PropertySource("classpath:xxl-job-region.properties")
 //public class XxlJobConfig implements EnvironmentAware {
 //    private Environment env;
 //

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

@@ -5,8 +5,8 @@ package com.gyee.generation.service.initalcache;/*
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.generation.model.auto.ProBasicEquipment;
-import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
+import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
+import com.gyee.generation.model.auto.ProBasicSubStation;
 import com.gyee.generation.service.auto.*;
 import com.gyee.generation.util.redis.RedisService;
 import lombok.extern.slf4j.Slf4j;
@@ -58,23 +58,23 @@ public class CacheService {
 
 
     public void initRedisCache(){
-        redisService.select(9);
-        log.info("--------------------------redisWT");
-        List<ProBasicEquipment> windturbineList = windturbineService.list().stream().filter(i-> i.getIsable().equals(1)).collect(Collectors.toList());
-        log.info("--------------------------windturbineList"+windturbineList.size());
-        windturbineList.stream().forEach(i->{
-            Map<String, ProBasicEquipmentPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
-            qw.eq("windturbine_id",i.getId());
-            List<ProBasicEquipmentPoint> windturbinetestingpointai2List = windturbinetestingpointnewService.list(qw);
-            log.info("--------------------------windturbinetestingpointai2List"+windturbinetestingpointai2List.size());
-            windturbinetestingpointai2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            log.info("--------------------------codeaimap"+codeaimap.size());
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
+//        redisService.select(9);
+//        log.info("--------------------------redisWT");
+//        List<ProBasicEquipment> windturbineList = windturbineService.list().stream().filter(i-> i.getIsable().equals(1)).collect(Collectors.toList());
+//        log.info("--------------------------windturbineList"+windturbineList.size());
+//        windturbineList.stream().forEach(i->{
+//            Map<String, ProBasicEquipmentPoint> codeaimap = new HashMap<>();
+//            QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
+//            qw.eq("windturbine_id",i.getId());
+//            List<ProBasicEquipmentPoint> windturbinetestingpointai2List = windturbinetestingpointnewService.list(qw);
+//            log.info("--------------------------windturbinetestingpointai2List"+windturbinetestingpointai2List.size());
+//            windturbinetestingpointai2List.stream().forEach(x->{
+//                codeaimap.put(x.getUniformCode(),x);
+//            });
+//            log.info("--------------------------codeaimap"+codeaimap.size());
+//            String s = JSONObject.toJSONString(codeaimap);
+//            redisService.set(i.getId(),s);
+//        });
 //
 //        log.info("--------------------------redisZL");
 //        List<ProBasicBranch> branchList = proBasicBranchService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
@@ -137,18 +137,18 @@ public class CacheService {
 //        });
 //
 //        log.info("--------------------------redisSubWP");
-//        List<ProBasicSubStation> subStationList = subStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-//        subStationList.stream().forEach(i->{
-//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-//            qw.eq("windpowerstation_id",i.getId());
-//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-//            windpowerstationtestingpoint2List.stream().forEach(x->{
-//                codeaimap.put(x.getUniformCode(),x);
-//            });
-//            String s = JSONObject.toJSONString(codeaimap);
-//            redisService.set(i.getId(),s);
-//        });
+        List<ProBasicSubStation> subStationList = subStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+        subStationList.stream().forEach(i->{
+            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+            qw.eq("windpowerstation_id",i.getId());
+            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+            windpowerstationtestingpoint2List.stream().forEach(x->{
+                codeaimap.put(x.getUniformCode(),x);
+            });
+            String s = JSONObject.toJSONString(codeaimap);
+            redisService.set(i.getId(),s);
+        });
 //
 //        log.info("--------------------------redisWeatherWP");
 //        List<ProBasicWeatherStation> weatherStationList = proBasicWeatherStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());

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

@@ -175,7 +175,7 @@ public class RegionCalreService  {
         ProBasicPowerstationPoint zsszbzglPoint = powerstationPointMap.get(ContantXk.SSZBZGL);
         ProBasicPowerstationPoint zssznhglzsPoint = powerstationPointMap.get(ContantXk.SSZNHGLZS);
         ProBasicPowerstationPoint zsszzyglPoint = powerstationPointMap.get(ContantXk.SSZZYGL);
-        ProBasicPowerstationPoint zsszkyglPoint = powerstationPointMap.get(ContantXk.SSZKYGL);
+//        ProBasicPowerstationPoint zsszkyglPoint = powerstationPointMap.get(ContantXk.SSZKYGL);
         ProBasicPowerstationPoint zycglPoint = powerstationPointMap.get(ContantXk.ZYCGL);
 
         ProBasicPowerstationPoint zgztsmxPoint = powerstationPointMap.get(ContantXk.GZTSMX);
@@ -208,7 +208,7 @@ public class RegionCalreService  {
         AtomicReference<Double> zbzgl = new AtomicReference<>((double) 0);
         AtomicReference<Double> znhglzs = new AtomicReference<>((double) 0);
         AtomicReference<Double> zzygl = new AtomicReference<>((double) 0);
-        AtomicReference<Double> zkygl = 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);
@@ -273,7 +273,7 @@ public class RegionCalreService  {
                 ProBasicPowerstationPoint sszbzglPoint = powerstationPointMap1.get(ContantXk.SSZBZGL);
                 ProBasicPowerstationPoint ssznhglzsPoint = powerstationPointMap1.get(ContantXk.SSZNHGLZS);
                 ProBasicPowerstationPoint sszzyglPoint = powerstationPointMap1.get(ContantXk.SSZZYGL);
-                ProBasicPowerstationPoint sszkyglPoint = powerstationPointMap1.get(ContantXk.SSZKYGL);
+//                ProBasicPowerstationPoint sszkyglPoint = powerstationPointMap1.get(ContantXk.SSZKYGL);
                 ProBasicPowerstationPoint sszycglPoint = powerstationPointMap1.get(ContantXk.ZYCGL);
 
                 ProBasicPowerstationPoint gztsmxPoint = powerstationPointMap1.get(ContantXk.GZTSMX);
@@ -406,14 +406,14 @@ public class RegionCalreService  {
                     }
                     return v;
                 });
-                zkygl.updateAndGet(v -> {
-                    try {
-                        return new Double((double) (v + edosUtil.getRealData(sszkyglPoint).getPointValueInDouble()));
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    return v;
-                });
+//                zkygl.updateAndGet(v -> {
+//                    try {
+//                        return new Double((double) (v + edosUtil.getRealData(sszkyglPoint).getPointValueInDouble()));
+//                    } catch (Exception e) {
+//                        e.printStackTrace();
+//                    }
+//                    return v;
+//                });
                 zycgl.updateAndGet(v -> {
                     try {
                         return new Double((double) (v + edosUtil.getRealData(sszycglPoint).getPointValueInDouble()));
@@ -624,7 +624,7 @@ public class RegionCalreService  {
         resultList.add(PointUtil.createPointData(currentDate,zbzgl.get(),zsszbzglPoint.getNemCode(),zsszbzglPoint.getName()));
         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,zkygl.get(),zsszkyglPoint.getNemCode(),zsszkyglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,zycgl.get(),zycglPoint.getNemCode(),zycglPoint.getName()));
 
 
@@ -679,7 +679,7 @@ public class RegionCalreService  {
         ProBasicPowerstationPoint zsszbzglPoint = powerstationPointMap.get(ContantXk.SSZBZGL);
         ProBasicPowerstationPoint zssznhglzsPoint = powerstationPointMap.get(ContantXk.SSZNHGLZS);
         ProBasicPowerstationPoint zsszzyglPoint = powerstationPointMap.get(ContantXk.SSZZYGL);
-        ProBasicPowerstationPoint zsszkyglPoint = powerstationPointMap.get(ContantXk.SSZKYGL);
+//        ProBasicPowerstationPoint zsszkyglPoint = powerstationPointMap.get(ContantXk.SSZKYGL);
         ProBasicPowerstationPoint zycglPoint = powerstationPointMap.get(ContantXk.ZYCGL);
 
         ProBasicPowerstationPoint zgztsmxPoint = powerstationPointMap.get(ContantXk.GZTSMX);
@@ -711,7 +711,7 @@ public class RegionCalreService  {
         AtomicReference<Double> zbzgl = new AtomicReference<>((double) 0);
         AtomicReference<Double> znhglzs = new AtomicReference<>((double) 0);
         AtomicReference<Double> zzygl = new AtomicReference<>((double) 0);
-        AtomicReference<Double> zkygl = 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);
@@ -761,7 +761,7 @@ public class RegionCalreService  {
             ProBasicPowerstationPoint sszbzglPoint = powerstationPointMap1.get(ContantXk.SSZBZGL);
             ProBasicPowerstationPoint ssznhglzsPoint = powerstationPointMap1.get(ContantXk.SSZNHGLZS);
             ProBasicPowerstationPoint sszzyglPoint = powerstationPointMap1.get(ContantXk.SSZZYGL);
-            ProBasicPowerstationPoint sszkyglPoint = powerstationPointMap1.get(ContantXk.SSZKYGL);
+//            ProBasicPowerstationPoint sszkyglPoint = powerstationPointMap1.get(ContantXk.SSZKYGL);
             ProBasicPowerstationPoint sszycglPoint = powerstationPointMap1.get(ContantXk.ZYCGL);
 
             ProBasicPowerstationPoint gztsmxPoint = powerstationPointMap1.get(ContantXk.GZTSMX);
@@ -875,14 +875,14 @@ public class RegionCalreService  {
                 }
                 return v;
             });
-            zkygl.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getRealData(sszkyglPoint).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
+//            zkygl.updateAndGet(v -> {
+//                try {
+//                    return new Double((double) (v + edosUtil.getRealData(sszkyglPoint).getPointValueInDouble()));
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
+//                return v;
+//            });
             zycgl.updateAndGet(v -> {
                 try {
                     return new Double((double) (v + edosUtil.getRealData(sszycglPoint).getPointValueInDouble()));
@@ -1082,7 +1082,7 @@ public class RegionCalreService  {
         resultList.add(PointUtil.createPointData(currentDate,zbzgl.get(),zsszbzglPoint.getNemCode(),zsszbzglPoint.getName()));
         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,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()));
@@ -1136,7 +1136,7 @@ public class RegionCalreService  {
         ProBasicPowerstationPoint zsszbzglPoint = powerstationPointMap.get(ContantXk.SSZBZGL);
         ProBasicPowerstationPoint zssznhglzsPoint = powerstationPointMap.get(ContantXk.SSZNHGLZS);
         ProBasicPowerstationPoint zsszzyglPoint = powerstationPointMap.get(ContantXk.SSZZYGL);
-        ProBasicPowerstationPoint zsszkyglPoint = powerstationPointMap.get(ContantXk.SSZKYGL);
+//        ProBasicPowerstationPoint zsszkyglPoint = powerstationPointMap.get(ContantXk.SSZKYGL);
         ProBasicPowerstationPoint zycglPoint = powerstationPointMap.get(ContantXk.ZYCGL);
 
         ProBasicPowerstationPoint zgztsmxPoint = powerstationPointMap.get(ContantXk.GZTSMX);
@@ -1168,7 +1168,7 @@ public class RegionCalreService  {
         AtomicReference<Double> zbzgl = new AtomicReference<>((double) 0);
         AtomicReference<Double> znhglzs = new AtomicReference<>((double) 0);
         AtomicReference<Double> zzygl = new AtomicReference<>((double) 0);
-        AtomicReference<Double> zkygl = 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);
@@ -1218,7 +1218,7 @@ public class RegionCalreService  {
             ProBasicPowerstationPoint sszbzglPoint = powerstationPointMap1.get(ContantXk.SSZBZGL);
             ProBasicPowerstationPoint ssznhglzsPoint = powerstationPointMap1.get(ContantXk.SSZNHGLZS);
             ProBasicPowerstationPoint sszzyglPoint = powerstationPointMap1.get(ContantXk.SSZZYGL);
-            ProBasicPowerstationPoint sszkyglPoint = powerstationPointMap1.get(ContantXk.SSZKYGL);
+//            ProBasicPowerstationPoint sszkyglPoint = powerstationPointMap1.get(ContantXk.SSZKYGL);
             ProBasicPowerstationPoint sszycglPoint = powerstationPointMap1.get(ContantXk.ZYCGL);
 
             ProBasicPowerstationPoint gztsmxPoint = powerstationPointMap1.get(ContantXk.GZTSMX);
@@ -1332,14 +1332,14 @@ public class RegionCalreService  {
                 }
                 return v;
             });
-            zkygl.updateAndGet(v -> {
-                try {
-                    return new Double((double) (v + edosUtil.getRealData(sszkyglPoint).getPointValueInDouble()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return v;
-            });
+//            zkygl.updateAndGet(v -> {
+//                try {
+//                    return new Double((double) (v + edosUtil.getRealData(sszkyglPoint).getPointValueInDouble()));
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
+//                return v;
+//            });
             zycgl.updateAndGet(v -> {
                 try {
                     return new Double((double) (v + edosUtil.getRealData(sszycglPoint).getPointValueInDouble()));
@@ -1539,7 +1539,7 @@ public class RegionCalreService  {
         resultList.add(PointUtil.createPointData(currentDate,zbzgl.get(),zsszbzglPoint.getNemCode(),zsszbzglPoint.getName()));
         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,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()));

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

@@ -239,9 +239,12 @@ public class SaticScheduleCALTask {
 
         XxlJobHelper.log("区域公司实时程序执行开始!........");
         try {
-            regionCalreService.companyCal();
-            regionCalreService.RegionCal();
-            regionCalreService.groupCal();
+          while(true)
+          {
+              regionCalreService.companyCal();
+              regionCalreService.RegionCal();
+              regionCalreService.groupCal();
+          }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -258,9 +261,13 @@ public class SaticScheduleCALTask {
 
         XxlJobHelper.log("区域公司历史程序执行开始!........");
         try {
-            regionCalService.companyCal();
-            regionCalService.RegionCal();
-            regionCalService.groupCal();
+            while(true)
+            {
+                regionCalService.companyCal();
+                regionCalService.RegionCal();
+                regionCalService.groupCal();
+            }
+
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -272,12 +279,15 @@ public class SaticScheduleCALTask {
      * 每天0点执行
      * 59 14/15 * * * ?
      */
-    @XxlJob("regionCal_aqts")
+
+    @XxlJob(value = "yourJobHandler")
     public void regionCal_aqts()  {
 
         XxlJobHelper.log("区域公司安全天数程序执行开始!........");
         try {
-            regionCalreService.aqts();
+            while(true) {
+                regionCalreService.aqts();
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }

realtime/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java

@@ -1995,6 +1995,7 @@ public class EdosUtil implements IEdosUtil {
                 JSONObject jsonObject = resp.getBody();
                 if (StringUtils.isNotEmpty(jsonObject) && !jsonObject.isEmpty())
                 {
+
                     return JsonObjectHelper.phrasePointData(jsonObject,id);
                 }
                 else {

realtime/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/JsonObjectHelper.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.gyee.common.model.DNAStatVal;
 import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
+import com.gyee.common.model.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -40,7 +41,7 @@ public class JsonObjectHelper {
             pointData.setPointName("1");
             pointData.setPointTime(ts);
             pointData.setPointValue(pointValue);
-            pointData.setPointValueInDouble(Double.parseDouble(pointValue));
+            pointData.setPointValueInDouble(StringUtils.round(Double.parseDouble(pointValue),4));
             //System.out.println("key= " + tagName + ", ts = " + ts + ", value = " + pointValue);
             result.add(pointData);
         }
@@ -74,7 +75,7 @@ public class JsonObjectHelper {
                 pointData.setPointName("1");
                 pointData.setPointTime(ts);
                 pointData.setPointValue(pointValue);
-                pointData.setPointValueInDouble(Double.parseDouble(pointValue));
+                pointData.setPointValueInDouble(StringUtils.round(Double.parseDouble(pointValue),4));
                 //System.out.println("key= " + tagName + ", ts = " + ts + ", value = " + pointValue);
                 result.add(pointData);
             }
@@ -110,7 +111,7 @@ public class JsonObjectHelper {
                 pointData.setPointName("1");
                 pointData.setPointTime(ts);
                 pointData.setPointValue(pointValue);
-                pointData.setPointValueInDouble(Double.parseDouble(pointValue));
+                pointData.setPointValueInDouble(StringUtils.round(Double.parseDouble(pointValue),4));
                 //System.out.println("key= " + tagName + ", ts = " + ts + ", value = " + pointValue);
 
             }
@@ -154,7 +155,7 @@ public class JsonObjectHelper {
                     pointData.setPointValueInDouble(1.0);
                 }else
                 {
-                    pointData.setPointValueInDouble(Double.parseDouble(pointValue));
+                    pointData.setPointValueInDouble(StringUtils.round(Double.parseDouble(pointValue),4));
                 }
 
                 //  System.out.println("key= " + key + ", ts = " + ts + ", value = " + pointValue);

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

@@ -30,11 +30,16 @@ public class RealTest {
 //        cacheService.initRedisCache();
 
 
-       begin=new Date();
+        begin=new Date();
         System.out.println("状态判定调度程序执行开始!。。。。。。");
-       statusService.statusReal();
+
+        statusService.middleStatusReal();
+        statusService.statusReal();
+
+//        realtimeService.savaRealtimeTarget();
+//        cycleCalculationService.saveCyle();
+//
 //        realtimeService.savaRealtimeTarget();
-//       cycleCalculationService.saveCyle();
         end=new Date();
         System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
         System.out.println("状态判定调度程序执行结束!。。。。。。");