hubin 1 жил өмнө
parent
commit
7649fe2fe7
20 өөрчлөгдсөн 59 нэмэгдсэн , 59 устгасан
  1. 1 1
      build.gradle
  2. 1 1
      src/main/java/com/aizuda/boot/config/BootException.java
  3. 2 2
      src/main/java/com/aizuda/boot/modules/flw/FlowHelper.java
  4. 3 3
      src/main/java/com/aizuda/boot/modules/flw/FlowTaskAccessStrategy.java
  5. 5 5
      src/main/java/com/aizuda/boot/modules/flw/FlowTaskActorProvider.java
  6. 10 10
      src/main/java/com/aizuda/boot/modules/flw/FlowTaskListener.java
  7. 1 1
      src/main/java/com/aizuda/boot/modules/flw/controller/ProcessInstanceController.java
  8. 1 1
      src/main/java/com/aizuda/boot/modules/flw/entity/ApprovalContent.java
  9. 1 1
      src/main/java/com/aizuda/boot/modules/flw/entity/dto/FlwProcessDTO.java
  10. 1 1
      src/main/java/com/aizuda/boot/modules/flw/entity/dto/ProcessStartDTO.java
  11. 2 2
      src/main/java/com/aizuda/boot/modules/flw/entity/dto/TaskAppendNodeDTO.java
  12. 1 1
      src/main/java/com/aizuda/boot/modules/flw/entity/dto/TaskAssigneeDTO.java
  13. 1 1
      src/main/java/com/aizuda/boot/modules/flw/entity/vo/FlwHisTaskVO.java
  14. 2 2
      src/main/java/com/aizuda/boot/modules/flw/entity/vo/PendingApprovalTaskVO.java
  15. 2 2
      src/main/java/com/aizuda/boot/modules/flw/entity/vo/PendingClaimTaskVO.java
  16. 2 2
      src/main/java/com/aizuda/boot/modules/flw/service/IFlwProcessService.java
  17. 1 1
      src/main/java/com/aizuda/boot/modules/flw/service/IProcessTaskService.java
  18. 8 8
      src/main/java/com/aizuda/boot/modules/flw/service/impl/FlwProcessServiceImpl.java
  19. 13 13
      src/main/java/com/aizuda/boot/modules/flw/service/impl/ProcessTaskServiceImpl.java
  20. 1 1
      src/main/java/com/aizuda/boot/modules/system/entity/vo/DepartmentHeadVO.java

+ 1 - 1
build.gradle

@@ -82,7 +82,7 @@ dependencies {
     implementation("com.aizuda:aizuda-monitor")
 
     // 工作流引擎
-    implementation("com.flowlong:flowlong-spring-boot-starter:0.0.2-SNAPSHOT")
+    implementation("com.aizuda:flowlong-spring-boot-starter:0.0.1")
 
     // SpringBootAdmin 监控管理客户端,未使用可以删除
     // implementation("de.codecentric:spring-boot-admin-starter-client:3.0.2")

+ 1 - 1
src/main/java/com/aizuda/boot/config/BootException.java

@@ -6,7 +6,7 @@
 package com.aizuda.boot.config;
 
 import com.aizuda.core.api.ApiResult;
-import com.flowlong.bpm.engine.exception.FlowLongException;
+import com.aizuda.bpm.engine.exception.FlowLongException;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;

+ 2 - 2
src/main/java/com/aizuda/boot/modules/flw/FlowHelper.java

@@ -1,8 +1,8 @@
 package com.aizuda.boot.modules.flw;
 
 import com.aizuda.service.web.UserSession;
-import com.flowlong.bpm.engine.core.FlowCreator;
-import com.flowlong.bpm.engine.entity.FlwTaskActor;
+import com.aizuda.bpm.engine.core.FlowCreator;
+import com.aizuda.bpm.engine.entity.FlwTaskActor;
 
 /**
  * 工作流辅助类

+ 3 - 3
src/main/java/com/aizuda/boot/modules/flw/FlowTaskAccessStrategy.java

@@ -3,9 +3,9 @@ package com.aizuda.boot.modules.flw;
 import com.aizuda.boot.modules.system.service.ISysUserDepartmentService;
 import com.aizuda.boot.modules.system.service.ISysUserRoleService;
 import com.aizuda.service.spring.SpringHelper;
-import com.flowlong.bpm.engine.TaskAccessStrategy;
-import com.flowlong.bpm.engine.assist.ObjectUtils;
-import com.flowlong.bpm.engine.entity.FlwTaskActor;
+import com.aizuda.bpm.engine.TaskAccessStrategy;
+import com.aizuda.bpm.engine.assist.ObjectUtils;
+import com.aizuda.bpm.engine.entity.FlwTaskActor;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 

+ 5 - 5
src/main/java/com/aizuda/boot/modules/flw/FlowTaskActorProvider.java

@@ -5,11 +5,11 @@ import com.aizuda.boot.modules.system.service.ISysDepartmentService;
 import com.aizuda.core.api.ApiAssert;
 import com.aizuda.service.spring.SpringHelper;
 import com.aizuda.service.web.UserSession;
-import com.flowlong.bpm.engine.TaskActorProvider;
-import com.flowlong.bpm.engine.assist.ObjectUtils;
-import com.flowlong.bpm.engine.core.Execution;
-import com.flowlong.bpm.engine.entity.FlwTaskActor;
-import com.flowlong.bpm.engine.model.NodeModel;
+import com.aizuda.bpm.engine.TaskActorProvider;
+import com.aizuda.bpm.engine.assist.ObjectUtils;
+import com.aizuda.bpm.engine.core.Execution;
+import com.aizuda.bpm.engine.entity.FlwTaskActor;
+import com.aizuda.bpm.engine.model.NodeModel;
 import org.springframework.stereotype.Component;
 
 import java.util.Collections;

+ 10 - 10
src/main/java/com/aizuda/boot/modules/flw/FlowTaskListener.java

@@ -5,16 +5,16 @@ import com.aizuda.boot.modules.flw.entity.FlwProcessApproval;
 import com.aizuda.boot.modules.flw.service.IFlwProcessApprovalService;
 import com.aizuda.common.toolkit.CollectionUtils;
 import com.aizuda.common.toolkit.StringUtils;
-import com.flowlong.bpm.engine.FlowDataTransfer;
-import com.flowlong.bpm.engine.FlowLongEngine;
-import com.flowlong.bpm.engine.core.FlowCreator;
-import com.flowlong.bpm.engine.core.enums.EventType;
-import com.flowlong.bpm.engine.core.enums.PerformType;
-import com.flowlong.bpm.engine.core.enums.TaskType;
-import com.flowlong.bpm.engine.entity.FlwTask;
-import com.flowlong.bpm.engine.listener.TaskListener;
-import com.flowlong.bpm.engine.model.NodeModel;
-import com.flowlong.bpm.engine.model.ProcessModel;
+import com.aizuda.bpm.engine.FlowDataTransfer;
+import com.aizuda.bpm.engine.FlowLongEngine;
+import com.aizuda.bpm.engine.core.FlowCreator;
+import com.aizuda.bpm.engine.core.enums.EventType;
+import com.aizuda.bpm.engine.core.enums.PerformType;
+import com.aizuda.bpm.engine.core.enums.TaskType;
+import com.aizuda.bpm.engine.entity.FlwTask;
+import com.aizuda.bpm.engine.listener.TaskListener;
+import com.aizuda.bpm.engine.model.NodeModel;
+import com.aizuda.bpm.engine.model.ProcessModel;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
 

+ 1 - 1
src/main/java/com/aizuda/boot/modules/flw/controller/ProcessInstanceController.java

@@ -3,7 +3,7 @@ package com.aizuda.boot.modules.flw.controller;
 import com.aizuda.boot.modules.flw.FlowHelper;
 import com.aizuda.core.api.ApiController;
 import com.baomidou.kisso.annotation.Permission;
-import com.flowlong.bpm.engine.FlowLongEngine;
+import com.aizuda.bpm.engine.FlowLongEngine;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;

+ 1 - 1
src/main/java/com/aizuda/boot/modules/flw/entity/ApprovalContent.java

@@ -1,6 +1,6 @@
 package com.aizuda.boot.modules.flw.entity;
 
-import com.flowlong.bpm.engine.model.NodeAssignee;
+import com.aizuda.bpm.engine.model.NodeAssignee;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;

+ 1 - 1
src/main/java/com/aizuda/boot/modules/flw/entity/dto/FlwProcessDTO.java

@@ -2,7 +2,7 @@ package com.aizuda.boot.modules.flw.entity.dto;
 
 
 import com.aizuda.boot.modules.flw.entity.FlwProcessSetting;
-import com.flowlong.bpm.engine.entity.FlwProcess;
+import com.aizuda.bpm.engine.entity.FlwProcess;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;

+ 1 - 1
src/main/java/com/aizuda/boot/modules/flw/entity/dto/ProcessStartDTO.java

@@ -1,6 +1,6 @@
 package com.aizuda.boot.modules.flw.entity.dto;
 
-import com.flowlong.bpm.engine.model.DynamicAssignee;
+import com.aizuda.bpm.engine.model.DynamicAssignee;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;

+ 2 - 2
src/main/java/com/aizuda/boot/modules/flw/entity/dto/TaskAppendNodeDTO.java

@@ -1,7 +1,7 @@
 package com.aizuda.boot.modules.flw.entity.dto;
 
-import com.flowlong.bpm.engine.model.NodeAssignee;
-import com.flowlong.bpm.engine.model.NodeModel;
+import com.aizuda.bpm.engine.model.NodeAssignee;
+import com.aizuda.bpm.engine.model.NodeModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

+ 1 - 1
src/main/java/com/aizuda/boot/modules/flw/entity/dto/TaskAssigneeDTO.java

@@ -1,6 +1,6 @@
 package com.aizuda.boot.modules.flw.entity.dto;
 
-import com.flowlong.bpm.engine.core.FlowCreator;
+import com.aizuda.bpm.engine.core.FlowCreator;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

+ 1 - 1
src/main/java/com/aizuda/boot/modules/flw/entity/vo/FlwHisTaskVO.java

@@ -1,6 +1,6 @@
 package com.aizuda.boot.modules.flw.entity.vo;
 
-import com.flowlong.bpm.engine.entity.FlwHisTask;
+import com.aizuda.bpm.engine.entity.FlwHisTask;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;

+ 2 - 2
src/main/java/com/aizuda/boot/modules/flw/entity/vo/PendingApprovalTaskVO.java

@@ -50,12 +50,12 @@ public class PendingApprovalTaskVO {
     @Schema(description = "任务显示名称")
     private String displayName;
     /**
-     * 任务类型 {@link com.flowlong.bpm.engine.core.enums.TaskType}
+     * 任务类型 {@link com.aizuda.bpm.engine.core.enums.TaskType}
      */
     @Schema(description = "任务类型")
     protected Integer taskType;
     /**
-     * 参与方式 {@link com.flowlong.bpm.engine.core.enums.PerformType}
+     * 参与方式 {@link com.aizuda.bpm.engine.core.enums.PerformType}
      */
     @Schema(description = "参与方式")
     protected Integer performType;

+ 2 - 2
src/main/java/com/aizuda/boot/modules/flw/entity/vo/PendingClaimTaskVO.java

@@ -50,12 +50,12 @@ public class PendingClaimTaskVO {
     @Schema(description = "任务显示名称")
     private String displayName;
     /**
-     * 任务类型 {@link com.flowlong.bpm.engine.core.enums.TaskType}
+     * 任务类型 {@link com.aizuda.bpm.engine.core.enums.TaskType}
      */
     @Schema(description = "任务类型")
     protected Integer taskType;
     /**
-     * 参与方式 {@link com.flowlong.bpm.engine.core.enums.PerformType}
+     * 参与方式 {@link com.aizuda.bpm.engine.core.enums.PerformType}
      */
     @Schema(description = "参与方式")
     protected Integer performType;

+ 2 - 2
src/main/java/com/aizuda/boot/modules/flw/service/IFlwProcessService.java

@@ -4,8 +4,8 @@ import com.aizuda.boot.modules.flw.entity.dto.FlwProcessDTO;
 import com.aizuda.boot.modules.flw.entity.dto.ProcessStartDTO;
 import com.aizuda.boot.modules.flw.entity.vo.FlwProcessCategoryVO;
 import com.aizuda.service.service.IBaseService;
-import com.flowlong.bpm.engine.core.FlowCreator;
-import com.flowlong.bpm.engine.entity.FlwProcess;
+import com.aizuda.bpm.engine.core.FlowCreator;
+import com.aizuda.bpm.engine.entity.FlwProcess;
 
 import java.util.List;
 import java.util.Map;

+ 1 - 1
src/main/java/com/aizuda/boot/modules/flw/service/IProcessTaskService.java

@@ -4,7 +4,7 @@ import com.aizuda.boot.modules.flw.entity.dto.*;
 import com.aizuda.boot.modules.flw.entity.vo.*;
 import com.aizuda.core.api.PageParam;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.flowlong.bpm.engine.core.FlowCreator;
+import com.aizuda.bpm.engine.core.FlowCreator;
 
 import java.util.List;
 

+ 8 - 8
src/main/java/com/aizuda/boot/modules/flw/service/impl/FlwProcessServiceImpl.java

@@ -14,14 +14,14 @@ import com.aizuda.boot.modules.flw.service.*;
 import com.aizuda.core.api.ApiAssert;
 import com.aizuda.service.web.UserSession;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.flowlong.bpm.engine.FlowDataTransfer;
-import com.flowlong.bpm.engine.FlowLongEngine;
-import com.flowlong.bpm.engine.core.FlowCreator;
-import com.flowlong.bpm.engine.core.FlowLongContext;
-import com.flowlong.bpm.engine.entity.FlwInstance;
-import com.flowlong.bpm.engine.entity.FlwProcess;
-import com.flowlong.bpm.engine.model.*;
-import com.flowlong.bpm.mybatisplus.mapper.FlwProcessMapper;
+import com.aizuda.bpm.engine.FlowDataTransfer;
+import com.aizuda.bpm.engine.FlowLongEngine;
+import com.aizuda.bpm.engine.core.FlowCreator;
+import com.aizuda.bpm.engine.core.FlowLongContext;
+import com.aizuda.bpm.engine.entity.FlwInstance;
+import com.aizuda.bpm.engine.entity.FlwProcess;
+import com.aizuda.bpm.engine.model.*;
+import com.aizuda.bpm.mybatisplus.mapper.FlwProcessMapper;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;

+ 13 - 13
src/main/java/com/aizuda/boot/modules/flw/service/impl/ProcessTaskServiceImpl.java

@@ -14,19 +14,19 @@ import com.aizuda.core.api.ApiAssert;
 import com.aizuda.core.api.PageParam;
 import com.aizuda.service.web.UserSession;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.flowlong.bpm.engine.FlowDataTransfer;
-import com.flowlong.bpm.engine.FlowLongEngine;
-import com.flowlong.bpm.engine.TaskService;
-import com.flowlong.bpm.engine.core.FlowCreator;
-import com.flowlong.bpm.engine.entity.FlwExtInstance;
-import com.flowlong.bpm.engine.entity.FlwHisInstance;
-import com.flowlong.bpm.engine.entity.FlwTask;
-import com.flowlong.bpm.engine.entity.FlwTaskActor;
-import com.flowlong.bpm.engine.model.ModelHelper;
-import com.flowlong.bpm.engine.model.NodeAssignee;
-import com.flowlong.bpm.engine.model.NodeModel;
-import com.flowlong.bpm.engine.model.ProcessModel;
-import com.flowlong.bpm.mybatisplus.mapper.FlwExtInstanceMapper;
+import com.aizuda.bpm.engine.FlowDataTransfer;
+import com.aizuda.bpm.engine.FlowLongEngine;
+import com.aizuda.bpm.engine.TaskService;
+import com.aizuda.bpm.engine.core.FlowCreator;
+import com.aizuda.bpm.engine.entity.FlwExtInstance;
+import com.aizuda.bpm.engine.entity.FlwHisInstance;
+import com.aizuda.bpm.engine.entity.FlwTask;
+import com.aizuda.bpm.engine.entity.FlwTaskActor;
+import com.aizuda.bpm.engine.model.ModelHelper;
+import com.aizuda.bpm.engine.model.NodeAssignee;
+import com.aizuda.bpm.engine.model.NodeModel;
+import com.aizuda.bpm.engine.model.ProcessModel;
+import com.aizuda.bpm.mybatisplus.mapper.FlwExtInstanceMapper;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;

+ 1 - 1
src/main/java/com/aizuda/boot/modules/system/entity/vo/DepartmentHeadVO.java

@@ -1,6 +1,6 @@
 package com.aizuda.boot.modules.system.entity.vo;
 
-import com.flowlong.bpm.engine.entity.FlwTaskActor;
+import com.aizuda.bpm.engine.entity.FlwTaskActor;
 import lombok.Getter;
 import lombok.Setter;