增加训练组织判断

src/main/java/com/shkpr/service/aimodelpower/bizmgr/PredictBizMgr.java

@@ -83,8 +83,8 @@ public class PredictBizMgr {
     public void holidaysTask() {
         taskScheduler.execute(() -> {
             //训练水量
-            modelPredictor.trainDayWater();
-            modelPredictor.trainHourWater();
+            modelPredictor.trainDayWater(null);
+            modelPredictor.trainHourWater(null);
         });
     }
 }

src/main/java/com/shkpr/service/aimodelpower/components/DataMigrator.java

@@ -77,8 +77,8 @@ public class DataMigrator {
         }
 
         //训练模型
-        modelPredictor.trainDayWater();
-        modelPredictor.trainHourWater();
+        modelPredictor.trainDayWater(orgName);
+        modelPredictor.trainHourWater(orgName);
 
         //预测数据
         modelPredictor.predictDayWater(30, 2, orgName);

src/main/java/com/shkpr/service/aimodelpower/components/ModelPredictor.java

@@ -270,8 +270,10 @@ public class ModelPredictor {
 
     /**
      * 训练小时水量
+     *
+     * @param orgName 组织名称
      */
-    public void trainDayWater() {
+    public void trainDayWater(String orgName) {
         //关闭的组织名称
         List<String> closeOrgNames = predictProperties.getCloseOrgNames();
         //获取组织配置
@@ -282,6 +284,8 @@ public class ModelPredictor {
 
         //遍历组织配置
         orgConfigs.forEach(orgConfig -> {
+            if (orgName != null && !Objects.equals(orgConfig.getOrgName(), orgName)) return;
+
             long begin = System.currentTimeMillis();
 
             //请求参数
@@ -322,8 +326,10 @@ public class ModelPredictor {
 
     /**
      * 训练小时水量
+     *
+     * @param orgName 组织名称
      */
-    public void trainHourWater() {
+    public void trainHourWater(String orgName) {
         //关闭的组织名称
         List<String> closeOrgNames = predictProperties.getCloseOrgNames();
         //获取组织配置
@@ -334,6 +340,8 @@ public class ModelPredictor {
 
         //遍历组织配置
         orgConfigs.forEach(orgConfig -> {
+            if (orgName != null && !Objects.equals(orgConfig.getOrgName(), orgName)) return;
+
             long begin = System.currentTimeMillis();
 
             //请求参数