> summary;
-
- @Schema(description = "å‘起人的用户信æ¯")
- private UserSimpleDTO startUser;
- }
-
- @Data
- @Schema(description = "æ“作按钮设置")
- public static class OperationButtonSettingDTO {
-
- @Schema(description = "显示å称", example = "审批")
- private String displayName;
-
- @Schema(description = "是å¦å¯ç”¨", example = "true")
- private Boolean enable;
- }
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/task/dto/UserSimpleDTO.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/task/dto/UserSimpleDTO.java
deleted file mode 100644
index 295d43b..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/task/dto/UserSimpleDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.zt.plat.module.bpm.api.task.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "RPC æœåŠ¡ - ç”¨æˆ·ç²¾ç®€ä¿¡æ¯ DTO")
-@Data
-public class UserSimpleDTO {
-
- @Schema(description = "用户编å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long id;
-
- @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
- private String nickname;
-
- @Schema(description = "用户头åƒ", example = "https://www.iocoder.cn/1.png")
- private String avatar;
-
- @Schema(description = "部门编å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long deptId;
-
- @Schema(description = "部门å称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ç ”å‘部")
- private String deptName;
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/ApiConstants.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/ApiConstants.java
deleted file mode 100644
index 3c4bac9..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/ApiConstants.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.zt.plat.module.bpm.enums;
-
-import com.zt.plat.framework.common.enums.RpcConstants;
-
-/**
- * API 相关的枚举
- *
- * @author ZT
- */
-public class ApiConstants {
-
- /**
- * æœåŠ¡å
- *
- * 注æ„，需è¦ä¿è¯å’Œ spring.application.name ä¿æŒä¸€è‡´
- */
- public static final String NAME = "bpm-server";
-
- public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/bpm";
-
- public static final String VERSION = "1.0.0";
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/DictTypeConstants.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/DictTypeConstants.java
deleted file mode 100644
index 13dcf72..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/DictTypeConstants.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zt.plat.module.bpm.enums;
-
-/**
- * BPM å—典类型的枚举类
- *
- * @author ZT
- */
-public interface DictTypeConstants {
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/ErrorCodeConstants.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/ErrorCodeConstants.java
deleted file mode 100644
index b9db1ed..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/ErrorCodeConstants.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.zt.plat.module.bpm.enums;
-
-import com.zt.plat.framework.common.exception.ErrorCode;
-
-/**
- * Bpm 错误ç 枚举类
- *
- * bpm 系统，使用 1-009-000-000 段
- */
-public interface ErrorCodeConstants {
-
- // ========== 通用æµç¨‹å¤„ç† æ¨¡å— 1-009-000-000 ==========
-
- // ========== OA æµç¨‹æ¨¡å— 1-009-001-000 ==========
- ErrorCode OA_LEAVE_NOT_EXISTS = new ErrorCode(1_009_001_001, "请å‡ç”³è¯·ä¸å˜åœ¨");
-
- // ========== æµç¨‹æ¨¡åž‹ 1-009-002-000 ==========
- ErrorCode MODEL_KEY_EXISTS = new ErrorCode(1_009_002_000, "å·²ç»å˜åœ¨æµç¨‹æ ‡è¯†ä¸ºã€{}】的æµç¨‹");
- ErrorCode MODEL_NOT_EXISTS = new ErrorCode(1_009_002_001, "æµç¨‹æ¨¡åž‹ä¸å˜åœ¨");
- ErrorCode MODEL_KEY_VALID = new ErrorCode(1_009_002_002, "æµç¨‹æ ‡è¯†æ ¼å¼ä¸æ£ç¡®ï¼Œéœ€è¦ä»¥å—æ¯æˆ–下划线开头，åŽæŽ¥ä»»æ„å—æ¯ã€æ•°å—ã€ä¸åˆ’线ã€ä¸‹åˆ’线ã€å¥ç‚¹ï¼");
- ErrorCode MODEL_DEPLOY_FAIL_FORM_NOT_CONFIG = new ErrorCode(1_009_002_003, "部署æµç¨‹å¤±è´¥ï¼ŒåŽŸå› ：æµç¨‹è¡¨å•æœªé…置，请点击ã€ä¿®æ”¹æµç¨‹ã€‘按钮进行é…ç½®");
- ErrorCode MODEL_DEPLOY_FAIL_TASK_CANDIDATE_NOT_CONFIG = new ErrorCode(1_009_002_004, "部署æµç¨‹å¤±è´¥ï¼Œ" +
- "åŽŸå› ï¼šç”¨æˆ·ä»»åŠ¡({})未é…置审批人，请点击ã€æµç¨‹è®¾è®¡ã€‘按钮，选择该它的ã€ä»»åŠ¡ï¼ˆå®¡æ‰¹äººï¼‰ã€‘进行é…ç½®");
- ErrorCode MODEL_DEPLOY_FAIL_BPMN_START_EVENT_NOT_EXISTS = new ErrorCode(1_009_002_005, "部署æµç¨‹å¤±è´¥ï¼ŒåŽŸå› ：BPMN æµç¨‹å›¾ä¸ï¼Œæ²¡æœ‰å¼€å§‹äº‹ä»¶");
- ErrorCode MODEL_DEPLOY_FAIL_BPMN_USER_TASK_NAME_NOT_EXISTS = new ErrorCode(1_009_002_006, "部署æµç¨‹å¤±è´¥ï¼ŒåŽŸå› ：BPMN æµç¨‹å›¾ä¸ï¼Œç”¨æˆ·ä»»åŠ¡({})çš„åå—ä¸å˜åœ¨");
- ErrorCode MODEL_UPDATE_FAIL_NOT_MANAGER = new ErrorCode(1_009_002_007, "æ“作æµç¨‹å¤±è´¥ï¼ŒåŽŸå› ï¼šä½ ä¸æ˜¯è¯¥æµç¨‹({})的管ç†å‘˜");
- ErrorCode MODEL_DEPLOY_FAIL_FIRST_USER_TASK_CANDIDATE_STRATEGY_ERROR = new ErrorCode(1_009_002_008, "部署æµç¨‹å¤±è´¥ï¼ŒåŽŸå› ：首个任务({})的审批人ä¸èƒ½æ˜¯ã€å®¡æ‰¹äººè‡ªé€‰ã€‘");
-
- // ========== æµç¨‹å®šä¹‰ 1-009-003-000 ==========
- ErrorCode PROCESS_DEFINITION_KEY_NOT_MATCH = new ErrorCode(1_009_003_000, "æµç¨‹å®šä¹‰çš„æ ‡è¯†æœŸæœ›æ˜¯({})，当å‰æ˜¯({})，请修改 BPMN æµç¨‹å›¾");
- ErrorCode PROCESS_DEFINITION_NAME_NOT_MATCH = new ErrorCode(1_009_003_001, "æµç¨‹å®šä¹‰çš„åå—期望是({})，当å‰æ˜¯({})，请修改 BPMN æµç¨‹å›¾");
- ErrorCode PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_009_003_002, "æµç¨‹å®šä¹‰ä¸å˜åœ¨");
- ErrorCode PROCESS_DEFINITION_IS_SUSPENDED = new ErrorCode(1_009_003_003, "æµç¨‹å®šä¹‰å¤„于挂起状æ€");
-
- // ========== æµç¨‹å®žä¾‹ 1-009-004-000 ==========
- ErrorCode PROCESS_INSTANCE_NOT_EXISTS = new ErrorCode(1_009_004_000, "æµç¨‹å®žä¾‹ä¸å˜åœ¨");
- ErrorCode PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS = new ErrorCode(1_009_004_001, "æµç¨‹å–消失败，æµç¨‹ä¸å¤„于è¿è¡Œä¸");
- ErrorCode PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF = new ErrorCode(1_009_004_002, "æµç¨‹å–消失败，该æµç¨‹ä¸æ˜¯ä½ å‘èµ·çš„");
- ErrorCode PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG = new ErrorCode(1_009_004_003, "任务({})的候选人未é…ç½®");
- ErrorCode PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_EXISTS = new ErrorCode(1_009_004_004, "任务({})的候选人({})ä¸å˜åœ¨");
- ErrorCode PROCESS_INSTANCE_START_USER_CAN_START = new ErrorCode(1_009_004_005, "å‘èµ·æµç¨‹å¤±è´¥ï¼Œä½ 没有æƒé™å‘起该æµç¨‹");
- ErrorCode PROCESS_INSTANCE_CANCEL_FAIL_NOT_ALLOW = new ErrorCode(1_009_004_005, "æµç¨‹å–消失败，该æµç¨‹ä¸å…许å–消");
- ErrorCode PROCESS_INSTANCE_HTTP_TRIGGER_CALL_ERROR = new ErrorCode(1_009_004_006, "æµç¨‹ Http 触å‘器请求调用失败");
- ErrorCode PROCESS_INSTANCE_APPROVE_USER_SELECT_ASSIGNEES_NOT_CONFIG = new ErrorCode(1_009_004_007, "下一个任务({})的审批人未é…ç½®");
- ErrorCode PROCESS_INSTANCE_CANCEL_CHILD_FAIL_NOT_ALLOW = new ErrorCode(1_009_004_008, "åæµç¨‹å–消失败，åæµç¨‹ä¸å…许å–消");
-
- // ========== æµç¨‹ä»»åŠ¡ 1-009-005-000 ==========
- ErrorCode TASK_OPERATE_FAIL_ASSIGN_NOT_SELF = new ErrorCode(1_009_005_001, "æ“ä½œå¤±è´¥ï¼ŒåŽŸå› ï¼šè¯¥ä»»åŠ¡çš„å®¡æ‰¹äººä¸æ˜¯ä½ ");
- ErrorCode TASK_NOT_EXISTS = new ErrorCode(1_009_005_002, "æµç¨‹ä»»åŠ¡ä¸å˜åœ¨");
- ErrorCode TASK_IS_PENDING = new ErrorCode(1_009_005_003, "当å‰ä»»åŠ¡å¤„于挂起状æ€ï¼Œä¸èƒ½æ“作");
- ErrorCode TASK_TARGET_NODE_NOT_EXISTS = new ErrorCode(1_009_005_004, " ç›®æ ‡èŠ‚ç‚¹ä¸å˜åœ¨");
- ErrorCode TASK_RETURN_FAIL_SOURCE_TARGET_ERROR = new ErrorCode(1_009_005_006, "é€€å›žä»»åŠ¡å¤±è´¥ï¼Œç›®æ ‡èŠ‚ç‚¹æ˜¯åœ¨å¹¶è¡Œç½‘å…³ä¸Šæˆ–éžåŒä¸€è·¯çº¿ä¸Šï¼Œä¸å¯è·³è½¬");
- ErrorCode TASK_DELEGATE_FAIL_USER_REPEAT = new ErrorCode(1_009_005_007, "任务委派失败，委派人和当å‰å®¡æ‰¹äººä¸ºåŒä¸€äºº");
- ErrorCode TASK_DELEGATE_FAIL_USER_NOT_EXISTS = new ErrorCode(1_009_005_008, "任务委派失败，被委派人ä¸å˜åœ¨");
- ErrorCode TASK_SIGN_CREATE_USER_NOT_EXIST = new ErrorCode(1_009_005_009, "ä»»åŠ¡åŠ ç¾ï¼šé€‰æ‹©çš„用户ä¸å˜åœ¨");
- ErrorCode TASK_SIGN_CREATE_TYPE_ERROR = new ErrorCode(1_009_005_010, "ä»»åŠ¡åŠ ç¾ï¼šå½“å‰ä»»åŠ¡å·²ç»{}，ä¸èƒ½{}");
- ErrorCode TASK_SIGN_CREATE_USER_REPEAT = new ErrorCode(1_009_005_011, "ä»»åŠ¡åŠ ç¾å¤±è´¥ï¼ŒåŠ ç¾äººä¸ŽçŽ°æœ‰å®¡æ‰¹äºº[{}]é‡å¤");
- ErrorCode TASK_SIGN_DELETE_NO_PARENT = new ErrorCode(1_009_005_012, "任务å‡ç¾å¤±è´¥ï¼Œè¢«å‡ç¾çš„ä»»åŠ¡å¿…é¡»æ˜¯é€šè¿‡åŠ ç¾ç”Ÿæˆçš„任务");
- ErrorCode TASK_TRANSFER_FAIL_USER_REPEAT = new ErrorCode(1_009_005_013, "任务转办失败，转办人和当å‰å®¡æ‰¹äººä¸ºåŒä¸€äºº");
- ErrorCode TASK_TRANSFER_FAIL_USER_NOT_EXISTS = new ErrorCode(1_009_005_014, "任务转办失败，转办人ä¸å˜åœ¨");
- ErrorCode TASK_CREATE_FAIL_NO_CANDIDATE_USER = new ErrorCode(1_009_006_003, "æ“ä½œå¤±è´¥ï¼ŒåŽŸå› ï¼šæ‰¾ä¸åˆ°ä»»åŠ¡çš„审批人ï¼");
- ErrorCode TASK_SIGNATURE_NOT_EXISTS = new ErrorCode(1_009_005_015, "ç¾åä¸èƒ½ä¸ºç©ºï¼");
- ErrorCode TASK_REASON_REQUIRE = new ErrorCode(1_009_005_016, "审批æ„è§ä¸èƒ½ä¸ºç©ºï¼");
-
- // ========== 动æ€è¡¨å•æ¨¡å— 1-009-010-000 ==========
- ErrorCode FORM_NOT_EXISTS = new ErrorCode(1_009_010_000, "动æ€è¡¨å•ä¸å˜åœ¨");
- ErrorCode FORM_FIELD_REPEAT = new ErrorCode(1_009_010_001, "表å•é¡¹({}) å’Œ ({}) 使用了相åŒçš„å—段å({})");
-
- // ========== ç”¨æˆ·ç»„æ¨¡å— 1-009-011-000 ==========
- ErrorCode USER_GROUP_NOT_EXISTS = new ErrorCode(1_009_011_000, "用户分组ä¸å˜åœ¨");
- ErrorCode USER_GROUP_IS_DISABLE = new ErrorCode(1_009_011_001, "åå—为ã€{}】的用户分组已被ç¦ç”¨");
-
- // ========== ç”¨æˆ·ç»„æ¨¡å— 1-009-012-000 ==========
- ErrorCode CATEGORY_NOT_EXISTS = new ErrorCode(1_009_012_000, "æµç¨‹åˆ†ç±»ä¸å˜åœ¨");
- ErrorCode CATEGORY_NAME_DUPLICATE = new ErrorCode(1_009_012_001, "æµç¨‹åˆ†ç±»åå—ã€{}】é‡å¤");
- ErrorCode CATEGORY_CODE_DUPLICATE = new ErrorCode(1_009_012_002, "æµç¨‹åˆ†ç±»ç¼–ç ã€{}】é‡å¤");
-
- // ========== BPM æµç¨‹ç›‘å¬å™¨ 1-009-013-000 ==========
- ErrorCode PROCESS_LISTENER_NOT_EXISTS = new ErrorCode(1_009_013_000, "æµç¨‹ç›‘å¬å™¨ä¸å˜åœ¨");
- ErrorCode PROCESS_LISTENER_CLASS_NOT_FOUND = new ErrorCode(1_009_013_001, "æµç¨‹ç›‘å¬å™¨ç±»({})ä¸å˜åœ¨");
- ErrorCode PROCESS_LISTENER_CLASS_IMPLEMENTS_ERROR = new ErrorCode(1_009_013_002, "æµç¨‹ç›‘å¬å™¨ç±»({})没有实现接å£({})");
- ErrorCode PROCESS_LISTENER_EXPRESSION_INVALID = new ErrorCode(1_009_013_003, "æµç¨‹ç›‘å¬å™¨è¡¨è¾¾å¼({})ä¸åˆæ³•");
-
- // ========== BPM æµç¨‹è¡¨è¾¾å¼ 1-009-014-000 ==========
- ErrorCode PROCESS_EXPRESSION_NOT_EXISTS = new ErrorCode(1_009_014_000, "æµç¨‹è¡¨è¾¾å¼ä¸å˜åœ¨");
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmAutoApproveTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmAutoApproveTypeEnum.java
deleted file mode 100644
index 2611d38..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmAutoApproveTypeEnum.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * BPM 自动去é‡çš„类型的枚举
- *
- * @author Lesan
- */
-@Getter
-@AllArgsConstructor
-public enum BpmAutoApproveTypeEnum implements ArrayValuable {
-
- NONE(0, "ä¸è‡ªåŠ¨é€šè¿‡"),
- APPROVE_ALL(1, "仅审批一次，åŽç»é‡å¤çš„审批节点å‡è‡ªåŠ¨é€šè¿‡"),
- APPROVE_SEQUENT(2, "仅针对连ç»å®¡æ‰¹çš„节点自动通过");
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmAutoApproveTypeEnum::getType).toArray(Integer[]::new);
-
- private final Integer type;
- private final String name;
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmBoundaryEventTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmBoundaryEventTypeEnum.java
deleted file mode 100644
index d168f66..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmBoundaryEventTypeEnum.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import cn.hutool.core.util.ArrayUtil;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * BPM 边界事件 (boundary event) 自定义类型枚举
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum BpmBoundaryEventTypeEnum {
-
- USER_TASK_TIMEOUT(1, "用户任务超时"),
- DELAY_TIMER_TIMEOUT(2, "延迟器超时"),
- CHILD_PROCESS_TIMEOUT(3, "åæµç¨‹è¶…æ—¶");
-
- private final Integer type;
- private final String name;
-
- public static BpmBoundaryEventTypeEnum typeOf(Integer type) {
- return ArrayUtil.firstMatch(eventType -> eventType.getType().equals(type), values());
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmChildProcessMultiInstanceSourceTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmChildProcessMultiInstanceSourceTypeEnum.java
deleted file mode 100644
index 68574cb..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmChildProcessMultiInstanceSourceTypeEnum.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import cn.hutool.core.util.ArrayUtil;
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * BPM åæµç¨‹å¤šå®žä¾‹æ¥æºç±»åž‹æžšä¸¾
- *
- * @author Lesan
- */
-@Getter
-@AllArgsConstructor
-public enum BpmChildProcessMultiInstanceSourceTypeEnum implements ArrayValuable {
-
- FIXED_QUANTITY(1, "固定数é‡"),
- NUMBER_FORM(2, "æ•°å—表å•"),
- MULTIPLE_FORM(3, "多选表å•");
-
- private final Integer type;
- private final String name;
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmChildProcessMultiInstanceSourceTypeEnum::getType).toArray(Integer[]::new);
-
- public static BpmChildProcessMultiInstanceSourceTypeEnum typeOf(Integer type) {
- return ArrayUtil.firstMatch(item -> item.getType().equals(type), values());
- }
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmChildProcessStartUserEmptyTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmChildProcessStartUserEmptyTypeEnum.java
deleted file mode 100644
index 5b13462..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmChildProcessStartUserEmptyTypeEnum.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import cn.hutool.core.util.ArrayUtil;
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * BPM 当åæµç¨‹å‘起人为空时类型枚举
- *
- * @author Lesan
- */
-@Getter
-@AllArgsConstructor
-public enum BpmChildProcessStartUserEmptyTypeEnum implements ArrayValuable {
-
- MAIN_PROCESS_START_USER(1, "åŒä¸»æµç¨‹å‘起人"),
- CHILD_PROCESS_ADMIN(2, "åæµç¨‹ç®¡ç†å‘˜"),
- MAIN_PROCESS_ADMIN(3, "主æµç¨‹ç®¡ç†å‘˜");
-
- private final Integer type;
- private final String name;
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmChildProcessStartUserEmptyTypeEnum::getType).toArray(Integer[]::new);
-
- public static BpmChildProcessStartUserEmptyTypeEnum typeOf(Integer type) {
- return ArrayUtil.firstMatch(item -> item.getType().equals(type), values());
- }
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmChildProcessStartUserTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmChildProcessStartUserTypeEnum.java
deleted file mode 100644
index 8470a72..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmChildProcessStartUserTypeEnum.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import cn.hutool.core.util.ArrayUtil;
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * BPM åæµç¨‹å‘起人类型枚举
- *
- * @author Lesan
- */
-@Getter
-@AllArgsConstructor
-public enum BpmChildProcessStartUserTypeEnum implements ArrayValuable {
-
- MAIN_PROCESS_START_USER(1, "åŒä¸»æµç¨‹å‘起人"),
- FROM_FORM(2, "表å•");
-
- private final Integer type;
- private final String name;
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmChildProcessStartUserTypeEnum::getType).toArray(Integer[]::new);
-
- public static BpmChildProcessStartUserTypeEnum typeOf(Integer type) {
- return ArrayUtil.firstMatch(item -> item.getType().equals(type), values());
- }
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmDelayTimerTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmDelayTimerTypeEnum.java
deleted file mode 100644
index aabaef0..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmDelayTimerTypeEnum.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * BPM 延迟器类型枚举
- *
- * @author Lesan
- */
-@Getter
-@AllArgsConstructor
-public enum BpmDelayTimerTypeEnum implements ArrayValuable {
-
- FIXED_TIME_DURATION(1, "固定时长"),
- FIXED_DATE_TIME(2, "固定日期");
-
- private final Integer type;
- private final String name;
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmDelayTimerTypeEnum::getType).toArray(Integer[]::new);
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmFieldPermissionEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmFieldPermissionEnum.java
deleted file mode 100644
index 8571f90..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmFieldPermissionEnum.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import cn.hutool.core.util.ArrayUtil;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * BPM 表å•æƒé™çš„枚举
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum BpmFieldPermissionEnum {
-
- READ(1, "åªè¯»"),
- WRITE(2, "å¯ç¼–辑"),
- NONE(3, "éšè—");
-
- /**
- * æƒé™
- */
- private final Integer permission;
- /**
- * åå—
- */
- private final String name;
-
- public static BpmFieldPermissionEnum valueOf(Integer permission) {
- return ArrayUtil.firstMatch(item -> item.getPermission().equals(permission), values());
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmHttpRequestParamTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmHttpRequestParamTypeEnum.java
deleted file mode 100644
index dd1fc50..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmHttpRequestParamTypeEnum.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * BPM HTTP 请求å‚数设置类型。用于 Simple 设计器任务监å¬å™¨å’Œè§¦å‘器é…置。
- *
- * @author Lesan
- */
-@Getter
-@AllArgsConstructor
-public enum BpmHttpRequestParamTypeEnum implements ArrayValuable {
-
- FIXED_VALUE(1, "固定值"),
- FROM_FORM(2, "表å•");
-
- private final Integer type;
- private final String name;
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmHttpRequestParamTypeEnum::getType).toArray(Integer[]::new);
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmModelFormTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmModelFormTypeEnum.java
deleted file mode 100644
index f28b1ed..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmModelFormTypeEnum.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * BPM 模型的表å•ç±»åž‹çš„枚举
- *
- * @author ZT
- */
-@Getter
-@AllArgsConstructor
-public enum BpmModelFormTypeEnum implements ArrayValuable {
-
- NORMAL(10, "æµç¨‹è¡¨å•"), // 对应 BpmFormDO
- CUSTOM(20, "业务表å•") // 业务自己定义的表å•ï¼Œè‡ªå·±è¿›è¡Œæ•°æ®çš„å˜å‚¨
- ;
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmModelFormTypeEnum::getType).toArray(Integer[]::new);
-
- private final Integer type;
- private final String name;
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmModelTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmModelTypeEnum.java
deleted file mode 100644
index 259b365..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmModelTypeEnum.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * BPM 模型的类型的枚举
- *
- * @author ZT
- */
-@Getter
-@AllArgsConstructor
-public enum BpmModelTypeEnum implements ArrayValuable {
-
- BPMN(10, "BPMN 设计器"), // https://bpmn.io/toolkit/bpmn-js/
- SIMPLE(20, "SIMPLE 设计器"); // å‚考钉钉ã€é£žä¹¦å·¥ä½œæµçš„设计器
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmModelTypeEnum::getType).toArray(Integer[]::new);
-
- private final Integer type;
- private final String name;
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmProcessListenerTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmProcessListenerTypeEnum.java
deleted file mode 100644
index b1ecfe4..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmProcessListenerTypeEnum.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * BPM æµç¨‹ç›‘å¬å™¨çš„类型
- *
- * @author ZT
- */
-@Getter
-@AllArgsConstructor
-public enum BpmProcessListenerTypeEnum {
-
- EXECUTION("execution", "执行监å¬å™¨"),
- TASK("task", "任务执行器");
-
- private final String type;
- private final String name;
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmProcessListenerValueTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmProcessListenerValueTypeEnum.java
deleted file mode 100644
index 7ff961b..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmProcessListenerValueTypeEnum.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * BPM æµç¨‹ç›‘å¬å™¨çš„值类型
- *
- * @author ZT
- */
-@Getter
-@AllArgsConstructor
-public enum BpmProcessListenerValueTypeEnum {
-
- CLASS("class", "Java ç±»"),
- DELEGATE_EXPRESSION("delegateExpression", "代ç†è¡¨è¾¾å¼"),
- EXPRESSION("expression", "表达å¼");
-
- private final String type;
- private final String name;
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmSimpleModeConditionTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmSimpleModeConditionTypeEnum.java
deleted file mode 100644
index b8c8ee2..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmSimpleModeConditionTypeEnum.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import cn.hutool.core.util.ArrayUtil;
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * 仿钉钉的æµç¨‹å™¨è®¾è®¡å™¨æ¡ä»¶èŠ‚点的æ¡ä»¶ç±»åž‹
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum BpmSimpleModeConditionTypeEnum implements ArrayValuable {
-
- EXPRESSION(1, "æ¡ä»¶è¡¨è¾¾å¼"),
- RULE(2, "æ¡ä»¶è§„则");
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmSimpleModeConditionTypeEnum::getType).toArray(Integer[]::new);
-
- private final Integer type;
-
- private final String name;
-
- public static BpmSimpleModeConditionTypeEnum valueOf(Integer type) {
- return ArrayUtil.firstMatch(nodeType -> nodeType.getType().equals(type), values());
- }
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmSimpleModelNodeTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmSimpleModelNodeTypeEnum.java
deleted file mode 100644
index 6590a4c..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmSimpleModelNodeTypeEnum.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import cn.hutool.core.util.ArrayUtil;
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.Objects;
-
-/**
- * 仿钉钉的æµç¨‹å™¨è®¾è®¡å™¨çš„模型节点类型
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum BpmSimpleModelNodeTypeEnum implements ArrayValuable {
-
- // 0 ~ 1 开始和结æŸ
- START_NODE(0, "开始", "startEvent"),
- END_NODE(1, "结æŸ", "endEvent"),
-
- // 10 ~ 49 å„ç§èŠ‚点
- START_USER_NODE(10, "å‘起人", "userTask"), // å‘起人节点。å‰ç«¯çš„开始节点，Id 固定
- APPROVE_NODE(11, "审批人", "userTask"),
- COPY_NODE(12, "抄é€äºº", "serviceTask"),
- TRANSACTOR_NODE(13, "办ç†äºº", "userTask"),
-
- DELAY_TIMER_NODE(14, "延迟器", "receiveTask"),
- TRIGGER_NODE(15, "触å‘器", "serviceTask"),
-
- CHILD_PROCESS(20, "åæµç¨‹", "callActivity"),
-
- // 50 ~ æ¡ä»¶åˆ†æ”¯
- CONDITION_NODE(50, "æ¡ä»¶", "sequenceFlow"), // 用于构建æµè½¬æ¡ä»¶çš„表达å¼
- CONDITION_BRANCH_NODE(51, "æ¡ä»¶åˆ†æ”¯", "exclusiveGateway"),
- PARALLEL_BRANCH_NODE(52, "并行分支", "parallelGateway"),
- INCLUSIVE_BRANCH_NODE(53, "包容分支", "inclusiveGateway"),
- ROUTER_BRANCH_NODE(54, "路由分支", "exclusiveGateway")
- ;
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmSimpleModelNodeTypeEnum::getType).toArray(Integer[]::new);
-
- private final Integer type;
- private final String name;
- private final String bpmnType;
-
- /**
- * 判æ–是å¦ä¸ºåˆ†æ”¯èŠ‚点
- *
- * @param type 节点类型
- */
- public static boolean isBranchNode(Integer type) {
- return Objects.equals(CONDITION_BRANCH_NODE.getType(), type)
- || Objects.equals(PARALLEL_BRANCH_NODE.getType(), type)
- || Objects.equals(INCLUSIVE_BRANCH_NODE.getType(), type)
- || Objects.equals(ROUTER_BRANCH_NODE.getType(), type);
- }
-
- public static BpmSimpleModelNodeTypeEnum valueOf(Integer type) {
- return ArrayUtil.firstMatch(nodeType -> nodeType.getType().equals(type), values());
- }
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmTriggerTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmTriggerTypeEnum.java
deleted file mode 100644
index 72c3c39..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmTriggerTypeEnum.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import cn.hutool.core.util.ArrayUtil;
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * BPM Simple 触å‘器类型枚举
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum BpmTriggerTypeEnum implements ArrayValuable {
-
- HTTP_REQUEST(1, "å‘èµ· HTTP 请求"), // BPM => 业务，æµç¨‹ç»§ç»æ‰§è¡Œï¼Œæ— 需ç‰å¾…业务
- HTTP_CALLBACK(2, "接收 HTTP 回调"), // BPM => 业务 => BPM，æµç¨‹å¡ä¸»ï¼Œç‰å¾…业务回调
-
- FORM_UPDATE(10, "æ›´æ–°æµç¨‹è¡¨å•æ•°æ®"),
- FORM_DELETE(11, "åˆ é™¤æµç¨‹è¡¨å•æ•°æ®"),
- ;
-
- /**
- * 触å‘器执行动作类型
- */
- private final Integer type;
-
- /**
- * 触å‘器执行动作æè¿°
- */
- private final String desc;
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmTriggerTypeEnum::getType).toArray(Integer[]::new);
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
- public static BpmTriggerTypeEnum typeOf(Integer type) {
- return ArrayUtil.firstMatch(item -> item.getType().equals(type), values());
- }
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskApproveMethodEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskApproveMethodEnum.java
deleted file mode 100644
index 065035d..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskApproveMethodEnum.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import cn.hutool.core.util.ArrayUtil;
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * BPM 多人审批方å¼çš„枚举
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum BpmUserTaskApproveMethodEnum implements ArrayValuable {
-
- RANDOM(1, "éšæœºæŒ‘选一人审批", null),
- RATIO(2, "多人会ç¾(按通过比例)", "${ nrOfCompletedInstances/nrOfInstances >= %s}"), // 会ç¾ï¼ˆæŒ‰é€šè¿‡æ¯”例）
- ANY(3, "多人或ç¾(一人通过或拒ç»)", "${ nrOfCompletedInstances > 0 }"), // 或ç¾ï¼ˆé€šè¿‡åªéœ€ä¸€äººï¼Œæ‹’ç»åªéœ€ä¸€äººï¼‰
- SEQUENTIAL(4, "ä¾æ¬¡å®¡æ‰¹", "${ nrOfCompletedInstances >= nrOfInstances }"); // ä¾æ¬¡å®¡æ‰¹
-
- /**
- * 审批方å¼
- */
- private final Integer method;
- /**
- * åå—
- */
- private final String name;
- /**
- * 完æˆè¡¨è¾¾å¼
- */
- private final String completionCondition;
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmUserTaskApproveMethodEnum::getMethod).toArray(Integer[]::new);
-
- public static BpmUserTaskApproveMethodEnum valueOf(Integer method) {
- return ArrayUtil.firstMatch(item -> item.getMethod().equals(method), values());
- }
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskApproveTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskApproveTypeEnum.java
deleted file mode 100644
index df40e18..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskApproveTypeEnum.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * 用户任务的审批类型枚举
- *
- * @author ZT
- */
-@Getter
-@AllArgsConstructor
-public enum BpmUserTaskApproveTypeEnum implements ArrayValuable {
-
- USER(1), // 人工审批
- AUTO_APPROVE(2), // 自动通过
- AUTO_REJECT(3); // 自动拒ç»
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmUserTaskApproveTypeEnum::getType).toArray(Integer[]::new);
-
- private final Integer type;
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskAssignEmptyHandlerTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskAssignEmptyHandlerTypeEnum.java
deleted file mode 100644
index 237ef8e..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskAssignEmptyHandlerTypeEnum.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-import java.util.Arrays;
-
-/**
- * BPM 用户任务的审批人为空时，处ç†ç±»åž‹æžšä¸¾
- *
- * @author ZT
- */
-@RequiredArgsConstructor
-@Getter
-public enum BpmUserTaskAssignEmptyHandlerTypeEnum implements ArrayValuable {
-
- APPROVE(1), // 自动通过
- REJECT(2), // 自动拒ç»
- ASSIGN_USER(3), // 指定人员审批
- ASSIGN_ADMIN(4), // 转交给æµç¨‹ç®¡ç†å‘˜
- ;
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmUserTaskAssignEmptyHandlerTypeEnum::getType).toArray(Integer[]::new);
-
- private final Integer type;
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskAssignStartUserHandlerTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskAssignStartUserHandlerTypeEnum.java
deleted file mode 100644
index ffed389..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskAssignStartUserHandlerTypeEnum.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-import java.util.Arrays;
-
-/**
- * BPM 用户任务的审批人与å‘起人相åŒæ—¶ï¼Œå¤„ç†ç±»åž‹æžšä¸¾
- *
- * @author ZT
- */
-@RequiredArgsConstructor
-@Getter
-public enum BpmUserTaskAssignStartUserHandlerTypeEnum implements ArrayValuable {
-
- START_USER_AUDIT(1), // ç”±å‘起人对自己审批
- SKIP(2), // 自动跳过ã€å‚考飞书】：1）如果当å‰èŠ‚点还有其他审批人，则交由其他审批人进行审批；2）如果当å‰èŠ‚点没有其他审批人，则该节点自动通过
- TRANSFER_DEPT_LEADER(3); // 转交给部门负责人审批ã€å‚考飞书】：若部门负责人为空，则自动通过
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmUserTaskAssignStartUserHandlerTypeEnum::getType).toArray(Integer[]::new);
-
- private final Integer type;
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskRejectHandlerTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskRejectHandlerTypeEnum.java
deleted file mode 100644
index f251971..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskRejectHandlerTypeEnum.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import cn.hutool.core.util.ArrayUtil;
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * BPM 用户任务拒ç»å¤„ç†ç±»åž‹æžšä¸¾
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum BpmUserTaskRejectHandlerTypeEnum implements ArrayValuable {
-
- FINISH_PROCESS_INSTANCE(1, "终æ¢æµç¨‹"),
- RETURN_USER_TASK(2, "驳回到指定任务节点");
-
- private final Integer type;
- private final String name;
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmUserTaskRejectHandlerTypeEnum::getType).toArray(Integer[]::new);
-
- public static BpmUserTaskRejectHandlerTypeEnum typeOf(Integer type) {
- return ArrayUtil.firstMatch(item -> item.getType().equals(type), values());
- }
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskTimeoutHandlerTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskTimeoutHandlerTypeEnum.java
deleted file mode 100644
index 8f9460e..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/definition/BpmUserTaskTimeoutHandlerTypeEnum.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.zt.plat.module.bpm.enums.definition;
-
-import com.zt.plat.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * 用户任务超时处ç†ç±»åž‹æžšä¸¾
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum BpmUserTaskTimeoutHandlerTypeEnum implements ArrayValuable {
-
- REMINDER(1,"自动æ醒"),
- APPROVE(2, "自动åŒæ„"),
- REJECT(3, "自动拒ç»");
-
- private final Integer type;
- private final String name;
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmUserTaskTimeoutHandlerTypeEnum::getType).toArray(Integer[]::new);
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/message/BpmMessageEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/message/BpmMessageEnum.java
deleted file mode 100644
index d8db9ae..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/message/BpmMessageEnum.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.zt.plat.module.bpm.enums.message;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * Bpm 消æ¯çš„枚举
- *
- * @author ZT
- */
-@AllArgsConstructor
-@Getter
-public enum BpmMessageEnum {
-
- PROCESS_INSTANCE_APPROVE("bpm_process_instance_approve"), // æµç¨‹ä»»åŠ¡è¢«å®¡æ‰¹é€šè¿‡æ—¶ï¼Œå‘é€ç»™ç”³è¯·äºº
- PROCESS_INSTANCE_REJECT("bpm_process_instance_reject"), // æµç¨‹ä»»åŠ¡è¢«å®¡æ‰¹ä¸é€šè¿‡æ—¶ï¼Œå‘é€ç»™ç”³è¯·äºº
- TASK_ASSIGNED("bpm_task_assigned"), // 任务被分é…时，å‘é€ç»™å®¡æ‰¹äºº
- TASK_TIMEOUT("bpm_task_timeout"); // 任务审批超时时，å‘é€ç»™å®¡æ‰¹äºº
-
- /**
- * çŸä¿¡æ¨¡æ¿çš„æ ‡è¯†
- *
- * å…³è” SmsTemplateDO çš„ code 属性
- */
- private final String smsTemplateCode;
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmCommentTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmCommentTypeEnum.java
deleted file mode 100644
index 51a5ffa..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmCommentTypeEnum.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.zt.plat.module.bpm.enums.task;
-
-import cn.hutool.core.util.StrUtil;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * æµç¨‹ä»»åŠ¡çš„ Comment 评论类型枚举
- *
- * @author kehaiyou
- */
-@Getter
-@AllArgsConstructor
-public enum BpmCommentTypeEnum {
-
- APPROVE("1", "审批通过", "å®¡æ‰¹é€šè¿‡ï¼ŒåŽŸå› æ˜¯ï¼š{}"),
- REJECT("2", "ä¸é€šè¿‡", "审批ä¸é€šè¿‡ï¼šåŽŸå› 是：{}"),
- CANCEL("3", "å·²å–消", "系统自动å–æ¶ˆï¼ŒåŽŸå› æ˜¯ï¼š{}"),
- RETURN("4", "退回", "ä»»åŠ¡è¢«é€€å›žï¼ŒåŽŸå› æ˜¯ï¼š{}"),
- DELEGATE_START("5", "委派å‘èµ·", "[{}]将任务委派给[{}]，委派ç†ç”±ä¸º:{}"),
- DELEGATE_END("6", "委派完æˆ", "[{}]完æˆå§”派任务，任务é‡æ–°å›žåˆ°[{}]手ä¸ï¼Œå®¡æ‰¹å»ºè®®ä¸º:{}"),
- TRANSFER("7", "转派", "[{}]将任务转派给[{}]，转派ç†ç”±ä¸º:{}"),
- ADD_SIGN("8", "åŠ ç¾", "[{}]{}给了[{}]，ç†ç”±ä¸ºï¼š{}"),
- SUB_SIGN("9", "å‡ç¾", "[{}]æ“作了ã€å‡ç¾ã€‘,审批人[{}]的任务被å–消"),
- ;
-
- /**
- * æ“作类型
- *
- * 由于 BPM Comment 类型为 String，所以这里就ä¸ä½¿ç”¨ Integer
- */
- private final String type;
- /**
- * æ“作åå—
- */
- private final String name;
- /**
- * æ“作æè¿°
- */
- private final String comment;
-
- public String formatComment(Object... params) {
- return StrUtil.format(comment, params);
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java
deleted file mode 100644
index 0e61d22..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.zt.plat.module.bpm.enums.task;
-
-import com.zt.plat.framework.common.core.ArrayValuable;
-import com.zt.plat.framework.common.util.object.ObjectUtils;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.Arrays;
-
-/**
- * æµç¨‹å®žä¾‹ ProcessInstance 的状æ€
- *
- * @author ZT
- */
-@Getter
-@AllArgsConstructor
-public enum BpmProcessInstanceStatusEnum implements ArrayValuable {
-
- NOT_START(-1, "未开始"),
- RUNNING(1, "审批ä¸"),
- APPROVE(2, "审批通过"),
- REJECT(3, "审批ä¸é€šè¿‡"),
- CANCEL(4, "å·²å–消");
-
- public static final Integer[] ARRAYS = Arrays.stream(values()).map(BpmProcessInstanceStatusEnum::getStatus).toArray(Integer[]::new);
-
- /**
- * 状æ€
- */
- private final Integer status;
- /**
- * æè¿°
- */
- private final String desc;
-
- @Override
- public Integer[] array() {
- return ARRAYS;
- }
-
- public static boolean isRejectStatus(Integer status) {
- return REJECT.getStatus().equals(status);
- }
-
- public static boolean isProcessEndStatus(Integer status) {
- return ObjectUtils.equalsAny(status,
- APPROVE.getStatus(), REJECT.getStatus(), CANCEL.getStatus());
- }
-
- /**
- * 通过æµç¨‹çš„状æ€è¿”回对应的枚举
- * @param status æµç¨‹çŠ¶æ€
- * @return
- */
- public static BpmProcessInstanceStatusEnum getEnumByStatus(Integer status){
- for (BpmProcessInstanceStatusEnum e : BpmProcessInstanceStatusEnum.values()) {
- if (e.getStatus().equals(status)) {
- return e;
- }
- }
- return NOT_START;
- }
-
- /**
- * 通过枚举æ述返回对应的枚举
- * @param desc æè¿°
- * @return
- */
- public static BpmProcessInstanceStatusEnum getEnumByDesc(String desc){
- if (StringUtils.isEmpty(desc)) return NOT_START;
- for (BpmProcessInstanceStatusEnum e : BpmProcessInstanceStatusEnum.values()) {
- if (desc.equals(e.getDesc())) {
- return e;
- }
- }
- return NOT_START;
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmReasonEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmReasonEnum.java
deleted file mode 100644
index 8bf768f..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmReasonEnum.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.zt.plat.module.bpm.enums.task;
-
-import cn.hutool.core.util.StrUtil;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * æµç¨‹å®žä¾‹/任务的的处ç†åŽŸå› 枚举
- *
- * @author ZT
- */
-@Getter
-@AllArgsConstructor
-public enum BpmReasonEnum {
-
- // ========== æµç¨‹å®žä¾‹çš„ç‹¬æœ‰åŽŸå› ==========
-
- REJECT_TASK("审批ä¸é€šè¿‡ä»»åŠ¡ï¼ŒåŽŸå› ：{}"), // 场景：用户审批ä¸é€šè¿‡ä»»åŠ¡ã€‚修改文案时，需è¦æ³¨æ„ isRejectReason 方法
- CANCEL_PROCESS_INSTANCE_BY_START_USER("用户主动å–消æµç¨‹ï¼ŒåŽŸå› ：{}"), // 场景：用户主动å–消æµç¨‹
- CANCEL_PROCESS_INSTANCE_BY_ADMIN("管ç†å‘˜ã€{}】å–消æµç¨‹ï¼ŒåŽŸå› ：{}"), // 场景：管ç†å‘˜å–消æµç¨‹
- CANCEL_CHILD_PROCESS_INSTANCE_BY_MAIN_PROCESS("åæµç¨‹è‡ªåŠ¨å–æ¶ˆï¼ŒåŽŸå› ï¼šä¸»æµç¨‹å·²å–消"),
-
- // ========== æµç¨‹ä»»åŠ¡çš„ç‹¬æœ‰åŽŸå› ==========
-
- CANCEL_BY_SYSTEM("系统自动å–消"), // 场景：éžå¸¸å¤šï¼Œæ¯”如说：1）多任务审批已ç»æ»¡è¶³æ¡ä»¶ï¼Œæ— 需审批该任务；2）æµç¨‹å®žä¾‹è¢«å–æ¶ˆï¼Œæ— éœ€å®¡æ‰¹è¯¥ä»»åŠ¡ï¼›ç‰ç‰
- TIMEOUT_APPROVE("审批超时，系统自动通过"),
- TIMEOUT_REJECT("审批超时，系统自动ä¸é€šè¿‡"),
- ASSIGN_START_USER_APPROVE("审批人与æ交人为åŒä¸€äººæ—¶ï¼Œè‡ªåŠ¨é€šè¿‡"),
- ASSIGN_START_USER_APPROVE_WHEN_SKIP("审批人与æ交人为åŒä¸€äººæ—¶ï¼Œè‡ªåŠ¨é€šè¿‡"),
- ASSIGN_START_USER_APPROVE_WHEN_SKIP_START_USER_NODE("å‘起人节点首次自动通过"), // ç›®å‰ä»…“åæµç¨‹â€ä½¿ç”¨
- ASSIGN_START_USER_APPROVE_WHEN_DEPT_LEADER_NOT_FOUND("审批人与æ交人为åŒä¸€äººæ—¶ï¼Œæ‰¾ä¸åˆ°éƒ¨é—¨è´Ÿè´£äººï¼Œè‡ªåŠ¨é€šè¿‡"),
- ASSIGN_START_USER_TRANSFER_DEPT_LEADER("审批人与æ交人为åŒä¸€äººæ—¶ï¼Œè½¬äº¤ç»™éƒ¨é—¨è´Ÿè´£äººå®¡æ‰¹"),
- ASSIGN_EMPTY_APPROVE("审批人为空，自动通过"),
- ASSIGN_EMPTY_REJECT("审批人为空，自动ä¸é€šè¿‡"),
- APPROVE_TYPE_AUTO_APPROVE("éžäººå·¥å®¡æ ¸ï¼Œè‡ªåŠ¨é€šè¿‡"),
- APPROVE_TYPE_AUTO_REJECT("éžäººå·¥å®¡æ ¸ï¼Œè‡ªåŠ¨ä¸é€šè¿‡"),
- CANCEL_BY_PROCESS_CLEAN("进程清ç†è‡ªåŠ¨å–消"),
- ;
-
- private final String reason;
-
- /**
- * æ ¼å¼åŒ–ç†ç”±
- *
- * @param args å‚æ•°
- * @return ç†ç”±
- */
- public String format(Object... args) {
- return StrUtil.format(reason, args);
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmTaskSignTypeEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmTaskSignTypeEnum.java
deleted file mode 100644
index 40aa2b1..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmTaskSignTypeEnum.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.zt.plat.module.bpm.enums.task;
-
-import cn.hutool.core.util.ArrayUtil;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * æµç¨‹ä»»åŠ¡çš„åŠ ç¾ç±»åž‹æžšä¸¾
- *
- * @author kehaiyou
- */
-@Getter
-@AllArgsConstructor
-public enum BpmTaskSignTypeEnum {
-
- /**
- * å‘å‰åŠ ç¾ï¼Œéœ€è¦å‰ç½®ä»»åŠ¡å®¡æ‰¹å®Œæˆï¼Œæ‰å›žåˆ°åŽŸå®¡æ‰¹äºº
- */
- BEFORE("before", "å‘å‰åŠ ç¾"),
- /**
- * å‘åŽåŠ ç¾ï¼Œéœ€è¦åŽç½®ä»»åŠ¡å…¨éƒ¨å®¡æ‰¹å®Œï¼Œæ‰ä¼šé€šè¿‡åŽŸå®¡æ‰¹äººèŠ‚点
- */
- AFTER("after", "å‘åŽåŠ ç¾");
-
- /**
- * 类型
- */
- private final String type;
- /**
- * åå—
- */
- private final String name;
-
- public static String nameOfType(String type) {
- for (BpmTaskSignTypeEnum value : values()) {
- if (value.type.equals(type)) {
- return value.name;
- }
- }
- return null;
- }
-
- public static BpmTaskSignTypeEnum of(String type) {
- return ArrayUtil.firstMatch(value -> value.getType().equals(type), values());
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmTaskStatusEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmTaskStatusEnum.java
deleted file mode 100644
index 42ac7df..0000000
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmTaskStatusEnum.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.zt.plat.module.bpm.enums.task;
-
-import cn.hutool.core.util.ObjUtil;
-import com.zt.plat.framework.common.util.object.ObjectUtils;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * æµç¨‹ä»»åŠ¡ Task 的状æ€æžšä¸¾
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum BpmTaskStatusEnum {
-
- NOT_START(-1, "未开始"),
- RUNNING(1, "审批ä¸"),
- APPROVE(2, "审批通过"),
- REJECT(3, "审批ä¸é€šè¿‡"),
- CANCEL(4, "å·²å–消"),
-
- RETURN(5, "已退回"),
-
- /**
- * 使用场景：
- * 1. 任务被å‘åŽã€åŠ ç¾ã€‘时，它在审批通过åŽï¼Œä¼šå˜æˆ APPROVING 这个状æ€ï¼Œç„¶åŽç‰åˆ°ã€åŠ ç¾ã€‘出æ¥çš„任务都被审批åŽï¼Œæ‰ä¼šå˜æˆ APPROVE 审批通过
- */
- APPROVING(7, "审批通过ä¸"),
- /**
- * 使用场景：
- * 1. 任务被å‘å‰ã€åŠ ç¾ã€‘时，它会å˜æˆ WAIT 状æ€ï¼Œéœ€è¦ç‰å¾…ã€åŠ ç¾ã€‘出æ¥çš„任务被审批åŽï¼Œå®ƒæ‰èƒ½ç»§ç»å˜ä¸º RUNNING 继ç»å®¡æ‰¹
- * 2. 任务被å‘åŽã€åŠ ç¾ã€‘时，ã€åŠ ç¾ã€‘出æ¥çš„任务处于 WAIT 状æ€ï¼Œå®ƒä»¬éœ€è¦ç‰å¾…该任务被审批åŽï¼Œå®ƒä»¬æ‰èƒ½ç»§ç»å˜ä¸º RUNNING 继ç»å®¡æ‰¹
- */
- WAIT(0, "待审批");
-
- /**
- * 状æ€
- *
- * å¦‚æžœæ–°å¢žæ—¶ï¼Œæ³¨æ„ {@link #isEndStatus(Integer)} 是å¦éœ€è¦å˜æ›´
- */
- private final Integer status;
- /**
- * åå—
- */
- private final String name;
-
- public static boolean isRejectStatus(Integer status) {
- return REJECT.getStatus().equals(status);
- }
-
- /**
- * 判æ–该状æ€æ˜¯å¦å·²ç»å¤„于 End 最终状æ€
- *
- * 主è¦ç”¨äºŽä¸€äº›çŠ¶æ€æ›´æ–°çš„逻辑，如果已ç»æ˜¯æœ€ç»ˆçŠ¶æ€ï¼Œå°±ä¸å†è¿›è¡Œæ›´æ–°
- *
- * @param status 状æ€
- * @return 是å¦
- */
- public static boolean isEndStatus(Integer status) {
- return ObjectUtils.equalsAny(status,
- APPROVE.getStatus(), REJECT.getStatus(), CANCEL.getStatus(),
- RETURN.getStatus(), APPROVING.getStatus());
- }
-
- public static boolean isCancelStatus(Integer status) {
- return ObjUtil.equal(status, CANCEL.getStatus());
- }
-
-
- /**
- * 通过æµç¨‹çš„状æ€è¿”回对应的枚举
- * @param status æµç¨‹çŠ¶æ€
- * @return
- */
- public static BpmTaskStatusEnum getEnumByStatus(Integer status){
- for (BpmTaskStatusEnum e : BpmTaskStatusEnum.values()) {
- if (e.getStatus().equals(status)) {
- return e;
- }
- }
- return NOT_START;
- }
-
- /**
- * 通过枚举æ述返回对应的枚举
- * @param name æè¿°
- * @return
- */
- public static BpmTaskStatusEnum getEnumByName(String name){
- if (StringUtils.isEmpty(name)) return NOT_START;
- for (BpmTaskStatusEnum e : BpmTaskStatusEnum.values()) {
- if (name.equals(e.getName())) {
- return e;
- }
- }
- return NOT_START;
- }
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/pom.xml b/zt-module-bpm/zt-module-bpm-server/pom.xml
index 72239fb..cebf709 100644
--- a/zt-module-bpm/zt-module-bpm-server/pom.xml
+++ b/zt-module-bpm/zt-module-bpm-server/pom.xml
@@ -4,11 +4,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
com.zt.plat
- zt-module-bpm
+ zt-module-bpm-dsc
${revision}
4.0.0
- zt-module-bpm-server
+ zt-module-bpm-server-dsc
${project.artifactId}
@@ -28,6 +28,16 @@
zt-module-bpm-api
${revision}
+
+ com.zt.plat
+ zt-module-bpm-server
+ ${revision}
+
+
+ com.zt.plat
+ zt-module-bpm-api-dsc
+ ${revision}
+
com.zt.plat
zt-module-system-api
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java
deleted file mode 100644
index fe4cc83..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java
+++ /dev/null
@@ -1,778 +0,0 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by FernFlower decompiler)
-//
-
-package com.alibaba.druid.pool;
-
-import com.alibaba.cloud.commons.lang.StringUtils;
-import com.alibaba.druid.VERSION;
-import com.alibaba.druid.support.logging.Log;
-import com.alibaba.druid.support.logging.LogFactory;
-import com.alibaba.druid.util.JdbcUtils;
-import com.alibaba.druid.util.MySqlUtils;
-
-import java.net.SocketTimeoutException;
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.List;
-
-public class DruidPooledStatement extends PoolableWrapper implements Statement {
- private static final Log LOG = LogFactory.getLog(DruidPooledStatement.class);
- private final Statement stmt;
- protected DruidPooledConnection conn;
- protected List resultSetTrace;
- protected boolean closed;
- protected int fetchRowPeak = -1;
- protected int exceptionCount;
-
- public DruidPooledStatement(DruidPooledConnection conn, Statement stmt) {
- super(stmt);
- this.conn = conn;
- this.stmt = stmt;
- }
-
- protected void addResultSetTrace(ResultSet resultSet) {
- if (this.resultSetTrace == null) {
- this.resultSetTrace = new ArrayList(1);
- } else if (this.resultSetTrace.size() > 0) {
- int lastIndex = this.resultSetTrace.size() - 1;
- ResultSet lastResultSet = (ResultSet)this.resultSetTrace.get(lastIndex);
-
- try {
- if (lastResultSet.isClosed()) {
- this.resultSetTrace.set(lastIndex, resultSet);
- return;
- }
- } catch (SQLException var5) {
- }
- }
-
- this.resultSetTrace.add(resultSet);
- }
-
- protected void recordFetchRowCount(int fetchRowCount) {
- if (this.fetchRowPeak < fetchRowCount) {
- this.fetchRowPeak = fetchRowCount;
- }
-
- }
-
- public int getFetchRowPeak() {
- return this.fetchRowPeak;
- }
-
- protected SQLException checkException(Throwable error) throws SQLException {
- String sql = null;
- if (this instanceof DruidPooledPreparedStatement) {
- sql = ((DruidPooledPreparedStatement)this).getSql();
- }
-
- this.handleSocketTimeout(error);
- ++this.exceptionCount;
- return this.conn.handleException(error, sql);
- }
-
- protected SQLException checkException(Throwable error, String sql) throws SQLException {
- this.handleSocketTimeout(error);
- ++this.exceptionCount;
- return this.conn.handleException(error, sql);
- }
-
- protected void handleSocketTimeout(Throwable error) throws SQLException {
- if (this.conn != null && this.conn.transactionInfo == null && this.conn.holder != null) {
- DruidDataSource dataSource = null;
- DruidConnectionHolder holder = this.conn.holder;
- if (holder.dataSource instanceof DruidDataSource) {
- dataSource = (DruidDataSource)holder.dataSource;
- }
-
- if (dataSource != null) {
- if (dataSource.killWhenSocketReadTimeout) {
- SQLException sqlException = null;
- if (error instanceof SQLException) {
- sqlException = (SQLException)error;
- }
-
- if (sqlException != null) {
- Throwable cause = error.getCause();
- boolean socketReadTimeout = cause instanceof SocketTimeoutException && "Read timed out".equals(cause.getMessage());
- if (socketReadTimeout) {
- if (JdbcUtils.isMysqlDbType(dataSource.dbTypeName)) {
- String killQuery = MySqlUtils.buildKillQuerySql(this.conn.getConnection(), (SQLException)error);
- if (killQuery != null) {
- DruidPooledConnection killQueryConn = null;
- Statement killQueryStmt = null;
-
- try {
- killQueryConn = dataSource.getConnection(1000L);
- if (killQueryConn != null) {
- killQueryStmt = killQueryConn.createStatement();
- killQueryStmt.execute(killQuery);
- if (LOG.isDebugEnabled()) {
- LOG.debug(killQuery + " success.");
- }
-
- return;
- }
- } catch (Exception ex) {
- LOG.warn(killQuery + " error.", ex);
- return;
- } finally {
- JdbcUtils.close(killQueryStmt);
- JdbcUtils.close(killQueryConn);
- }
-
- }
- }
- }
- }
- }
- }
- }
- }
-
- public DruidPooledConnection getPoolableConnection() {
- return this.conn;
- }
-
- public Statement getStatement() {
- return this.stmt;
- }
-
- protected void checkOpen() throws SQLException {
- if (this.closed) {
- Throwable disableError = null;
- if (this.conn != null) {
- disableError = this.conn.getDisableError();
- }
-
- if (disableError != null) {
- throw new SQLException("statement is closed", disableError);
- } else {
- throw new SQLException("statement is closed");
- }
- }
- }
-
- protected void clearResultSet() {
- if (this.resultSetTrace != null) {
- for(ResultSet rs : this.resultSetTrace) {
- try {
- if (!rs.isClosed()) {
- rs.close();
- }
- } catch (SQLException ex) {
- LOG.error("clearResultSet error", ex);
- }
- }
-
- this.resultSetTrace.clear();
- }
- }
-
- public void incrementExecuteCount() {
- DruidPooledConnection conn = this.getPoolableConnection();
- if (conn != null) {
- DruidConnectionHolder holder = conn.getConnectionHolder();
- if (holder != null) {
- DruidAbstractDataSource dataSource = holder.getDataSource();
- if (dataSource != null) {
- dataSource.incrementExecuteCount();
- }
- }
- }
- }
-
- public void incrementExecuteBatchCount() {
- DruidPooledConnection conn = this.getPoolableConnection();
- if (conn != null) {
- DruidConnectionHolder holder = conn.getConnectionHolder();
- if (holder != null) {
- if (holder.getDataSource() != null) {
- DruidAbstractDataSource dataSource = holder.getDataSource();
- if (dataSource != null) {
- dataSource.incrementExecuteBatchCount();
- }
- }
- }
- }
- }
-
- public void incrementExecuteUpdateCount() {
- DruidPooledConnection conn = this.getPoolableConnection();
- if (conn != null) {
- DruidConnectionHolder holder = conn.getConnectionHolder();
- if (holder != null) {
- DruidAbstractDataSource dataSource = holder.getDataSource();
- if (dataSource != null) {
- dataSource.incrementExecuteUpdateCount();
- }
- }
- }
- }
-
- public void incrementExecuteQueryCount() {
- DruidPooledConnection conn = this.conn;
- if (conn != null) {
- DruidConnectionHolder holder = conn.holder;
- if (holder != null) {
- DruidAbstractDataSource dataSource = holder.dataSource;
- if (dataSource != null) {
- ++dataSource.executeQueryCount;
- }
- }
- }
- }
-
- protected void transactionRecord(String sql) throws SQLException {
- this.conn.transactionRecord(sql);
- }
-
- public final ResultSet executeQuery(String sql) throws SQLException {
- this.checkOpen();
- this.incrementExecuteQueryCount();
- this.transactionRecord(sql);
- this.conn.beforeExecute();
-
- ResultSet var3;
- try {
- ResultSet rs = this.stmt.executeQuery(sql);
- if (rs != null) {
- DruidPooledResultSet poolableResultSet = new DruidPooledResultSet(this, rs);
- this.addResultSetTrace(poolableResultSet);
- DruidPooledResultSet var4 = poolableResultSet;
- return var4;
- }
-
- var3 = rs;
- } catch (Throwable t) {
- this.errorCheck(t);
- throw this.checkException(t, sql);
- } finally {
- this.conn.afterExecute();
- }
-
- return var3;
- }
-
- public final int executeUpdate(String sql) throws SQLException {
- this.checkOpen();
- this.incrementExecuteUpdateCount();
- this.transactionRecord(sql);
- this.conn.beforeExecute();
-
- int var2;
- try {
- var2 = this.stmt.executeUpdate(sql);
- } catch (Throwable t) {
- this.errorCheck(t);
- throw this.checkException(t, sql);
- } finally {
- this.conn.afterExecute();
- }
-
- return var2;
- }
-
- protected final void errorCheck(Throwable t) {
- String errorClassName = t.getClass().getName();
- if (errorClassName.endsWith(".CommunicationsException") && this.conn.holder != null && this.conn.holder.dataSource.testWhileIdle) {
- DruidConnectionHolder holder = this.conn.holder;
- DruidAbstractDataSource dataSource = holder.dataSource;
- long currentTimeMillis = System.currentTimeMillis();
- long lastActiveTimeMillis = holder.lastActiveTimeMillis;
- if (lastActiveTimeMillis < holder.lastKeepTimeMillis) {
- lastActiveTimeMillis = holder.lastKeepTimeMillis;
- }
-
- long idleMillis = currentTimeMillis - lastActiveTimeMillis;
- long lastValidIdleMillis = currentTimeMillis - holder.lastActiveTimeMillis;
- String errorMsg = "CommunicationsException, druid version " + VERSION.getVersionNumber() + ", jdbcUrl : " + dataSource.jdbcUrl + ", testWhileIdle " + dataSource.testWhileIdle + ", idle millis " + idleMillis + ", minIdle " + dataSource.minIdle + ", poolingCount " + dataSource.getPoolingCount() + ", timeBetweenEvictionRunsMillis " + dataSource.timeBetweenEvictionRunsMillis + ", lastValidIdleMillis " + lastValidIdleMillis + ", driver " + dataSource.driver.getClass().getName();
- if (dataSource.exceptionSorter != null) {
- errorMsg = errorMsg + ", exceptionSorter " + dataSource.exceptionSorter.getClass().getName();
- }
-
- LOG.error(errorMsg);
- }
-
- }
-
- public final int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
- this.checkOpen();
- this.incrementExecuteUpdateCount();
- this.transactionRecord(sql);
- this.conn.beforeExecute();
-
- int var3;
- try {
- var3 = this.stmt.executeUpdate(sql, autoGeneratedKeys);
- } catch (Throwable t) {
- this.errorCheck(t);
- throw this.checkException(t, sql);
- } finally {
- this.conn.afterExecute();
- }
-
- return var3;
- }
-
- public final int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
- this.checkOpen();
- this.incrementExecuteUpdateCount();
- this.transactionRecord(sql);
- this.conn.beforeExecute();
-
- int var3;
- try {
- var3 = this.stmt.executeUpdate(sql, columnIndexes);
- } catch (Throwable t) {
- this.errorCheck(t);
- throw this.checkException(t, sql);
- } finally {
- this.conn.afterExecute();
- }
-
- return var3;
- }
-
- public final int executeUpdate(String sql, String[] columnNames) throws SQLException {
- this.checkOpen();
- this.incrementExecuteUpdateCount();
- this.transactionRecord(sql);
- this.conn.beforeExecute();
-
- int var3;
- try {
- var3 = this.stmt.executeUpdate(sql, columnNames);
- } catch (Throwable t) {
- this.errorCheck(t);
- throw this.checkException(t, sql);
- } finally {
- this.conn.afterExecute();
- }
-
- return var3;
- }
-
- public final boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
- this.checkOpen();
- this.incrementExecuteCount();
- this.transactionRecord(sql);
- this.conn.beforeExecute();
-
- boolean var3;
- try {
- var3 = this.stmt.execute(sql, autoGeneratedKeys);
- } catch (Throwable t) {
- this.errorCheck(t);
- throw this.checkException(t, sql);
- } finally {
- this.conn.afterExecute();
- }
-
- return var3;
- }
-
- public final boolean execute(String sql, int[] columnIndexes) throws SQLException {
- this.checkOpen();
- this.incrementExecuteCount();
- this.transactionRecord(sql);
- this.conn.beforeExecute();
-
- boolean var3;
- try {
- var3 = this.stmt.execute(sql, columnIndexes);
- } catch (Throwable t) {
- this.errorCheck(t);
- throw this.checkException(t, sql);
- } finally {
- this.conn.afterExecute();
- }
-
- return var3;
- }
-
- public final boolean execute(String sql, String[] columnNames) throws SQLException {
- this.checkOpen();
- this.incrementExecuteCount();
- this.transactionRecord(sql);
- this.conn.beforeExecute();
-
- boolean var3;
- try {
- var3 = this.stmt.execute(sql, columnNames);
- } catch (Throwable t) {
- this.errorCheck(t);
- throw this.checkException(t, sql);
- } finally {
- this.conn.afterExecute();
- }
-
- return var3;
- }
-
-
- public int getMaxFieldSize() throws SQLException {
- this.checkOpen();
-
- try {
- return this.stmt.getMaxFieldSize();
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public void close() throws SQLException {
- if (!this.closed) {
- this.clearResultSet();
- if (this.stmt != null) {
- this.stmt.close();
- }
-
- this.closed = true;
- DruidConnectionHolder connHolder = this.conn.getConnectionHolder();
- if (connHolder != null) {
- connHolder.removeTrace(this);
- }
-
- }
- }
-
- public void setMaxFieldSize(int max) throws SQLException {
- this.checkOpen();
-
- try {
- this.stmt.setMaxFieldSize(max);
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final int getMaxRows() throws SQLException {
- this.checkOpen();
-
- try {
- return this.stmt.getMaxRows();
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public void setMaxRows(int max) throws SQLException {
- this.checkOpen();
-
- try {
- this.stmt.setMaxRows(max);
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final void setEscapeProcessing(boolean enable) throws SQLException {
- this.checkOpen();
-
- try {
- this.stmt.setEscapeProcessing(enable);
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final int getQueryTimeout() throws SQLException {
- this.checkOpen();
-
- try {
- return this.stmt.getQueryTimeout();
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public void setQueryTimeout(int seconds) throws SQLException {
- this.checkOpen();
-
- try {
- this.stmt.setQueryTimeout(seconds);
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final void cancel() throws SQLException {
- this.checkOpen();
-
- try {
- this.stmt.cancel();
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final SQLWarning getWarnings() throws SQLException {
- this.checkOpen();
-
- try {
- return this.stmt.getWarnings();
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final void clearWarnings() throws SQLException {
- this.checkOpen();
-
- try {
- this.stmt.clearWarnings();
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final void setCursorName(String name) throws SQLException {
- this.checkOpen();
-
- try {
- this.stmt.setCursorName(name);
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- @Override
- public final boolean execute(String sql) throws SQLException {
- checkOpen();
-
- incrementExecuteCount();
- transactionRecord(sql);
-
- try {
- if (StringUtils.isNotEmpty(sql)){
- sql = sql.replace("TRUE", "1");
- sql = sql.replace("FALSE", "0");
- }
- return stmt.execute(sql);
- } catch (Throwable t) {
- errorCheck(t);
- throw checkException(t, sql);
- }
- }
-
- public final ResultSet getResultSet() throws SQLException {
- this.checkOpen();
-
- try {
- ResultSet rs = this.stmt.getResultSet();
- if (rs == null) {
- return null;
- } else {
- DruidPooledResultSet poolableResultSet = new DruidPooledResultSet(this, rs);
- this.addResultSetTrace(poolableResultSet);
- return poolableResultSet;
- }
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final int getUpdateCount() throws SQLException {
- this.checkOpen();
-
- try {
- return this.stmt.getUpdateCount();
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final boolean getMoreResults() throws SQLException {
- this.checkOpen();
-
- try {
- boolean moreResults = this.stmt.getMoreResults();
- if (this.resultSetTrace != null && this.resultSetTrace.size() > 0) {
- ResultSet lastResultSet = (ResultSet)this.resultSetTrace.get(this.resultSetTrace.size() - 1);
- if (lastResultSet instanceof DruidPooledResultSet) {
- DruidPooledResultSet pooledResultSet = (DruidPooledResultSet)lastResultSet;
- pooledResultSet.closed = true;
- }
- }
-
- return moreResults;
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public void setFetchDirection(int direction) throws SQLException {
- this.checkOpen();
-
- try {
- this.stmt.setFetchDirection(direction);
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final int getFetchDirection() throws SQLException {
- this.checkOpen();
-
- try {
- return this.stmt.getFetchDirection();
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public void setFetchSize(int rows) throws SQLException {
- this.checkOpen();
-
- try {
- this.stmt.setFetchSize(rows);
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final int getFetchSize() throws SQLException {
- this.checkOpen();
-
- try {
- return this.stmt.getFetchSize();
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final int getResultSetConcurrency() throws SQLException {
- this.checkOpen();
-
- try {
- return this.stmt.getResultSetConcurrency();
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final int getResultSetType() throws SQLException {
- this.checkOpen();
-
- try {
- return this.stmt.getResultSetType();
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final void addBatch(String sql) throws SQLException {
- this.checkOpen();
- this.transactionRecord(sql);
-
- try {
- this.stmt.addBatch(sql);
- } catch (Throwable t) {
- throw this.checkException(t, sql);
- }
- }
-
- public final void clearBatch() throws SQLException {
- if (!this.closed) {
- try {
- this.stmt.clearBatch();
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
- }
-
- public int[] executeBatch() throws SQLException {
- this.checkOpen();
- this.incrementExecuteBatchCount();
- this.conn.beforeExecute();
-
- int[] var1;
- try {
- var1 = this.stmt.executeBatch();
- } catch (Throwable t) {
- this.errorCheck(t);
- throw this.checkException(t);
- } finally {
- this.conn.afterExecute();
- }
-
- return var1;
- }
-
- public final Connection getConnection() throws SQLException {
- this.checkOpen();
- return this.conn;
- }
-
- public final boolean getMoreResults(int current) throws SQLException {
- this.checkOpen();
-
- try {
- boolean results = this.stmt.getMoreResults(current);
- if (this.resultSetTrace != null && this.resultSetTrace.size() > 0) {
- ResultSet lastResultSet = (ResultSet)this.resultSetTrace.get(this.resultSetTrace.size() - 1);
- if (lastResultSet instanceof DruidPooledResultSet) {
- DruidPooledResultSet pooledResultSet = (DruidPooledResultSet)lastResultSet;
- pooledResultSet.closed = true;
- }
- }
-
- return results;
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final ResultSet getGeneratedKeys() throws SQLException {
- this.checkOpen();
-
- try {
- ResultSet rs = this.stmt.getGeneratedKeys();
- DruidPooledResultSet poolableResultSet = new DruidPooledResultSet(this, rs);
- this.addResultSetTrace(poolableResultSet);
- return poolableResultSet;
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final int getResultSetHoldability() throws SQLException {
- this.checkOpen();
-
- try {
- return this.stmt.getResultSetHoldability();
- } catch (Throwable t) {
- throw this.checkException(t);
- }
- }
-
- public final boolean isClosed() throws SQLException {
- return this.closed;
- }
-
- public final void setPoolable(boolean poolable) throws SQLException {
- if (!poolable) {
- throw new SQLException("not support");
- }
- }
-
- public final boolean isPoolable() throws SQLException {
- return false;
- }
-
- public String toString() {
- return this.stmt.toString();
- }
-
- public void closeOnCompletion() throws SQLException {
- this.stmt.closeOnCompletion();
- }
-
- public boolean isCloseOnCompletion() throws SQLException {
- return this.stmt.isCloseOnCompletion();
- }
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/definition/BpmCategoryApiImpl.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/definition/BpmCategoryApiImpl.java
deleted file mode 100644
index 7f161dd..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/definition/BpmCategoryApiImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.zt.plat.module.bpm.api.definition;
-
-import com.zt.plat.framework.common.enums.CommonStatusEnum;
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.module.bpm.api.definition.dto.BpmCategoryPageReqDTO;
-import com.zt.plat.module.bpm.api.definition.dto.BpmCategoryRespDTO;
-import com.zt.plat.module.bpm.api.definition.dto.BpmCategorySaveReqDTO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.category.BpmCategoryPageReqVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.category.BpmCategorySaveReqVO;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmCategoryDO;
-import com.zt.plat.module.bpm.service.definition.BpmCategoryService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RestController;
-
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import java.util.List;
-
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-
-/**
- * BPM æµç¨‹åˆ†ç±» Api 实现类
- *
- * @author ZT
- */
-@RestController
-@Validated
-public class BpmCategoryApiImpl implements BpmCategoryApi {
-
- @Resource
- private BpmCategoryService categoryService;
-
- @Override
- public CommonResult createCategory(@Valid BpmCategorySaveReqDTO createReqDTO) {
- BpmCategorySaveReqVO createReqVO = BeanUtils.toBean(createReqDTO, BpmCategorySaveReqVO.class);
- return success(categoryService.createCategory(createReqVO));
- }
-
- @Override
- public CommonResult updateCategory(@Valid BpmCategorySaveReqDTO updateReqDTO) {
- BpmCategorySaveReqVO updateReqVO = BeanUtils.toBean(updateReqDTO, BpmCategorySaveReqVO.class);
- categoryService.updateCategory(updateReqVO);
- return success(true);
- }
-
- @Override
- public CommonResult updateCategorySortBatch(List ids) {
- categoryService.updateCategorySortBatch(ids);
- return success(true);
- }
-
- @Override
- public CommonResult deleteCategory(Long id) {
- categoryService.deleteCategory(id);
- return success(true);
- }
-
- @Override
- public CommonResult getCategory(Long id) {
- BpmCategoryDO category = categoryService.getCategory(id);
- return success(BeanUtils.toBean(category, BpmCategoryRespDTO.class));
- }
-
- @Override
- public CommonResult> getCategoryPage(@Valid BpmCategoryPageReqDTO pageReqDTO) {
- BpmCategoryPageReqVO pageReqVO = BeanUtils.toBean(pageReqDTO, BpmCategoryPageReqVO.class);
- PageResult pageResult = categoryService.getCategoryPage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, BpmCategoryRespDTO.class));
- }
-
- @Override
- public CommonResult> getCategorySimpleList() {
- List list = categoryService.getCategoryListByStatus(CommonStatusEnum.ENABLE.getStatus());
- return success(BeanUtils.toBean(list, BpmCategoryRespDTO.class));
- }
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/definition/BpmFormApiImpl.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/definition/BpmFormApiImpl.java
deleted file mode 100644
index faceb1e..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/definition/BpmFormApiImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.zt.plat.module.bpm.api.definition;
-
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.module.bpm.api.definition.dto.BpmFormPageReqDTO;
-import com.zt.plat.module.bpm.api.definition.dto.BpmFormRespDTO;
-import com.zt.plat.module.bpm.api.definition.dto.BpmFormSaveReqDTO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.form.BpmFormSaveReqVO;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmFormDO;
-import com.zt.plat.module.bpm.service.definition.BpmFormService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RestController;
-
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import java.util.List;
-
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-
-/**
- * 动æ€è¡¨å• Api 实现类
- *
- * @author ZT
- */
-@RestController
-@Validated
-public class BpmFormApiImpl implements BpmFormApi {
-
- @Resource
- private BpmFormService formService;
-
- @Override
- public CommonResult createForm(@Valid BpmFormSaveReqDTO createReqDTO) {
- BpmFormSaveReqVO createReqVO = BeanUtils.toBean(createReqDTO, BpmFormSaveReqVO.class);
- return success(formService.createForm(createReqVO));
- }
-
- @Override
- public CommonResult updateForm(@Valid BpmFormSaveReqDTO updateReqDTO) {
- BpmFormSaveReqVO updateReqVO = BeanUtils.toBean(updateReqDTO, BpmFormSaveReqVO.class);
- formService.updateForm(updateReqVO);
- return success(true);
- }
-
- @Override
- public CommonResult deleteForm(Long id) {
- formService.deleteForm(id);
- return success(true);
- }
-
- @Override
- public CommonResult getForm(Long id) {
- BpmFormDO form = formService.getForm(id);
- return success(BeanUtils.toBean(form, BpmFormRespDTO.class));
- }
-
- @Override
- public CommonResult> getFormPage(BpmFormPageReqDTO pageReqDTO) {
- BpmFormPageReqVO pageReqVO = BeanUtils.toBean(pageReqDTO, BpmFormPageReqVO.class);
- PageResult pageResult = formService.getFormPage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, BpmFormRespDTO.class));
- }
-
- @Override
- public CommonResult> getFormSimpleList() {
- List list = formService.getFormList();
- // åªè¿”回 idã€name å—段
- List dtoList = list.stream()
- .map(formDO -> new BpmFormRespDTO().setId(formDO.getId()).setName(formDO.getName()))
- .collect(java.util.stream.Collectors.toList());
- return success(dtoList);
- }
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/definition/BpmUserGroupApiImpl.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/definition/BpmUserGroupApiImpl.java
deleted file mode 100644
index 502b9d6..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/definition/BpmUserGroupApiImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.zt.plat.module.bpm.api.definition;
-
-import com.zt.plat.framework.common.enums.CommonStatusEnum;
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.module.bpm.api.definition.dto.BpmUserGroupRespDTO;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
-import com.zt.plat.module.bpm.service.definition.BpmUserGroupService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RestController;
-
-import jakarta.annotation.Resource;
-import java.util.List;
-
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-
-/**
- * 用户组 Api 实现类
- *
- * @author ZT
- */
-@RestController
-@Validated
-public class BpmUserGroupApiImpl implements BpmUserGroupApi {
-
- @Resource
- private BpmUserGroupService userGroupService;
-
- @Override
- public CommonResult getUserGroup(Long id) {
- BpmUserGroupDO userGroup = userGroupService.getUserGroup(id);
- return success(BeanUtils.toBean(userGroup, BpmUserGroupRespDTO.class));
- }
-
- @Override
- public CommonResult> getUserGroupSimpleList() {
- List list = userGroupService.getUserGroupListByStatus(CommonStatusEnum.ENABLE.getStatus());
- return success(BeanUtils.toBean(list, BpmUserGroupRespDTO.class));
- }
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/package-info.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/package-info.java
deleted file mode 100644
index 7c3b4c4..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * bpm API 实现类，定义暴露给其它模å—çš„ API
- */
-package com.zt.plat.module.bpm.api;
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/task/BpmProcessInstanceApiImpl.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/task/BpmProcessInstanceApiImpl.java
deleted file mode 100644
index b3d1e79..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/task/BpmProcessInstanceApiImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.zt.plat.module.bpm.api.task;
-
-import cn.hutool.core.util.StrUtil;
-import com.zt.plat.framework.business.core.util.DeptUtil;
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.util.json.JsonUtils;
-import com.zt.plat.framework.common.util.number.NumberUtils;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.module.bpm.api.task.dto.*;
-import com.zt.plat.module.bpm.controller.admin.task.vo.instance.*;
-import com.zt.plat.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
-import com.zt.plat.module.bpm.controller.admin.task.vo.task.BpmTaskRejectReqVO;
-import com.zt.plat.module.bpm.convert.task.BpmProcessInstanceConvert;
-import com.zt.plat.module.bpm.convert.task.BpmProcessInstanceDTOConvert;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
-import com.zt.plat.module.bpm.service.definition.BpmProcessDefinitionService;
-import com.zt.plat.module.bpm.service.task.BpmProcessInstanceService;
-import com.zt.plat.module.bpm.service.task.BpmTaskService;
-import com.zt.plat.module.system.api.dept.DeptApi;
-import com.zt.plat.module.system.api.dept.dto.DeptRespDTO;
-import com.zt.plat.module.system.api.user.AdminUserApi;
-import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.flowable.engine.history.HistoricProcessInstance;
-import org.flowable.engine.repository.ProcessDefinition;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-import static com.zt.plat.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
-
-/**
- * Flowable æµç¨‹å®žä¾‹ Api 实现类
- *
- * @author ZT
- * @author jason
- */
-@RestController
-@Valid
-public class BpmProcessInstanceApiImpl implements BpmProcessInstanceApi {
-
- @Resource
- private BpmProcessInstanceService processInstanceService;
-
- @Resource
- private BpmTaskService taskService;
-
- @Resource
- private BpmProcessDefinitionService processDefinitionService;
-
- @Resource
- private AdminUserApi adminUserApi;
-
- @Resource
- private DeptApi deptApi;
-
- @Override
- public CommonResult createProcessInstance(Long userId, @Valid @RequestBody BpmProcessInstanceCreateReqDTO reqDTO) {
- return success(processInstanceService.createProcessInstance(userId, reqDTO));
- }
-
-
- @Override
- public CommonResult getProcessInstance(String id) {
- HistoricProcessInstance processInstance = processInstanceService.getHistoricProcessInstance(id);
- if (processInstance == null) {
- return success(null);
- }
-
- // 拼接返回
- ProcessDefinition processDefinition = processDefinitionService.getProcessDefinition(
- processInstance.getProcessDefinitionId());
- BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(
- processInstance.getProcessDefinitionId());
- AdminUserRespDTO startUser = adminUserApi.getUser(NumberUtils.parseLong(processInstance.getStartUserId())).getCheckedData();
- DeptRespDTO dept = null;
- if (startUser != null) {
- Long deptId = DeptUtil.getDeptId(startUser);
- if (deptId > 0) {
- dept = deptApi.getDept(deptId).getCheckedData();
- }
- }
- BpmProcessInstanceRespVO vo = BpmProcessInstanceConvert.INSTANCE.buildProcessInstance(processInstance,
- processDefinition, processDefinitionInfo, startUser, dept);
- return success(BpmProcessInstanceDTOConvert.INSTANCE.convert(vo));
- }
-
- @Override
- public CommonResult cancelProcessInstanceByStartUser(
- Long userId, @Valid @RequestBody BpmProcessInstanceCancelReqDTO cancelReqDTO) {
- BpmProcessInstanceCancelReqVO cancelReqVO = BpmProcessInstanceDTOConvert.INSTANCE.convertVO(cancelReqDTO);
- processInstanceService.cancelProcessInstanceByStartUser(userId, cancelReqVO);
- return success(true);
- }
-
- @Override
- public CommonResult cancelProcessInstanceByAdmin(
- Long userId, @Valid @RequestBody BpmProcessInstanceCancelReqDTO cancelReqDTO) {
- BpmProcessInstanceCancelReqVO cancelReqVO = BpmProcessInstanceDTOConvert.INSTANCE.convertVO(cancelReqDTO);
- processInstanceService.cancelProcessInstanceByAdmin(userId, cancelReqVO);
- return success(true);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public CommonResult getApprovalDetail(Long userId,
- @Valid @RequestBody BpmApprovalDetailReqDTO reqDTO) {
- BpmApprovalDetailReqVO reqVO = BpmProcessInstanceDTOConvert.INSTANCE.convertVO(reqDTO);
- if (StrUtil.isNotEmpty(reqDTO.getProcessVariablesStr())) {
- reqVO.setProcessVariables(JsonUtils.parseObject(reqDTO.getProcessVariablesStr(), Map.class));
- }
- BpmApprovalDetailRespVO respVO = processInstanceService.getApprovalDetail(userId, reqVO);
- return success(BpmProcessInstanceDTOConvert.INSTANCE.convert(respVO));
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public CommonResult> getNextApprovalNodes(Long userId,
- @Valid @RequestBody BpmApprovalDetailReqDTO reqDTO) {
- BpmApprovalDetailReqVO reqVO = BpmProcessInstanceDTOConvert.INSTANCE.convertVO(reqDTO);
- if (StrUtil.isNotEmpty(reqDTO.getProcessVariablesStr())) {
- reqVO.setProcessVariables(JsonUtils.parseObject(reqDTO.getProcessVariablesStr(), Map.class));
- }
- List nodes = processInstanceService.getNextApprovalNodes(userId, reqVO);
- return success(BpmProcessInstanceDTOConvert.INSTANCE.convertActivityNodes(nodes));
- }
-
- @Override
- public CommonResult getProcessInstanceBpmnModelView(String id) {
- BpmProcessInstanceBpmnModelViewRespVO respVO = processInstanceService.getProcessInstanceBpmnModelView(id);
- return success(BpmProcessInstanceDTOConvert.INSTANCE.convert(respVO));
- }
-
- @Override
- public CommonResult approveTask(BpmTaskApproveReqDTO reqVO) {
- taskService.approveTask(getLoginUserId(), BeanUtils.toBean(reqVO, BpmTaskApproveReqVO.class));
- return success(true);
- }
-
- @Override
- public CommonResult rejectTask(BpmTaskRejectReqDTO reqVO) {
- taskService.rejectTask(getLoginUserId(), BeanUtils.toBean(reqVO, BpmTaskRejectReqVO.class));
- return success(true);
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/task/BpmTaskApiImpl.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/task/BpmTaskApiImpl.java
deleted file mode 100644
index 4d70c6a..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/task/BpmTaskApiImpl.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package com.zt.plat.module.bpm.api.task;
-
-import cn.hutool.core.collection.CollUtil;
-import com.zt.plat.framework.business.core.util.DeptUtil;
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.util.number.NumberUtils;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
-import com.zt.plat.module.bpm.api.task.dto.BpmTaskPageReqDTO;
-import com.zt.plat.module.bpm.api.task.dto.BpmTaskRespDTO;
-import com.zt.plat.module.bpm.controller.admin.task.vo.task.BpmTaskPageReqVO;
-import com.zt.plat.module.bpm.convert.task.BpmTaskConvert;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmFormDO;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
-import com.zt.plat.module.bpm.service.definition.BpmFormService;
-import com.zt.plat.module.bpm.service.definition.BpmProcessDefinitionService;
-import com.zt.plat.module.bpm.service.task.BpmProcessInstanceService;
-import com.zt.plat.module.bpm.service.task.BpmTaskService;
-import com.zt.plat.module.system.api.dept.DeptApi;
-import com.zt.plat.module.system.api.dept.dto.DeptRespDTO;
-import com.zt.plat.module.system.api.user.AdminUserApi;
-import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.flowable.engine.history.HistoricProcessInstance;
-import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.task.api.Task;
-import org.flowable.task.api.history.HistoricTaskInstance;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.*;
-import java.util.stream.Stream;
-
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertSet;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertSetByFlatMap;
-
-/**
- * BPM 任务 API 实现类
- *
- * @author ZT
- */
-@RestController
-@Validated
-public class BpmTaskApiImpl implements BpmTaskApi {
-
- @Resource
- private BpmTaskService taskService;
- @Resource
- private BpmProcessInstanceService processInstanceService;
- @Resource
- private BpmFormService formService;
- @Resource
- private BpmProcessDefinitionService processDefinitionService;
- @Resource
- private AdminUserApi adminUserApi;
- @Resource
- private DeptApi deptApi;
-
- @Override
- public CommonResult> getTaskTodoPage(@Valid BpmTaskPageReqDTO pageReqDTO) {
- // 转æ¢è¯·æ±‚å‚æ•°
- BpmTaskPageReqVO pageReqVO = BeanUtils.toBean(pageReqDTO, BpmTaskPageReqVO.class);
-
- // 调用 Service 层方法
- PageResult pageResult = taskService.getTaskTodoPage(SecurityFrameworkUtils.getLoginUserId(), pageReqVO);
- if (CollUtil.isEmpty(pageResult.getList())) {
- return success(new ArrayList<>());
- }
-
- // æ‹¼æŽ¥æ•°æ® - å‚考 Controller 逻辑
- Map processInstanceMap = processInstanceService.getProcessInstanceMap(convertSet(pageResult.getList(), Task::getProcessInstanceId));
- Map userMap = adminUserApi.getUserMap(convertSet(processInstanceMap.values(), instance -> Long.valueOf(instance.getStartUserId())));
- Map processDefinitionInfoMap = processDefinitionService.getProcessDefinitionInfoMap(convertSet(pageResult.getList(), Task::getProcessDefinitionId));
-
- // 使用转æ¢å™¨æž„建完整的 VO 结果，然åŽè½¬æ¢ä¸º DTO
- var voPageResult = BpmTaskConvert.INSTANCE.buildTodoTaskPage(pageResult, processInstanceMap, userMap, processDefinitionInfoMap);
- List result = BpmTaskConvert.INSTANCE.buildTaskRespDTOList(voPageResult.getList());
-
- return success(result);
- }
-
- @Override
- public CommonResult> getTaskDonePage(@Valid BpmTaskPageReqDTO pageReqDTO) {
- // 转æ¢è¯·æ±‚å‚æ•°
- BpmTaskPageReqVO pageReqVO = BeanUtils.toBean(pageReqDTO, BpmTaskPageReqVO.class);
-
- // 调用 Service 层方法
- PageResult pageResult = taskService.getTaskDonePage(SecurityFrameworkUtils.getLoginUserId(), pageReqVO);
- if (CollUtil.isEmpty(pageResult.getList())) {
- return success(new ArrayList<>());
- }
-
- // æ‹¼æŽ¥æ•°æ® - å‚考 Controller 逻辑
- Map processInstanceMap = processInstanceService.getHistoricProcessInstanceMap(convertSet(pageResult.getList(), HistoricTaskInstance::getProcessInstanceId));
- Map userMap = adminUserApi.getUserMap(convertSet(processInstanceMap.values(), instance -> Long.valueOf(instance.getStartUserId())));
- Map processDefinitionInfoMap = processDefinitionService.getProcessDefinitionInfoMap(convertSet(pageResult.getList(), HistoricTaskInstance::getProcessDefinitionId));
-
- // 使用转æ¢å™¨æž„建完整的 VO 结果，然åŽè½¬æ¢ä¸º DTO
- var voPageResult = BpmTaskConvert.INSTANCE.buildTaskPage(pageResult, processInstanceMap, userMap, null, processDefinitionInfoMap);
- List result = BpmTaskConvert.INSTANCE.buildTaskRespDTOList(voPageResult.getList());
-
- return success(result);
- }
-
- @Override
- public CommonResult> getTaskManagerPage(@Valid BpmTaskPageReqDTO pageReqDTO) {
- // 转æ¢è¯·æ±‚å‚æ•°
- BpmTaskPageReqVO pageReqVO = BeanUtils.toBean(pageReqDTO, BpmTaskPageReqVO.class);
-
- // 调用 Service 层方法
- PageResult pageResult = taskService.getTaskPage(SecurityFrameworkUtils.getLoginUserId(), pageReqVO);
- if (CollUtil.isEmpty(pageResult.getList())) {
- return success(new ArrayList<>());
- }
-
- // æ‹¼æŽ¥æ•°æ® - å‚考 Controller 逻辑
- Map processInstanceMap = processInstanceService.getHistoricProcessInstanceMap(convertSet(pageResult.getList(), HistoricTaskInstance::getProcessInstanceId));
- // 获得 User 和 Dept Map
- Set userIds = convertSet(processInstanceMap.values(), instance -> Long.valueOf(instance.getStartUserId()));
- userIds.addAll(convertSet(pageResult.getList(), task -> NumberUtils.parseLong(task.getAssignee())));
- Map userMap = adminUserApi.getUserMap(userIds);
- Map deptMap = deptApi.getDeptMap(convertSet(userMap.values(), DeptUtil::getDeptId));
- Map processDefinitionInfoMap = processDefinitionService.getProcessDefinitionInfoMap(convertSet(pageResult.getList(), HistoricTaskInstance::getProcessDefinitionId));
-
- // 使用转æ¢å™¨æž„建完整的 VO 结果，然åŽè½¬æ¢ä¸º DTO
- var voPageResult = BpmTaskConvert.INSTANCE.buildTaskPage(pageResult, processInstanceMap, userMap, deptMap, processDefinitionInfoMap);
- List result = BpmTaskConvert.INSTANCE.buildTaskRespDTOList(voPageResult.getList());
-
- return success(result);
- }
-
- @Override
- public CommonResult> getTaskListByProcessInstanceId(String processInstanceId) {
- // 调用 Service 层方法
- List taskList = taskService.getTaskListByProcessInstanceId(processInstanceId, true);
- if (CollUtil.isEmpty(taskList)) {
- return success(Collections.emptyList());
- }
-
- // æ‹¼æŽ¥æ•°æ® - å‚考 Controller 逻辑
- Set userIds = convertSetByFlatMap(taskList, task -> Stream.of(NumberUtils.parseLong(task.getAssignee()), NumberUtils.parseLong(task.getOwner())));
- Map userMap = adminUserApi.getUserMap(userIds);
- Map deptMap = deptApi.getDeptMap(convertSet(userMap.values(), DeptUtil::getDeptId));
- // 获得 Form Map
- Map formMap = formService.getFormMap(convertSet(taskList, task -> {
- String formKey = task.getFormKey();
- if (formKey == null || formKey.isBlank()) {
- return 0L;
- }
- try {
- return Long.parseLong(formKey);
- } catch (NumberFormatException e) {
- // 如果 formKey ä¸æ˜¯æ•°å—（比如是URL），返回0L
- return 0L;
- }
- }));
-
- // 使用转æ¢å™¨æž„建完整的 VO 结果，然åŽè½¬æ¢ä¸º DTO
- var voList = BpmTaskConvert.INSTANCE.buildTaskListByProcessInstanceId(taskList, formMap, userMap, deptMap);
- List result = BpmTaskConvert.INSTANCE.buildTaskRespDTOList(voList);
-
- return success(result);
- }
-
- @Override
- public CommonResult> getTaskListByReturn(String id) {
- // 调用 Service 层方法
- var userTaskList = taskService.getUserTaskListByReturn(id);
-
- // 转æ¢è¿”回结果 - åªè¿”回 id å’Œ name（对应 taskDefinitionKey å’Œ name）
- List result = userTaskList.stream().map(userTask -> {
- BpmTaskRespDTO dto = new BpmTaskRespDTO();
- dto.setName(userTask.getName());
- dto.setTaskDefinitionKey(userTask.getId());
- return dto;
- }).toList();
-
- return success(result);
- }
-
- @Override
- public CommonResult> getTaskListByParentTaskId(String parentTaskId) {
- // 调用 Service 层方法
- List taskList = taskService.getTaskListByParentTaskId(parentTaskId);
- if (CollUtil.isEmpty(taskList)) {
- return success(Collections.emptyList());
- }
-
- // æ‹¼æŽ¥æ•°æ® - å‚考 Controller 逻辑
- Map userMap = adminUserApi.getUserMap(convertSetByFlatMap(taskList, user -> Stream.of(NumberUtils.parseLong(user.getAssignee()), NumberUtils.parseLong(user.getOwner()))));
- Map deptMap = deptApi.getDeptMap(convertSet(userMap.values(), DeptUtil::getDeptId));
-
- // 使用转æ¢å™¨æž„建完整的 VO 结果，然åŽè½¬æ¢ä¸º DTO
- var voList = BpmTaskConvert.INSTANCE.buildTaskListByParentTaskId(taskList, userMap, deptMap);
- List result = BpmTaskConvert.INSTANCE.buildTaskRespDTOList(voList);
-
- return success(result);
- }
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/base/dept/DeptSimpleBaseVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/base/dept/DeptSimpleBaseVO.java
deleted file mode 100644
index b0c466b..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/base/dept/DeptSimpleBaseVO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.base.dept;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "éƒ¨é—¨ç²¾ç®€ä¿¡æ¯ VO")
-@Data
-public class DeptSimpleBaseVO {
-
- @Schema(description = "部门编å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long id;
- @Schema(description = "部门å称", requiredMode = Schema.RequiredMode.REQUIRED, example = "技术部")
- private String name;
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/base/package-info.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/base/package-info.java
deleted file mode 100644
index 141c17f..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/base/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 基础包，放一些通用的 VO 类
- */
-package com.zt.plat.module.bpm.controller.admin.base;
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/base/user/UserSimpleBaseVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/base/user/UserSimpleBaseVO.java
deleted file mode 100644
index 68b9b8a..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/base/user/UserSimpleBaseVO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.base.user;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "ç”¨æˆ·ç²¾ç®€ä¿¡æ¯ VO")
-@Data
-public class UserSimpleBaseVO {
-
- @Schema(description = "用户编å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long id;
- @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
- private String nickname;
- @Schema(description = "用户头åƒ", example = "https://www.iocoder.cn/1.png")
- private String avatar;
-
- @Schema(description = "部门编å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long deptId;
- @Schema(description = "部门å称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ç ”å‘部")
- private String deptName;
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmCategoryController.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmCategoryController.java
deleted file mode 100644
index b318b4b..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmCategoryController.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition;
-
-import com.zt.plat.framework.common.enums.CommonStatusEnum;
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.category.BpmCategoryPageReqVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.category.BpmCategoryRespVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.category.BpmCategorySaveReqVO;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmCategoryDO;
-import com.zt.plat.module.bpm.service.definition.BpmCategoryService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Comparator;
-import java.util.List;
-
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-
-@Tag(name = "管ç†åŽå° - BPM æµç¨‹åˆ†ç±»")
-@RestController
-@RequestMapping("/bpm/category")
-@Validated
-public class BpmCategoryController {
-
- @Resource
- private BpmCategoryService categoryService;
-
- @PostMapping("/create")
- @Operation(summary = "创建æµç¨‹åˆ†ç±»")
- @PreAuthorize("@ss.hasPermission('bpm:category:create')")
- public CommonResult createCategory(@Valid @RequestBody BpmCategorySaveReqVO createReqVO) {
- return success(categoryService.createCategory(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "æ›´æ–°æµç¨‹åˆ†ç±»")
- @PreAuthorize("@ss.hasPermission('bpm:category:update')")
- public CommonResult updateCategory(@Valid @RequestBody BpmCategorySaveReqVO updateReqVO) {
- categoryService.updateCategory(updateReqVO);
- return success(true);
- }
-
- @PutMapping("/update-sort-batch")
- @Operation(summary = "批é‡æ›´æ–°æµç¨‹åˆ†ç±»çš„排åº")
- @Parameter(name = "ids", description = "分类编å·åˆ—表", required = true, example = "1,2,3")
- @PreAuthorize("@ss.hasPermission('bpm:category:update')")
- public CommonResult updateCategorySortBatch(@RequestParam("ids") List ids) {
- categoryService.updateCategorySortBatch(ids);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "åˆ é™¤æµç¨‹åˆ†ç±»")
- @Parameter(name = "id", description = "ç¼–å·", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:category:delete')")
- public CommonResult deleteCategory(@RequestParam("id") Long id) {
- categoryService.deleteCategory(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得æµç¨‹åˆ†ç±»")
- @Parameter(name = "id", description = "ç¼–å·", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:category:query')")
- public CommonResult getCategory(@RequestParam("id") Long id) {
- BpmCategoryDO category = categoryService.getCategory(id);
- return success(BeanUtils.toBean(category, BpmCategoryRespVO.class));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得æµç¨‹åˆ†ç±»åˆ†é¡µ")
- @PreAuthorize("@ss.hasPermission('bpm:category:query')")
- public CommonResult> getCategoryPage(@Valid BpmCategoryPageReqVO pageReqVO) {
- PageResult pageResult = categoryService.getCategoryPage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, BpmCategoryRespVO.class));
- }
-
- @GetMapping("/simple-list")
- @Operation(summary = "获å–æµç¨‹åˆ†ç±»çš„精简信æ¯åˆ—表", description = "åªåŒ…å«è¢«å¼€å¯çš„分类，主è¦ç”¨äºŽå‰ç«¯çš„下拉选项")
- public CommonResult> getCategorySimpleList() {
- List list = categoryService.getCategoryListByStatus(CommonStatusEnum.ENABLE.getStatus());
- list.sort(Comparator.comparingInt(BpmCategoryDO::getSort));
- return success(convertList(list, category -> new BpmCategoryRespVO().setId(category.getId())
- .setName(category.getName()).setCode(category.getCode())));
- }
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmFormController.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmFormController.java
deleted file mode 100644
index fa47346..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmFormController.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition;
-
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.form.BpmFormRespVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.form.BpmFormSaveReqVO;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmFormDO;
-import com.zt.plat.module.bpm.service.definition.BpmFormService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-
-@Tag(name = "管ç†åŽå° - 动æ€è¡¨å•")
-@RestController
-@RequestMapping("/bpm/form")
-@Validated
-public class BpmFormController {
-
- @Resource
- private BpmFormService formService;
-
- @PostMapping("/create")
- @Operation(summary = "创建动æ€è¡¨å•")
- @PreAuthorize("@ss.hasPermission('bpm:form:create')")
- public CommonResult createForm(@Valid @RequestBody BpmFormSaveReqVO createReqVO) {
- return success(formService.createForm(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新动æ€è¡¨å•")
- @PreAuthorize("@ss.hasPermission('bpm:form:update')")
- public CommonResult updateForm(@Valid @RequestBody BpmFormSaveReqVO updateReqVO) {
- formService.updateForm(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "åˆ é™¤åŠ¨æ€è¡¨å•")
- @Parameter(name = "id", description = "ç¼–å·", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:form:delete')")
- public CommonResult deleteForm(@RequestParam("id") Long id) {
- formService.deleteForm(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得动æ€è¡¨å•")
- @Parameter(name = "id", description = "ç¼–å·", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:form:query')")
- public CommonResult getForm(@RequestParam("id") Long id) {
- BpmFormDO form = formService.getForm(id);
- return success(BeanUtils.toBean(form, BpmFormRespVO.class));
- }
-
- @GetMapping({"/list-all-simple", "/simple-list"})
- @Operation(summary = "获得动æ€è¡¨å•çš„精简列表", description = "用于表å•ä¸‹æ‹‰æ¡†")
- public CommonResult> getFormSimpleList() {
- List list = formService.getFormList();
- return success(convertList(list, formDO -> // åªè¿”回 idã€name å—段
- new BpmFormRespVO().setId(formDO.getId()).setName(formDO.getName())));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得动æ€è¡¨å•åˆ†é¡µ")
- @PreAuthorize("@ss.hasPermission('bpm:form:query')")
- public CommonResult> getFormPage(@Valid BpmFormPageReqVO pageVO) {
- PageResult pageResult = formService.getFormPage(pageVO);
- return success(BeanUtils.toBean(pageResult, BpmFormRespVO.class));
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmModelController.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmModelController.java
deleted file mode 100644
index 8a408e8..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmModelController.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition;
-
-import cn.hutool.core.collection.CollUtil;
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.model.*;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelUpdateReqVO;
-import com.zt.plat.module.bpm.convert.definition.BpmModelConvert;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmCategoryDO;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmFormDO;
-import com.zt.plat.module.bpm.service.definition.BpmCategoryService;
-import com.zt.plat.module.bpm.service.definition.BpmFormService;
-import com.zt.plat.module.bpm.service.definition.BpmModelService;
-import com.zt.plat.module.bpm.service.definition.BpmProcessDefinitionService;
-import com.zt.plat.module.system.api.dept.DeptApi;
-import com.zt.plat.module.system.api.dept.dto.DeptRespDTO;
-import com.zt.plat.module.system.api.user.AdminUserApi;
-import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.flowable.engine.repository.Deployment;
-import org.flowable.engine.repository.Model;
-import org.flowable.engine.repository.ProcessDefinition;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.*;
-import static com.zt.plat.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管ç†åŽå° - æµç¨‹æ¨¡åž‹")
-@RestController
-@RequestMapping("/bpm/model")
-@Validated
-public class BpmModelController {
-
- @Resource
- private BpmModelService modelService;
- @Resource
- private BpmFormService formService;
- @Resource
- private BpmCategoryService categoryService;
- @Resource
- private BpmProcessDefinitionService processDefinitionService;
-
- @Resource
- private AdminUserApi adminUserApi;
- @Resource
- private DeptApi deptApi;
-
- @GetMapping("/list")
- @Operation(summary = "获得模型分页")
- @Parameter(name = "name", description = "模型å称", example = "ZT")
- public CommonResult> getModelList(@RequestParam(value = "name", required = false) String name) {
- List list = modelService.getModelList(name);
- if (CollUtil.isEmpty(list)) {
- return success(Collections.emptyList());
- }
-
- // 获得 Form 表å•
- Set formIds = convertSet(list, model -> {
- BpmModelMetaInfoVO metaInfo = BpmModelConvert.INSTANCE.parseMetaInfo(model);
- return metaInfo != null ? metaInfo.getFormId() : null;
- });
- Map formMap = formService.getFormMap(formIds);
- // 获得 Category Map
- Map categoryMap = categoryService.getCategoryMap(
- convertSet(list, Model::getCategory));
- // 获得 Deployment Map
- Map deploymentMap = processDefinitionService.getDeploymentMap(
- convertSet(list, Model::getDeploymentId));
- // 获得 ProcessDefinition Map
- List processDefinitions = processDefinitionService.getProcessDefinitionListByDeploymentIds(
- deploymentMap.keySet());
- Map processDefinitionMap = convertMap(processDefinitions, ProcessDefinition::getDeploymentId);
- // 获得 User Mapã€Dept Map
- Set userIds = convertSetByFlatMap(list, model -> {
- BpmModelMetaInfoVO metaInfo = BpmModelConvert.INSTANCE.parseMetaInfo(model);
- return metaInfo != null ? metaInfo.getStartUserIds().stream() : Stream.empty();
- });
- Map userMap = adminUserApi.getUserMap(userIds);
- Set deptIds = convertSetByFlatMap(list, model -> {
- BpmModelMetaInfoVO metaInfo = BpmModelConvert.INSTANCE.parseMetaInfo(model);
- return metaInfo != null && metaInfo.getStartDeptIds() != null ? metaInfo.getStartDeptIds().stream() : Stream.empty();
- });
- Map deptMap = deptApi.getDeptMap(deptIds);
- return success(BpmModelConvert.INSTANCE.buildModelList(list,
- formMap, categoryMap, deploymentMap, processDefinitionMap, userMap, deptMap));
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得模型")
- @Parameter(name = "id", description = "ç¼–å·", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:model:query')")
- public CommonResult getModel(@RequestParam("id") String id) {
- Model model = modelService.getModel(id);
- if (model == null) {
- return null;
- }
- byte[] bpmnBytes = modelService.getModelBpmnXML(id);
- BpmSimpleModelNodeVO simpleModel = modelService.getSimpleModel(id);
- return success(BpmModelConvert.INSTANCE.buildModel(model, bpmnBytes, simpleModel));
- }
-
- @PostMapping("/create")
- @Operation(summary = "新建模型")
- @PreAuthorize("@ss.hasPermission('bpm:model:create')")
- public CommonResult createModel(@Valid @RequestBody BpmModelSaveReqVO createRetVO) {
- return success(modelService.createModel(createRetVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "修改模型")
- @PreAuthorize("@ss.hasPermission('bpm:model:update')")
- public CommonResult updateModel(@Valid @RequestBody BpmModelSaveReqVO modelVO) {
- modelService.updateModel(getLoginUserId(), modelVO);
- return success(true);
- }
-
- @PutMapping("/update-sort-batch")
- @Operation(summary = "批é‡ä¿®æ”¹æ¨¡åž‹æŽ’åº")
- @Parameter(name = "ids", description = "ç¼–å·æ•°ç»„", required = true, example = "1,2,3")
- public CommonResult updateModelSortBatch(@RequestParam("ids") List ids) {
- modelService.updateModelSortBatch(getLoginUserId(), ids);
- return success(true);
- }
-
- @PostMapping("/deploy")
- @Operation(summary = "部署模型")
- @Parameter(name = "id", description = "ç¼–å·", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:model:deploy')")
- public CommonResult deployModel(@RequestParam("id") String id) {
- modelService.deployModel(getLoginUserId(), id);
- return success(true);
- }
-
- @PutMapping("/update-state")
- @Operation(summary = "修改模型的状æ€", description = "实际更新的部署的æµç¨‹å®šä¹‰çš„状æ€")
- @PreAuthorize("@ss.hasPermission('bpm:model:update')")
- public CommonResult updateModelState(@Valid @RequestBody BpmModelUpdateStateReqVO reqVO) {
- modelService.updateModelState(getLoginUserId(), reqVO.getId(), reqVO.getState());
- return success(true);
- }
-
- @Deprecated
- @PutMapping("/update-bpmn")
- @Operation(summary = "修改模型的 BPMN")
- @PreAuthorize("@ss.hasPermission('bpm:model:update')")
- public CommonResult updateModelBpmn(@Valid @RequestBody BpmModeUpdateBpmnReqVO reqVO) {
- modelService.updateModelBpmnXml(reqVO.getId(), reqVO.getBpmnXml());
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "åˆ é™¤æ¨¡åž‹")
- @Parameter(name = "id", description = "ç¼–å·", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:model:delete')")
- public CommonResult deleteModel(@RequestParam("id") String id) {
- modelService.deleteModel(getLoginUserId(), id);
- return success(true);
- }
-
- @DeleteMapping("/clean")
- @Operation(summary = "清ç†æ¨¡åž‹")
- @Parameter(name = "id", description = "ç¼–å·", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:model:clean')")
- public CommonResult cleanModel(@RequestParam("id") String id) {
- modelService.cleanModel(getLoginUserId(), id);
- return success(true);
- }
-
- // ========== 仿钉钉/飞书的精简模型 =========
-
- @GetMapping("/simple/get")
- @Operation(summary = "获得仿钉钉æµç¨‹è®¾è®¡æ¨¡åž‹")
- @Parameter(name = "modelId", description = "æµç¨‹æ¨¡åž‹ç¼–å·", required = true, example = "a2c5eee0-eb6c-11ee-abf4-0c37967c420a")
- public CommonResult getSimpleModel(@RequestParam("id") String modelId){
- return success(modelService.getSimpleModel(modelId));
- }
-
- @Deprecated
- @PostMapping("/simple/update")
- @Operation(summary = "ä¿å˜ä»¿é’‰é’‰æµç¨‹è®¾è®¡æ¨¡åž‹")
- @PreAuthorize("@ss.hasPermission('bpm:model:update')")
- public CommonResult updateSimpleModel(@Valid @RequestBody BpmSimpleModelUpdateReqVO reqVO) {
- modelService.updateSimpleModel(getLoginUserId(), reqVO);
- return success(Boolean.TRUE);
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
deleted file mode 100644
index e5ee29a..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition;
-
-import cn.hutool.core.collection.CollUtil;
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
-import com.zt.plat.module.bpm.convert.definition.BpmProcessDefinitionConvert;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmCategoryDO;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmFormDO;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
-import com.zt.plat.module.bpm.service.definition.BpmCategoryService;
-import com.zt.plat.module.bpm.service.definition.BpmFormService;
-import com.zt.plat.module.bpm.service.definition.BpmProcessDefinitionService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import org.flowable.bpmn.model.BpmnModel;
-import org.flowable.common.engine.impl.db.SuspensionState;
-import org.flowable.engine.repository.Deployment;
-import org.flowable.engine.repository.ProcessDefinition;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertSet;
-import static com.zt.plat.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管ç†åŽå° - æµç¨‹å®šä¹‰")
-@RestController
-@RequestMapping("/bpm/process-definition")
-@Validated
-public class BpmProcessDefinitionController {
-
- @Resource
- private BpmProcessDefinitionService processDefinitionService;
- @Resource
- private BpmFormService formService;
- @Resource
- private BpmCategoryService categoryService;
-
- @GetMapping("/page")
- @Operation(summary = "获得æµç¨‹å®šä¹‰åˆ†é¡µ")
- @PreAuthorize("@ss.hasPermission('bpm:process-definition:query')")
- public CommonResult> getProcessDefinitionPage(
- BpmProcessDefinitionPageReqVO pageReqVO) {
- PageResult pageResult = processDefinitionService.getProcessDefinitionPage(pageReqVO);
- if (CollUtil.isEmpty(pageResult.getList())) {
- return success(PageResult.empty(pageResult.getTotal()));
- }
-
- // 获得 Category Map
- Map categoryMap = categoryService.getCategoryMap(
- convertSet(pageResult.getList(), ProcessDefinition::getCategory));
- // 获得 Deployment Map
- Map deploymentMap = processDefinitionService.getDeploymentMap(
- convertSet(pageResult.getList(), ProcessDefinition::getDeploymentId));
- // 获得 BpmProcessDefinitionInfoDO Map
- Map processDefinitionMap = processDefinitionService.getProcessDefinitionInfoMap(
- convertSet(pageResult.getList(), ProcessDefinition::getId));
- // 获得 Form Map
- Map formMap = formService.getFormMap(
- convertSet(processDefinitionMap.values(), BpmProcessDefinitionInfoDO::getFormId));
- return success(BpmProcessDefinitionConvert.INSTANCE.buildProcessDefinitionPage(
- pageResult, deploymentMap, processDefinitionMap, formMap, categoryMap));
- }
-
- @GetMapping ("/list")
- @Operation(summary = "获得æµç¨‹å®šä¹‰åˆ—表")
- @Parameter(name = "suspensionState", description = "挂起状æ€", required = true, example = "1") // å‚è§ Flowable SuspensionState 枚举
- public CommonResult> getProcessDefinitionList(
- @RequestParam("suspensionState") Integer suspensionState) {
- // 1.1 获得开å¯çš„æµç¨‹å®šä¹‰
- List list = processDefinitionService.getProcessDefinitionListBySuspensionState(suspensionState);
- if (CollUtil.isEmpty(list)) {
- return success(Collections.emptyList());
- }
- // 1.2 移除ä¸å¯è§çš„æµç¨‹å®šä¹‰
- Map processDefinitionMap = processDefinitionService.getProcessDefinitionInfoMap(
- convertSet(list, ProcessDefinition::getId));
- Long userId = getLoginUserId();
- list.removeIf(processDefinition -> {
- BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionMap.get(processDefinition.getId());
- return processDefinitionInfo == null // ä¸å˜åœ¨
- || Boolean.FALSE.equals(processDefinitionInfo.getVisible()) // visible ä¸å¯è§
- || !processDefinitionService.canUserStartProcessDefinition(processDefinitionInfo, userId); // æ— æƒé™å‘èµ·
- });
-
- // 2. 拼接 VO 返回
- return success(BpmProcessDefinitionConvert.INSTANCE.buildProcessDefinitionList(
- list, null, processDefinitionMap, null, null));
- }
-
- @GetMapping("/simple-list")
- @Operation(summary = "获得æµç¨‹å®šä¹‰ç²¾ç®€åˆ—表", description = "åªåŒ…å«æœªæŒ‚èµ·çš„æµç¨‹ï¼Œä¸»è¦ç”¨äºŽå‰ç«¯çš„下拉选项")
- public CommonResult> getSimpleProcessDefinitionList() {
- // åªæŸ¥è¯¢æœªæŒ‚èµ·çš„æµç¨‹
- List list = processDefinitionService.getProcessDefinitionListBySuspensionState(
- SuspensionState.ACTIVE.getStateCode());
- // 拼接 VO 返回，åªè¿”回 idã€nameã€key
- return success(convertList(list, definition -> new BpmProcessDefinitionRespVO()
- .setId(definition.getId()).setName(definition.getName()).setKey(definition.getKey())));
- }
-
- @GetMapping ("/get")
- @Operation(summary = "获得æµç¨‹å®šä¹‰")
- @Parameter(name = "id", description = "æµç¨‹ç¼–å·", required = true, example = "1024")
- @Parameter(name = "key", description = "æµç¨‹å®šä¹‰æ ‡è¯†", required = true, example = "1024")
- public CommonResult getProcessDefinition(
- @RequestParam(value = "id", required = false) String id,
- @RequestParam(value = "key", required = false) String key) {
- ProcessDefinition processDefinition = id != null ? processDefinitionService.getProcessDefinition(id)
- : processDefinitionService.getActiveProcessDefinition(key);
- if (processDefinition == null) {
- return success(null);
- }
- BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(processDefinition.getId());
- BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processDefinition.getId());
- return success(BpmProcessDefinitionConvert.INSTANCE.buildProcessDefinition(
- processDefinition, null, processDefinitionInfo, null, null, bpmnModel));
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmProcessExpressionController.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmProcessExpressionController.java
deleted file mode 100644
index 08fcb42..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmProcessExpressionController.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition;
-
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionPageReqVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionRespVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionSaveReqVO;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmProcessExpressionDO;
-import com.zt.plat.module.bpm.service.definition.BpmProcessExpressionService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管ç†åŽå° - BPM æµç¨‹è¡¨è¾¾å¼")
-@RestController
-@RequestMapping("/bpm/process-expression")
-@Validated
-public class BpmProcessExpressionController {
-
- @Resource
- private BpmProcessExpressionService processExpressionService;
-
- @PostMapping("/create")
- @Operation(summary = "创建æµç¨‹è¡¨è¾¾å¼")
- @PreAuthorize("@ss.hasPermission('bpm:process-expression:create')")
- public CommonResult createProcessExpression(@Valid @RequestBody BpmProcessExpressionSaveReqVO createReqVO) {
- return success(processExpressionService.createProcessExpression(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "æ›´æ–°æµç¨‹è¡¨è¾¾å¼")
- @PreAuthorize("@ss.hasPermission('bpm:process-expression:update')")
- public CommonResult updateProcessExpression(@Valid @RequestBody BpmProcessExpressionSaveReqVO updateReqVO) {
- processExpressionService.updateProcessExpression(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "åˆ é™¤æµç¨‹è¡¨è¾¾å¼")
- @Parameter(name = "id", description = "ç¼–å·", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:process-expression:delete')")
- public CommonResult deleteProcessExpression(@RequestParam("id") Long id) {
- processExpressionService.deleteProcessExpression(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得æµç¨‹è¡¨è¾¾å¼")
- @Parameter(name = "id", description = "ç¼–å·", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:process-expression:query')")
- public CommonResult getProcessExpression(@RequestParam("id") Long id) {
- BpmProcessExpressionDO processExpression = processExpressionService.getProcessExpression(id);
- return success(BeanUtils.toBean(processExpression, BpmProcessExpressionRespVO.class));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得æµç¨‹è¡¨è¾¾å¼åˆ†é¡µ")
- @PreAuthorize("@ss.hasPermission('bpm:process-expression:query')")
- public CommonResult> getProcessExpressionPage(
- @Valid BpmProcessExpressionPageReqVO pageReqVO) {
- PageResult pageResult = processExpressionService.getProcessExpressionPage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, BpmProcessExpressionRespVO.class));
- }
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmProcessListenerController.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmProcessListenerController.java
deleted file mode 100644
index 3077a91..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmProcessListenerController.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition;
-
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.listener.BpmProcessListenerPageReqVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.listener.BpmProcessListenerRespVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.listener.BpmProcessListenerSaveReqVO;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmProcessListenerDO;
-import com.zt.plat.module.bpm.service.definition.BpmProcessListenerService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管ç†åŽå° - BPM æµç¨‹ç›‘å¬å™¨")
-@RestController
-@RequestMapping("/bpm/process-listener")
-@Validated
-public class BpmProcessListenerController {
-
- @Resource
- private BpmProcessListenerService processListenerService;
-
- @PostMapping("/create")
- @Operation(summary = "创建æµç¨‹ç›‘å¬å™¨")
- @PreAuthorize("@ss.hasPermission('bpm:process-listener:create')")
- public CommonResult createProcessListener(@Valid @RequestBody BpmProcessListenerSaveReqVO createReqVO) {
- return success(processListenerService.createProcessListener(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "æ›´æ–°æµç¨‹ç›‘å¬å™¨")
- @PreAuthorize("@ss.hasPermission('bpm:process-listener:update')")
- public CommonResult updateProcessListener(@Valid @RequestBody BpmProcessListenerSaveReqVO updateReqVO) {
- processListenerService.updateProcessListener(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "åˆ é™¤æµç¨‹ç›‘å¬å™¨")
- @Parameter(name = "id", description = "ç¼–å·", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:process-listener:delete')")
- public CommonResult deleteProcessListener(@RequestParam("id") Long id) {
- processListenerService.deleteProcessListener(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得æµç¨‹ç›‘å¬å™¨")
- @Parameter(name = "id", description = "ç¼–å·", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:process-listener:query')")
- public CommonResult getProcessListener(@RequestParam("id") Long id) {
- BpmProcessListenerDO processListener = processListenerService.getProcessListener(id);
- return success(BeanUtils.toBean(processListener, BpmProcessListenerRespVO.class));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得æµç¨‹ç›‘å¬å™¨åˆ†é¡µ")
- @PreAuthorize("@ss.hasPermission('bpm:process-listener:query')")
- public CommonResult> getProcessListenerPage(
- @Valid BpmProcessListenerPageReqVO pageReqVO) {
- PageResult pageResult = processListenerService.getProcessListenerPage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, BpmProcessListenerRespVO.class));
- }
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmUserGroupController.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmUserGroupController.java
deleted file mode 100644
index 226e5da..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmUserGroupController.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition;
-
-import com.zt.plat.framework.common.enums.CommonStatusEnum;
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.group.BpmUserGroupRespVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.group.BpmUserGroupSaveReqVO;
-import com.zt.plat.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
-import com.zt.plat.module.bpm.service.definition.BpmUserGroupService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-
-@Tag(name = "管ç†åŽå° - 用户组")
-@RestController
-@RequestMapping("/bpm/user-group")
-@Validated
-public class BpmUserGroupController {
-
- @Resource
- private BpmUserGroupService userGroupService;
-
- @PostMapping("/create")
- @Operation(summary = "创建用户组")
- @PreAuthorize("@ss.hasPermission('bpm:user-group:create')")
- public CommonResult createUserGroup(@Valid @RequestBody BpmUserGroupSaveReqVO createReqVO) {
- return success(userGroupService.createUserGroup(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新用户组")
- @PreAuthorize("@ss.hasPermission('bpm:user-group:update')")
- public CommonResult updateUserGroup(@Valid @RequestBody BpmUserGroupSaveReqVO updateReqVO) {
- userGroupService.updateUserGroup(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "åˆ é™¤ç”¨æˆ·ç»„")
- @Parameter(name = "id", description = "ç¼–å·", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:user-group:delete')")
- public CommonResult deleteUserGroup(@RequestParam("id") Long id) {
- userGroupService.deleteUserGroup(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得用户组")
- @Parameter(name = "id", description = "ç¼–å·", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:user-group:query')")
- public CommonResult getUserGroup(@RequestParam("id") Long id) {
- BpmUserGroupDO userGroup = userGroupService.getUserGroup(id);
- return success(BeanUtils.toBean(userGroup, BpmUserGroupRespVO.class));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得用户组分页")
- @PreAuthorize("@ss.hasPermission('bpm:user-group:query')")
- public CommonResult> getUserGroupPage(@Valid BpmUserGroupPageReqVO pageVO) {
- PageResult pageResult = userGroupService.getUserGroupPage(pageVO);
- return success(BeanUtils.toBean(pageResult, BpmUserGroupRespVO.class));
- }
-
- @GetMapping("/simple-list")
- @Operation(summary = "获å–用户组精简信æ¯åˆ—表", description = "åªåŒ…å«è¢«å¼€å¯çš„用户组，主è¦ç”¨äºŽå‰ç«¯çš„下拉选项")
- public CommonResult> getUserGroupSimpleList() {
- List list = userGroupService.getUserGroupListByStatus(CommonStatusEnum.ENABLE.getStatus());
- return success(convertList(list, group -> new BpmUserGroupRespVO().setId(group.getId()).setName(group.getName())));
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/category/BpmCategoryPageReqVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/category/BpmCategoryPageReqVO.java
deleted file mode 100644
index 5de14e2..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/category/BpmCategoryPageReqVO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.category;
-
-import com.zt.plat.framework.common.enums.CommonStatusEnum;
-import com.zt.plat.framework.common.pojo.PageParam;
-import com.zt.plat.framework.common.validation.InEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管ç†åŽå° - BPM æµç¨‹åˆ†ç±»åˆ†é¡µ Request VO")
-@Data
-public class BpmCategoryPageReqVO extends PageParam {
-
- @Schema(description = "分类å", example = "王五")
- private String name;
-
- @Schema(description = "åˆ†ç±»æ ‡å¿—", example = "OA")
- private String code;
-
- @Schema(description = "分类状æ€", example = "1")
- @InEnum(CommonStatusEnum.class)
- private Integer status;
-
- @Schema(description = "创建时间")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime[] createTime;
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/category/BpmCategoryRespVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/category/BpmCategoryRespVO.java
deleted file mode 100644
index 5f3db13..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/category/BpmCategoryRespVO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.category;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管ç†åŽå° - BPM æµç¨‹åˆ†ç±» Response VO")
-@Data
-public class BpmCategoryRespVO {
-
- @Schema(description = "分类编å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "3167")
- private Long id;
-
- @Schema(description = "分类å", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
- private String name;
-
- @Schema(description = "åˆ†ç±»æ ‡å¿—", requiredMode = Schema.RequiredMode.REQUIRED, example = "OA")
- private String code;
-
- @Schema(description = "分类æè¿°", requiredMode = Schema.RequiredMode.REQUIRED, example = "ä½ çŒœ")
- private String description;
-
- @Schema(description = "分类状æ€", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer status;
-
- @Schema(description = "分类排åº", requiredMode = Schema.RequiredMode.REQUIRED)
- private Integer sort;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/category/BpmCategorySaveReqVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/category/BpmCategorySaveReqVO.java
deleted file mode 100644
index 0203453..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/category/BpmCategorySaveReqVO.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.category;
-
-import com.zt.plat.framework.common.enums.CommonStatusEnum;
-import com.zt.plat.framework.common.validation.InEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Schema(description = "管ç†åŽå° - BPM æµç¨‹åˆ†ç±»æ–°å¢ž/修改 Request VO")
-@Data
-public class BpmCategorySaveReqVO {
-
- @Schema(description = "分类编å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "3167")
- private Long id;
-
- @Schema(description = "分类å", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
- @NotEmpty(message = "分类åä¸èƒ½ä¸ºç©º")
- private String name;
-
- @Schema(description = "分类æè¿°", example = "ä½ çŒœ")
- private String description;
-
- @Schema(description = "åˆ†ç±»æ ‡å¿—", requiredMode = Schema.RequiredMode.REQUIRED, example = "OA")
- @NotEmpty(message = "åˆ†ç±»æ ‡å¿—ä¸èƒ½ä¸ºç©º")
- private String code;
-
- @Schema(description = "分类状æ€", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "分类状æ€ä¸èƒ½ä¸ºç©º")
- @InEnum(CommonStatusEnum.class)
- private Integer status;
-
- @Schema(description = "分类排åº", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "分类排åºä¸èƒ½ä¸ºç©º")
- private Integer sort;
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionPageReqVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionPageReqVO.java
deleted file mode 100644
index 1d3bbed..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionPageReqVO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.expression;
-
-import com.zt.plat.framework.common.enums.CommonStatusEnum;
-import com.zt.plat.framework.common.pojo.PageParam;
-import com.zt.plat.framework.common.validation.InEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管ç†åŽå° - BPM æµç¨‹è¡¨è¾¾å¼åˆ†é¡µ Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmProcessExpressionPageReqVO extends PageParam {
-
- @Schema(description = "表达å¼åå—", example = "æŽå››")
- private String name;
-
- @Schema(description = "表达å¼çŠ¶æ€", example = "1")
- @InEnum(CommonStatusEnum.class)
- private Integer status;
-
- @Schema(description = "创建时间")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime[] createTime;
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionRespVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionRespVO.java
deleted file mode 100644
index 2bb959b..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionRespVO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.expression;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管ç†åŽå° - BPM æµç¨‹è¡¨è¾¾å¼ Response VO")
-@Data
-public class BpmProcessExpressionRespVO {
-
- @Schema(description = "ç¼–å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "3870")
- @ExcelProperty("ç¼–å·")
- private Long id;
-
- @Schema(description = "表达å¼åå—", requiredMode = Schema.RequiredMode.REQUIRED, example = "æŽå››")
- @ExcelProperty("表达å¼åå—")
- private String name;
-
- @Schema(description = "表达å¼çŠ¶æ€", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer status;
-
- @Schema(description = "表达å¼", requiredMode = Schema.RequiredMode.REQUIRED)
- private String expression;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionSaveReqVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionSaveReqVO.java
deleted file mode 100644
index a5771d1..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionSaveReqVO.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.expression;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Schema(description = "管ç†åŽå° - BPM æµç¨‹è¡¨è¾¾å¼æ–°å¢ž/修改 Request VO")
-@Data
-public class BpmProcessExpressionSaveReqVO {
-
- @Schema(description = "ç¼–å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "3870")
- private Long id;
-
- @Schema(description = "表达å¼åå—", requiredMode = Schema.RequiredMode.REQUIRED, example = "æŽå››")
- @NotEmpty(message = "表达å¼åå—ä¸èƒ½ä¸ºç©º")
- private String name;
-
- @Schema(description = "表达å¼çŠ¶æ€", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "表达å¼çŠ¶æ€ä¸èƒ½ä¸ºç©º")
- private Integer status;
-
- @Schema(description = "表达å¼", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "表达å¼ä¸èƒ½ä¸ºç©º")
- private String expression;
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormFieldVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormFieldVO.java
deleted file mode 100644
index 53af985..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormFieldVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.form;
-
-import lombok.Data;
-
-/**
- * æµç¨‹è¡¨å•å—段 VO
- */
-@Data
-public class BpmFormFieldVO {
-
- /**
- * å—段类型
- */
- private String type;
- /**
- * å—æ®µæ ‡è¯†
- */
- private String field;
- /**
- * å—æ®µæ ‡é¢˜
- */
- private String title;
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java
deleted file mode 100644
index 4160512..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.form;
-
-import com.zt.plat.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管ç†åŽå° - 动æ€è¡¨å•åˆ†é¡µ Request VO")
-@Data
-public class BpmFormPageReqVO extends PageParam {
-
- @Schema(description = "表å•å称", example = "ZT")
- private String name;
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java
deleted file mode 100644
index 1950d7a..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.form;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Schema(description = "管ç†åŽå° - 动æ€è¡¨å• Response VO")
-@Data
-public class BpmFormRespVO {
-
- @Schema(description = "表å•ç¼–å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long id;
-
- @Schema(description = "表å•å称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
- @NotNull(message = "表å•å称ä¸èƒ½ä¸ºç©º")
- private String name;
-
- @Schema(description = "表å•çš„é…ç½®-JSON å—符串", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "表å•çš„é…ç½®ä¸èƒ½ä¸ºç©º")
- private String conf;
-
- @Schema(description = "表å•é¡¹çš„数组-JSON å—符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "表å•é¡¹çš„数组ä¸èƒ½ä¸ºç©º")
- private List fields;
-
- @Schema(description = "表å•çŠ¶æ€", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "表å•çŠ¶æ€ä¸èƒ½ä¸ºç©º")
- private Integer status; // å‚è§ CommonStatusEnum 枚举
-
- @Schema(description = "备注", example = "我是备注")
- private String remark;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormSaveReqVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormSaveReqVO.java
deleted file mode 100644
index 5953485..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormSaveReqVO.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.form;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.util.List;
-
-@Schema(description = "管ç†åŽå° - 动æ€è¡¨å•åˆ›å»º/æ›´æ–° Request VO")
-@Data
-public class BpmFormSaveReqVO {
-
- @Schema(description = "表å•ç¼–å·", example = "1024")
- private Long id;
-
- @Schema(description = "表å•å称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
- @NotNull(message = "表å•å称ä¸èƒ½ä¸ºç©º")
- private String name;
-
- @Schema(description = "表å•çš„é…ç½®-JSON å—符串", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "表å•çš„é…ç½®ä¸èƒ½ä¸ºç©º")
- private String conf;
-
- @Schema(description = "表å•é¡¹çš„数组-JSON å—符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "表å•é¡¹çš„数组ä¸èƒ½ä¸ºç©º")
- private List fields;
-
- @Schema(description = "表å•çŠ¶æ€-å‚è§ CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "表å•çŠ¶æ€ä¸èƒ½ä¸ºç©º")
- private Integer status;
-
- @Schema(description = "备注", example = "我是备注")
- private String remark;
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java
deleted file mode 100644
index 25a0c2f..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.group;
-
-import com.zt.plat.framework.common.pojo.PageParam;
-import com.zt.plat.framework.common.util.date.DateUtils;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管ç†åŽå° - 用户组分页 Request VO")
-@Data
-public class BpmUserGroupPageReqVO extends PageParam {
-
- @Schema(description = "ç¼–å·", example = "1024")
- private Long id;
-
- @Schema(description = "组å", example = "ZT")
- private String name;
-
- @Schema(description = "状æ€", example = "1")
- private Integer status;
-
- @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- @Schema(description = "创建时间")
- private LocalDateTime[] createTime;
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java
deleted file mode 100644
index 7bff95d..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.group;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.Set;
-
-@Schema(description = "管ç†åŽå° - 用户组 Response VO")
-@Data
-public class BpmUserGroupRespVO {
-
- @Schema(description = "ç¼–å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long id;
-
- @Schema(description = "组å", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
- private String name;
-
- @Schema(description = "æè¿°", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZTæºç ")
- private String description;
-
- @Schema(description = "æˆå‘˜ç¼–å·æ•°ç»„", requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2,3")
- private Set userIds;
-
- @Schema(description = "状æ€", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer status;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSaveReqVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSaveReqVO.java
deleted file mode 100644
index ceccee3..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSaveReqVO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.group;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.util.Set;
-
-@Schema(description = "管ç†åŽå° - 用户组创建/修改 Request VO")
-@Data
-public class BpmUserGroupSaveReqVO {
-
- @Schema(description = "ç¼–å·", example = "1024")
- private Long id;
-
- @Schema(description = "组å", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
- @NotNull(message = "组åä¸èƒ½ä¸ºç©º")
- private String name;
-
- @Schema(description = "æè¿°", example = "ZTæºç ")
- private String description;
-
- @Schema(description = "æˆå‘˜ç¼–å·æ•°ç»„", requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2,3")
- @NotNull(message = "æˆå‘˜ç¼–å·æ•°ç»„ä¸èƒ½ä¸ºç©º")
- private Set userIds;
-
- @Schema(description = "状æ€", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "状æ€ä¸èƒ½ä¸ºç©º")
- private Integer status;
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerPageReqVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerPageReqVO.java
deleted file mode 100644
index 13b8a73..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerPageReqVO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.listener;
-
-import com.zt.plat.framework.common.enums.CommonStatusEnum;
-import com.zt.plat.framework.common.pojo.PageParam;
-import com.zt.plat.framework.common.validation.InEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管ç†åŽå° - BPM æµç¨‹ç›‘å¬å™¨åˆ†é¡µ Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmProcessListenerPageReqVO extends PageParam {
-
- @Schema(description = "监å¬å™¨åå—", example = "èµµå…")
- private String name;
-
- @Schema(description = "监å¬å™¨ç±»åž‹", example = "execution")
- private String type;
-
- @Schema(description = "监å¬äº‹ä»¶", example = "start")
- private String event;
-
- @Schema(description = "状æ€", example = "1")
- @InEnum(CommonStatusEnum.class)
- private Integer status;
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerRespVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerRespVO.java
deleted file mode 100644
index 7bfdde8..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerRespVO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.listener;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管ç†åŽå° - BPM æµç¨‹ç›‘å¬å™¨ Response VO")
-@Data
-public class BpmProcessListenerRespVO {
-
- @Schema(description = "ç¼–å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "13089")
- private Long id;
-
- @Schema(description = "监å¬å™¨åå—", requiredMode = Schema.RequiredMode.REQUIRED, example = "èµµå…")
- private String name;
-
- @Schema(description = "监å¬å™¨ç±»åž‹", requiredMode = Schema.RequiredMode.REQUIRED, example = "execution")
- private String type;
-
- @Schema(description = "监å¬å™¨çŠ¶æ€", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer status;
-
- @Schema(description = "监å¬äº‹ä»¶", requiredMode = Schema.RequiredMode.REQUIRED, example = "start")
- private String event;
-
- @Schema(description = "监å¬å™¨å€¼ç±»åž‹", requiredMode = Schema.RequiredMode.REQUIRED, example = "class")
- private String valueType;
-
- @Schema(description = "监å¬å™¨å€¼", requiredMode = Schema.RequiredMode.REQUIRED)
- private String value;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerSaveReqVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerSaveReqVO.java
deleted file mode 100644
index 908caa9..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerSaveReqVO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.listener;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Schema(description = "管ç†åŽå° - BPM æµç¨‹ç›‘å¬å™¨æ–°å¢ž/修改 Request VO")
-@Data
-public class BpmProcessListenerSaveReqVO {
-
- @Schema(description = "ç¼–å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "13089")
- private Long id;
-
- @Schema(description = "监å¬å™¨åå—", requiredMode = Schema.RequiredMode.REQUIRED, example = "èµµå…")
- @NotEmpty(message = "监å¬å™¨åå—ä¸èƒ½ä¸ºç©º")
- private String name;
-
- @Schema(description = "监å¬å™¨ç±»åž‹", requiredMode = Schema.RequiredMode.REQUIRED, example = "execution")
- @NotEmpty(message = "监å¬å™¨ç±»åž‹ä¸èƒ½ä¸ºç©º")
- private String type;
-
- @Schema(description = "监å¬å™¨çŠ¶æ€", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "监å¬å™¨çŠ¶æ€ä¸èƒ½ä¸ºç©º")
- private Integer status;
-
- @Schema(description = "监å¬äº‹ä»¶", requiredMode = Schema.RequiredMode.REQUIRED, example = "start")
- @NotEmpty(message = "监å¬äº‹ä»¶ä¸èƒ½ä¸ºç©º")
- private String event;
-
- @Schema(description = "监å¬å™¨å€¼ç±»åž‹", requiredMode = Schema.RequiredMode.REQUIRED, example = "class")
- @NotEmpty(message = "监å¬å™¨å€¼ç±»åž‹ä¸èƒ½ä¸ºç©º")
- private String valueType;
-
- @Schema(description = "监å¬å™¨å€¼", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "监å¬å™¨å€¼ä¸èƒ½ä¸ºç©º")
- private String value;
-
-}
\ No newline at end of file
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModeUpdateBpmnReqVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModeUpdateBpmnReqVO.java
deleted file mode 100644
index 03e0e5f..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModeUpdateBpmnReqVO.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.model;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import lombok.Data;
-
-@Schema(description = "管ç†åŽå° - æµç¨‹æ¨¡åž‹çš„æ›´æ–° BPMN XML Request VO")
-@Data
-public class BpmModeUpdateBpmnReqVO {
-
- @Schema(description = "æµç¨‹ç¼–å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotEmpty(message = "æµç¨‹ç¼–å·ä¸èƒ½ä¸ºç©º")
- private String id;
-
- @Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "BPMN XML ä¸èƒ½ä¸ºç©º")
- private String bpmnXml;
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java
deleted file mode 100644
index dcc06fc..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.model;
-
-import com.zt.plat.framework.common.core.KeyValue;
-import com.zt.plat.framework.common.validation.InEnum;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
-import com.zt.plat.module.bpm.enums.definition.BpmAutoApproveTypeEnum;
-import com.zt.plat.module.bpm.enums.definition.BpmModelFormTypeEnum;
-import com.zt.plat.module.bpm.enums.definition.BpmModelTypeEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import org.hibernate.validator.constraints.URL;
-
-import java.util.List;
-
-/**
- * BPM æµç¨‹ MetaInfo Response DTO
- * 主è¦ç”¨äºŽ { Model#setMetaInfo(String)} çš„å˜å‚¨
- *
- * 最终，它的å—段和
- * {@link com.zt.plat.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO}
- * 是一致的
- *
- * @author ZT
- */
-@Data
-public class BpmModelMetaInfoVO {
-
- @Schema(description = "æµç¨‹å›¾æ ‡", example = "https://www.iocoder.cn/zt.jpg")
- @URL(message = "æµç¨‹å›¾æ ‡æ ¼å¼ä¸æ£ç¡®")
- private String icon;
-
- @Schema(description = "æµç¨‹æè¿°", example = "我是æè¿°")
- private String description;
-
- @Schema(description = "æµç¨‹ç±»åž‹", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
- @InEnum(BpmModelTypeEnum.class)
- @NotNull(message = "æµç¨‹ç±»åž‹ä¸èƒ½ä¸ºç©º")
- private Integer type;
-
- @Schema(description = "表å•ç±»åž‹", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
- @InEnum(BpmModelFormTypeEnum.class)
- @NotNull(message = "表å•ç±»åž‹ä¸èƒ½ä¸ºç©º")
- private Integer formType;
- @Schema(description = "表å•ç¼–å·", example = "1024")
- private Long formId; // formType 为 NORMAL 使用，必须éžç©º
-
- @Schema(description = "自定义表å•çš„æ交路径，使用 Vue 的路由地å€", example = "/bpm/oa/leave/create")
- private String formCustomCreatePath; // 表å•ç±»åž‹ä¸º CUSTOM 时，必须éžç©º
- @Schema(description = "自定义表å•çš„查看路径，使用 Vue 的路由地å€", example = "/bpm/oa/leave/view")
- private String formCustomViewPath; // 表å•ç±»åž‹ä¸º CUSTOM 时，必须éžç©º
-
- @Schema(description = "是å¦å¯è§", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "是å¦å¯è§ä¸èƒ½ä¸ºç©º")
- private Boolean visible;
-
- @Schema(description = "是å¦å…许é‡æ–°å‘èµ·", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "是å¦å…许é‡æ–°å‘èµ·ä¸èƒ½ä¸ºç©º")
- private Boolean restart;
-
- @Schema(description = "å¯å‘起用户编å·æ•°ç»„", example = "[1,2,3]")
- private List startUserIds;
-
- @Schema(description = "å¯å‘起部门编å·æ•°ç»„", example = "[2,4,6]")
- private List startDeptIds;
-
- @Schema(description = "å¯ç®¡ç†ç”¨æˆ·ç¼–å·æ•°ç»„", requiredMode = Schema.RequiredMode.REQUIRED, example = "[2,4,6]")
- @NotEmpty(message = "å¯ç®¡ç†ç”¨æˆ·ç¼–å·æ•°ç»„ä¸èƒ½ä¸ºç©º")
- private List managerUserIds;
-
- @Schema(description = "排åº", example = "1")
- private Long sort; // 创建时，åŽç«¯è‡ªåŠ¨ç”Ÿæˆ
-
- @Schema(description = "å…许撤销审批ä¸çš„申请", example = "true")
- private Boolean allowCancelRunningProcess;
-
- @Schema(description = "æµç¨‹ ID 规则", example = "{}")
- private ProcessIdRule processIdRule;
-
- @Schema(description = "自动去é‡ç±»åž‹", example = "1")
- @InEnum(BpmAutoApproveTypeEnum.class)
- private Integer autoApprovalType;
-
- @Schema(description = "æ ‡é¢˜è®¾ç½®", example = "{}")
- private TitleSetting titleSetting;
-
- @Schema(description = "摘è¦è®¾ç½®", example = "{}")
- private SummarySetting summarySetting;
-
- @Schema(description = "æµç¨‹å‰ç½®é€šçŸ¥è®¾ç½®", example = "{}")
- private HttpRequestSetting processBeforeTriggerSetting;
-
- @Schema(description = "æµç¨‹åŽç½®é€šçŸ¥è®¾ç½®", example = "{}")
- private HttpRequestSetting processAfterTriggerSetting;
-
- @Schema(description = "任务å‰ç½®é€šçŸ¥è®¾ç½®", example = "{}")
- private HttpRequestSetting taskBeforeTriggerSetting;
-
- @Schema(description = "任务åŽç½®é€šçŸ¥è®¾ç½®", example = "{}")
- private HttpRequestSetting taskAfterTriggerSetting;
-
- @Schema(description = "æµç¨‹ ID 规则")
- @Data
- @Valid
- public static class ProcessIdRule {
-
- @Schema(description = "是å¦å¯ç”¨", example = "false")
- @NotNull(message = "是å¦å¯ç”¨ä¸èƒ½ä¸ºç©º")
- private Boolean enable;
-
- @Schema(description = "å‰ç¼€", example = "XX")
- private String prefix;
-
- @Schema(description = "ä¸ç¼€", example = "20250120")
- private String infix; // 精确到日ã€ç²¾ç¡®åˆ°æ—¶ã€ç²¾ç¡®åˆ°åˆ†ã€ç²¾ç¡®åˆ°ç§’
-
- @Schema(description = "åŽç¼€", example = "YY")
- private String postfix;
-
- @Schema(description = "åºåˆ—长度", example = "5")
- @NotNull(message = "åºåˆ—长度ä¸èƒ½ä¸ºç©º")
- private Integer length;
-
- }
-
- @Schema(description = "æ ‡é¢˜è®¾ç½®")
- @Data
- @Valid
- public static class TitleSetting {
-
- @Schema(description = "是å¦è‡ªå®šä¹‰", example = "false")
- @NotNull(message = "是å¦è‡ªå®šä¹‰ä¸èƒ½ä¸ºç©º")
- private Boolean enable;
-
- @Schema(description = "æ ‡é¢˜", example = "æµç¨‹æ ‡é¢˜")
- private String title;
-
- }
-
- @Schema(description = "摘è¦è®¾ç½®")
- @Data
- @Valid
- public static class SummarySetting {
-
- @Schema(description = "是å¦è‡ªå®šä¹‰", example = "false")
- @NotNull(message = "是å¦è‡ªå®šä¹‰ä¸èƒ½ä¸ºç©º")
- private Boolean enable;
-
- @Schema(description = "摘è¦å—段数组", example = "[]")
- private List summary;
-
- }
-
- @Schema(description = "http 请求通知设置", example = "{}")
- @Data
- public static class HttpRequestSetting {
-
- @Schema(description = "请求路径", example = "http://127.0.0.1")
- @NotEmpty(message = "请求 URL ä¸èƒ½ä¸ºç©º")
- @URL(message = "请求 URL æ ¼å¼ä¸æ£ç¡®")
- private String url;
-
- @Schema(description = "请求头å‚数设置", example = "[]")
- @Valid
- private List header;
-
- @Schema(description = "请求头å‚数设置", example = "[]")
- @Valid
- private List body;
-
- /**
- * 请求返回处ç†è®¾ç½®ï¼Œç”¨äºŽä¿®æ”¹æµç¨‹è¡¨å•å€¼
- *
- * key：表示è¦ä¿®æ”¹çš„æµç¨‹è¡¨å•å—段å(name)
- * value：接å£è¿”回的å—段å
- */
- @Schema(description = "请求返回处ç†è®¾ç½®", example = "[]")
- private List> response;
-
- }
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java
deleted file mode 100644
index 63ef57d..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.model;
-
-import com.zt.plat.module.bpm.controller.admin.base.dept.DeptSimpleBaseVO;
-import com.zt.plat.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
-import com.zt.plat.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Schema(description = "管ç†åŽå° - æµç¨‹æ¨¡åž‹ Response VO")
-@Data
-public class BpmModelRespVO extends BpmModelMetaInfoVO {
-
- @Schema(description = "ç¼–å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private String id;
-
- @Schema(description = "æµç¨‹æ ‡è¯†", requiredMode = Schema.RequiredMode.REQUIRED, example = "process_zt")
- private String key;
-
- @Schema(description = "æµç¨‹å称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
- private String name;
-
- @Schema(description = "æµç¨‹å›¾æ ‡", example = "https://www.iocoder.cn/zt.jpg")
- private String icon;
-
- @Schema(description = "æµç¨‹åˆ†ç±»ç¼–å·", example = "1")
- private String category;
- @Schema(description = "æµç¨‹åˆ†ç±»åå—", example = "请å‡")
- private String categoryName;
-
- @Schema(description = "表å•åå—", example = "请å‡è¡¨å•")
- private String formName;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
- @Schema(description = "å¯å‘起的用户数组")
- private List startUsers;
-
- @Schema(description = "å¯å‘起的部门数组")
- private List startDepts;
-
- @Schema(description = "BPMN XML")
- private String bpmnXml;
-
- @Schema(description = "仿钉钉æµç¨‹è®¾è®¡æ¨¡åž‹å¯¹è±¡")
- private BpmSimpleModelNodeVO simpleModel;
-
- /**
- * 最新部署的æµç¨‹å®šä¹‰
- */
- private BpmProcessDefinitionRespVO processDefinition;
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
deleted file mode 100644
index 6d57341..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.model;
-
-import com.zt.plat.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Schema(description = "管ç†åŽå° - æµç¨‹æ¨¡åž‹çš„ä¿å˜ Request VO")
-@Data
-public class BpmModelSaveReqVO extends BpmModelMetaInfoVO {
-
- @Schema(description = "ç¼–å·", example = "1024")
- private String id;
-
- @Schema(description = "æµç¨‹æ ‡è¯†", requiredMode = Schema.RequiredMode.REQUIRED, example = "process_zt")
- @NotEmpty(message = "æµç¨‹æ ‡è¯†ä¸èƒ½ä¸ºç©º")
- private String key;
-
- @Schema(description = "æµç¨‹å称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
- @NotEmpty(message = "æµç¨‹å称ä¸èƒ½ä¸ºç©º")
- private String name;
-
- @Schema(description = "æµç¨‹åˆ†ç±»", example = "1")
- private String category;
-
- @Schema(description = "BPMN XML")
- private String bpmnXml;
-
- @Schema(description = "仿钉钉æµç¨‹è®¾è®¡æ¨¡åž‹å¯¹è±¡")
- @Valid
- private BpmSimpleModelNodeVO simpleModel;
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateStateReqVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateStateReqVO.java
deleted file mode 100644
index cd7fea1..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateStateReqVO.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.model;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Schema(description = "管ç†åŽå° - æµç¨‹æ¨¡åž‹æ›´æ–°çŠ¶æ€ Request VO")
-@Data
-public class BpmModelUpdateStateReqVO {
-
- @Schema(description = "ç¼–å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotNull(message = "ç¼–å·ä¸èƒ½ä¸ºç©º")
- private String id;
-
- @Schema(description = "状æ€", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "状æ€ä¸èƒ½ä¸ºç©º")
- private Integer state; // å‚è§ Flowable SuspensionState 枚举
-
-}
diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java
deleted file mode 100644
index cd5177a..0000000
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java
+++ /dev/null
@@ -1,526 +0,0 @@
-package com.zt.plat.module.bpm.controller.admin.definition.vo.model.simple;
-
-import com.zt.plat.framework.common.core.KeyValue;
-import com.zt.plat.framework.common.validation.InEnum;
-import com.zt.plat.module.bpm.enums.definition.*;
-import com.zt.plat.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import org.flowable.bpmn.model.IOParameter;
-import org.hibernate.validator.constraints.URL;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-@Schema(description = "管ç†åŽå° - 仿钉钉æµç¨‹è®¾è®¡æ¨¡åž‹èŠ‚点 VO")
-@Data
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class BpmSimpleModelNodeVO {
-
- @Schema(description = "模型节点编å·", requiredMode = Schema.RequiredMode.REQUIRED, example = "StartEvent_1")
- @NotEmpty(message = "模型节点编å·ä¸èƒ½ä¸ºç©º")
- private String id;
-
- @Schema(description = "模型节点类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "模型节点类型ä¸èƒ½ä¸ºç©º")
- @InEnum(BpmSimpleModelNodeTypeEnum.class)
- private Integer type;
-
- @Schema(description = "模型节点å称", example = "领导审批")
- private String name;
-
- @Schema(description = "节点展示内容", example = "指定æˆå‘˜: ZTæºç ")
- private String showText;
-
- @Schema(description = "å节点")
- private BpmSimpleModelNodeVO childNode; // 补充说明：在该模型下，å节点有且仅有一个，ä¸ä¼šæœ‰å¤šä¸ª
-
- @Schema(description = "候选人ç–ç•¥", example = "30")
- @InEnum(BpmTaskCandidateStrategyEnum.class)
- private Integer candidateStrategy; // 用于审批，抄é€èŠ‚点
-
- @Schema(description = "候选人å‚æ•°")
- private String candidateParam; // 用于审批，抄é€èŠ‚点
-
- @Schema(description = "审批节点类型", example = "1")
- @InEnum(BpmUserTaskApproveTypeEnum.class)
- private Integer approveType; // 用于审批节点
-
- @Schema(description = "多人审批方å¼", example = "1")
- @InEnum(BpmUserTaskApproveMethodEnum.class)
- private Integer approveMethod; // 用于审批节点
-
- @Schema(description = "通过比例", example = "100")
- private Integer approveRatio; // 通过比例，当多人审批方å¼ä¸ºï¼šå¤šäººä¼šç¾(按通过比例) 需è¦è®¾ç½®
-
- @Schema(description = "表å•æƒé™", example = "[]")
- private List> fieldsPermission;
-
- @Schema(description = "æ“作按钮设置", example = "[]")
- private List buttonsSetting; // 用于审批节点
-
- @Schema(description = "是å¦éœ€è¦ç¾å", example = "false")
- private Boolean signEnable;
-
- @Schema(description = "是å¦å¡«å†™å®¡æ‰¹æ„è§", example = "false")
- private Boolean reasonRequire;
-
- /**
- * 审批节点拒ç»å¤„ç†
- */
- private RejectHandler rejectHandler;
-
- /**
- * 审批节点超时处ç†
- */
- private TimeoutHandler timeoutHandler;
-
- @Schema(description = "审批节点的审批人与å‘起人相åŒæ—¶ï¼Œå¯¹åº”的处ç†ç±»åž‹", example = "1")
- @InEnum(BpmUserTaskAssignStartUserHandlerTypeEnum.class)
- private Integer assignStartUserHandlerType;
-
- /**
- * 空处ç†ç–ç•¥
- */
- private AssignEmptyHandler assignEmptyHandler;
-
- /**
- * 创建任务监å¬å™¨
- */
- private ListenerHandler taskCreateListener;
- /**
- * 指派任务监å¬å™¨
- */
- private ListenerHandler taskAssignListener;
- /**
- * 完æˆä»»åŠ¡ç›‘å¬å™¨
- */
- private ListenerHandler taskCompleteListener;
-
- @Schema(description = "延迟器设置", example = "{}")
- private DelaySetting delaySetting;
-
- @Schema(description = "æ¡ä»¶èŠ‚点")
- private List conditionNodes; // 补充说明：有且仅有æ¡ä»¶ã€å¹¶è¡Œã€åŒ…容分支会使用
-
- /**
- * æ¡ä»¶èŠ‚点设置
- */
- private ConditionSetting conditionSetting; // 仅用于æ¡ä»¶èŠ‚点 BpmSimpleModelNodeTypeEnum.CONDITION_NODE
-
- @Schema(description = "路由分支组", example = "[]")
- private List routerGroups;
-
- @Schema(description = "路由分支默认分支 ID", example = "Flow_xxx", hidden = true) // ç”±åŽç«¯ç”Ÿæˆï¼ˆä¸ä»Žå‰ç«¯ä¼ 递），所以 hidden = true
- @JsonIgnore
- private String routerDefaultFlowId; // 仅用于路由分支节点 BpmSimpleModelNodeType.ROUTER_BRANCH_NODE
-
- /**
- * 触å‘器节点设置
- */
- private TriggerSetting triggerSetting;
-
- @Schema(description = "é™„åŠ èŠ‚ç‚¹ Id", example = "UserTask_xxx", hidden = true) // ç”±åŽç«¯ç”Ÿæˆï¼ˆä¸ä»Žå‰ç«¯ä¼ 递），所以 hidden = true
- @JsonIgnore
- private String attachNodeId; // ç›®å‰ç”¨äºŽè§¦å‘器节点（HTTP å›žè°ƒï¼‰ã€‚éœ€è¦ UserTask å’Œ ReceiveTaskï¼ˆé™„åŠ èŠ‚ç‚¹) æ¥å®Œæˆ
-
- /**
- * åæµç¨‹è®¾ç½®
- */
- private ChildProcessSetting childProcessSetting;
-
- @Schema(description = "任务监å¬å™¨")
- @Valid
- @Data
- public static class ListenerHandler {
-
- @Schema(description = "是å¦å¼€å¯ä»»åŠ¡ç›‘å¬å™¨", example = "false")
- @NotNull(message = "是å¦å¼€å¯ä»»åŠ¡ç›‘å¬å™¨ä¸èƒ½ä¸ºç©º")
- private Boolean enable;
-
- @Schema(description = "请求路径", example = "http://xxxxx")
- private String path;
-
- @Schema(description = "请求头", example = "[]")
- private List header;
-
- @Schema(description = "请求体", example = "[]")
- private List body;
-
- }
-
- @Schema(description = "HTTP 请求å‚数设置")
- @Data
- public static class HttpRequestParam {
-
- @Schema(description = "值类型", example = "1")
- @InEnum(BpmHttpRequestParamTypeEnum.class)
- @NotNull(message = "值类型ä¸èƒ½ä¸ºç©º")
- private Integer type;
-
- @Schema(description = "é”®", example = "xxx")
- @NotEmpty(message = "é”®ä¸èƒ½ä¸ºç©º")
- private String key;
-
- @Schema(description = "值", example = "xxx")
- @NotEmpty(message = "值ä¸èƒ½ä¸ºç©º")
- private String value;
-
- }
-
- @Schema(description = "审批节点拒ç»å¤„ç†ç–ç•¥")
- @Data
- public static class RejectHandler {
-
- @Schema(description = "æ‹’ç»å¤„ç†ç±»åž‹", example = "1")
- @InEnum(BpmUserTaskRejectHandlerTypeEnum.class)
- private Integer type;
-
- @Schema(description = "任务拒ç»åŽé©³å›žçš„节点 Id", example = "Activity_1")
- private String returnNodeId;
- }
-
- @Schema(description = "审批节点超时处ç†ç–ç•¥")
- @Valid
- @Data
- public static class TimeoutHandler {
-
- @Schema(description = "是å¦å¼€å¯è¶…时处ç†", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
- @NotNull(message = "是å¦å¼€å¯è¶…时处ç†ä¸èƒ½ä¸ºç©º")
- private Boolean enable;
-
- @Schema(description = "任务超时未处ç†çš„行为", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "任务超时未处ç†çš„行为ä¸èƒ½ä¸ºç©º")
- @InEnum(BpmUserTaskTimeoutHandlerTypeEnum.class)
- private Integer type;
-
- @Schema(description = "超时时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "PT6H")
- @NotEmpty(message = "超时时间ä¸èƒ½ä¸ºç©º")
- private String timeDuration;
-
- @Schema(description = "最大æ醒次数", example = "1")
- private Integer maxRemindCount;
- }
-
- @Schema(description = "空处ç†ç–ç•¥")
- @Data
- @Valid
- public static class AssignEmptyHandler {
-
- @Schema(description = "空处ç†ç±»åž‹", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "空处ç†ç±»åž‹ä¸èƒ½ä¸ºç©º")
- @InEnum(BpmUserTaskAssignEmptyHandlerTypeEnum.class)
- private Integer type;
-
- @Schema(description = "指定人员审批的用户编å·æ•°ç»„", example = "1")
- private List userIds;
- }
-
- @Schema(description = "æ“作按钮设置")
- @Data
- @Valid
- public static class OperationButtonSetting {
-
- // TODO @jason：是ä¸æ˜¯æŒ‰é’®çš„æ ‡è¯†ï¼Ÿid 会和数æ®åº“çš„ id 自增有点模糊，key æ ‡è¯†ä¼šæ›´åˆç†ä¸€ç‚¹ç‚¹å“ˆã€‚
- @Schema(description = "按钮 Id", example = "1")
- private Integer id;
-
- @Schema(description = "显示å称", example = "审批")
- private String displayName;
-
- @Schema(description = "是å¦å¯ç”¨", example = "true")
- private Boolean enable;
- }
-
- @Schema(description = "æ¡ä»¶è®¾ç½®")
- @Data
- @Valid
- // 仅用于æ¡ä»¶èŠ‚点 BpmSimpleModelNodeTypeEnum.CONDITION_NODE
- public static class ConditionSetting {
-
- @Schema(description = "æ¡ä»¶ç±»åž‹", example = "1")
- @InEnum(BpmSimpleModeConditionTypeEnum.class)
- private Integer conditionType;
-
- @Schema(description = "æ¡ä»¶è¡¨è¾¾å¼", example = "${day>3}")
- private String conditionExpression;
-
- @Schema(description = "是å¦é»˜è®¤æ¡ä»¶", example = "true")
- private Boolean defaultFlow;
-
- /**
- * æ¡ä»¶ç»„
- */
- private ConditionGroups conditionGroups;
- }
-
- @Schema(description = "æ¡ä»¶ç»„")
- @Data
- @Valid
- public static class ConditionGroups {
-
- @Schema(description = "æ¡ä»¶ç»„下的æ¡ä»¶å…³ç³»æ˜¯å¦ä¸ºä¸Žå…³ç³»", example = "true")
- @NotNull(message = "æ¡ä»¶å…³ç³»ä¸èƒ½ä¸ºç©º")
- private Boolean and;
-
- @Schema(description = "æ¡ä»¶ç»„下的æ¡ä»¶", example = "[]")
- @NotEmpty(message = "æ¡ä»¶ä¸èƒ½ä¸ºç©º")
- private List conditions;
- }
-
- @Schema(description = "æ¡ä»¶")
- @Data
- @Valid
- public static class Condition {
-
- @Schema(description = "æ¡ä»¶ä¸‹çš„规则关系是å¦ä¸ºä¸Žå…³ç³»", example = "true")
- @NotNull(message = "规则关系ä¸èƒ½ä¸ºç©º")
- private Boolean and;
-
- @Schema(description = "æ¡ä»¶ä¸‹çš„规则", example = "[]")
- @NotEmpty(message = "规则ä¸èƒ½ä¸ºç©º")
- private List rules;
- }
-
- @Schema(description = "æ¡ä»¶è§„则")
- @Data
- @Valid
- public static class ConditionRule {
-
- @Schema(description = "è¿è¡Œç¬¦å·", example = "==")
- @NotEmpty(message = "è¿è¡Œç¬¦å·ä¸èƒ½ä¸ºç©º")
- private String opCode;
-
- @Schema(description = "è¿ç®—符左边的值,例如æŸä¸ªæµç¨‹å˜é‡", example = "startUserId")
- @NotEmpty(message = "è¿ç®—符左边的值ä¸èƒ½ä¸ºç©º")
- private String leftSide;
-
- @Schema(description = "è¿ç®—符å³è¾¹çš„值", example = "1")
- @NotEmpty(message = "è¿ç®—符å³è¾¹çš„值ä¸èƒ½ä¸ºç©º")
- private String rightSide;
- }
-
- @Schema(description = "延迟器")
- @Data
- @Valid
- public static class DelaySetting {
-
- @Schema(description = "延迟时间类型", example = "1")
- @NotNull(message = "延迟时间类型ä¸èƒ½ä¸ºç©º")
- @InEnum(BpmDelayTimerTypeEnum.class)
- private Integer delayType;
-
- @Schema(description = "延迟时间表达å¼", example = "PT1H,2025-01-01T00:00:00")
- @NotEmpty(message = "延迟时间表达å¼ä¸èƒ½ä¸ºç©º")
- private String delayTime;
- }
-
- @Schema(description = "路由分支")
- @Data
- @Valid
- public static class RouterSetting {
-
- @Schema(description = "节点 Id", example = "Activity_xxx") // 跳转到该节点
- @NotEmpty(message = "节点 Id ä¸èƒ½ä¸ºç©º")
- private String nodeId;
-
- @Schema(description = "æ¡ä»¶ç±»åž‹", example = "1")
- @InEnum(BpmSimpleModeConditionTypeEnum.class)
- @NotNull(message = "æ¡ä»¶ç±»åž‹ä¸èƒ½ä¸ºç©º")
- private Integer conditionType;
-
- @Schema(description = "æ¡ä»¶è¡¨è¾¾å¼", example = "${day>3}")
- private String conditionExpression;
-
- @Schema(description = "æ¡ä»¶ç»„", example = "{}")
- private ConditionGroups conditionGroups;
- }
-
- @Schema(description = "触å‘器节点é…ç½®")
- @Data
- @Valid
- public static class TriggerSetting {
-
- @Schema(description = "触å‘器类型", example = "1")
- @InEnum(BpmTriggerTypeEnum.class)
- @NotNull(message = "触å‘器类型ä¸èƒ½ä¸ºç©º")
- private Integer type;
-
- /**
- * http 请求触å‘器设置
- */
- @Valid
- private HttpRequestTriggerSetting httpRequestSetting;
-
- /**
- * æµç¨‹è¡¨å•è§¦å‘器设置
- */
- private List formSettings;
-
- @Schema(description = "http 请求触å‘器设置", example = "{}")
- @Data
- public static class HttpRequestTriggerSetting {
-
- @Schema(description = "请求路径", example = "http://127.0.0.1")
- @NotEmpty(message = "请求 URL ä¸èƒ½ä¸ºç©º")
- @URL(message = "请求 URL æ ¼å¼ä¸æ£ç¡®")
- private String url;
-
- @Schema(description = "请求头å‚数设置", example = "[]")
- @Valid
- private List header;
-
- @Schema(description = "请求头å‚数设置", example = "[]")
- @Valid
- private List body;
-
- /**
- * 请求返回处ç†è®¾ç½®ï¼Œç”¨äºŽä¿®æ”¹æµç¨‹è¡¨å•å€¼
- *
- * key：表示è¦ä¿®æ”¹çš„æµç¨‹è¡¨å•å—段å(name)
- * value：接å£è¿”回的å—段å
- */
- @Schema(description = "请求返回处ç†è®¾ç½®", example = "[]")
- private List> response;
-
- /**
- * Http 回调请求，需è¦æŒ‡å®šå›žè°ƒä»»åŠ¡ Key，用于回调执行
- */
- @Schema(description = "回调任务 Key", example = "xxx", hidden = true)
- private String callbackTaskDefineKey;
-
- }
-
- @Schema(description = "æµç¨‹è¡¨å•è§¦å‘器设置", example = "{}")
- @Data
- public static class FormTriggerSetting {
-
- @Schema(description = "æ¡ä»¶ç±»åž‹", example = "1")
- @InEnum(BpmSimpleModeConditionTypeEnum.class)
- private Integer conditionType;
-
- @Schema(description = "æ¡ä»¶è¡¨è¾¾å¼", example = "${day>3}")
- private String conditionExpression;
-
- @Schema(description = "æ¡ä»¶ç»„", example = "{}")
- private ConditionGroups conditionGroups;
-
- @Schema(description = "修改的表å•å—段", example = "{}")
- private Map updateFormFields;
-
- @Schema(description = "åˆ é™¤è¡¨å•å—段", example = "[]")
- private Set