소스 검색

处理专题分析场站排序

xieshengjie 2 년 전
부모
커밋
003b05db2d

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

@@ -719,7 +719,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -756,7 +756,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -866,7 +866,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -903,7 +903,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -1012,7 +1012,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1049,7 +1049,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
 
@@ -1159,7 +1159,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1196,7 +1196,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -1305,7 +1305,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1342,7 +1342,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -1451,7 +1451,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1488,7 +1488,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -1597,7 +1597,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1635,7 +1635,7 @@ public class SpecificService {
             });
         }
 
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
         return resultendList;
     }
 
@@ -1743,7 +1743,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1780,7 +1780,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -1889,7 +1889,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1926,7 +1926,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -2035,7 +2035,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -2072,7 +2072,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -2181,7 +2181,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -2218,7 +2218,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -2328,7 +2328,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -2365,7 +2365,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -2474,7 +2474,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -2511,7 +2511,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }

+ 1 - 1
web/runeconomy-xk/src/main/java/com/gyee/runeconomy/util/realtimesource/EdosUtil.java

@@ -28,7 +28,7 @@ import java.util.*;
 public class EdosUtil implements IEdosUtil {
 
     private RestTemplate restTemplate =new RestTemplate();
-    @Value("${gyee.adapter-url}")
+    @Value("${db.url}")
     private String baseURL;
 
     @Value("${initialcode}")

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

@@ -83,7 +83,7 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     auto-mapping-behavior: full
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     default-enum-type-handler: org.apache.ibatis.type.EnumOrdinalTypeHandler
   mapper-locations: classpath*:mapper/**/*Mapper.xml
   global-config:
@@ -103,11 +103,10 @@ mybatis-plus:
 logging:
   level:
     root: info
-    com.example: debug
+    com.example: error
 initialcode: INITIAL
 db:
   url: http://124.70.75.91:8011/ts
   #url: http://192.168.11.250:8011/ts
 
   #url: http://192.168.11.250:8011/ts
-runWindpowerstation: SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_LYDL_BH1_FDC_STA,SD_LYDL_BH2_FDC_STA,SD_LYDL_CG_FDC_STA,SD_LYDL_FJ_FDC_STA,SD_LYDL_YS_FDC_STA,SD_SXNY_FXFC_FDC_STA,SD_SXNY_JNSS_FDC_STA,SD_SXNY_WFBH_FDC_STA,SD_SXNY_PLHS_FDC_STA,SD_SXNY_JNCQ_FDC_STA,SD_SXNY_LXLN_FDC_STA,SD_SXNY_LQJS_FDC_STA,SD_SXNY_ZYXD_FDC_STA,SD_SXNY_ZYFS_FDC_STA,SD_GHTZ_HZJ_GDC_STA