优化

electricity/wind/build.gradle

@@ -15,6 +15,8 @@ buildscript {
 apply plugin: "$bootGroup"
 apply plugin: 'io.spring.dependency-management'
 
+archivesBaseName='powergen-wind'
+
 dependencyManagement {
     imports {
         mavenBom "org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion"

realtime/wind/build.gradle

@@ -15,6 +15,8 @@ buildscript {
 apply plugin: "$bootGroup"
 apply plugin: 'io.spring.dependency-management'
 
+archivesBaseName='realtime-wind'
+
 dependencyManagement {
     imports {
         mavenBom "org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion"

realtime/wind/src/main/java/com/gyee/gaia/realtime/wind/job/CauseJobHandler.java

@@ -35,7 +35,7 @@ public class CauseJobHandler implements ApplicationRunner {
     @Resource
     private ThreadPoolTaskExecutor taskExecutor;
 
-    private Map<String, ArrayDeque<PointData>> pdaqMap = new ConcurrentHashMap<>();
+    private final Map<String, ArrayDeque<PointData>> pdaqMap = new ConcurrentHashMap<>();
 
     private boolean isload = false;
 
@@ -63,9 +63,7 @@ public class CauseJobHandler implements ApplicationRunner {
                     pdaqMap.put(k, pdaq);
                 });
             } else {
-                latest.forEach((k, v) -> {
-                    pdaqMap.get(k).offer(v);
-                });
+                latest.forEach((k, v) -> pdaqMap.get(k).offer(v));
             }
             Thread.sleep(1000);
         }
@@ -73,17 +71,17 @@ public class CauseJobHandler implements ApplicationRunner {
 
     private void refreshQueue() {
 
-        try {
-            while (true) {
+        while (true) {
+            try {
                 Map<String, PointData> latest = adapterApi.getLatest(CacheContext.pointCodes);
                 latest.forEach((k, v) -> {
                     pdaqMap.get(k).poll();
                     pdaqMap.get(k).offer(v);
                 });
                 Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
             }
-        } catch (Exception e) {
-            e.printStackTrace();
         }
     }
 
@@ -92,7 +90,7 @@ public class CauseJobHandler implements ApplicationRunner {
 
         if (!isload) return;
         try {
-            String pointCode = null;
+            String pointCode;
             RealtimeAverageTarget target;
             double v;
             //uniformcode,点名
@@ -113,38 +111,38 @@ public class CauseJobHandler implements ApplicationRunner {
 
                 pointCode = entryValue.get(uniformcodeOne.get("wind-speed"));
                 if (pointCode != null) {
-                    v = pdaqMap.get(pointCode).stream().mapToDouble(data -> data.getDoubleValue()).average().orElse(0);
+                    v = pdaqMap.get(pointCode).stream().mapToDouble(PointData::getDoubleValue).average().orElse(0);
                     speed = NumberUtil.round(v, 2).doubleValue();
                     target.setWindSpeed((float) speed);
                     if (speed < 3) {
-                        power = Double.valueOf(0);
+                        power = 0.0;
                     } else {
                         power = CacheContext.mpdsMapMap.get(CacheContext.equipModelMap.get(entry.getKey())).get(speed);
                     }
                     if (power == null) {
-                        power = Double.valueOf(0);
+                        power = 0.0;
                         System.out.println(entry.getKey() + speed);
                     }
-                    target.setTheoryGeneration(NumberUtil.round(power / 60, 3).floatValue());
+                    target.setTheoryGeneration(NumberUtil.round(power / 60, 4).floatValue());
                 }
                 pointCode = entryValue.get(uniformcodeOne.get("active-power"));
                 if (pointCode != null) {
-                    v = pdaqMap.get(pointCode).stream().mapToDouble(data -> data.getDoubleValue()).average().orElse(0);
+                    v = pdaqMap.get(pointCode).stream().mapToDouble(PointData::getDoubleValue).average().orElse(0);
                     target.setPower(NumberUtil.round(v, 2).floatValue());
                 }
                 pointCode = entryValue.get(uniformcodeOne.get("generator_speed"));
                 if (pointCode != null) {
-                    v = pdaqMap.get(pointCode).stream().mapToDouble(data -> data.getDoubleValue()).average().orElse(0);
+                    v = pdaqMap.get(pointCode).stream().mapToDouble(PointData::getDoubleValue).average().orElse(0);
                     target.setGeneratorSpeed(NumberUtil.round(v, 2).floatValue());
                 }
                 pointCode = entryValue.get(uniformcodeOne.get("impeller_speed"));
                 if (pointCode != null) {
-                    v = pdaqMap.get(pointCode).stream().mapToDouble(data -> data.getDoubleValue()).average().orElse(0);
+                    v = pdaqMap.get(pointCode).stream().mapToDouble(PointData::getDoubleValue).average().orElse(0);
                     target.setImpellerSpeed(NumberUtil.round(v, 2).floatValue());
                 }
                 pointCode = entryValue.get(uniformcodeOne.get("wind_direction"));
                 if (pointCode != null) {
-                    v = pdaqMap.get(pointCode).stream().mapToDouble(data -> data.getDoubleValue()).average().orElse(0);
+                    v = pdaqMap.get(pointCode).stream().mapToDouble(PointData::getDoubleValue).average().orElse(0);
                     target.setWindDirection(NumberUtil.round(v, 2).floatValue());
                 }
                 targets.add(target);

realtime/wind/src/main/java/com/gyee/gaia/realtime/wind/job/DataFillJobHandler.java

@@ -35,7 +35,7 @@ public class DataFillJobHandler {
     /**
      * 风机id,uniformcode,平均数据
      */
-    private Map<String, Map<String, List<PointData>>> dsdlssMap;
+    //private Map<String, Map<String, List<PointData>>> dsdlssMap;
 
     @XxlJob("DataFilling")
     public void calcEquipPowerGenDay() {
@@ -89,7 +89,7 @@ public class DataFillJobHandler {
         }
         realtimeAverageTargetService.saveBatch(realtimeAverageTargetList);
     }
-
+/*
     private void getDatas(long time1, long time2) {
         dsdlssMap = new HashMap<>();
         CacheContext.equipUcMap.forEach((equipId, ucode) -> {
@@ -100,7 +100,7 @@ public class DataFillJobHandler {
             });
             dsdlssMap.put(equipId, map);
         });
-    }
+    }*/
 
     private void setRats(RealtimeAverageTarget rat, String equipId, long time1, long time2, Map<String, List<PointData>> lpdsMap) {
 
@@ -137,7 +137,7 @@ public class DataFillJobHandler {
         if (speed < 3) {
             rat.setTheoryGeneration(0f);
         } else {
-            rat.setTheoryGeneration(NumberUtil.round(CacheContext.mpdsMapMap.get(CacheContext.equipModelMap.get(equipId)).get(speed) / 60, 3).floatValue());
+            rat.setTheoryGeneration(NumberUtil.round(CacheContext.mpdsMapMap.get(CacheContext.equipModelMap.get(equipId)).get(speed) / 60, 4).floatValue());
         }
     }
 }

state/cause/build.gradle

@@ -15,6 +15,8 @@ buildscript {
 apply plugin: "$bootGroup"
 apply plugin: 'io.spring.dependency-management'
 
+archivesBaseName='state-cause'
+
 dependencyManagement {
     imports {
         mavenBom "org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion"