Merge branch 'feature/REQ-5965' into test

This commit is contained in:
wangli 2025-11-21 18:29:26 +08:00
commit ff03caea22
16 changed files with 1323 additions and 30 deletions

View File

@ -46,7 +46,6 @@ import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.SYNC;
*/
//@FeignClient(name = "workflow-engine", url = "${axzo.service.workflow-engine:http://workflow-engine:8080}", configuration = CommonFeignConfiguration.class)
@WorkflowEngineFeignClient
@Manageable
public interface ProcessModelApi {
/**
@ -57,6 +56,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "流程模型列表")
@GetMapping("/api/process/model/page")
@Manageable
@InvokeMode(SYNC)
CommonResponse<BpmPageResult<BpmnModelDetailVO>> page(@Validated @RequestBody BpmnModelSearchDTO dto);
@ -66,6 +66,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "创建流程模型")
@PostMapping("/api/process/model/create")
@Manageable
@InvokeMode(SYNC)
CommonResponse<String> create(@Validated @RequestBody BpmnModelCreateDTO dto);
@ -74,6 +75,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "通过模型ID查询指定流程模型")
@GetMapping("/api/process/model/get")
@Manageable
@InvokeMode(SYNC)
CommonResponse<BpmnModelDetailVO> getById(@NotBlank(message = "流程模型 ID 不能为空") @RequestParam(required = false) String processModelId,
@RequestParam(required = false) String tenantId);
@ -83,6 +85,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "通过模型KEY查询指定流程模型")
@GetMapping("/api/process/model/getByKey")
@Manageable
@InvokeMode(SYNC)
CommonResponse<BpmnModelDetailVO> getByKey(@NotBlank(message = "流程模型 KEY 不能为空") @RequestParam(required = false) String processModelKey,
@NotBlank(message = "租户不能为空") @RequestParam(required = false) String tenantId);
@ -96,6 +99,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "获取指定模型的扩展属性")
@GetMapping("/api/process/model/ext")
@Manageable
@InvokeMode(SYNC)
CommonResponse<BpmnModelExtVO> getModelExt(@NotBlank(message = "模型 ID 不能为空") @RequestParam(required = false) String modelId);
@ -104,6 +108,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "更新流程模型")
@PutMapping("/api/process/model/update")
@Manageable
@InvokeMode(SYNC)
CommonResponse<String> update(@RequestBody BpmnModelUpdateDTO dto);
@ -115,6 +120,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "通过模型 ID 部署流程模型")
@PostMapping("/api/process/model/deploy")
@Manageable
@InvokeMode(SYNC)
CommonResponse<String> deployById(@NotBlank(message = "流程模型 ID 不能为空") @RequestParam(required = false) String processModelId,
@RequestParam(required = false, defaultValue = "") String modelTenantId,
@ -127,6 +133,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "通过模型 KEY 部署流程模型")
@PostMapping("/api/process/model/deployByKey")
@Manageable
@InvokeMode(SYNC)
CommonResponse<String> deployByKey(@NotBlank(message = "流程模型 KEY 不能为空") @RequestParam(required = false) String processModelKey,
@NotBlank(message = "租户不能为空") @RequestParam(required = false) String modelTenantId,
@ -142,6 +149,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "通过模型 ID 取消部署流程模型")
@PostMapping("/api/process/model/undeploy")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Void> unDeployById(@NotBlank(message = "流程模型 ID 不能为空") @RequestParam(required = false) String processModelId,
@RequestParam(required = false, defaultValue = "") String tenantId,
@ -152,6 +160,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "删除指定模型 ID 的流程模型")
@DeleteMapping("/api/process/model/delete")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Void> deleteById(@NotBlank(message = "流程模型 ID 不能为空") @RequestParam String processModelId,
@RequestParam(required = false, defaultValue = "") String tenantId);
@ -165,6 +174,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "删除指定模型 KEY 的流程模型")
@DeleteMapping("/api/process/model/deleteByKey")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Void> deleteByKey(@NotBlank(message = "流程模型 KEY 不能为空") @RequestParam String processModelKey,
@RequestParam(required = false, defaultValue = "") String tenantId);
@ -179,6 +189,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "修改模型状态")
@PostMapping("/api/process/model/changeStatus")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Boolean> changeStatus(@NotBlank(message = "模型 ID 不能为空") @RequestParam String modelId,
@NotNull(message = "状态不能为空") @RequestParam Integer status,
@ -194,6 +205,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "修改模型打印开关状态")
@PostMapping("/api/process/model/print/changeStatus")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Boolean> changePrintStatus(@NotBlank(message = "模型 ID 不能为空") @RequestParam String modelId,
@NotNull(message = "状态不能为空") @RequestParam Integer status,
@ -206,6 +218,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "查询流程模型使用的分类列表")
@GetMapping("/api/process/model/category/ids")
@Manageable
@InvokeMode(SYNC)
CommonResponse<List<String>> getModelCategoryList();
@ -216,6 +229,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "查询模型的租户集合")
@GetMapping("/api/process/model/tenant/ids")
@Manageable
@InvokeMode(SYNC)
CommonResponse<List<String>> getModelTenantIds();
@ -227,6 +241,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "获取打印模板配置内容")
@PostMapping("/api/process/model/print/template/config/query")
@Manageable
@InvokeMode(SYNC)
CommonResponse<PrintModelDTO> getPrintTemplateConfig(@Validated @RequestBody PrintTemplateConfigQueryDTO dto);
@ -238,6 +253,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "代运营重置打印模板")
@PostMapping(value = "/api/process/model/print/template/config/reset")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Boolean> resetPrintTemplateConfig(@Validated @RequestBody RestPrintTemplateConfigDTO dto);
@ -249,6 +265,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "搜索文档列表")
@PostMapping(value = "/api/process/model/doc/page")
@Manageable
@InvokeMode(SYNC)
CommonResponse<BpmPageResult<DocBaseVO>> docPage(@Validated @RequestBody DocSearchDTO dto);
@ -259,6 +276,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "获取指定 docIds 文档列表")
@PostMapping(value = "/api/process/model/doc/ids")
@Manageable
@InvokeMode(SYNC)
CommonResponse<List<DocBaseVO>> docByIds(@Validated @RequestBody DocByIdDTO dto);
@ -281,6 +299,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "获取关联 HiPrint 类型文档模板内容")
@PostMapping(value = "/api/process/model/hi-print/content/get")
@Manageable
@InvokeMode(SYNC)
CommonResponse<String> getHiPrintContent(@RequestParam String fileRelationId);
@ -291,6 +310,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "添加关联文档")
@PutMapping(value = "/api/process/model/doc/create")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Boolean> createDoc(@Validated @RequestBody DocCreateDTO dto);
@ -301,6 +321,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "修改关联文档")
@PostMapping(value = "/api/process/model/doc/update")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Boolean> updateDoc(@Validated @RequestBody DocUpdateDTO dto);
@ -312,6 +333,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "克隆关联文档")
@PostMapping(value = "/api/process/model/doc/clone")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Boolean> cloneDoc(@RequestParam("id") Long docId);
@ -322,6 +344,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "删除指定文档")
@DeleteMapping(value = "/api/process/model/doc/delete")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Boolean> deleteDoc(@RequestParam("id") Long docId);
@ -333,6 +356,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "关联文档配置排序")
@PostMapping(value = "/api/process/model/doc/order")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Boolean> orderDoc(@Validated @RequestBody DocOrderDTO dto);
@ -344,6 +368,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "重置关联文档配置")
@PostMapping(value = "/api/process/model/doc/reset")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Boolean> resetDoc(@Validated @RequestBody DocResetDTO dto);
@ -355,6 +380,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "设置关联文档的停启用状态")
@PostMapping(value = "/api/process/model/doc/status")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Boolean> statusDoc(@Validated @RequestBody DocStatusDTO dto);
@ -365,6 +391,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "设置关联文档的必选状态")
@PostMapping(value = "/api/process/model/doc/require")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Boolean> requireDoc(@Validated @RequestBody DocStatusDTO dto);
@ -375,6 +402,7 @@ public interface ProcessModelApi {
*/
@Operation(summary = "特殊的查询设置过关联过文档的工作台 ID 集合")
@PostMapping(value = "/api/process/model/has/docs/tenantId")
@Manageable
@InvokeMode(SYNC)
CommonResponse<List<Long>> hasFilesTenantIds(@Validated @RequestBody DocTenantQueryDTO dto);
}

View File

@ -1,6 +1,5 @@
package cn.axzo.workflow.common.model.request.bpmn.process;
import cn.axzo.workflow.common.model.dto.UploadFieldDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -20,15 +19,7 @@ public class BpmnProcessInstanceCreateWithFormDTO {
/**
* 审批使用了表单请一定注意传参
* <p>
* 图片类型和附件类型组件请用 @see {@link UploadFieldDTO} 对象集合传入
* <pre>
* // form_image 为表单项的 key value UploadFileDTO 对象集合如果前端使用了组件一般建议回传所有属性特殊情况下可以只传 fileUrl
* "form_image": [{
* "fileName": "",
* "fileUrl": "http://gips2.baidu.com/it/u=195724436,3554684702&fm=3028&app=3028&f=JPEG&fmt=auto?w=1280&h=960",
* "fileKey": 123
* }]
* </pre>
* 请先查看{@see https://alidocs.dingtalk.com/i/nodes/ZgpG2NdyVXKy17o6fQ5nKGvMWMwvDqPk}文档根据不同类型传不同的 value 对象
*/
@ApiModelProperty(value = "通过表单创建流程时传入的初始表单数据")
private Map<String, Object> startFormVariables;

View File

@ -1,10 +1,16 @@
package cn.axzo.workflow.core.listener;
import cn.axzo.workflow.common.constant.BpmnConstants;
import cn.axzo.workflow.core.common.context.OperationContext;
import cn.hutool.json.JSONUtil;
import org.slf4j.MDC;
import org.springframework.util.StringUtils;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static cn.azxo.framework.common.constatns.Constants.CTX_LOG_ID_MDC;
/**
@ -43,4 +49,29 @@ public abstract class AbstractBpmnEventListener<T extends OperationContext> impl
}
return processDefinitionId.split(":")[0];
}
/**
* 移除一些业务不需要关心的变量
*
* @param originVariables
* @return
*/
public static Map<String, Object> removeBpmnConstantsVariables(Map<String, Object> originVariables) {
if (originVariables == null) return new HashMap<>();
// 定义需要移除的前缀列表
List<String> prefixesToRemove = Arrays.asList(
BpmnConstants.INTERNAL_TASK_RELATION_ASSIGNEE_INFO,
BpmnConstants.INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT,
BpmnConstants.TASK_COMPLETE_OPERATION_TYPE,
BpmnConstants.INTERNAL_TASK_RELATION_ASSIGNEE_LIST_INFO
);
return originVariables.entrySet().stream()
.filter(entry -> entry.getKey() != null)
// 核心修改检查 key 是否以任一前缀开头
.filter(entry -> prefixesToRemove.stream()
.noneMatch(prefix -> entry.getKey().startsWith(prefix)))
.collect(HashMap::new, (m, e) -> m.put(e.getKey(), e.getValue()), HashMap::putAll);
}
}

View File

@ -158,6 +158,18 @@
<groupId>cn.axzo.infra</groupId>
<artifactId>adapter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
</dependency>
</dependencies>
<build>

View File

@ -13,6 +13,7 @@ import org.springframework.web.servlet.HandlerInterceptor;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.time.Duration;
import java.util.Enumeration;
import java.util.Objects;
@ -22,10 +23,10 @@ import static cn.axzo.workflow.client.config.WorkflowRequestInterceptor.HEADER_A
import static cn.axzo.workflow.client.config.WorkflowRequestInterceptor.HEADER_HTTP_CLIENT;
import static cn.axzo.workflow.client.config.WorkflowRequestInterceptor.HEADER_HTTP_CLIENT_VALUE;
import static cn.axzo.workflow.client.config.WorkflowRequestInterceptor.HEADER_SERVER_NAME;
import static cn.axzo.workflow.common.constant.BpmnConstants.FLOW_SERVER_VERSION_130;
import static cn.axzo.workflow.common.constant.StarterConstants.ENABLE_MANAGEABLE;
import static cn.axzo.workflow.common.code.OtherRespCode.CLIENT_VERSION_SUPPORT;
import static cn.axzo.workflow.common.code.OtherRespCode.MICRO_SERVER_NEED_REBUILD;
import static cn.axzo.workflow.common.constant.BpmnConstants.FLOW_SERVER_VERSION_130;
import static cn.axzo.workflow.common.constant.StarterConstants.ENABLE_MANAGEABLE;
/**
* 客户端与服务端的版本比较
@ -47,11 +48,11 @@ public class RequestHeaderContextInterceptor implements HandlerInterceptor {
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
if (Objects.equals(HEADER_HTTP_CLIENT_VALUE, request.getHeader(HEADER_HTTP_CLIENT))) {
String headerClientVersion = request.getHeader(HEADER_API_VERSION)
.replaceAll("-SNAPSHOT", "")
.replaceAll("-RELEASE", "");
.replaceAll("-SNAPSHOT", "")
.replaceAll("-RELEASE", "");
serviceVersion = serviceVersion
.replaceAll("-SNAPSHOT", "")
.replaceAll("-RELEASE", "");
.replaceAll("-SNAPSHOT", "")
.replaceAll("-RELEASE", "");
DefaultArtifactVersion minimumSupportedVersion = new DefaultArtifactVersion(FLOW_SERVER_VERSION_130);
DefaultArtifactVersion clientVersion = new DefaultArtifactVersion(headerClientVersion);
DefaultArtifactVersion serverVersion = new DefaultArtifactVersion(serviceVersion);
@ -65,10 +66,29 @@ public class RequestHeaderContextInterceptor implements HandlerInterceptor {
throw new WorkflowEngineException(CLIENT_VERSION_SUPPORT, serviceVersion, headerClientVersion);
}
}
if (request.getRequestURI().contains("/web/process/validate-auth")) {
return true;
}
if (request.getRequestURI().contains("/web/process/form")) {
HttpSession session = request.getSession();
// 检查session中是否有"已验证"标记
Boolean isAuthenticated = (Boolean) session.getAttribute("isAuthenticated");
if (isAuthenticated == null || !isAuthenticated) {
// 未验证转发到原页面由页面展示授权码输入框
return true; // 不拦截由页面逻辑处理
// 或重定向到单独的授权页面response.sendRedirect("/auth/page");
}
}
// feignApi 才需要检查版本
if (!request.getRequestURI().contains("/web/") && !request.getRequestURI().contains("checkDeath")
&& !request.getRequestURI().contains("/error")
&& !StringUtils.hasText(request.getHeader(HEADER_HTTP_CLIENT))) {
&& !request.getRequestURI().contains(".ico")// 这三行主要解决form.html页面访问
&& !request.getRequestURI().contains(".json")//
&& !request.getRequestURI().contains(".html")//
&& !request.getRequestURI().contains("/error")
&& !StringUtils.hasText(request.getHeader(HEADER_HTTP_CLIENT))) {
String serverName = request.getHeader(HEADER_SERVER_NAME);
printHeader(request);
log.error(MICRO_SERVER_NEED_REBUILD.getMessage(), serverName);
@ -104,7 +124,7 @@ public class RequestHeaderContextInterceptor implements HandlerInterceptor {
}
ExtAxProperty property = extAxProperty.get();
if (Objects.equals(property.getValue(), clientVersion.toString())
&& Objects.equals(property.getManageable().toString(), manageableStatus)) {
&& Objects.equals(property.getManageable().toString(), manageableStatus)) {
return;
}
property.setName(requestApplicationName);

View File

@ -178,7 +178,7 @@ public class RocketMqBpmActivityEvent_100_Listener extends AbstractBpmnEventList
if (Objects.nonNull(processInstance)) {
dto.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
dto.setBusinessKey(processInstance.getBusinessKey());
dto.setVariables(processInstance.getProcessVariables());
dto.setVariables(removeBpmnConstantsVariables(processInstance.getProcessVariables()));
dto.setWorkflowEngineVersion(String.valueOf(processInstance.getProcessVariables()
.getOrDefault(WORKFLOW_ENGINE_VERSION, FLOW_SERVER_VERSION_121)));
} else {

View File

@ -26,7 +26,6 @@ import org.flowable.engine.HistoryService;
import org.flowable.engine.TaskService;
import org.flowable.engine.impl.util.CommandContextUtil;
import org.flowable.engine.impl.util.ProcessDefinitionUtil;
import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.service.impl.persistence.entity.TaskEntity;
import org.springframework.beans.factory.annotation.Value;
@ -451,7 +450,7 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener<
.setTemplateId(templateId)
.setTaskId(event.getTaskId())
.setReceivePersons(event.getAssigners())
.setVariables(variables)
.setVariables(removeBpmnConstantsVariables(variables))
.setProcessApproveConf(event.getProcessApproveConfig())
.setActivitySignature(activitySignature)
.setTerminalType(terminalType);

View File

@ -81,7 +81,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
.setProcessDefinitionKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey())
.setProcessDefinitionVersion(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionVersion())
.setInitiator(initiator)
.setVariables(((ExecutionEntityImpl) event.getEntity()).getVariables())
.setVariables(removeBpmnConstantsVariables(((ExecutionEntityImpl) event.getEntity()).getVariables()))
.setStartTime(((ExecutionEntityImpl) event.getEntity()).getStartTime())
.setTenantId(((ExecutionEntityImpl) event.getEntity()).getTenantId())
.setBusinessKey(((ExecutionEntityImpl) event.getEntity()).getBusinessKey())
@ -117,7 +117,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
.setProcessDefinitionKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey())
.setProcessDefinitionVersion(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionVersion())
.setInitiator(initiator)
.setVariables(((ExecutionEntityImpl) event.getEntity()).getVariables())
.setVariables(removeBpmnConstantsVariables(((ExecutionEntityImpl) event.getEntity()).getVariables()))
.setStartTime(((ExecutionEntityImpl) event.getEntity()).getStartTime())
.setTenantId(((ExecutionEntityImpl) event.getEntity()).getTenantId())
.setBusinessKey(((ExecutionEntityImpl) event.getEntity()).getProcessInstance().getBusinessKey())
@ -151,7 +151,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
.setInitiator(initiator)
.setLastOperationAssigner(getContext().getLastOperationAssigner(() -> BpmnTaskDelegateAssigner.toObjectCompatible(
runtimeService.getVariable(event.getProcessInstanceId(), CLOSE_PROCESS_ASSIGNER, BpmnTaskDelegateAssigner.class))))
.setVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables())
.setVariables(removeBpmnConstantsVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables()))
.setStartTime(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getStartTime())
.setTenantId(((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId())
.setBusinessKey(((FlowableProcessCancelledEventImpl) event).getExecution().getProcessInstanceBusinessKey())
@ -192,7 +192,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
.setInitiator(initiator)
.setLastOperationAssigner(getContext().getLastOperationAssigner(() -> BpmnTaskDelegateAssigner.toObjectCompatible(
runtimeService.getVariable(event.getProcessInstanceId(), CLOSE_PROCESS_ASSIGNER, BpmnTaskDelegateAssigner.class))))
.setVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables())
.setVariables(removeBpmnConstantsVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables()))
.setStartTime(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getStartTime())
.setTenantId(((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId())
.setBusinessKey(((FlowableProcessCancelledEventImpl) event).getExecution().getProcessInstanceBusinessKey())
@ -228,7 +228,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
.setInitiator(initiator)
.setLastOperationAssigner(getContext().getLastOperationAssigner(() -> BpmnTaskDelegateAssigner.toObjectCompatible(
runtimeService.getVariable(event.getProcessInstanceId(), CLOSE_PROCESS_ASSIGNER, BpmnTaskDelegateAssigner.class))))
.setVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables())
.setVariables(removeBpmnConstantsVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables()))
.setStartTime(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getStartTime())
.setTenantId(((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId())
.setBusinessKey(((FlowableProcessCancelledEventImpl) event).getExecution().getProcessInstanceBusinessKey())
@ -264,7 +264,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener<
.setInitiator(initiator)
.setLastOperationAssigner(getContext().getLastOperationAssigner(() -> BpmnTaskDelegateAssigner.toObjectCompatible(
runtimeService.getVariable(event.getProcessInstanceId(), CLOSE_PROCESS_ASSIGNER, BpmnTaskDelegateAssigner.class))))
.setVariables(((ExecutionEntityImpl) event.getEntity()).getVariables())
.setVariables(removeBpmnConstantsVariables(((ExecutionEntityImpl) event.getEntity()).getVariables()))
.setStartTime(((ExecutionEntityImpl) event.getEntity()).getStartTime())
.setTenantId(((ExecutionEntityImpl) event.getEntity()).getTenantId())
.setBusinessKey(((ExecutionEntityImpl) event.getEntity()).getProcessInstanceBusinessKey())

View File

@ -154,7 +154,7 @@ public class RocketMqBpmnTaskEvent_102_Listener extends AbstractBpmnEventListene
.setInitiator(BpmnTaskDelegateAssigner.toObjectCompatible(delegateTask.getVariable(INTERNAL_INITIATOR)))
.setApprover(BpmnTaskDelegateAssigner.toObjectCompatible(
delegateTask.getVariable(INTERNAL_TASK_RELATION_ASSIGNEE_INFO + delegateTask.getId())))
.setVariables(delegateTask.getVariables())
.setVariables(removeBpmnConstantsVariables(delegateTask.getVariables()))
.setStartTime(delegateTask.getCreateTime())
.setTenantId(delegateTask.getTenantId())
.setBusinessKey(processInstance.getBusinessKey())

View File

@ -0,0 +1,239 @@
package cn.axzo.workflow.server.controller.web;
import cn.axzo.framework.domain.data.AssertUtil;
import cn.axzo.infra.xxl220to250.XxlJobLogger;
import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAbortDTO;
import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCancelDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAuditDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
import cn.axzo.workflow.core.repository.entity.ExtAxProcessLog;
import cn.axzo.workflow.core.service.BpmnProcessTaskService;
import cn.axzo.workflow.core.service.ExtAxProcessLogService;
import cn.axzo.workflow.server.controller.web.bpmn.BpmnProcessInstanceController;
import cn.axzo.workflow.server.controller.web.bpmn.BpmnProcessJobController;
import cn.axzo.workflow.server.controller.web.bpmn.BpmnProcessTaskController;
import cn.axzo.workflow.server.service.AuthCodeService;
import cn.axzo.workflow.server.xxljob.DangerSuperOperationJobHandler;
import cn.azxo.framework.common.model.CommonResponse;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpSession;
import java.util.List;
import java.util.Objects;
import static cn.axzo.workflow.common.code.BpmnInstanceRespCode.PROCESS_INSTANCE_NOT_EXISTS;
import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_INITIATOR;
import static cn.axzo.workflow.common.constant.StarterConstants.K8S_POD_NAME_SPACE;
import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.PROCESSING;
/**
* 用于临时处理审批的一些问题
*
* @author wangli
* @since 2025-11-18 15:37
*/
@Slf4j
@Controller
public class DangerOperationController {
@Resource
private RuntimeService runtimeService;
@Resource
private BpmnProcessInstanceController instanceController;
@Resource
private BpmnProcessTaskController taskController;
@Resource
private BpmnProcessTaskService taskService;
@Resource
private BpmnProcessJobController jobController;
@Resource
private ExtAxProcessLogService processLogService;
@Resource
private AuthCodeService authCodeService;
@Resource
private Environment environment;
// 显示表单页面
@GetMapping("/web/process/form")
public String showProcessForm(HttpSession session, Model model) {
// 检查session中是否已验证授权码
Boolean isAuthenticated = (Boolean) session.getAttribute("isAuthenticated");
model.addAttribute("isAuthenticated", isAuthenticated != null && isAuthenticated);
String myPodNamespace = environment.getProperty(K8S_POD_NAME_SPACE);
model.addAttribute("apiBaseUrl", StringUtils.hasText(myPodNamespace) ? "/workflow-engine" : "");
// 可以在这里添加需要传递到页面的数据
return "form"; // 对应templates目录下的form.html
}
/**
* 获取授权码
*
* @param password
* @return
*/
@PostMapping("/web/process/get-auth-code")
@ResponseBody
public CommonResponse<String> getAuthCode(@RequestParam String password) {
if (Objects.equals("WANG+lI648438", password)) {
String authCode = authCodeService.generateAuthCode();
return CommonResponse.success(authCode);
}
return CommonResponse.error("密码错误");
}
/**
* 验证用户输入的授权码
*/
@PostMapping("/web/process/validate-auth")
public String validateAuthCode(@RequestParam String authCode, HttpSession session, Model model) {
if (Objects.equals("WANG+lI648438", authCode) || authCodeService.validateAuthCode(authCode)) {
// 验证通过在session中标记
session.setAttribute("isAuthenticated", true);
model.addAttribute("isAuthenticated", true);
} else {
// 验证失败提示错误
model.addAttribute("isAuthenticated", false);
model.addAttribute("authError", "授权码无效或已过期,请重新输入");
}
String myPodNamespace = environment.getProperty(K8S_POD_NAME_SPACE);
model.addAttribute("apiBaseUrl", StringUtils.hasText(myPodNamespace) ? "/workflow-engine" : "");
return "form"; // 重新显示授权码输入框
}
// 处理表单提交
@PostMapping(value = "/web/process/handle")
@ResponseBody
public CommonResponse<String> handleProcess(@Validated @RequestBody DangerSuperOperationJobHandler.DangerOperationJobParam jobParam, Model model) {
// 处理表单提交的逻辑
log.info("请求参入: {}", JSON.toJSONString(jobParam));
try {
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(jobParam.getProcessInstanceId()).singleResult();
AssertUtil.notNull(processInstance, PROCESS_INSTANCE_NOT_EXISTS);
// 这里可以添加实际的业务逻辑如调用流程引擎API等
switch (jobParam.getOperationType()) {
case CANCEL:
cancelProcessInstance(jobParam);
break;
case APPROVE:
approveTask(jobParam);
break;
case REJECT:
rejectTask(jobParam);
break;
case ABORT:
abortProcessInstance(jobParam);
break;
case RESUMER_DEADLINE_JOB:
resumerDeadlineJob(jobParam);
break;
default:
break;
}
// 可以将处理结果添加到模型中返回给页面
model.addAttribute("message", "操作已成功提交");
return CommonResponse.success("操作已成功提交");
} catch (Exception e) {
model.addAttribute("message", "操作失败: " + e.getMessage());
return CommonResponse.error("操作失败: " + e.getMessage());
}
}
private void resumerDeadlineJob(DangerSuperOperationJobHandler.DangerOperationJobParam jobParam) {
jobController.executeDeadLetterJobAction("", jobParam.getProcessInstanceId());
}
private void abortProcessInstance(DangerSuperOperationJobHandler.DangerOperationJobParam jobParam) {
instanceController.abortProcessInstance(BpmnProcessInstanceAbortDTO.builder()
.processInstanceId(jobParam.getProcessInstanceId())
.advice(jobParam.getComment())
.build());
}
private void rejectTask(DangerSuperOperationJobHandler.DangerOperationJobParam jobParam) {
String personId = jobParam.getPersonId();
if (!StringUtils.hasText(personId)) {
log.warn("缺少 personId 参数,无法驳回任务");
XxlJobLogger.log("缺少 personId 参数,无法驳回任务");
}
String taskId = taskService.findTaskIdByInstanceIdAndPersonId(jobParam.getProcessInstanceId(), jobParam.getPersonId());
ExtAxProcessLog query = new ExtAxProcessLog();
query.setProcessInstanceId(jobParam.getProcessInstanceId());
query.setTaskId(taskId);
query.setStatus(PROCESSING.getStatus());
List<ExtAxProcessLog> logs = processLogService.genericQuery(query);
if (CollectionUtils.isEmpty(logs)) {
log.warn("未找到可操作的任务日志无法驳回任务processInstanceId={}, personId={}", jobParam.getProcessInstanceId(), jobParam.getPersonId());
XxlJobLogger.log("未找到可操作的任务日志无法驳回任务processInstanceId={}, personId={}", jobParam.getProcessInstanceId(), jobParam.getPersonId());
return;
}
taskController.rejectTask(BpmnTaskAuditDTO.builder()
.processInstanceId(jobParam.getProcessInstanceId())
.advice(jobParam.getComment())
.approver(logs.get(0).getAssigneeFull().get(0))
.async(false)
.build());
}
private void approveTask(DangerSuperOperationJobHandler.DangerOperationJobParam jobParam) {
String personId = jobParam.getPersonId();
if (!StringUtils.hasText(personId)) {
log.warn("缺少 personId 参数,无法驳回任务");
XxlJobLogger.log("缺少 personId 参数,无法驳回任务");
}
String taskId = taskService.findTaskIdByInstanceIdAndPersonId(jobParam.getProcessInstanceId(), jobParam.getPersonId());
ExtAxProcessLog query = new ExtAxProcessLog();
query.setProcessInstanceId(jobParam.getProcessInstanceId());
query.setTaskId(taskId);
query.setStatus(PROCESSING.getStatus());
List<ExtAxProcessLog> logs = processLogService.genericQuery(query);
if (CollectionUtils.isEmpty(logs)) {
log.warn("未找到可操作的任务日志无法驳回任务processInstanceId={}, personId={}", jobParam.getProcessInstanceId(), jobParam.getPersonId());
XxlJobLogger.log("未找到可操作的任务日志无法驳回任务processInstanceId={}, personId={}", jobParam.getProcessInstanceId(), jobParam.getPersonId());
return;
}
taskController.approveTask(BpmnTaskAuditDTO.builder()
.processInstanceId(jobParam.getProcessInstanceId())
.advice(jobParam.getComment())
.approver(logs.get(0).getAssigneeFull().get(0))
.async(false)
.build());
}
private void cancelProcessInstance(DangerSuperOperationJobHandler.DangerOperationJobParam jobParam) {
String processInstanceId = jobParam.getProcessInstanceId();
BpmnTaskDelegateAssigner assigner = BpmnTaskDelegateAssigner.toObjectCompatible(runtimeService.getVariable(processInstanceId, INTERNAL_INITIATOR));
BpmnProcessInstanceCancelDTO cancelDTO = new BpmnProcessInstanceCancelDTO();
cancelDTO.setProcessInstanceId(processInstanceId);
cancelDTO.setInitiator(assigner);
cancelDTO.setReason(jobParam.getComment());
cancelDTO.setAsync(false);
instanceController.cancelProcessInstance(cancelDTO);
log.info("撤回操作完成");
XxlJobLogger.log("撤回操作完成");
}
}

View File

@ -0,0 +1,46 @@
package cn.axzo.workflow.server.service;
import cn.axzo.workflow.server.common.util.RedisUtils;
import org.springframework.stereotype.Service;
import java.time.Duration;
import java.util.Objects;
import java.util.UUID;
/**
* form.html 页面授权码
*
* @author wangli
* @since 2025-11-19 10:51
*/
@Service
public class AuthCodeService {
private static final String AUTH_CODE_KEY_PREFIX = "we:auth_code";
// 授权码有效期1小时可自定义
private static final long EXPIRE_HOURS = 1;
/**
* 生成授权码仅管理员可调用
*/
public String generateAuthCode() {
// 生成随机授权码UUID简化
String authCode = UUID.randomUUID().toString().replace("-", "").substring(0, 8);
RedisUtils.setCacheObject(AUTH_CODE_KEY_PREFIX, authCode, Duration.ofMinutes(1));
return authCode;
}
/**
* 验证授权码是否有效
*/
public boolean validateAuthCode(String authCode) {
if (authCode == null || authCode.isEmpty()) {
return false;
}
String key = RedisUtils.getCacheObject(AUTH_CODE_KEY_PREFIX);
if (key == null || !Objects.equals(key, authCode)) {
return false;
}
RedisUtils.deleteObject(AUTH_CODE_KEY_PREFIX);
return true;
}
}

View File

@ -0,0 +1,190 @@
package cn.axzo.workflow.server.xxljob;
import cn.axzo.infra.xxl220to250.XxlJobLogger;
import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAbortDTO;
import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCancelDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAuditDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
import cn.axzo.workflow.core.repository.entity.ExtAxProcessLog;
import cn.axzo.workflow.core.service.BpmnProcessTaskService;
import cn.axzo.workflow.core.service.ExtAxProcessLogService;
import cn.axzo.workflow.server.controller.web.bpmn.BpmnProcessInstanceController;
import cn.axzo.workflow.server.controller.web.bpmn.BpmnProcessJobController;
import cn.axzo.workflow.server.controller.web.bpmn.BpmnProcessTaskController;
import com.alibaba.fastjson.JSON;
import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.RuntimeService;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_INITIATOR;
import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.PROCESSING;
/**
* 危险操作操作审批中的行为
*
* @author wangli
* @since 2025-11-18 14:08
*/
@Component
@RequiredArgsConstructor
@Slf4j
public class DangerSuperOperationJobHandler extends IJobHandler {
@Resource
private RuntimeService runtimeService;
@Resource
private BpmnProcessInstanceController instanceController;
@Resource
private BpmnProcessTaskController taskController;
@Resource
private BpmnProcessTaskService taskService;
@Resource
private BpmnProcessJobController jobController;
@Resource
private ExtAxProcessLogService processLogService;
@Override
@XxlJob("DangerSuperOperationJobHandler")
public void execute() throws Exception {
String paramStr = XxlJobHelper.getJobParam();
log.info("#DangerSuperOperationJobHandler#param_({})", paramStr);
XxlJobLogger.log("#DangerSuperOperationJobHandler#param_({})", paramStr);
DangerOperationJobParam dangerOperationJobParam = JSON.parseObject(paramStr, DangerOperationJobParam.class);
String processInstanceId = dangerOperationJobParam.getProcessInstanceId();
if (!StringUtils.hasText(processInstanceId)) {
log.warn("缺少 processInstanceId 参数,无法撤回流程实例");
XxlJobLogger.log("缺少 processInstanceId 参数,无法撤回流程实例");
return;
}
switch (dangerOperationJobParam.getOperationType()) {
case CANCEL:
cancelProcessInstance(dangerOperationJobParam);
break;
case APPROVE:
approveTask(dangerOperationJobParam);
break;
case REJECT:
rejectTask(dangerOperationJobParam);
break;
case ABORT:
abortProcessInstance(dangerOperationJobParam);
break;
case RESUMER_DEADLINE_JOB:
resumerDeadlineJob(dangerOperationJobParam);
break;
default:
break;
}
}
private void resumerDeadlineJob(DangerOperationJobParam dangerOperationJobParam) {
jobController.executeDeadLetterJobAction("", dangerOperationJobParam.getProcessInstanceId());
}
private void abortProcessInstance(DangerOperationJobParam dangerOperationJobParam) {
instanceController.abortProcessInstance(BpmnProcessInstanceAbortDTO.builder()
.processInstanceId(dangerOperationJobParam.getProcessInstanceId())
.advice(dangerOperationJobParam.getComment())
.build());
}
private void rejectTask(DangerOperationJobParam dangerOperationJobParam) {
String personId = dangerOperationJobParam.getPersonId();
if (!StringUtils.hasText(personId)) {
log.warn("缺少 personId 参数,无法驳回任务");
XxlJobLogger.log("缺少 personId 参数,无法驳回任务");
}
String taskId = taskService.findTaskIdByInstanceIdAndPersonId(dangerOperationJobParam.getProcessInstanceId(), dangerOperationJobParam.getPersonId());
ExtAxProcessLog query = new ExtAxProcessLog();
query.setProcessInstanceId(dangerOperationJobParam.getProcessInstanceId());
query.setTaskId(taskId);
query.setStatus(PROCESSING.getStatus());
List<ExtAxProcessLog> logs = processLogService.genericQuery(query);
if (CollectionUtils.isEmpty(logs)) {
log.warn("未找到可操作的任务日志无法驳回任务processInstanceId={}, personId={}", dangerOperationJobParam.getProcessInstanceId(), dangerOperationJobParam.getPersonId());
XxlJobLogger.log("未找到可操作的任务日志无法驳回任务processInstanceId={}, personId={}", dangerOperationJobParam.getProcessInstanceId(), dangerOperationJobParam.getPersonId());
return;
}
taskController.rejectTask(BpmnTaskAuditDTO.builder()
.processInstanceId(dangerOperationJobParam.getProcessInstanceId())
.advice(dangerOperationJobParam.getComment())
.approver(logs.get(0).getAssigneeFull().get(0))
.async(false)
.build());
}
private void approveTask(DangerOperationJobParam dangerOperationJobParam) {
String personId = dangerOperationJobParam.getPersonId();
if (!StringUtils.hasText(personId)) {
log.warn("缺少 personId 参数,无法驳回任务");
XxlJobLogger.log("缺少 personId 参数,无法驳回任务");
}
String taskId = taskService.findTaskIdByInstanceIdAndPersonId(dangerOperationJobParam.getProcessInstanceId(), dangerOperationJobParam.getPersonId());
ExtAxProcessLog query = new ExtAxProcessLog();
query.setProcessInstanceId(dangerOperationJobParam.getProcessInstanceId());
query.setTaskId(taskId);
query.setStatus(PROCESSING.getStatus());
List<ExtAxProcessLog> logs = processLogService.genericQuery(query);
if (CollectionUtils.isEmpty(logs)) {
log.warn("未找到可操作的任务日志无法驳回任务processInstanceId={}, personId={}", dangerOperationJobParam.getProcessInstanceId(), dangerOperationJobParam.getPersonId());
XxlJobLogger.log("未找到可操作的任务日志无法驳回任务processInstanceId={}, personId={}", dangerOperationJobParam.getProcessInstanceId(), dangerOperationJobParam.getPersonId());
return;
}
taskController.approveTask(BpmnTaskAuditDTO.builder()
.processInstanceId(dangerOperationJobParam.getProcessInstanceId())
.advice(dangerOperationJobParam.getComment())
.approver(logs.get(0).getAssigneeFull().get(0))
.async(false)
.build());
}
private void cancelProcessInstance(DangerOperationJobParam dangerOperationJobParam) {
String processInstanceId = dangerOperationJobParam.getProcessInstanceId();
BpmnTaskDelegateAssigner assigner = BpmnTaskDelegateAssigner.toObjectCompatible(runtimeService.getVariable(processInstanceId, INTERNAL_INITIATOR));
BpmnProcessInstanceCancelDTO cancelDTO = new BpmnProcessInstanceCancelDTO();
cancelDTO.setProcessInstanceId(processInstanceId);
cancelDTO.setInitiator(assigner);
cancelDTO.setReason(dangerOperationJobParam.getComment());
cancelDTO.setAsync(false);
instanceController.cancelProcessInstance(cancelDTO);
log.info("撤回操作完成");
XxlJobLogger.log("撤回操作完成");
}
@Data
public static class DangerOperationJobParam implements Serializable {
@NotNull(message = "操作类型不能为空")
private OperationEnumType operationType;
@NotBlank(message = "流程实例ID不能为空")
private String processInstanceId;
private String personId;
private String comment;
}
public static enum OperationEnumType {
CANCEL, // 撤销任务
APPROVE, // 同意任务
REJECT, // 拒绝任务
ABORT, // 中止实例
RESUMER_DEADLINE_JOB, // 一般是因为二方计算人异常导致卡节点
}
}

View File

@ -2,3 +2,10 @@ arthas:
app-name: ${spring.application.name}
agent-id: ${ARTHAS_AGENT_ID:${spring.profiles.active}-${spring.application.name}}
tunnel-server: ${ARTHAS_TUNNEL_SERVER:ws://localhost:7777/ws}
spring:
thymeleaf:
mode: LEGACYHTML5
cache: false
encoding: UTF-8
prefix: classpath:/templates/
suffix: .html

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -0,0 +1,729 @@
<!DOCTYPE html>
<html lang="zh-CN" xmlns:th="http://www.thymeleaf.org">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>流程操作表单</title>
<!-- 引入Tailwind CSS -->
<script src="https://cdn.tailwindcss.com"></script>
<!-- 引入Font Awesome -->
<link href="https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css" rel="stylesheet">
<!-- 配置Tailwind自定义颜色和字体 -->
<script>
tailwind.config = {
theme: {
extend: {
colors: {
primary: '#165DFF',
secondary: '#6B7280',
success: '#00B42A',
danger: '#F53F3F',
warning: '#FF7D00',
light: '#F2F3F5',
dark: '#1D2129'
},
fontFamily: {
inter: ['Inter', 'system-ui', 'sans-serif'],
},
}
}
}
</script>
<style type="text/tailwindcss">
@layer utilities {
.form-input-focus {
@apply focus:border-primary focus:ring-2 focus:ring-primary/20 focus:outline-none;
}
.form-transition {
@apply transition-all duration-300 ease-in-out;
}
.card-shadow {
@apply shadow-lg hover:shadow-xl transition-shadow duration-300;
}
.form-hidden {
@apply hidden opacity-0 h-0;
}
.form-visible {
@apply opacity-100 h-auto;
}
.mask-fade {
@apply transition-opacity duration-300 ease-in-out;
}
.tab-active {
@apply text-primary border-primary;
}
}
</style>
<!-- 全局上下文路径变量 -->
<script th:inline="javascript">
const ctx = [[@{/}]]; // 自动获取servlet.context.path
</script>
<!-- 在<head>中添加通过Thymeleaf读取后端传递的环境变量推荐 -->
<script th:inline="javascript">
// 后端传递的基础路径K8Shttp://backend-service:8080本地
const apiBaseUrl = [[${apiBaseUrl}]] || '';
// 处理斜杠问题:移除路径首尾多余的斜杠,避免拼接后出现 //
const normalizePath = (path) => {
return path.replace(/^\/+|\/+$/g, ''); // 移除开头和结尾的斜杠
};
// 生成完整路径:确保 apiBaseUrl 和相对路径正确拼接
const getFullUrl = (relativePath) => {
if (!relativePath) return apiBaseUrl;
const normalizedBase = normalizePath(apiBaseUrl);
const normalizedRelative = normalizePath(relativePath);
// 若基础路径为空,直接返回相对路径(本地环境)
if (!normalizedBase) {
return `/${normalizedRelative}`;
}
// 拼接基础路径和相对路径K8S环境
return `/${normalizedBase}/${normalizedRelative}`;
};
</script>
</head>
<body class="bg-gray-50 font-inter min-h-screen flex flex-col">
<!-- 顶部导航 -->
<header class="bg-white shadow-sm">
<div class="container mx-auto px-4 py-4 flex justify-between items-center">
<h1 class="text-xl font-bold text-primary flex items-center">
<i class="fa fa-cogs mr-2"></i>审批流程后台操作系统
</h1>
<div class="text-gray-600">
<i class="fa fa-user-circle-o mr-1"></i>管理员操作
</div>
</div>
</header>
<!-- 主要内容 -->
<main class="flex-grow container mx-auto px-4 py-8 md:py-12">
<div class="max-w-2xl mx-auto">
<!-- 表单卡片 -->
<div class="bg-white rounded-xl p-6 md:p-8 card-shadow">
<div class="mb-6">
<h2 class="text-[clamp(1.5rem,3vw,2rem)] font-bold text-dark mb-2"
th:text="${isAuthenticated} ? '流程操作' : '授权验证'"></h2>
<p class="text-secondary"
th:text="${isAuthenticated} ? '请根据需要选择相应操作并填写表单信息' : '请输入或获取授权码以继续操作'"></p>
</div>
<!-- 授权验证区域 - 未认证时显示 -->
<div th:unless="${isAuthenticated}">
<!-- Tab导航 -->
<div class="border-b border-gray-200 mb-6">
<div class="flex -mb-px">
<button id="inputTab"
class="tab-active py-3 px-5 border-b-2 font-medium text-sm form-transition"
onclick="switchTab('input')">
<i class="fa fa-key mr-1"></i>输入授权码
</button>
<button id="getTab"
class="text-gray-500 hover:text-gray-700 py-3 px-5 border-b-2 border-transparent font-medium text-sm form-transition"
onclick="switchTab('get')">
<i class="fa fa-refresh mr-1"></i>获取授权码
</button>
</div>
</div>
<!-- 输入授权码表单 -->
<form id="authForm" th:action="${apiBaseUrl} + @{/web/process/validate-auth}" method="post"
class="space-y-6">
<!-- 授权码输入 -->
<div class="form-group">
<label for="authCode" class="block text-sm font-medium text-gray-700 mb-1">
授权码 <span class="text-danger">*</span>
</label>
<div class="relative">
<span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
<i class="fa fa-key"></i>
</span>
<input type="text" id="authCode" name="authCode"
class="w-full pl-10 pr-4 py-2.5 rounded-lg border border-gray-300 form-input-focus form-transition"
placeholder="请输入授权码" required/>
</div>
<!-- 授权错误提示 -->
<p class="mt-1 text-xs text-danger hidden" id="authError" th:if="${authError}"
th:text="${authError}">
<i class="fa fa-exclamation-circle mr-1"></i>授权码无效或已过期,请重新输入
</p>
</div>
<!-- 提交按钮 -->
<div class="pt-4 flex justify-end">
<button type="submit"
class="px-6 py-2.5 bg-primary hover:bg-primary/90 text-white font-medium rounded-lg transition-all duration-300 transform hover:scale-[1.02] active:scale-[0.98] flex items-center">
<i class="fa fa-unlock-alt mr-2"></i>验证授权
</button>
</div>
</form>
<!-- 获取授权码表单 -->
<form id="getAuthForm" class="space-y-6 form-hidden">
<!-- 密码输入 -->
<div class="form-group">
<label for="authPassword" class="block text-sm font-medium text-gray-700 mb-1">
管理员密码 <span class="text-danger">*</span>
</label>
<div class="relative">
<span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
<i class="fa fa-lock"></i>
</span>
<input type="password" id="authPassword"
class="w-full pl-10 pr-4 py-2.5 rounded-lg border border-gray-300 form-input-focus form-transition"
placeholder="请输入管理员密码获取授权码" required/>
</div>
<!-- 获取授权码错误提示 -->
<p class="mt-1 text-xs text-danger hidden" id="getAuthError">
<i class="fa fa-exclamation-circle mr-1"></i>密码错误,无法获取授权码
</p>
</div>
<!-- 授权码展示区域 -->
<div id="authCodeDisplay"
class="form-group form-hidden bg-gray-50 p-4 rounded-lg border border-gray-200">
<p class="text-sm font-medium text-gray-700 mb-2">
<i class="fa fa-info-circle mr-1 text-primary"></i>获取到的授权码
</p>
<div class="flex items-center">
<input type="text" id="displayedAuthCode" readonly
class="flex-grow pl-4 pr-4 py-2 rounded-lg border border-gray-300 bg-white text-gray-800 cursor-default"
placeholder="授权码将显示在这里"/>
<button type="button" onclick="copyAuthCode()"
class="ml-2 px-3 py-2 text-sm bg-primary/10 text-primary rounded-lg hover:bg-primary/20 form-transition">
<i class="fa fa-copy mr-1"></i>复制
</button>
</div>
<p class="mt-2 text-xs text-gray-500">
<i class="fa fa-clock-o mr-1"></i>授权码有效期为30分钟请及时使用
</p>
</div>
<!-- 提交按钮 -->
<div class="pt-4 flex justify-end">
<button type="button" id="getAuthCodeBtn"
class="px-6 py-2.5 bg-primary hover:bg-primary/90 text-white font-medium rounded-lg transition-all duration-300 transform hover:scale-[1.02] active:scale-[0.98] flex items-center">
<i class="fa fa-get-pocket mr-2"></i>获取授权码
</button>
</div>
</form>
</div>
<!-- 流程操作表单 - 验证通过后显示 -->
<form id="processForm" th:action="@{/web/process/handle}" method="post" class="space-y-6"
th:if="${isAuthenticated}">
<!-- 操作类型选择 -->
<div class="form-group">
<label for="operationType" class="block text-sm font-medium text-gray-700 mb-1">
操作类型 <span class="text-danger">*</span>
</label>
<div class="relative">
<select id="operationType" name="operationType"
class="w-full px-4 py-2.5 rounded-lg border border-gray-300 bg-white form-input-focus form-transition appearance-none"
required>
<option value="" disabled selected>请选择操作类型</option>
<option value="CANCEL">撤回实例</option>
<option value="APPROVE">同意任务</option>
<option value="REJECT">拒绝任务</option>
<option value="ABORT">中止实例</option>
<option value="RESUMER_DEADLINE_JOB">恢复节点</option>
</select>
<div class="pointer-events-none absolute inset-y-0 right-0 flex items-center px-3 text-gray-500">
<i class="fa fa-chevron-down text-xs"></i>
</div>
</div>
</div>
<!-- 流程实例编号 -->
<div id="processInstanceIdGroup" class="form-group form-transition">
<label for="processInstanceId" class="block text-sm font-medium text-gray-700 mb-1">
流程实例编号 <span class="text-danger">*</span>
</label>
<div class="relative">
<span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
<i class="fa fa-hashtag"></i>
</span>
<input type="text" id="processInstanceId" name="processInstanceId"
class="w-full pl-10 pr-4 py-2.5 rounded-lg border border-gray-300 form-input-focus form-transition"
placeholder="请输入流程实例编号" required
oninput="this.value = this.value.replace(/[^0-9]/g, '');"/>
</div>
<p class="mt-1 text-xs text-gray-500 hidden" id="processInstanceIdError">
<i class="fa fa-exclamation-circle text-danger mr-1"></i>流程实例编号为必填项
</p>
</div>
<!-- 自然人ID -->
<div id="personIdGroup" class="form-group form-transition form-hidden">
<label for="personId" class="block text-sm font-medium text-gray-700 mb-1">
自然人ID <span class="text-danger">*</span>
</label>
<div class="relative">
<span class="absolute inset-y-0 left-0 flex items-center pl-3 text-gray-500">
<i class="fa fa-user"></i>
</span>
<input type="text" id="personId" name="personId"
class="w-full pl-10 pr-4 py-2.5 rounded-lg border border-gray-300 form-input-focus form-transition"
placeholder="请输入自然人ID"
oninput="this.value = this.value.replace(/[^0-9]/g, '');"/>
</div>
<p class="mt-1 text-xs text-gray-500 hidden" id="personIdError">
<i class="fa fa-exclamation-circle text-danger mr-1"></i>自然人ID为必填项
</p>
</div>
<!-- 意见 -->
<div id="commentGroup" class="form-group form-transition form-hidden">
<label for="comment" class="block text-sm font-medium text-gray-700 mb-1">
意见 <span id="commentRequired" class="text-danger hidden">*</span>
</label>
<div class="relative">
<span class="absolute top-3 left-3 text-gray-500">
<i class="fa fa-comment"></i>
</span>
<textarea id="comment" name="comment" rows="3"
class="w-full pl-10 pr-4 py-2.5 rounded-lg border border-gray-300 form-input-focus form-transition resize-none"
placeholder="请输入意见(选填)"></textarea>
</div>
<p class="mt-1 text-xs text-gray-500 hidden" id="commentError">
<i class="fa fa-exclamation-circle text-danger mr-1"></i>意见为必填项
</p>
</div>
<!-- 提交按钮 -->
<div class="pt-4 flex justify-end gap-4">
<button type="button"
onclick="processForm.reset(); updateFormFields(); operationMessage.classList.add('hidden')"
class="px-6 py-2.5 bg-gray-200 hover:bg-gray-300 text-gray-800 font-medium rounded-lg transition-all duration-300 transform hover:scale-[1.02] active:scale-[0.98] flex items-center">
<i class="fa fa-refresh mr-2"></i>重置
</button>
<button type="submit"
class="px-6 py-2.5 bg-primary hover:bg-primary/90 text-white font-medium rounded-lg transition-all duration-300 transform hover:scale-[1.02] active:scale-[0.98] flex items-center">
<i class="fa fa-check mr-2"></i>提交
</button>
</div>
<!-- 操作消息显示区域 -->
<div id="operationMessage" class="mt-4 p-4 rounded-lg hidden"></div>
</form>
</div>
<!-- 操作说明 - 仅在验证通过后显示 -->
<div class="mt-6 bg-blue-50 border border-blue-100 rounded-lg p-4" th:if="${isAuthenticated}">
<h3 class="font-medium text-primary flex items-center mb-2">
<i class="fa fa-info-circle mr-2"></i>操作说明,功能如有问题请联系王粒
</h3>
<ul class="text-sm text-gray-600 space-y-1 list-disc list-inside">
<li>撤回实例:需要提供流程实例编号,可选择填写意见</li>
<li>同意/拒绝任务需要提供流程实例编号和处理人ID</li>
<li>中止实例:需要提供流程实例编号和中止原因</li>
<li>恢复节点:仅需要提供流程实例编号</li>
</ul>
</div>
</div>
</main>
<!-- 页脚 -->
<footer class="bg-white border-t border-gray-200 py-4">
<div class="container mx-auto px-4 text-center text-sm text-gray-500">
© 2026 审批流程后台操作系统 - 版权所有
</div>
</footer>
<!-- 成功提交提示框 -->
<div id="successToast"
class="fixed top-4 right-4 bg-success text-white px-4 py-3 rounded-lg shadow-lg transform translate-x-full transition-transform duration-500 flex items-center z-50">
<i class="fa fa-check-circle mr-2"></i>
<span>操作提交成功!</span>
</div>
<!-- 复制成功提示框 -->
<div id="copyToast"
class="fixed top-4 right-4 bg-success text-white px-4 py-3 rounded-lg shadow-lg transform translate-x-full transition-transform duration-500 flex items-center z-50">
<i class="fa fa-check-circle mr-2"></i>
<span>授权码已复制!</span>
</div>
<!-- 提交遮罩层 -->
<div id="submitMask"
class="fixed inset-0 bg-black/50 flex items-center justify-center z-50 mask-fade opacity-0 pointer-events-none">
<div class="bg-white rounded-lg p-8 max-w-md w-full flex flex-col items-center">
<div class="w-16 h-16 border-4 border-primary border-t-transparent rounded-full animate-spin mb-4"></div>
<h3 class="text-lg font-medium text-dark mb-2">处理中</h3>
<p class="text-gray-500 text-center" id="maskMessage">请稍候,正在处理您的请求...</p>
</div>
</div>
<script>
// 获取DOM元素
const operationType = document.getElementById('operationType');
const processInstanceIdGroup = document.getElementById('processInstanceIdGroup');
const personIdGroup = document.getElementById('personIdGroup');
const commentGroup = document.getElementById('commentGroup');
const commentRequired = document.getElementById('commentRequired');
const personId = document.getElementById('personId');
const comment = document.getElementById('comment');
const processForm = document.getElementById('processForm');
const authForm = document.getElementById('authForm');
const getAuthForm = document.getElementById('getAuthForm');
const getAuthCodeBtn = document.getElementById('getAuthCodeBtn');
const authPassword = document.getElementById('authPassword');
const authCodeDisplay = document.getElementById('authCodeDisplay');
const displayedAuthCode = document.getElementById('displayedAuthCode');
const successToast = document.getElementById('successToast');
const copyToast = document.getElementById('copyToast');
const submitMask = document.getElementById('submitMask');
const maskMessage = document.getElementById('maskMessage');
const operationMessage = document.getElementById('operationMessage');
// 错误提示元素
const processInstanceIdError = document.getElementById('processInstanceIdError');
const personIdError = document.getElementById('personIdError');
const commentError = document.getElementById('commentError');
const authError = document.getElementById('authError');
const getAuthError = document.getElementById('getAuthError');
// 清除所有元素的计时器,防止冲突
const elementTimeouts = new Map();
// Tab切换功能
function switchTab(tabType) {
const inputTab = document.getElementById('inputTab');
const getTab = document.getElementById('getTab');
// 重置所有错误提示
if (authError) authError.classList.add('hidden');
if (getAuthError) getAuthError.classList.add('hidden');
if (tabType === 'input') {
// 切换到输入授权码
inputTab.classList.add('tab-active');
inputTab.classList.remove('text-gray-500', 'hover:text-gray-700', 'border-transparent');
getTab.classList.remove('tab-active');
getTab.classList.add('text-gray-500', 'hover:text-gray-700', 'border-transparent');
hideElement(getAuthForm);
setTimeout(() => {
showElement(authForm);
}, 300);
} else {
// 切换到获取授权码
getTab.classList.add('tab-active');
getTab.classList.remove('text-gray-500', 'hover:text-gray-700', 'border-transparent');
inputTab.classList.remove('tab-active');
inputTab.classList.add('text-gray-500', 'hover:text-gray-700', 'border-transparent');
hideElement(authForm);
setTimeout(() => {
showElement(getAuthForm);
// 隐藏授权码显示区域
hideElement(authCodeDisplay);
}, 300);
}
}
// 显示元素的动画
function showElement(element) {
if (elementTimeouts.has(element)) {
clearTimeout(elementTimeouts.get(element));
elementTimeouts.delete(element);
}
element.classList.remove('form-hidden');
setTimeout(() => {
element.classList.add('form-visible');
}, 10);
}
// 隐藏元素的动画
function hideElement(element) {
element.classList.remove('form-visible');
const timeoutId = setTimeout(() => {
element.classList.add('form-hidden');
elementTimeouts.delete(element);
}, 300);
elementTimeouts.set(element, timeoutId);
}
// 显示遮罩层
function showMask(message) {
maskMessage.textContent = message || '请稍候,正在处理您的请求...';
submitMask.classList.remove('opacity-0', 'pointer-events-none');
}
// 隐藏遮罩层
function hideMask() {
submitMask.classList.add('opacity-0', 'pointer-events-none');
}
// 复制授权码
function copyAuthCode() {
const code = displayedAuthCode.value;
if (code) {
navigator.clipboard.writeText(code).then(() => {
copyToast.classList.remove('translate-x-full');
setTimeout(() => {
copyToast.classList.add('translate-x-full');
}, 2000);
});
}
}
// 根据选择的操作类型显示对应的表单字段
function updateFormFields() {
const selectedValue = operationType.value;
// 重置所有字段状态
hideElement(personIdGroup);
hideElement(commentGroup);
commentRequired.classList.add('hidden');
personId.required = false;
comment.required = false;
// 清除错误提示
processInstanceIdError.classList.add('hidden');
personIdError.classList.add('hidden');
commentError.classList.add('hidden');
// 根据选择显示不同字段
switch (selectedValue) {
case 'CANCEL': // 撤回实例
showElement(commentGroup);
break;
case 'APPROVE': // 同意任务
case 'REJECT': // 拒绝任务
showElement(personIdGroup);
showElement(commentGroup);
personId.required = true;
break;
case 'ABORT': // 中止实例
showElement(commentGroup);
commentRequired.classList.remove('hidden');
comment.required = true;
break;
case 'RESUMER_DEADLINE_JOB': // 恢复节点
// 只显示流程实例ID其他都隐藏
break;
}
}
// 表单验证
function validateForm() {
let isValid = true;
const selectedValue = operationType.value;
// 验证流程实例ID
const processInstanceId = document.getElementById('processInstanceId').value.trim();
if (!processInstanceId) {
processInstanceIdError.classList.remove('hidden');
isValid = false;
} else {
processInstanceIdError.classList.add('hidden');
}
// 根据操作类型验证其他字段
if ((selectedValue === 'APPROVE' || selectedValue === 'REJECT') &&
!personId.value.trim()) {
personIdError.classList.remove('hidden');
isValid = false;
} else {
personIdError.classList.add('hidden');
}
if (selectedValue === 'ABORT' && !comment.value.trim()) {
commentError.classList.remove('hidden');
isValid = false;
} else {
commentError.classList.add('hidden');
}
return isValid;
}
// 显示成功提示
function showSuccessToast() {
successToast.classList.remove('translate-x-full');
setTimeout(() => {
successToast.classList.add('translate-x-full');
}, 3000);
}
// 获取授权码
async function getAuthCode() {
const password = authPassword.value.trim();
if (!password) {
getAuthError.innerHTML = '<i class="fa fa-exclamation-circle mr-1"></i>请输入管理员密码';
getAuthError.classList.remove('hidden');
return;
}
// 显示遮罩层
showMask('请稍候,正在获取授权码...');
getAuthError.classList.add('hidden');
try {
// 使用全局上下文路径变量拼接URL
const url = getFullUrl(`web/process/get-auth-code?password=${encodeURIComponent(password)}`);
// 保持POST请求方式参数通过URL查询参数传递
const response = await fetch(url, {
method: 'POST',
headers: {
'Accept': 'application/json'
}
});
const result = await response.json();
if (response.ok && result.code === 200 && result.data) {
// 成功获取授权码
displayedAuthCode.value = result.data;
showElement(authCodeDisplay);
// 自动切换到输入标签页并填充授权码
// setTimeout(() => {
// switchTab('input');
// document.getElementById('authCode').value = result.data;
// }, 1000);
} else {
// 显示错误信息
getAuthError.innerHTML = '<i class="fa fa-exclamation-circle mr-1"></i>' + (result.msg || '密码错误,无法获取授权码');
getAuthError.classList.remove('hidden');
}
} catch (error) {
console.error('获取授权码错误:', error);
getAuthError.innerHTML = '<i class="fa fa-exclamation-circle mr-1"></i>网络错误,请稍后重试';
getAuthError.classList.remove('hidden');
} finally {
// 隐藏遮罩层
hideMask();
}
}
// 事件监听 - 操作类型变化
if (operationType) {
operationType.addEventListener('change', updateFormFields);
}
// 流程表单提交处理
if (processForm) {
processForm.addEventListener('submit', async function (e) {
e.preventDefault();
// 清除两个字段的所有空格
const processInstanceIdInput = document.getElementById('processInstanceId');
const personIdInput = document.getElementById('personId');
processInstanceIdInput.value = processInstanceIdInput.value.replace(/\s+/g, '');
personIdInput.value = personIdInput.value.replace(/\s+/g, '');
if (!validateForm()) return;
// 显示遮罩层
showMask('请稍候,正在提交您的操作...');
// 收集表单数据为 JSON 对象
const formData = {
operationType: operationType.value,
processInstanceId: processInstanceIdInput.value,
personId: personIdInput.value || null,
comment: comment.value?.trim() || null
};
try {
const fullActionUrl = getFullUrl("/web/process/handle");
// 使用全局上下文路径变量
const response = await fetch(fullActionUrl, {
method: this.method,
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json'
},
body: JSON.stringify(formData)
});
const result = await response.json();
// 显示消息区域
operationMessage.classList.remove('hidden');
if (response.ok && result.code === 200) {
// 成功消息 - 绿色背景
operationMessage.className = 'mt-4 p-4 rounded-lg bg-green-50 border border-green-200 text-green-700';
operationMessage.innerHTML = `<i class="fa fa-check-circle mr-2"></i>${result.msg || '操作已成功提交'}`;
} else {
// 错误消息 - 红色背景
operationMessage.className = 'mt-4 p-4 rounded-lg bg-red-50 border border-red-200 text-red-700';
operationMessage.innerHTML = `<i class="fa fa-exclamation-circle mr-2"></i>${result.msg || '操作失败,请重试'}`;
}
} catch (error) {
console.error('请求错误:', error);
// 网络错误消息
operationMessage.className = 'mt-4 p-4 rounded-lg bg-red-50 border border-red-200 text-red-700';
operationMessage.innerHTML = `<i class="fa fa-exclamation-circle mr-2"></i>网络错误,请稍后重试`;
operationMessage.classList.remove('hidden');
} finally {
// 隐藏遮罩层
hideMask();
}
});
}
// 授权码表单提交处理
if (authForm) {
authForm.addEventListener('submit', function (e) {
// 显示遮罩层
showMask('请稍候,正在验证授权码...');
// 清除之前的错误提示
if (authError) {
authError.classList.add('hidden');
}
// 允许表单正常提交
});
}
// 获取授权码按钮点击事件
if (getAuthCodeBtn) {
getAuthCodeBtn.addEventListener('click', getAuthCode);
}
// 初始化
if (operationType) {
updateFormFields();
}
// 页面加载时检查后端消息
document.addEventListener('DOMContentLoaded', function () {
// 检查流程操作的后端消息(使用 Thymeleaf JS 内联语法)
/*[[#{
if (${message != null}) {
operationMessage.classList.remove('hidden');
if (${message.startsWith('操作成功')}) {
operationMessage.className = 'mt-4 p-4 rounded-lg bg-green-50 border border-green-200 text-green-700';
} else {
operationMessage.className = 'mt-4 p-4 rounded-lg bg-red-50 border border-red-200 text-red-700';
}
operationMessage.innerHTML = '<i class="fa ' + (${message.startsWith('操作成功')} ? 'fa-check-circle' : 'fa-exclamation-circle') + ' mr-2"></i>' + '${message}';
}
}]]*/
// 显示授权错误(如果有)
if (authError && authError.textContent.trim() !== '') {
authError.classList.remove('hidden');
}
});
</script>
</body>
</html>