From 8e794bd71a82959a0d4ffc9f321a15a825850c6c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 16 Nov 2023 15:05:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/PatrolXxlJob.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/PatrolXxlJob.java b/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/PatrolXxlJob.java
index 2014861..fafd1f2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/PatrolXxlJob.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/PatrolXxlJob.java
@@ -6,8 +6,10 @@
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.xxl.job.core.log.XxlJobLogger;
+import io.swagger.models.auth.In;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -32,13 +34,19 @@
@XxlJob("createTaskJobHandler")
public ReturnT<String> createTaskJobHandler(String param){
XxlJobLogger.log("开始自动创建任务...");
+ XxlJobLogger.log("参数：" + param);
+ XxlJobLogger.log("...");
JSONObject jsonParam = JSON.parseObject(param);
String processDefinitionId = jsonParam.getString("processDefinitionId");
String taskType = jsonParam.getString("taskType");
String title = jsonParam.getString("title");
String content = jsonParam.getString("content");
+ String typeStr = jsonParam.getString("type");
+ int type = 0;
+ if (!StringUtil.isBlank(typeStr))
+ type = Integer.parseInt(typeStr);
// 远程调用
- List<Integer> taskJobHandler = patrolTasClient.createTaskJobHandler(processDefinitionId, taskType, title, content);
+ List<Integer> taskJobHandler = patrolTasClient.createTaskJobHandler(processDefinitionId, taskType, title, content, type);
// 打印响应数据
XxlJobLogger.log("结束自动创建任务...");
XxlJobLogger.log("总数量：<span style='color:red'>" + taskJobHandler.get(0) + "</span> ... 失败数量:<span style='color:red'>" + taskJobHandler.get(1) + "</span> ");
--
Gitblit v1.9.3