Просмотр исходного кода

修改配置信息和多适配器切换

shilin 2 лет назад
Родитель
Сommit
0f5fa3e642

Разница между файлами не показана из-за своего большого размера
+ 42 - 3
realtime/failurestatistics-server-cph/src/main/java/com/gyee/failurestatistics/mapper/auto/FailurestatisticsmainMapper.java


+ 3 - 1
realtime/failurestatistics-server-cph/src/main/java/com/gyee/failurestatistics/util/realtimesource/EdosUtil.java

@@ -21,6 +21,7 @@ import org.springframework.web.client.RestTemplate;
 import java.util.*;
 
 
+
 public class EdosUtil implements IRealTimeDataBaseUtil {
 
 
@@ -93,6 +94,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
     @Override
     public List<PointData> getHistoryDatasSnap(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+
         if(StringUtils.notEmp(point) &&  StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(JKFC) && !point.getCode().startsWith(JKFJ))
         {
             baseURL = V2Config.getBaseurl();
@@ -806,7 +808,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     public List<PointData> getRealData(List<String> pointids) throws Exception {
 
 
-        if(StringUtils.notEmp(pointids) )
+        if(StringUtils.notEmp(pointids) && !pointids.isEmpty() )
         {
 
             if(!pointids.get(0).startsWith(JKFC) && !pointids.get(0).startsWith(JKFJ))

+ 1 - 1
realtime/failurestatistics-server-cph/src/main/resources/application-hb.yml

@@ -2,7 +2,7 @@
 gyee:
   #实时数据库Url
   baseurl: http://192.168.2.198:8011/ts
-  healthurl: http://192.168.2.198:8011/ts
+  healthurl: http://192.168.2.198:8012/ts
   #实时数据库选择
   realtimedataBase: mongodb #数据查询模式 golden、hwy
   initialcode: INITIAL

+ 1 - 1
realtime/failurestatistics-server-cph/src/main/resources/xxl-job-executor.properties

@@ -1,5 +1,5 @@
 ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://192.168.2.216:8175/xxl-job-admin
+xxl.job.admin.addresses=http://192.168.2.198:8175/xxl-job-admin
 
 ### xxl-job, access token
 xxl.job.accessToken=