Merge branch 'master' of http://git.jiayuepowertech.com:9022/xusl/cpp

cpp-admin/src/main/java/com/cpp/web/core/config/sharding/ShardingTablesLoadRunner.java

@@ -2,6 +2,7 @@ package com.cpp.web.core.config.sharding;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cpp.web.domain.accuracy.AccuracyPassRate;
+import com.cpp.web.domain.accuracy.ShortTermSinglePointDeviation;
 import com.cpp.web.domain.alarm.AbnormalAlarm;
 import com.cpp.web.domain.cloud.ForecastPowerShortTermCloud;
 import com.cpp.web.domain.cloud.ForecastPowerUltraShortTermCloud;
@@ -9,6 +10,7 @@ import com.cpp.web.domain.cloud.NwpCloud;
 import com.cpp.web.domain.datafactory.ParsingLog;
 import com.cpp.web.domain.station.*;
 import com.cpp.web.service.accuracy.AccuracyPassRateService;
+import com.cpp.web.service.accuracy.ShortTermSinglePointDeviationService;
 import com.cpp.web.service.alarm.AbnormalAlarmService;
 import com.cpp.web.service.cloud.ForecastPowerShortTermCloudService;
 import com.cpp.web.service.cloud.ForecastPowerUltraShortTermCloudService;
@@ -56,6 +58,7 @@ public class ShardingTablesLoadRunner{
     private final ParsingLogService parsingLogService;
     private final ForecastPowerShortTermSendService forecastPowerShortTermSendService;
     private final AccuracyPassRateService accuracyPassRateService;
+    private final ShortTermSinglePointDeviationService shortTermSinglePointDeviationService;
 
 
     @PostConstruct
@@ -140,6 +143,11 @@ public class ShardingTablesLoadRunner{
         accuracyPassRateLambdaQueryWrapper.eq(AccuracyPassRate::getTime, new Date()).last("limit 1");
         accuracyPassRateService.list(accuracyPassRateLambdaQueryWrapper);
 
+        // 读取已有分表，进行缓存
+        LambdaQueryWrapper<ShortTermSinglePointDeviation> shortTermSinglePointDeviationLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        shortTermSinglePointDeviationLambdaQueryWrapper.eq(ShortTermSinglePointDeviation::getTime, new Date()).last("limit 1");
+        shortTermSinglePointDeviationService.list(shortTermSinglePointDeviationLambdaQueryWrapper);
+
 
         log.info(">>>>>>>>>> 【ShardingTablesLoadRunner】缓存已有分表成功 <<<<<<<<<<");
     }

cpp-admin/src/main/resources/sharding.yaml

@@ -160,6 +160,12 @@ rules:
         standard:
           shardingColumn: time
           shardingAlgorithmName: auto-custom
+    cpp_short_term_single_point_deviation:
+      actualDataNodes: cpp.cpp_short_term_single_point_deviation
+      tableStrategy:
+        standard:
+          shardingColumn: time
+          shardingAlgorithmName: auto-custom
   shardingAlgorithms:
     auto-custom:
       type: CLASS_BASED