问题修复

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-executorWPXNY.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/test/java/com/gyee/generation/GenerationTest.java

@@ -79,14 +79,14 @@ public class GenerationTest {
 //        //场站接入状态，总预测功率
 //        accessStatusService.accessStatus();
 //        //全场状态
-        accessStatusService.fullFieldState();
+//        accessStatusService.fullFieldState();
 
 
 //        statusService.powerRationing();
 //        statusService.statusReal();
 //        statusService.calculateStatusNumber();
 
-//          realtimeService.savaRealtimeTarget();
+          realtimeService.savaRealtimeTarget();
 //        cycleCalculationService.saveCyle();
 
 //        electricityMeteringService.saveGenerationDatas();

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -71,6 +71,7 @@ public class BenchmarkingService {
         if (!companyids.endsWith("RGN")){
             list = list.stream().filter(wp->companyids.contains(wp.getCompanyId())).collect(Collectors.toList());
         }
+        SortUtils.sort(list,"orderNum",SortUtils.ASC);
         return list;
 
     }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -348,11 +348,11 @@ public class SpecificService {
         setCenterYtqInfo(companys,type,yearmonth,monthresultList);
         //设置比较数据
         monthresultList.stream().forEach(i->{
-            i.setMtbfCompare(i.getMtbf()>i.getTqmtbf()?1:2);
-            i.setMttrCompare(i.getMttr()>i.getTqmttr()?1:2);
-            i.setFwjslCompare(i.getFwjsl()>i.getTqfwjsl()?1:2);
-            i.setZtzhlCompare(i.getZtzhl()>i.getTqztzhl()?1:2);
-            i.setXqjslCompare(i.getXqjsl()>i.getTqxqjsl()?1:2);
+            i.setMtbfCompare(null == i.getTqmtbf() ? 2 : (i.getMtbf()>i.getTqmtbf()?1:2));
+            i.setMttrCompare(null == i.getTqmttr() ? 2 : (i.getMttr()>i.getTqmttr()?1:2));
+            i.setFwjslCompare(null == i.getTqfwjsl() ? 2: (i.getFwjsl()>i.getTqfwjsl()?1:2));
+            i.setZtzhlCompare(null == i.getTqztzhl() ? 2 : (i.getZtzhl()>i.getTqztzhl()?1:2));
+            i.setXqjslCompare(null == i.getTqxqjsl() ? 2 : (i.getXqjsl()>i.getTqxqjsl()?1:2));
         });
 
         //定义右边部分的结果list
@@ -363,11 +363,11 @@ public class SpecificService {
         setCenterNtqInfo(companys,type,yearmonth,yearresultList);
         //设置比较数据
         yearresultList.stream().forEach(i->{
-            i.setMtbfCompare(i.getMtbf()>i.getTqmtbf()?1:2);
-            i.setMttrCompare(i.getMttr()>i.getTqmttr()?1:2);
-            i.setFwjslCompare(i.getFwjsl()>i.getTqfwjsl()?1:2);
-            i.setZtzhlCompare(i.getZtzhl()>i.getTqztzhl()?1:2);
-            i.setXqjslCompare(i.getXqjsl()>i.getTqxqjsl()?1:2);
+            i.setMtbfCompare(null == i.getTqmtbf() ? 2 : (i.getMtbf()>i.getTqmtbf()?1:2));
+            i.setMttrCompare(null == i.getTqmttr() ? 2 : (i.getMttr()>i.getTqmttr()?1:2));
+            i.setFwjslCompare(null == i.getTqfwjsl() ? 2: (i.getFwjsl()>i.getTqfwjsl()?1:2));
+            i.setZtzhlCompare(null == i.getTqztzhl() ? 2 : (i.getZtzhl()>i.getTqztzhl()?1:2));
+            i.setXqjslCompare(null == i.getTqxqjsl() ? 2 : (i.getXqjsl()>i.getTqxqjsl()?1:2));
         });
 
         //封装最终返回结果

web/runeconomy-xk/src/main/resources/application-yun.yml

@@ -44,7 +44,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://124.70.75.91:5432/jn_test #IMS_NEM_SD
+    url: jdbc:postgresql://124.70.75.91:5432/hn20130114 #IMS_NEM_SD
     username: postgres
     password: gd123
     #华为云测试地址

web/runeconomy-xk/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
 #    active: jn
-#    active: yun
-    active: xk
+    active: yun
+#    active: xk
 #    active: sd