Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-07-05 abaf72a337248943e037b02d069c094e2ee5d60b

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

@@ -45,10 +45,26 @@
      List<String> result = outCallClient.createOutCallTaskJobHandler(isOver,taskScheduleTime,personNumber, day);
      XxlJobLogger.log("任务响应结果..." + result);
      // 创建外呼短信发送任务记录
      Boolean flag = createCallSmsNoticeTask(result);
      Boolean flag = createCallSmsNoticeTaskByEvery(result);
      XxlJobLogger.log("外呼短信通知任务创建结果:" + flag);
      XxlJobLogger.log("结束自动创建任务...");
      return ReturnT.SUCCESS;
   }

   /**
    * 创建外呼短信发送任务记录--日常定时任务
    * @param result
    */
   private Boolean createCallSmsNoticeTaskByEvery(List<String> result) {
      Boolean flag = false;
      if (null != result && result.size()>3) {
         if (result.get(2).equals("true")) {
            // 获取任务id
            String taskId = result.get(1);
            flag = outCallClient.createCallSmsNoticeTask(taskId);
         }
      }
      return flag;
   }

   /**
@@ -94,7 +110,7 @@
    * @return
    * @throws Exception
    */
   @XxlJob("testOutCall_0628")
   @XxlJob("testOutCall_0703")
   public ReturnT<String> testOutCall(String param){
      XxlJobLogger.log("开始执行任务...");
      JSONObject jsonParam = JSON.parseObject(param);
@@ -103,8 +119,8 @@
//      String personNumber = jsonParam.getString("personNumber");
//      String day = jsonParam.getString("day");
      // 创建外呼任务
      Object result = outCallClient.testOutCall("","","", "");
      XxlJobLogger.log("任务响应结果：" + result);
//      Object result = outCallClient.createOutCallTaskJobHandler("","","", "");
//      XxlJobLogger.log("任务响应结果：" + result);
      XxlJobLogger.log("结束自动创建任务...");
      return ReturnT.SUCCESS;
   }