From 22a8d55c777062fee3cabd7e084992e988354807 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Sun, 28 Apr 2024 15:29:16 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E4=BC=98=E5=8C=96=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E4=BB=BB=E5=8A=A1=E5=AE=9E=E4=BE=8B=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xxljob/OperationDataJobHandler.java | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/xxljob/OperationDataJobHandler.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/xxljob/OperationDataJobHandler.java index 37333b0dd..5dc1bb4e0 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/xxljob/OperationDataJobHandler.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/xxljob/OperationDataJobHandler.java @@ -1,7 +1,11 @@ package cn.axzo.workflow.server.xxljob; import cn.axzo.framework.jackson.utility.JSON; +import cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum; +import cn.axzo.workflow.common.model.request.bpmn.task.ExtHiTaskSearchDTO; +import cn.axzo.workflow.core.repository.entity.ExtAxHiTaskInst; import cn.axzo.workflow.core.repository.mapper.CommonMapper; +import cn.axzo.workflow.core.service.ExtAxHiTaskInstService; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.IJobHandler; import com.xxl.job.core.handler.annotation.XxlJob; @@ -9,11 +13,15 @@ import com.xxl.job.core.log.XxlJobLogger; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.util.List; import java.util.Map; +import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.APPROVED; + /** * 操作数据表 * @@ -26,12 +34,31 @@ import java.util.Map; public class OperationDataJobHandler extends IJobHandler { @Resource private CommonMapper commonMapper; + @Resource + private ExtAxHiTaskInstService extAxHiTaskInstService; @Override @XxlJob("executeDynamicSql") public ReturnT execute(String s) throws Exception { - List> maps = commonMapper.executeDynamicSQL(s); - XxlJobLogger.log("result: {}", JSON.toJSONString(maps)); + if (StringUtils.hasText(s)) { + List> maps = commonMapper.executeDynamicSQL(s); + XxlJobLogger.log("result: {}", JSON.toJSONString(maps)); + } else { + repairData(); + } return ReturnT.SUCCESS; } + + private void repairData() { + ExtHiTaskSearchDTO searchDTO = new ExtHiTaskSearchDTO(); + searchDTO.setTaskDefinitionKey("NODE_STARTER"); + searchDTO.setStatus(BpmnProcessInstanceResultEnum.PROCESSING); + List extAxHiTaskInsts = extAxHiTaskInstService.queryList(searchDTO); + if (!CollectionUtils.isEmpty(extAxHiTaskInsts)) { + extAxHiTaskInsts.forEach(i -> { + i.setStatus(APPROVED.getStatus()); + extAxHiTaskInstService.update(i); + }); + } + } }