Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

zhongrj

2023-08-07 50bc6ee76ffcebc0b539e0fb5698a3911e5f6c02

 skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/NkyXxlJob.java

@@ -1,8 +1,6 @@
package cn.gistack.job.executor.jobhandler;

import cn.gistack.nky.fegin.INkyClient;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.xxl.job.core.log.XxlJobLogger;
@@ -28,7 +26,7 @@
   private final INkyClient nkyClient;

   /**
    * 南科院请求预测
    * 南科院Arima请求预测
    * @param param
    * @return
    * @throws Exception
@@ -39,16 +37,43 @@
      arimaPredict();
      XxlJobLogger.log("ArimaPredict预测结束...");

      XxlJobLogger.log("开始Hst预测...");
      hstPredict();
      XxlJobLogger.log("Hst预测结束...");

      XxlJobLogger.log("结束任务...");
      return ReturnT.SUCCESS;
   }

   /**
    * 南科院请求预测结果
    * 南科院Hst请求预测
    * @param param
    * @return
    * @throws Exception
    */
   @XxlJob("predictNkyHstDataJobHandler")
   public ReturnT<String> predictNkyHstDataJobHandler(String param){

      XxlJobLogger.log("开始Hst预测...");
      hstPredict();
      XxlJobLogger.log("Hst预测结束...");
      XxlJobLogger.log("结束任务...");
      return ReturnT.SUCCESS;
   }

   /**
    * 南科院Hst请求预测结果
    * @param param
    * @return
    * @throws Exception
    */
   @XxlJob("queryNkyHstDataJobHandler")
   public ReturnT<String> queryNkyHstDataJobHandler(String param){
      XxlJobLogger.log("开始Hst预测结果请求");
      hstQuery();
      XxlJobLogger.log("Hst预测结果请求结束");
      XxlJobLogger.log("结束任务...");
      return ReturnT.SUCCESS;
   }

   /**
    * 南科院Arima请求预测结果
    * @param param
    * @return
    * @throws Exception
@@ -57,23 +82,17 @@
   public ReturnT<String> queryNkyDataJobHandler(String param){
      XxlJobLogger.log("开始Arima预测结果请求");
      arimaQuery();

      XxlJobLogger.log("Arima预测结果请求结束");

      XxlJobLogger.log("开始Hst预测结果请求");
      hstQuery();
      XxlJobLogger.log("Hst预测结果请求结束");


      XxlJobLogger.log("结束任务...");
      return ReturnT.SUCCESS;
   }

   public void arimaPredict(){
      XxlJobLogger.log("渗压预测开始");
      nkyClient.arimaPredictData(SY);
      XxlJobLogger.log("位移预测开始");
      nkyClient.arimaPredictData(X);
      nkyClient.arimaPredictData(Y);
      nkyClient.arimaPredictData(Z);

   }

   public void arimaQuery(){
@@ -83,11 +102,14 @@
      nkyClient.arimaQueryData(Z);
   }

   /**
    * hst预测
    */
   public void hstPredict(){
      XxlJobLogger.log("渗压预测开始");
      nkyClient.hstPredictData(SY);
      XxlJobLogger.log("位移预测开始");
      nkyClient.hstPredictData(X);
      nkyClient.hstPredictData(Y);
      nkyClient.hstPredictData(Z);
   }

   public void hstQuery(){