From b1e5e0b79822fee5116f73825110dcc62246624b Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Thu, 30 May 2024 17:04:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?update=20-=20REQ-2325-=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E8=AF=B7=E6=B1=82=E5=92=8C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/aspectj/ErrorReportAspect.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java index 4636021f5..64424ef49 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java @@ -4,6 +4,7 @@ import cn.axzo.workflow.core.common.event.ApiLogEvent; import cn.axzo.workflow.server.common.annotation.EnvConfig; import cn.axzo.workflow.server.common.annotation.ErrorReporter; import cn.axzo.workflow.server.common.config.property.WorkflowProperties; +import cn.hutool.json.JSONUtil; import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.Arrays; import java.util.Objects; +import java.util.stream.Collectors; import static cn.azxo.framework.common.constatns.Constants.CTX_LOG_ID_MDC; @@ -65,7 +67,12 @@ public class ErrorReportAspect implements Ordered { watch.start(signature.toShortString()); Object result = joinPoint.proceed(); watch.stop(); - log.info("StopWatch '{}': running time = {} 's", watch.getLastTaskName(), watch.getTotalTimeSeconds()); + String params = ""; + Object[] args = joinPoint.getArgs(); + if (args != null && args.length > 0) { + params = Arrays.stream(args).map(JSONUtil::toJsonStr).collect(Collectors.joining(",")); + } + log.info("StopWatch '{}',params:{},result:{}: running time = {} 's", watch.getLastTaskName(), watch.getTotalTimeSeconds(), params, JSONUtil.toJsonStr(result)); if (!signature.toShortString().contains("ExtAxApiLogServiceImpl")) { String type = getType(joinPoint); From 7a3efea30d17b18a986096e0790252935aa4c84c Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Thu, 30 May 2024 17:38:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?update=20-=20REQ-2324-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/aspectj/ErrorReportAspect.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java index 64424ef49..50aadee55 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java @@ -68,11 +68,18 @@ public class ErrorReportAspect implements Ordered { Object result = joinPoint.proceed(); watch.stop(); String params = ""; + String resultStr = ""; Object[] args = joinPoint.getArgs(); if (args != null && args.length > 0) { - params = Arrays.stream(args).map(JSONUtil::toJsonStr).collect(Collectors.joining(",")); + try { + params = Arrays.stream(args).map(JSONUtil::toJsonStr).collect(Collectors.joining(",")); + resultStr = JSONUtil.toJsonStr(result); + } catch (Exception e) { + params = "参数转换JSON字符串异常:" + e.getMessage(); + resultStr = "参数转换JSON字符串异常:" + e.getMessage(); + } } - log.info("StopWatch '{}',params:{},result:{}: running time = {} 's", watch.getLastTaskName(), watch.getTotalTimeSeconds(), params, JSONUtil.toJsonStr(result)); + log.info("StopWatch '{}',params:{},result:{}: running time = {} 's", watch.getLastTaskName(), watch.getTotalTimeSeconds(), params, resultStr); if (!signature.toShortString().contains("ExtAxApiLogServiceImpl")) { String type = getType(joinPoint); From 64c8708d9dd5b13dfcf065c0cad8b8ad5ae1c63c Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Thu, 30 May 2024 18:14:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?update=20-=20REQ-2324-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/aspectj/ErrorReportAspect.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java index 50aadee55..fa9e87040 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java @@ -67,19 +67,7 @@ public class ErrorReportAspect implements Ordered { watch.start(signature.toShortString()); Object result = joinPoint.proceed(); watch.stop(); - String params = ""; - String resultStr = ""; - Object[] args = joinPoint.getArgs(); - if (args != null && args.length > 0) { - try { - params = Arrays.stream(args).map(JSONUtil::toJsonStr).collect(Collectors.joining(",")); - resultStr = JSONUtil.toJsonStr(result); - } catch (Exception e) { - params = "参数转换JSON字符串异常:" + e.getMessage(); - resultStr = "参数转换JSON字符串异常:" + e.getMessage(); - } - } - log.info("StopWatch '{}',params:{},result:{}: running time = {} 's", watch.getLastTaskName(), watch.getTotalTimeSeconds(), params, resultStr); + log.info("StopWatch '{}': running time = {} 's", watch.getLastTaskName(), watch.getTotalTimeSeconds()); if (!signature.toShortString().contains("ExtAxApiLogServiceImpl")) { String type = getType(joinPoint); From 7f0a1b3c20f1c94c96cf9ecc35171f7b444967fb Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 31 May 2024 16:37:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?update(REQ-2324)=20-=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=AE=A1=E6=89=B9=E4=BA=BA=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=88=99=E8=87=AA=E5=8A=A8=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/service/impl/BpmnProcessActivityServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessActivityServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessActivityServiceImpl.java index 21840a93a..1026fab83 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessActivityServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessActivityServiceImpl.java @@ -46,6 +46,7 @@ public class BpmnProcessActivityServiceImpl implements BpmnProcessActivityServic if (CollectionUtils.isEmpty(dto.getAssigners())) { Execution execution = runtimeService.createExecutionQuery().executionId(dto.getTriggerId()).singleResult(); commandExecutor.execute(new CustomAbortProcessInstanceCmd(execution.getProcessInstanceId(), null, "业务未指定审批人", extAxHiTaskInstService)); + return; } commandExecutor.execute(new CustomBizSpecifyAssigneeToTaskCmd(dto.getTriggerId(), dto.getAssigners())); } From 1628402bd51a18d034382898dc26201dd3d5ea50 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 31 May 2024 16:56:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?update(REQ-2324)=20-=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=AE=A1=E6=89=B9=E4=BA=BA=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=88=99=E8=87=AA=E5=8A=A8=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/service/impl/BpmnProcessActivityServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessActivityServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessActivityServiceImpl.java index 1026fab83..b34039464 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessActivityServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessActivityServiceImpl.java @@ -45,6 +45,9 @@ public class BpmnProcessActivityServiceImpl implements BpmnProcessActivityServic CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutor(); if (CollectionUtils.isEmpty(dto.getAssigners())) { Execution execution = runtimeService.createExecutionQuery().executionId(dto.getTriggerId()).singleResult(); + if (Objects.isNull(execution)) { + throw new WorkflowEngineException(ACTIVITY_TRIGGER_NOT_EXISTS, dto.getTriggerId()); + } commandExecutor.execute(new CustomAbortProcessInstanceCmd(execution.getProcessInstanceId(), null, "业务未指定审批人", extAxHiTaskInstService)); return; }