Selaa lähdekoodia

优化理论保证功率实时计算

xieshengjie 2 vuotta sitten
vanhempi
commit
b8788d6e0b

+ 11 - 4
realtime/computing-services7001/src/main/java/com/gyee/generation/service/TheorypowerService.java

@@ -15,6 +15,8 @@ import com.gyee.generation.model.auto.*;
 import com.gyee.generation.service.auto.IWindturbinepowerService;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import com.gyee.generation.util.redis.RedisService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.language.bm.BeiderMorseEncoder;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -29,6 +31,7 @@ import java.util.stream.Collectors;
  * @Description : 理论功率,保证功率
  */
 @Service
+@Slf4j
 public class TheorypowerService {
     @Resource
     private IEdosUtil edosUtil;
@@ -62,6 +65,7 @@ public class TheorypowerService {
      * 理论功率,保证功率
      */
     public void theropower() throws Exception {
+        long begin = System.currentTimeMillis();
         init();
         Map<String, Map<Double, Double>> zbzglMap = CacheContext.zbzglMap;
         Map<String, Map<Double, Double>> zzsglMap = CacheContext.zzsglMap;
@@ -85,10 +89,10 @@ public class TheorypowerService {
                     Windpowerstationpointnew linebzglpoint = linepointnewMap.get(Contant.ZBZGL);
                     Windpowerstationpointnew linezsglpoint = linepointnewMap.get(Contant.ZZSGL);
                     linewtmap.get(line.getId()).stream().forEach(wt->{
-                        String zzsglString = redisService.get("ZZSGL");
-                        Map<String,Map<Double, Double>> zszglMap = JSONObject.parseObject(zzsglString, new TypeReference<Map<String,Map<Double,Double>>>() {
-                        });
-                        Map<Double, Double> zsglMap = zszglMap.get(wt.getId());
+//                        String zzsglString = redisService.get("ZZSGL");
+//                        Map<String,Map<Double, Double>> zszglMap = JSONObject.parseObject(zzsglString, new TypeReference<Map<String,Map<Double,Double>>>() {
+//                        });
+                        Map<Double, Double> zsglMap = zzsglMap.get(wt.getId());
                         Map<String, Windturbinetestingpointnew> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
                         Windturbinetestingpointnew speedPointnew = windturbinetestingpointnewMap.get(Contant.AI022);
                         Windturbinetestingpointnew ztmxPointnew = windturbinetestingpointnewMap.get(Contant.FJ5T);
@@ -152,6 +156,8 @@ public class TheorypowerService {
             resultList.add(wpzsglpointdata);
         });
         edosUtil.sendMultiPoint(resultList);
+        long end = System.currentTimeMillis();
+        log.info("用时:"+(end-begin));
     }
 
 
@@ -219,6 +225,7 @@ public class TheorypowerService {
             });
             zzsglMap.put(wt.getId(),doubleMap);
         });
+        CacheContext.zzsglMap = zzsglMap;
         redisService.set("ZZSGL", JSONObject.toJSONString(zzsglMap));
 
     }

+ 2 - 2
realtime/computing-services7001/src/test/java/com/gyee/generation/GenerationTest.java

@@ -53,9 +53,9 @@ public class GenerationTest {
 //        realtimeSpeedPowerService.calculateRealtimeSpeedPower();
 //        generationService.saveMeterpointValueRealtime();
 //        theorypowerService.fittingPower();
-//        theorypowerService.theropower();
+        theorypowerService.theropower();
 //        averageAndGeneratingService.saveAvespeedAndAvepowerAndScada();
-        fiveLossesService.lossesReal();
+//        fiveLossesService.lossesReal();
 //        fiveLossesService.saveShutdownevent();
 //        safetyService.safetyReatimel();
 //        fiveLossesService.lossesReal();

+ 11 - 4
realtime/computing-services7002/src/main/java/com/gyee/generation/service/TheorypowerService.java

@@ -15,6 +15,8 @@ import com.gyee.generation.model.auto.*;
 import com.gyee.generation.service.auto.IWindturbinepowerService;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import com.gyee.generation.util.redis.RedisService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.language.bm.BeiderMorseEncoder;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -29,6 +31,7 @@ import java.util.stream.Collectors;
  * @Description : 理论功率,保证功率
  */
 @Service
+@Slf4j
 public class TheorypowerService {
     @Resource
     private IEdosUtil edosUtil;
@@ -62,6 +65,7 @@ public class TheorypowerService {
      * 理论功率,保证功率
      */
     public void theropower() throws Exception {
+        long begin = System.currentTimeMillis();
         init();
         Map<String, Map<Double, Double>> zbzglMap = CacheContext.zbzglMap;
         Map<String, Map<Double, Double>> zzsglMap = CacheContext.zzsglMap;
@@ -85,10 +89,10 @@ public class TheorypowerService {
                     Windpowerstationpointnew linebzglpoint = linepointnewMap.get(Contant.ZBZGL);
                     Windpowerstationpointnew linezsglpoint = linepointnewMap.get(Contant.ZZSGL);
                     linewtmap.get(line.getId()).stream().forEach(wt->{
-                        String zzsglString = redisService.get("ZZSGL");
-                        Map<String,Map<Double, Double>> zszglMap = JSONObject.parseObject(zzsglString, new TypeReference<Map<String,Map<Double,Double>>>() {
-                        });
-                        Map<Double, Double> zsglMap = zszglMap.get(wt.getId());
+//                        String zzsglString = redisService.get("ZZSGL");
+//                        Map<String,Map<Double, Double>> zszglMap = JSONObject.parseObject(zzsglString, new TypeReference<Map<String,Map<Double,Double>>>() {
+//                        });
+                        Map<Double, Double> zsglMap = zzsglMap.get(wt.getId());
                         Map<String, Windturbinetestingpointnew> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
                         Windturbinetestingpointnew speedPointnew = windturbinetestingpointnewMap.get(Contant.AI022);
                         Windturbinetestingpointnew ztmxPointnew = windturbinetestingpointnewMap.get(Contant.FJ5T);
@@ -152,6 +156,8 @@ public class TheorypowerService {
             resultList.add(wpzsglpointdata);
         });
         edosUtil.sendMultiPoint(resultList);
+        long end = System.currentTimeMillis();
+        log.info("用时:"+(end-begin));
     }
 
 
@@ -219,6 +225,7 @@ public class TheorypowerService {
             });
             zzsglMap.put(wt.getId(),doubleMap);
         });
+        CacheContext.zzsglMap = zzsglMap;
         redisService.set("ZZSGL", JSONObject.toJSONString(zzsglMap));
 
     }

+ 11 - 4
realtime/computing-services7003/src/main/java/com/gyee/generation/service/TheorypowerService.java

@@ -15,6 +15,8 @@ import com.gyee.generation.model.auto.*;
 import com.gyee.generation.service.auto.IWindturbinepowerService;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import com.gyee.generation.util.redis.RedisService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.language.bm.BeiderMorseEncoder;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -29,6 +31,7 @@ import java.util.stream.Collectors;
  * @Description : 理论功率,保证功率
  */
 @Service
+@Slf4j
 public class TheorypowerService {
     @Resource
     private IEdosUtil edosUtil;
@@ -62,6 +65,7 @@ public class TheorypowerService {
      * 理论功率,保证功率
      */
     public void theropower() throws Exception {
+        long begin = System.currentTimeMillis();
         init();
         Map<String, Map<Double, Double>> zbzglMap = CacheContext.zbzglMap;
         Map<String, Map<Double, Double>> zzsglMap = CacheContext.zzsglMap;
@@ -85,10 +89,10 @@ public class TheorypowerService {
                     Windpowerstationpointnew linebzglpoint = linepointnewMap.get(Contant.ZBZGL);
                     Windpowerstationpointnew linezsglpoint = linepointnewMap.get(Contant.ZZSGL);
                     linewtmap.get(line.getId()).stream().forEach(wt->{
-                        String zzsglString = redisService.get("ZZSGL");
-                        Map<String,Map<Double, Double>> zszglMap = JSONObject.parseObject(zzsglString, new TypeReference<Map<String,Map<Double,Double>>>() {
-                        });
-                        Map<Double, Double> zsglMap = zszglMap.get(wt.getId());
+//                        String zzsglString = redisService.get("ZZSGL");
+//                        Map<String,Map<Double, Double>> zszglMap = JSONObject.parseObject(zzsglString, new TypeReference<Map<String,Map<Double,Double>>>() {
+//                        });
+                        Map<Double, Double> zsglMap = zzsglMap.get(wt.getId());
                         Map<String, Windturbinetestingpointnew> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
                         Windturbinetestingpointnew speedPointnew = windturbinetestingpointnewMap.get(Contant.AI022);
                         Windturbinetestingpointnew ztmxPointnew = windturbinetestingpointnewMap.get(Contant.FJ5T);
@@ -152,6 +156,8 @@ public class TheorypowerService {
             resultList.add(wpzsglpointdata);
         });
         edosUtil.sendMultiPoint(resultList);
+        long end = System.currentTimeMillis();
+        log.info("用时:"+(end-begin));
     }
 
 
@@ -219,6 +225,7 @@ public class TheorypowerService {
             });
             zzsglMap.put(wt.getId(),doubleMap);
         });
+        CacheContext.zzsglMap = zzsglMap;
         redisService.set("ZZSGL", JSONObject.toJSONString(zzsglMap));
 
     }