update 优化 工作流代码与接口命名

pom.xml

@@ -17,7 +17,7 @@
         <spring-boot.version>3.2.3</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <spring-boot.mybatis>3.0.3</spring-boot.mybatis>
         <springdoc.version>2.3.0</springdoc.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java

@@ -111,4 +111,8 @@ public class PageQuery implements Serializable {
         return list;
     }
 
+    public Integer getFirstNum() {
+        return (pageNum - 1) * pageSize;
+    }
+
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/PageEntity.java

@@ -1,28 +0,0 @@
-package org.dromara.workflow.common;
-
-
-import lombok.Data;
-
-/**
- * 分页参数
- *
- * @author may
- */
-@Data
-public class PageEntity {
-
-    /**
-     * 当前页码
-     */
-    private Integer pageNum = 0;
-
-    /**
-     * 页容量
-     */
-    private Integer pageSize = 10;
-
-    public Integer getPageNum() {
-        return (pageNum - 1) * pageSize;
-    }
-
-}

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java

@@ -10,6 +10,7 @@ import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.workflow.domain.bo.ModelBo;
@@ -45,8 +46,8 @@ public class ActModelController extends BaseController {
      * @param modelBo 模型参数
      */
     @GetMapping("/list")
-    public TableDataInfo<Model> page(ModelBo modelBo) {
+    public TableDataInfo<Model> page(ModelBo modelBo, PageQuery pageQuery) {
-        return actModelService.page(modelBo);
+        return actModelService.page(modelBo, pageQuery);
     }
 
     /**

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java

@@ -7,6 +7,7 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.workflow.domain.bo.ProcessDefinitionBo;
@@ -38,11 +39,11 @@ public class ActProcessDefinitionController extends BaseController {
     /**
      * 分页查询
      *
-     * @param processDefinitionBo 参数
+     * @param bo 参数
      */
     @GetMapping("/list")
-    public TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo processDefinitionBo) {
+    public TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo bo, PageQuery pageQuery) {
-        return actProcessDefinitionService.page(processDefinitionBo);
+        return actProcessDefinitionService.page(bo, pageQuery);
     }
 
     /**
@@ -50,9 +51,9 @@ public class ActProcessDefinitionController extends BaseController {
      *
      * @param key 流程定义key
      */
-    @GetMapping("/getProcessDefinitionListByKey/{key}")
+    @GetMapping("/getListByKey/{key}")
-    public R<List<ProcessDefinitionVo>> getProcessDefinitionListByKey(@NotEmpty(message = "流程定义key不能为空") @PathVariable String key) {
+    public R<List<ProcessDefinitionVo>> getListByKey(@NotEmpty(message = "流程定义key不能为空") @PathVariable String key) {
-        return R.ok("操作成功", actProcessDefinitionService.getProcessDefinitionListByKey(key));
+        return R.ok("操作成功", actProcessDefinitionService.getListByKey(key));
     }
 
     /**
@@ -60,9 +61,9 @@ public class ActProcessDefinitionController extends BaseController {
      *
      * @param processDefinitionId 流程定义id
      */
-    @GetMapping("/processDefinitionImage/{processDefinitionId}")
+    @GetMapping("/definitionImage/{processDefinitionId}")
-    public R<String> processDefinitionImage(@PathVariable String processDefinitionId) {
+    public R<String> definitionImage(@PathVariable String processDefinitionId) {
-        return R.ok("操作成功", actProcessDefinitionService.processDefinitionImage(processDefinitionId));
+        return R.ok("操作成功", actProcessDefinitionService.definitionImage(processDefinitionId));
     }
 
     /**
@@ -70,10 +71,10 @@ public class ActProcessDefinitionController extends BaseController {
      *
      * @param processDefinitionId 流程定义id
      */
-    @GetMapping("/processDefinitionXml/{processDefinitionId}")
+    @GetMapping("/definitionXml/{processDefinitionId}")
-    public R<Map<String, Object>> getXml(@NotBlank(message = "流程定义id不能为空") @PathVariable String processDefinitionId) {
+    public R<Map<String, Object>> definitionXml(@NotBlank(message = "流程定义id不能为空") @PathVariable String processDefinitionId) {
         Map<String, Object> map = new HashMap<>();
-        String xmlStr = actProcessDefinitionService.processDefinitionXml(processDefinitionId);
+        String xmlStr = actProcessDefinitionService.definitionXml(processDefinitionId);
         map.put("xml", Arrays.asList(xmlStr.split("\n")));
         map.put("xmlStr", xmlStr);
         return R.ok(map);
@@ -99,9 +100,9 @@ public class ActProcessDefinitionController extends BaseController {
      */
     @Log(title = "流程定义管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @PutMapping("/updateProcessDefState/{processDefinitionId}")
+    @PutMapping("/updateDefinitionState/{processDefinitionId}")
-    public R<Void> updateProcDefState(@NotBlank(message = "流程定义id不能为空") @PathVariable String processDefinitionId) {
+    public R<Void> updateDefinitionState(@NotBlank(message = "流程定义id不能为空") @PathVariable String processDefinitionId) {
-        return toAjax(actProcessDefinitionService.updateProcessDefState(processDefinitionId));
+        return toAjax(actProcessDefinitionService.updateDefinitionState(processDefinitionId));
     }
 
     /**
@@ -112,10 +113,10 @@ public class ActProcessDefinitionController extends BaseController {
      */
     @Log(title = "流程定义管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @PutMapping("/migrationProcessDefinition/{currentProcessDefinitionId}/{fromProcessDefinitionId}")
+    @PutMapping("/migrationDefinition/{currentProcessDefinitionId}/{fromProcessDefinitionId}")
-    public R<Void> migrationProcessDefinition(@NotBlank(message = "当前流程定义id") @PathVariable String currentProcessDefinitionId,
+    public R<Void> migrationDefinition(@NotBlank(message = "当前流程定义id") @PathVariable String currentProcessDefinitionId,
                                               @NotBlank(message = "需要迁移到的流程定义id") @PathVariable String fromProcessDefinitionId) {
-        return toAjax(actProcessDefinitionService.migrationProcessDefinition(currentProcessDefinitionId, fromProcessDefinitionId));
+        return toAjax(actProcessDefinitionService.migrationDefinition(currentProcessDefinitionId, fromProcessDefinitionId));
     }
 
     /**

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java

@@ -8,6 +8,7 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.workflow.domain.bo.ProcessInstanceBo;
@@ -37,21 +38,21 @@ public class ActProcessInstanceController extends BaseController {
     /**
      * 分页查询正在运行的流程实例
      *
-     * @param processInstanceBo 参数
+     * @param bo 参数
      */
-    @GetMapping("/getProcessInstanceRunningByPage")
+    @GetMapping("/getPageByRunning")
-    public TableDataInfo<ProcessInstanceVo> getProcessInstanceRunningByPage(ProcessInstanceBo processInstanceBo) {
+    public TableDataInfo<ProcessInstanceVo> getPageByRunning(ProcessInstanceBo bo, PageQuery pageQuery) {
-        return actProcessInstanceService.getProcessInstanceRunningByPage(processInstanceBo);
+        return actProcessInstanceService.getPageByRunning(bo, pageQuery);
     }
 
     /**
      * 分页查询已结束的流程实例
      *
-     * @param processInstanceBo 参数
+     * @param bo 参数
      */
-    @GetMapping("/getProcessInstanceFinishByPage")
+    @GetMapping("/getPageByFinish")
-    public TableDataInfo<ProcessInstanceVo> getProcessInstanceFinishByPage(ProcessInstanceBo processInstanceBo) {
+    public TableDataInfo<ProcessInstanceVo> getPageByFinish(ProcessInstanceBo bo, PageQuery pageQuery) {
-        return actProcessInstanceService.getProcessInstanceFinishByPage(processInstanceBo);
+        return actProcessInstanceService.getPageByFinish(bo, pageQuery);
     }
 
     /**
@@ -59,9 +60,9 @@ public class ActProcessInstanceController extends BaseController {
      *
      * @param processInstanceId 流程实例id
      */
-    @GetMapping("/getHistoryProcessImage/{processInstanceId}")
+    @GetMapping("/getHistoryImage/{processInstanceId}")
-    public R<String> getHistoryProcessImage(@NotBlank(message = "流程实例id不能为空") @PathVariable String processInstanceId) {
+    public R<String> getHistoryImage(@NotBlank(message = "流程实例id不能为空") @PathVariable String processInstanceId) {
-        return R.ok("操作成功", actProcessInstanceService.getHistoryProcessImage(processInstanceId));
+        return R.ok("操作成功", actProcessInstanceService.getHistoryImage(processInstanceId));
     }
 
     /**
@@ -69,9 +70,9 @@ public class ActProcessInstanceController extends BaseController {
      *
      * @param processInstanceId 流程实例id
      */
-    @GetMapping("/getHistoryProcessList/{processInstanceId}")
+    @GetMapping("/getHistoryList/{processInstanceId}")
-    public R<Map<String, Object>> getHistoryProcessList(@NotBlank(message = "流程实例id不能为空") @PathVariable String processInstanceId) {
+    public R<Map<String, Object>> getHistoryList(@NotBlank(message = "流程实例id不能为空") @PathVariable String processInstanceId) {
-        return R.ok("操作成功", actProcessInstanceService.getHistoryProcessList(processInstanceId));
+        return R.ok("操作成功", actProcessInstanceService.getHistoryList(processInstanceId));
     }
 
     /**
@@ -91,9 +92,9 @@ public class ActProcessInstanceController extends BaseController {
      */
     @Log(title = "流程实例管理", businessType = BusinessType.DELETE)
     @RepeatSubmit()
-    @PostMapping("/deleteRuntimeProcessInst")
+    @PostMapping("/deleteRunInstance")
-    public R<Void> deleteRuntimeProcessInst(@Validated(AddGroup.class) @RequestBody ProcessInvalidBo processInvalidBo) {
+    public R<Void> deleteRunInstance(@Validated(AddGroup.class) @RequestBody ProcessInvalidBo processInvalidBo) {
-        return toAjax(actProcessInstanceService.deleteRuntimeProcessInst(processInvalidBo));
+        return toAjax(actProcessInstanceService.deleteRunInstance(processInvalidBo));
     }
 
     /**
@@ -103,9 +104,9 @@ public class ActProcessInstanceController extends BaseController {
      */
     @Log(title = "流程实例管理", businessType = BusinessType.DELETE)
     @RepeatSubmit()
-    @DeleteMapping("/deleteRuntimeProcessAndHisInst/{processInstanceIds}")
+    @DeleteMapping("/deleteRunAndHisInstance/{processInstanceIds}")
-    public R<Void> deleteRuntimeProcessAndHisInst(@NotNull(message = "流程实例id不能为空") @PathVariable String[] processInstanceIds) {
+    public R<Void> deleteRunAndHisInstance(@NotNull(message = "流程实例id不能为空") @PathVariable String[] processInstanceIds) {
-        return toAjax(actProcessInstanceService.deleteRuntimeProcessAndHisInst(Arrays.asList(processInstanceIds)));
+        return toAjax(actProcessInstanceService.deleteRunAndHisInstance(Arrays.asList(processInstanceIds)));
     }
 
     /**
@@ -115,9 +116,9 @@ public class ActProcessInstanceController extends BaseController {
      */
     @Log(title = "流程实例管理", businessType = BusinessType.DELETE)
     @RepeatSubmit()
-    @DeleteMapping("/deleteFinishProcessAndHisInst/{processInstanceIds}")
+    @DeleteMapping("/deleteFinishAndHisInstance/{processInstanceIds}")
-    public R<Void> deleteFinishProcessAndHisInst(@NotNull(message = "流程实例id不能为空") @PathVariable String[] processInstanceIds) {
+    public R<Void> deleteFinishAndHisInstance(@NotNull(message = "流程实例id不能为空") @PathVariable String[] processInstanceIds) {
-        return toAjax(actProcessInstanceService.deleteFinishProcessAndHisInst(Arrays.asList(processInstanceIds)));
+        return toAjax(actProcessInstanceService.deleteFinishAndHisInstance(Arrays.asList(processInstanceIds)));
     }
 
     /**
@@ -135,11 +136,11 @@ public class ActProcessInstanceController extends BaseController {
     /**
      * 分页查询当前登录人单据
      *
-     * @param processInstanceBo 参数
+     * @param bo 参数
      */
-    @GetMapping("/getCurrentSubmitByPage")
+    @GetMapping("/getPageByCurrent")
-    public TableDataInfo<ProcessInstanceVo> getCurrentSubmitByPage(ProcessInstanceBo processInstanceBo) {
+    public TableDataInfo<ProcessInstanceVo> getPageByCurrent(ProcessInstanceBo bo, PageQuery pageQuery) {
-        return actProcessInstanceService.getCurrentSubmitByPage(processInstanceBo);
+        return actProcessInstanceService.getPageByCurrent(bo, pageQuery);
     }
 
     /**

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java

@@ -8,6 +8,7 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
@@ -67,9 +68,9 @@ public class ActTaskController extends BaseController {
      *
      * @param taskBo 参数
      */
-    @GetMapping("/getTaskWaitByPage")
+    @GetMapping("/getPageByTaskWait")
-    public TableDataInfo<TaskVo> getTaskWaitByPage(TaskBo taskBo) {
+    public TableDataInfo<TaskVo> getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery) {
-        return actTaskService.getTaskWaitByPage(taskBo);
+        return actTaskService.getPageByTaskWait(taskBo, pageQuery);
     }
 
     /**
@@ -77,9 +78,9 @@ public class ActTaskController extends BaseController {
      *
      * @param taskBo 参数
      */
-    @GetMapping("/getAllTaskWaitByPage")
+    @GetMapping("/getPageByAllTaskWait")
-    public TableDataInfo<TaskVo> getAllTaskWaitByPage(TaskBo taskBo) {
+    public TableDataInfo<TaskVo> getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery) {
-        return actTaskService.getAllTaskWaitByPage(taskBo);
+        return actTaskService.getPageByAllTaskWait(taskBo, pageQuery);
     }
 
     /**
@@ -87,9 +88,9 @@ public class ActTaskController extends BaseController {
      *
      * @param taskBo 参数
      */
-    @GetMapping("/getTaskFinishByPage")
+    @GetMapping("/getPageByTaskFinish")
-    public TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo) {
+    public TableDataInfo<TaskVo> getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
-        return actTaskService.getTaskFinishByPage(taskBo);
+        return actTaskService.getPageByTaskFinish(taskBo, pageQuery);
     }
 
     /**
@@ -97,9 +98,9 @@ public class ActTaskController extends BaseController {
      *
      * @param taskBo 参数
      */
-    @GetMapping("/getTaskCopyByPage")
+    @GetMapping("/getPageByTaskCopy")
-    public TableDataInfo<TaskVo> getTaskCopyByPage(TaskBo taskBo) {
+    public TableDataInfo<TaskVo> getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery) {
-        return actTaskService.getTaskCopyByPage(taskBo);
+        return actTaskService.getPageByTaskCopy(taskBo, pageQuery);
     }
 
     /**
@@ -107,9 +108,9 @@ public class ActTaskController extends BaseController {
      *
      * @param taskBo 参数
      */
-    @GetMapping("/getAllTaskFinishByPage")
+    @GetMapping("/getPageByAllTaskFinish")
-    public TableDataInfo<TaskVo> getAllTaskFinishByPage(TaskBo taskBo) {
+    public TableDataInfo<TaskVo> getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
-        return actTaskService.getAllTaskFinishByPage(taskBo);
+        return actTaskService.getPageByAllTaskFinish(taskBo, pageQuery);
     }
 
     /**

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WorkflowUserController.java

@@ -32,11 +32,11 @@ public class WorkflowUserController extends BaseController {
     /**
      * 分页查询工作流选择加签人员
      *
-     * @param sysUserMultiBo 参数
+     * @param bo 参数
      */
-    @GetMapping("/getWorkflowAddMultiListByPage")
+    @GetMapping("/getPageByAddMultiInstance")
-    public TableDataInfo<SysUserVo> getWorkflowAddMultiInstanceByPage(SysUserMultiBo sysUserMultiBo) {
+    public TableDataInfo<SysUserVo> getPageByAddMultiInstance(SysUserMultiBo bo, PageQuery pageQuery) {
-        return workflowUserService.getWorkflowAddMultiInstanceByPage(sysUserMultiBo);
+        return workflowUserService.getPageByAddMultiInstance(bo, pageQuery);
     }
 
     /**
@@ -44,9 +44,9 @@ public class WorkflowUserController extends BaseController {
      *
      * @param taskId 任务id
      */
-    @GetMapping("/getWorkflowDeleteMultiInstanceList/{taskId}")
+    @GetMapping("/getListByDeleteMultiInstance/{taskId}")
-    public R<List<TaskVo>> getWorkflowDeleteMultiInstanceList(@PathVariable String taskId) {
+    public R<List<TaskVo>> getListByDeleteMultiInstance(@PathVariable String taskId) {
-        return R.ok(workflowUserService.getWorkflowDeleteMultiInstanceList(taskId));
+        return R.ok(workflowUserService.getListByDeleteMultiInstance(taskId));
     }
 
     /**
@@ -65,8 +65,8 @@ public class WorkflowUserController extends BaseController {
      * @param sysUserBo 参数
      * @param pageQuery 分页
      */
-    @GetMapping("/getUserListByPage")
+    @GetMapping("/getPageByUserList")
-    public TableDataInfo<SysUserVo> getUserListByPage(SysUserBo sysUserBo, PageQuery pageQuery) {
+    public TableDataInfo<SysUserVo> getPageByUserList(SysUserBo sysUserBo, PageQuery pageQuery) {
-        return workflowUserService.getUserListByPage(sysUserBo, pageQuery);
+        return workflowUserService.getPageByUserList(sysUserBo, pageQuery);
     }
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java

@@ -3,10 +3,8 @@ package org.dromara.workflow.domain.bo;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.workflow.common.PageEntity;
 import org.dromara.workflow.common.constant.FlowConstant;
 
 import java.io.Serial;
@@ -18,8 +16,7 @@ import java.io.Serializable;
  * @author may
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
+public class ModelBo implements Serializable {
-public class ModelBo extends PageEntity implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java

@@ -1,8 +1,6 @@
 package org.dromara.workflow.domain.bo;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.workflow.common.PageEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -13,8 +11,7 @@ import java.io.Serializable;
  * @author may
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
+public class ProcessDefinitionBo implements Serializable {
-public class ProcessDefinitionBo extends PageEntity implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java

@@ -1,8 +1,6 @@
 package org.dromara.workflow.domain.bo;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.workflow.common.PageEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -13,8 +11,7 @@ import java.io.Serializable;
  * @author may
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
+public class ProcessInstanceBo implements Serializable {
-public class ProcessInstanceBo extends PageEntity implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java

@@ -1,7 +1,9 @@
 package org.dromara.workflow.domain.bo;
 
 import lombok.Data;
-import org.dromara.workflow.common.PageEntity;
+
+import java.io.Serial;
+import java.io.Serializable;
 
 
 /**
@@ -10,8 +12,11 @@ import org.dromara.workflow.common.PageEntity;
  * @author may
  */
 @Data
+public class SysUserMultiBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-public class SysUserMultiBo extends PageEntity {
     /**
      * 人员名称
      */

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java

@@ -1,8 +1,6 @@
 package org.dromara.workflow.domain.bo;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.workflow.common.PageEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -13,8 +11,7 @@ import java.io.Serializable;
  * @author may
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
+public class TaskBo implements Serializable {
-public class TaskBo extends PageEntity implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GroupRepresentation.java

@@ -1,27 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.dromara.workflow.domain.vo;
-
-import lombok.Data;
-
-/**
- * @author Joram Barrez
- */
-@Data
-public class GroupRepresentation {
-
-    protected String id;
-    protected String name;
-    protected String type;
-
-}

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java

@@ -4,6 +4,8 @@ import lombok.Data;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -12,7 +14,10 @@ import java.util.Date;
  * @author may
  */
 @Data
-public class TaskVo {
+public class TaskVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     /**
      * 任务id

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java

@@ -2,13 +2,19 @@ package org.dromara.workflow.domain.vo;
 
 import lombok.Data;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * 抄送
  *
  * @author may
  */
 @Data
-public class WfCopy {
+public class WfCopy implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     /**
      * 用户id

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java

@@ -1,6 +1,7 @@
 package org.dromara.workflow.service;
 
 import jakarta.servlet.http.HttpServletResponse;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.workflow.domain.bo.ModelBo;
 import org.dromara.workflow.domain.vo.ModelVo;
@@ -19,7 +20,7 @@ public interface IActModelService {
      * @param modelBo 模型参数
      * @return 返回分页列表
      */
-    TableDataInfo<Model> page(ModelBo modelBo);
+    TableDataInfo<Model> page(ModelBo modelBo, PageQuery pageQuery);
 
     /**
      * 新增模型

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java

@@ -1,5 +1,6 @@
 package org.dromara.workflow.service;
 
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.workflow.domain.bo.ProcessDefinitionBo;
 import org.dromara.workflow.domain.vo.ProcessDefinitionVo;
@@ -19,7 +20,7 @@ public interface IActProcessDefinitionService {
      * @param processDefinitionBo 参数
      * @return 返回分页列表
      */
-    TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo processDefinitionBo);
+    TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo processDefinitionBo, PageQuery pageQuery);
 
     /**
      * 查询历史流程定义列表
@@ -27,7 +28,7 @@ public interface IActProcessDefinitionService {
      * @param key 流程定义key
      * @return 结果
      */
-    List<ProcessDefinitionVo> getProcessDefinitionListByKey(String key);
+    List<ProcessDefinitionVo> getListByKey(String key);
 
     /**
      * 查看流程定义图片
@@ -35,7 +36,7 @@ public interface IActProcessDefinitionService {
      * @param processDefinitionId 流程定义id
      * @return 结果
      */
-    String processDefinitionImage(String processDefinitionId);
+    String definitionImage(String processDefinitionId);
 
     /**
      * 查看流程定义xml文件
@@ -43,7 +44,7 @@ public interface IActProcessDefinitionService {
      * @param processDefinitionId 流程定义id
      * @return 结果
      */
-    String processDefinitionXml(String processDefinitionId);
+    String definitionXml(String processDefinitionId);
 
     /**
      * 删除流程定义
@@ -60,7 +61,7 @@ public interface IActProcessDefinitionService {
      * @param processDefinitionId 流程定义id
      * @return 结果
      */
-    boolean updateProcessDefState(String processDefinitionId);
+    boolean updateDefinitionState(String processDefinitionId);
 
     /**
      * 迁移流程定义
@@ -69,7 +70,7 @@ public interface IActProcessDefinitionService {
      * @param fromProcessDefinitionId    需要迁移到的流程定义id
      * @return 结果
      */
-    boolean migrationProcessDefinition(String currentProcessDefinitionId, String fromProcessDefinitionId);
+    boolean migrationDefinition(String currentProcessDefinitionId, String fromProcessDefinitionId);
 
     /**
      * 流程定义转换为模型

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java

@@ -1,5 +1,6 @@
 package org.dromara.workflow.service;
 
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.workflow.domain.bo.ProcessInstanceBo;
 import org.dromara.workflow.domain.bo.ProcessInvalidBo;
@@ -21,7 +22,7 @@ public interface IActProcessInstanceService {
      * @param processInstanceId 流程实例id
      * @return 结果
      */
-    String getHistoryProcessImage(String processInstanceId);
+    String getHistoryImage(String processInstanceId);
 
     /**
      * 通过流程实例id获取历史流程图运行中，历史等节点
@@ -29,7 +30,7 @@ public interface IActProcessInstanceService {
      * @param processInstanceId 流程实例id
      * @return 结果
      */
-    Map<String, Object> getHistoryProcessList(String processInstanceId);
+    Map<String, Object> getHistoryList(String processInstanceId);
 
     /**
      * 分页查询正在运行的流程实例
@@ -37,7 +38,7 @@ public interface IActProcessInstanceService {
      * @param processInstanceBo 参数
      * @return 结果
      */
-    TableDataInfo<ProcessInstanceVo> getProcessInstanceRunningByPage(ProcessInstanceBo processInstanceBo);
+    TableDataInfo<ProcessInstanceVo> getPageByRunning(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
 
     /**
      * 分页查询已结束的流程实例
@@ -45,7 +46,7 @@ public interface IActProcessInstanceService {
      * @param processInstanceBo 参数
      * @return 结果
      */
-    TableDataInfo<ProcessInstanceVo> getProcessInstanceFinishByPage(ProcessInstanceBo processInstanceBo);
+    TableDataInfo<ProcessInstanceVo> getPageByFinish(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
 
     /**
      * 获取审批记录
@@ -61,7 +62,7 @@ public interface IActProcessInstanceService {
      * @param processInvalidBo 参数
      * @return 结果
      */
-    boolean deleteRuntimeProcessInst(ProcessInvalidBo processInvalidBo);
+    boolean deleteRunInstance(ProcessInvalidBo processInvalidBo);
 
     /**
      * 运行中的实例 删除程实例，删除历史记录，删除业务与流程关联信息
@@ -69,7 +70,7 @@ public interface IActProcessInstanceService {
      * @param processInstanceIds 流程实例id
      * @return 结果
      */
-    boolean deleteRuntimeProcessAndHisInst(List<String> processInstanceIds);
+    boolean deleteRunAndHisInstance(List<String> processInstanceIds);
 
     /**
      * 按照业务id删除 运行中的实例 删除程实例，删除历史记录，删除业务与流程关联信息
@@ -77,7 +78,7 @@ public interface IActProcessInstanceService {
      * @param businessKeys 业务id
      * @return 结果
      */
-    boolean deleteRuntimeProcessAndHisInstByBusinessKeys(List<String> businessKeys);
+    boolean deleteRunAndHisInstanceByBusinessKeys(List<String> businessKeys);
 
     /**
      * 已完成的实例 删除程实例，删除历史记录，删除业务与流程关联信息
@@ -85,7 +86,7 @@ public interface IActProcessInstanceService {
      * @param processInstanceIds 流程实例id
      * @return 结果
      */
-    boolean deleteFinishProcessAndHisInst(List<String> processInstanceIds);
+    boolean deleteFinishAndHisInstance(List<String> processInstanceIds);
 
     /**
      * 撤销流程申请
@@ -101,7 +102,7 @@ public interface IActProcessInstanceService {
      * @param processInstanceBo 参数
      * @return 结果
      */
-    TableDataInfo<ProcessInstanceVo> getCurrentSubmitByPage(ProcessInstanceBo processInstanceBo);
+    TableDataInfo<ProcessInstanceVo> getPageByCurrent(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
 
     /**
      * 任务催办(给当前任务办理人发送站内信，邮件，短信等)

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java

@@ -1,5 +1,6 @@
 package org.dromara.workflow.service;
 
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.workflow.domain.bo.*;
 import org.dromara.workflow.domain.vo.TaskVo;
@@ -35,7 +36,7 @@ public interface IActTaskService {
      * @param taskBo 参数
      * @return 结果
      */
-    TableDataInfo<TaskVo> getTaskWaitByPage(TaskBo taskBo);
+    TableDataInfo<TaskVo> getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery);
 
     /**
      * 查询当前租户所有待办任务
@@ -43,7 +44,7 @@ public interface IActTaskService {
      * @param taskBo 参数
      * @return 结果
      */
-    TableDataInfo<TaskVo> getAllTaskWaitByPage(TaskBo taskBo);
+    TableDataInfo<TaskVo> getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery);
 
 
     /**
@@ -52,7 +53,7 @@ public interface IActTaskService {
      * @param taskBo 参数
      * @return 结果
      */
-    TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo);
+    TableDataInfo<TaskVo> getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery);
 
     /**
      * 查询当前用户的抄送
@@ -60,7 +61,7 @@ public interface IActTaskService {
      * @param taskBo 参数
      * @return 结果
      */
-    TableDataInfo<TaskVo> getTaskCopyByPage(TaskBo taskBo);
+    TableDataInfo<TaskVo> getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery);
 
     /**
      * 查询当前租户所有已办任务
@@ -68,7 +69,7 @@ public interface IActTaskService {
      * @param taskBo 参数
      * @return 结果
      */
-    TableDataInfo<TaskVo> getAllTaskFinishByPage(TaskBo taskBo);
+    TableDataInfo<TaskVo> getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery);
 
     /**
      * 委派任务

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWorkflowUserService.java

@@ -23,7 +23,7 @@ public interface IWorkflowUserService {
      * @param sysUserMultiBo 参数
      * @return 结果
      */
-    TableDataInfo<SysUserVo> getWorkflowAddMultiInstanceByPage(SysUserMultiBo sysUserMultiBo);
+    TableDataInfo<SysUserVo> getPageByAddMultiInstance(SysUserMultiBo sysUserMultiBo, PageQuery pageQuery);
 
     /**
      * 查询工作流选择减签人员
@@ -31,7 +31,7 @@ public interface IWorkflowUserService {
      * @param taskId 任务id
      * @return 结果
      */
-    List<TaskVo> getWorkflowDeleteMultiInstanceList(String taskId);
+    List<TaskVo> getListByDeleteMultiInstance(String taskId);
 
     /**
      * 按照用户id查询用户
@@ -56,5 +56,5 @@ public interface IWorkflowUserService {
      * @param pageQuery 分页
      * @return 结果
      */
-    TableDataInfo<SysUserVo> getUserListByPage(SysUserBo sysUserBo, PageQuery pageQuery);
+    TableDataInfo<SysUserVo> getPageByUserList(SysUserBo sysUserBo, PageQuery pageQuery);
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java

@@ -15,6 +15,7 @@ import org.apache.batik.transcoder.image.PNGTranscoder;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.workflow.common.constant.FlowConstant;
@@ -59,7 +60,7 @@ public class ActModelServiceImpl implements IActModelService {
      * @return 返回分页列表
      */
     @Override
-    public TableDataInfo<Model> page(ModelBo modelBo) {
+    public TableDataInfo<Model> page(ModelBo modelBo, PageQuery pageQuery) {
         ModelQuery query = QueryUtils.modelQuery();
         if (StringUtils.isNotEmpty(modelBo.getName())) {
             query.modelNameLike("%" + modelBo.getName() + "%");
@@ -74,7 +75,7 @@ public class ActModelServiceImpl implements IActModelService {
         // 创建时间降序排列
         query.orderByCreateTime().desc();
         // 分页查询
-        List<Model> modelList = query.listPage(modelBo.getPageNum(), modelBo.getPageSize());
+        List<Model> modelList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
         // 总记录数
         long total = query.count();
         return new TableDataInfo<>(modelList, total);

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java

@@ -12,6 +12,7 @@ import org.apache.commons.io.IOUtils;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.workflow.common.constant.FlowConstant;
@@ -53,25 +54,25 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
     /**
      * 分页查询
      *
-     * @param processDefinitionBo 参数
+     * @param bo 参数
      * @return 返回分页列表
      */
     @Override
-    public TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo processDefinitionBo) {
+    public TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo bo, PageQuery pageQuery) {
         ProcessDefinitionQuery query = QueryUtils.definitionQuery();
-        if (StringUtils.isNotEmpty(processDefinitionBo.getKey())) {
+        if (StringUtils.isNotEmpty(bo.getKey())) {
-            query.processDefinitionKey(processDefinitionBo.getKey());
+            query.processDefinitionKey(bo.getKey());
         }
-        if (StringUtils.isNotEmpty(processDefinitionBo.getCategoryCode())) {
+        if (StringUtils.isNotEmpty(bo.getCategoryCode())) {
-            query.processDefinitionCategory(processDefinitionBo.getCategoryCode());
+            query.processDefinitionCategory(bo.getCategoryCode());
         }
-        if (StringUtils.isNotEmpty(processDefinitionBo.getName())) {
+        if (StringUtils.isNotEmpty(bo.getName())) {
-            query.processDefinitionNameLike("%" + processDefinitionBo.getName() + "%");
+            query.processDefinitionNameLike("%" + bo.getName() + "%");
         }
         query.orderByDeploymentId().desc();
         // 分页查询
         List<ProcessDefinitionVo> processDefinitionVoList = new ArrayList<>();
-        List<ProcessDefinition> definitionList = query.latestVersion().listPage(processDefinitionBo.getPageNum(), processDefinitionBo.getPageSize());
+        List<ProcessDefinition> definitionList = query.latestVersion().listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
         List<Deployment> deploymentList = null;
         if (CollUtil.isNotEmpty(definitionList)) {
             List<String> deploymentIds = StreamUtils.toList(definitionList, ProcessDefinition::getDeploymentId);
@@ -99,7 +100,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
      * @param key 流程定义key
      */
     @Override
-    public List<ProcessDefinitionVo> getProcessDefinitionListByKey(String key) {
+    public List<ProcessDefinitionVo> getListByKey(String key) {
         List<ProcessDefinitionVo> processDefinitionVoList = new ArrayList<>();
         ProcessDefinitionQuery query = QueryUtils.definitionQuery();
         List<ProcessDefinition> definitionList = query.processDefinitionKey(key).list();
@@ -128,7 +129,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
      */
     @SneakyThrows
     @Override
-    public String processDefinitionImage(String processDefinitionId) {
+    public String definitionImage(String processDefinitionId) {
         InputStream inputStream = repositoryService.getProcessDiagram(processDefinitionId);
         return Base64.encode(IOUtils.toByteArray(inputStream));
     }
@@ -139,7 +140,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
      * @param processDefinitionId 流程定义id
      */
     @Override
-    public String processDefinitionXml(String processDefinitionId) {
+    public String definitionXml(String processDefinitionId) {
         StringBuilder xml = new StringBuilder();
         ProcessDefinition processDefinition = repositoryService.getProcessDefinition(processDefinitionId);
         InputStream inputStream;
@@ -181,7 +182,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
      * @param processDefinitionId 流程定义id
      */
     @Override
-    public boolean updateProcessDefState(String processDefinitionId) {
+    public boolean updateDefinitionState(String processDefinitionId) {
         try {
             ProcessDefinition processDefinition = QueryUtils.definitionQuery()
                 .processDefinitionId(processDefinitionId).singleResult();
@@ -208,7 +209,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
      */
 
     @Override
-    public boolean migrationProcessDefinition(String currentProcessDefinitionId, String fromProcessDefinitionId) {
+    public boolean migrationDefinition(String currentProcessDefinitionId, String fromProcessDefinitionId) {
         try {
             // 迁移验证
             boolean migrationValid = processMigrationService.createProcessInstanceMigrationBuilder()

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java

@@ -11,6 +11,7 @@ import org.apache.commons.io.IOUtils;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.workflow.common.constant.FlowConstant;
@@ -90,29 +91,29 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
     /**
      * 分页查询正在运行的流程实例
      *
-     * @param processInstanceBo 参数
+     * @param bo 参数
      */
     @Override
-    public TableDataInfo<ProcessInstanceVo> getProcessInstanceRunningByPage(ProcessInstanceBo processInstanceBo) {
+    public TableDataInfo<ProcessInstanceVo> getPageByRunning(ProcessInstanceBo bo, PageQuery pageQuery) {
         List<ProcessInstanceVo> list = new ArrayList<>();
         ProcessInstanceQuery query = QueryUtils.instanceQuery();
-        if (StringUtils.isNotBlank(processInstanceBo.getName())) {
+        if (StringUtils.isNotBlank(bo.getName())) {
-            query.processInstanceNameLikeIgnoreCase("%" + processInstanceBo.getName() + "%");
+            query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%");
         }
-        if (StringUtils.isNotBlank(processInstanceBo.getKey())) {
+        if (StringUtils.isNotBlank(bo.getKey())) {
-            query.processDefinitionKey(processInstanceBo.getKey());
+            query.processDefinitionKey(bo.getKey());
         }
-        if (StringUtils.isNotBlank(processInstanceBo.getStartUserId())) {
+        if (StringUtils.isNotBlank(bo.getStartUserId())) {
-            query.startedBy(processInstanceBo.getStartUserId());
+            query.startedBy(bo.getStartUserId());
         }
-        if (StringUtils.isNotBlank(processInstanceBo.getBusinessKey())) {
+        if (StringUtils.isNotBlank(bo.getBusinessKey())) {
-            query.processInstanceBusinessKey(processInstanceBo.getBusinessKey());
+            query.processInstanceBusinessKey(bo.getBusinessKey());
         }
-        if (StringUtils.isNotBlank(processInstanceBo.getCategoryCode())) {
+        if (StringUtils.isNotBlank(bo.getCategoryCode())) {
-            query.processDefinitionCategory(processInstanceBo.getCategoryCode());
+            query.processDefinitionCategory(bo.getCategoryCode());
         }
         query.orderByStartTime().desc();
-        List<ProcessInstance> processInstances = query.listPage(processInstanceBo.getPageNum(), processInstanceBo.getPageSize());
+        List<ProcessInstance> processInstances = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
         for (ProcessInstance processInstance : processInstances) {
             ProcessInstanceVo processInstanceVo = BeanUtil.toBean(processInstance, ProcessInstanceVo.class);
             processInstanceVo.setIsSuspended(processInstance.isSuspended());
@@ -126,29 +127,29 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
     /**
      * 分页查询已结束的流程实例
      *
-     * @param processInstanceBo 参数
+     * @param bo 参数
      */
     @Override
-    public TableDataInfo<ProcessInstanceVo> getProcessInstanceFinishByPage(ProcessInstanceBo processInstanceBo) {
+    public TableDataInfo<ProcessInstanceVo> getPageByFinish(ProcessInstanceBo bo, PageQuery pageQuery) {
         List<ProcessInstanceVo> list = new ArrayList<>();
         HistoricProcessInstanceQuery query = QueryUtils.hisInstanceQuery()
             .finished().orderByProcessInstanceEndTime().desc();
-        if (StringUtils.isNotEmpty(processInstanceBo.getName())) {
+        if (StringUtils.isNotEmpty(bo.getName())) {
-            query.processInstanceNameLikeIgnoreCase("%" + processInstanceBo.getName() + "%");
+            query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%");
         }
-        if (StringUtils.isNotBlank(processInstanceBo.getKey())) {
+        if (StringUtils.isNotBlank(bo.getKey())) {
-            query.processDefinitionKey(processInstanceBo.getKey());
+            query.processDefinitionKey(bo.getKey());
         }
-        if (StringUtils.isNotEmpty(processInstanceBo.getStartUserId())) {
+        if (StringUtils.isNotEmpty(bo.getStartUserId())) {
-            query.startedBy(processInstanceBo.getStartUserId());
+            query.startedBy(bo.getStartUserId());
         }
-        if (StringUtils.isNotBlank(processInstanceBo.getBusinessKey())) {
+        if (StringUtils.isNotBlank(bo.getBusinessKey())) {
-            query.processInstanceBusinessKey(processInstanceBo.getBusinessKey());
+            query.processInstanceBusinessKey(bo.getBusinessKey());
         }
-        if (StringUtils.isNotBlank(processInstanceBo.getCategoryCode())) {
+        if (StringUtils.isNotBlank(bo.getCategoryCode())) {
-            query.processDefinitionCategory(processInstanceBo.getCategoryCode());
+            query.processDefinitionCategory(bo.getCategoryCode());
         }
-        List<HistoricProcessInstance> historicProcessInstances = query.listPage(processInstanceBo.getPageNum(), processInstanceBo.getPageSize());
+        List<HistoricProcessInstance> historicProcessInstances = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
         for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
             ProcessInstanceVo processInstanceVo = BeanUtil.toBean(historicProcessInstance, ProcessInstanceVo.class);
             processInstanceVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(historicProcessInstance.getBusinessStatus()));
@@ -165,7 +166,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
      */
     @SneakyThrows
     @Override
-    public String getHistoryProcessImage(String processInstanceId) {
+    public String getHistoryImage(String processInstanceId) {
         String processDefinitionId;
         // 获取当前的流程实例
         ProcessInstance processInstance = QueryUtils.instanceQuery(processInstanceId).singleResult();
@@ -220,7 +221,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
      * @param processInstanceId 流程实例id
      */
     @Override
-    public Map<String, Object> getHistoryProcessList(String processInstanceId) {
+    public Map<String, Object> getHistoryList(String processInstanceId) {
         Map<String, Object> map = new HashMap<>();
         List<Map<String, Object>> taskList = new ArrayList<>();
         HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery(processInstanceId).singleResult();
@@ -449,7 +450,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean deleteRuntimeProcessInst(ProcessInvalidBo processInvalidBo) {
+    public boolean deleteRunInstance(ProcessInvalidBo processInvalidBo) {
         try {
             List<Task> list = QueryUtils.taskQuery(processInvalidBo.getProcessInstanceId()).list();
             List<Task> subTasks = StreamUtils.filter(list, e -> StringUtils.isNotBlank(e.getParentTaskId()));
@@ -487,7 +488,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean deleteRuntimeProcessAndHisInst(List<String> processInstanceIds) {
+    public boolean deleteRunAndHisInstance(List<String> processInstanceIds) {
         try {
             // 1.删除运行中流程实例
             List<Task> list = QueryUtils.taskQuery(processInstanceIds).list();
@@ -515,7 +516,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean deleteRuntimeProcessAndHisInstByBusinessKeys(List<String> businessKeys) {
+    public boolean deleteRunAndHisInstanceByBusinessKeys(List<String> businessKeys) {
         try {
             // 1.删除运行中流程实例
             List<ActHiProcinst> actHiProcinsts = actHiProcinstService.selectByBusinessKeyIn(businessKeys);
@@ -549,7 +550,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean deleteFinishProcessAndHisInst(List<String> processInstanceIds) {
+    public boolean deleteFinishAndHisInstance(List<String> processInstanceIds) {
         try {
             historyService.bulkDeleteHistoricProcessInstances(processInstanceIds);
             return true;
@@ -614,27 +615,27 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
     /**
      * 分页查询当前登录人单据
      *
-     * @param processInstanceBo 参数
+     * @param bo 参数
      */
     @Override
-    public TableDataInfo<ProcessInstanceVo> getCurrentSubmitByPage(ProcessInstanceBo processInstanceBo) {
+    public TableDataInfo<ProcessInstanceVo> getPageByCurrent(ProcessInstanceBo bo, PageQuery pageQuery) {
         List<ProcessInstanceVo> list = new ArrayList<>();
         HistoricProcessInstanceQuery query = QueryUtils.hisInstanceQuery();
-        query.startedBy(processInstanceBo.getStartUserId());
+        query.startedBy(bo.getStartUserId());
-        if (StringUtils.isNotBlank(processInstanceBo.getName())) {
+        if (StringUtils.isNotBlank(bo.getName())) {
-            query.processInstanceNameLikeIgnoreCase("%" + processInstanceBo.getName() + "%");
+            query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%");
         }
-        if (StringUtils.isNotBlank(processInstanceBo.getKey())) {
+        if (StringUtils.isNotBlank(bo.getKey())) {
-            query.processDefinitionKey(processInstanceBo.getKey());
+            query.processDefinitionKey(bo.getKey());
         }
-        if (StringUtils.isNotBlank(processInstanceBo.getBusinessKey())) {
+        if (StringUtils.isNotBlank(bo.getBusinessKey())) {
-            query.processInstanceBusinessKey(processInstanceBo.getBusinessKey());
+            query.processInstanceBusinessKey(bo.getBusinessKey());
         }
-        if (StringUtils.isNotBlank(processInstanceBo.getCategoryCode())) {
+        if (StringUtils.isNotBlank(bo.getCategoryCode())) {
-            query.processDefinitionCategory(processInstanceBo.getCategoryCode());
+            query.processDefinitionCategory(bo.getCategoryCode());
         }
         query.orderByProcessInstanceStartTime().desc();
-        List<HistoricProcessInstance> historicProcessInstanceList = query.listPage(processInstanceBo.getPageNum(), processInstanceBo.getPageSize());
+        List<HistoricProcessInstance> historicProcessInstanceList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
         List<TaskVo> taskVoList = new ArrayList<>();
         if (CollUtil.isNotEmpty(historicProcessInstanceList)) {
             List<String> processInstanceIds = StreamUtils.toList(historicProcessInstanceList, HistoricProcessInstance::getId);

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java

@@ -236,10 +236,7 @@ public class ActTaskServiceImpl implements IActTaskService {
      * @param taskBo 参数
      */
     @Override
-    public TableDataInfo<TaskVo> getTaskWaitByPage(TaskBo taskBo) {
+    public TableDataInfo<TaskVo> getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery) {
-        PageQuery pageQuery = new PageQuery();
-        pageQuery.setPageNum(taskBo.getPageNum());
-        pageQuery.setPageSize(taskBo.getPageSize());
         QueryWrapper<TaskVo> queryWrapper = new QueryWrapper<>();
         List<RoleDTO> roles = LoginHelper.getLoginUser().getRoles();
         String userId = String.valueOf(LoginHelper.getUserId());
@@ -276,7 +273,7 @@ public class ActTaskServiceImpl implements IActTaskService {
      * @param taskBo 参数
      */
     @Override
-    public TableDataInfo<TaskVo> getAllTaskWaitByPage(TaskBo taskBo) {
+    public TableDataInfo<TaskVo> getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery) {
         TaskQuery query = QueryUtils.taskQuery();
         if (StringUtils.isNotBlank(taskBo.getName())) {
             query.taskNameLike("%" + taskBo.getName() + "%");
@@ -288,7 +285,7 @@ public class ActTaskServiceImpl implements IActTaskService {
             query.processDefinitionKey(taskBo.getProcessDefinitionKey());
         }
         query.orderByTaskCreateTime().desc();
-        List<Task> taskList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize());
+        List<Task> taskList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
         List<ProcessInstance> processInstanceList = null;
         if (CollUtil.isNotEmpty(taskList)) {
             Set<String> processInstanceIds = StreamUtils.toSet(taskList, Task::getProcessInstanceId);
@@ -320,7 +317,7 @@ public class ActTaskServiceImpl implements IActTaskService {
      * @param taskBo 参数
      */
     @Override
-    public TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo) {
+    public TableDataInfo<TaskVo> getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
         String userId = String.valueOf(LoginHelper.getUserId());
         HistoricTaskInstanceQuery query = QueryUtils.hisTaskInstanceQuery();
         query.taskAssignee(userId).finished().orderByHistoricTaskInstanceStartTime().desc();
@@ -333,7 +330,7 @@ public class ActTaskServiceImpl implements IActTaskService {
         if (StringUtils.isNotBlank(taskBo.getProcessDefinitionKey())) {
             query.processDefinitionKey(taskBo.getProcessDefinitionKey());
         }
-        List<HistoricTaskInstance> taskInstanceList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize());
+        List<HistoricTaskInstance> taskInstanceList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
         List<HistoricProcessInstance> historicProcessInstanceList = null;
         if (CollUtil.isNotEmpty(taskInstanceList)) {
             Set<String> processInstanceIds = StreamUtils.toSet(taskInstanceList, HistoricTaskInstance::getProcessInstanceId);
@@ -363,10 +360,7 @@ public class ActTaskServiceImpl implements IActTaskService {
      * @param taskBo 参数
      */
     @Override
-    public TableDataInfo<TaskVo> getTaskCopyByPage(TaskBo taskBo) {
+    public TableDataInfo<TaskVo> getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery) {
-        PageQuery pageQuery = new PageQuery();
-        pageQuery.setPageNum(taskBo.getPageNum());
-        pageQuery.setPageSize(taskBo.getPageSize());
         QueryWrapper<TaskVo> queryWrapper = new QueryWrapper<>();
         String userId = String.valueOf(LoginHelper.getUserId());
         if (StringUtils.isNotBlank(taskBo.getName())) {
@@ -395,7 +389,7 @@ public class ActTaskServiceImpl implements IActTaskService {
      * @param taskBo 参数
      */
     @Override
-    public TableDataInfo<TaskVo> getAllTaskFinishByPage(TaskBo taskBo) {
+    public TableDataInfo<TaskVo> getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
         HistoricTaskInstanceQuery query = QueryUtils.hisTaskInstanceQuery();
         query.finished().orderByHistoricTaskInstanceStartTime().desc();
         if (StringUtils.isNotBlank(taskBo.getName())) {
@@ -407,7 +401,7 @@ public class ActTaskServiceImpl implements IActTaskService {
         if (StringUtils.isNotBlank(taskBo.getProcessDefinitionKey())) {
             query.processDefinitionKey(taskBo.getProcessDefinitionKey());
         }
-        List<HistoricTaskInstance> taskInstanceList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize());
+        List<HistoricTaskInstance> taskInstanceList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
         List<HistoricProcessInstance> historicProcessInstanceList = null;
         if (CollUtil.isNotEmpty(taskInstanceList)) {
             Set<String> processInstanceIds = StreamUtils.toSet(taskInstanceList, HistoricTaskInstance::getProcessInstanceId);

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java

@@ -23,7 +23,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 请假Service业务层处理
@@ -118,7 +117,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids) {
         List<String> idList = StreamUtils.toList(ids, String::valueOf);
-        iActProcessInstanceService.deleteRuntimeProcessAndHisInstByBusinessKeys(idList);
+        iActProcessInstanceService.deleteRunAndHisInstanceByBusinessKeys(idList);
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java

@@ -50,12 +50,12 @@ public class WorkflowUserServiceImpl implements IWorkflowUserService {
     /**
      * 分页查询工作流选择加签人员
      *
-     * @param sysUserMultiBo 参数
+     * @param bo 参数
      */
     @Override
     @SuppressWarnings("unchecked")
-    public TableDataInfo<SysUserVo> getWorkflowAddMultiInstanceByPage(SysUserMultiBo sysUserMultiBo) {
+    public TableDataInfo<SysUserVo> getPageByAddMultiInstance(SysUserMultiBo bo, PageQuery pageQuery) {
-        Task task = QueryUtils.taskQuery().taskId(sysUserMultiBo.getTaskId()).singleResult();
+        Task task = QueryUtils.taskQuery().taskId(bo.getTaskId()).singleResult();
         if (task == null) {
             throw new ServiceException("任务不存在");
         }
@@ -65,7 +65,7 @@ public class WorkflowUserServiceImpl implements IWorkflowUserService {
         }
         LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
         //检索条件
-        queryWrapper.eq(StringUtils.isNotEmpty(sysUserMultiBo.getDeptId()), SysUser::getDeptId, sysUserMultiBo.getDeptId());
+        queryWrapper.eq(StringUtils.isNotEmpty(bo.getDeptId()), SysUser::getDeptId, bo.getDeptId());
         queryWrapper.eq(SysUser::getStatus, UserStatus.OK.getCode());
         if (multiInstance.getType() instanceof SequentialMultiInstanceBehavior) {
             List<Long> assigneeList = (List<Long>) runtimeService.getVariable(task.getExecutionId(), multiInstance.getAssigneeList());
@@ -75,9 +75,9 @@ public class WorkflowUserServiceImpl implements IWorkflowUserService {
             List<Long> userIds = StreamUtils.toList(list, e -> Long.valueOf(e.getAssignee()));
             queryWrapper.notIn(CollectionUtil.isNotEmpty(userIds), SysUser::getUserId, userIds);
         }
-        queryWrapper.like(StringUtils.isNotEmpty(sysUserMultiBo.getUserName()), SysUser::getUserName, sysUserMultiBo.getUserName());
+        queryWrapper.like(StringUtils.isNotEmpty(bo.getUserName()), SysUser::getUserName, bo.getUserName());
-        queryWrapper.like(StringUtils.isNotEmpty(sysUserMultiBo.getNickName()), SysUser::getNickName, sysUserMultiBo.getNickName());
+        queryWrapper.like(StringUtils.isNotEmpty(bo.getNickName()), SysUser::getNickName, bo.getNickName());
-        Page<SysUser> page = new Page<>(sysUserMultiBo.getPageNum(), sysUserMultiBo.getPageSize());
+        Page<SysUser> page = new Page<>(pageQuery.getFirstNum(), pageQuery.getPageSize());
         Page<SysUserVo> userPage = sysUserMapper.selectVoPage(page, queryWrapper);
         return TableDataInfo.build(recordPage(userPage));
     }
@@ -89,7 +89,7 @@ public class WorkflowUserServiceImpl implements IWorkflowUserService {
      */
     @Override
     @SuppressWarnings("unchecked")
-    public List<TaskVo> getWorkflowDeleteMultiInstanceList(String taskId) {
+    public List<TaskVo> getListByDeleteMultiInstance(String taskId) {
         Task task = QueryUtils.taskQuery().taskId(taskId).singleResult();
         List<Task> taskList = QueryUtils.taskQuery(task.getProcessInstanceId()).list();
         MultiInstanceVo multiInstance = WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey());
@@ -202,7 +202,7 @@ public class WorkflowUserServiceImpl implements IWorkflowUserService {
      * @param pageQuery 分页
      */
     @Override
-    public TableDataInfo<SysUserVo> getUserListByPage(SysUserBo sysUserBo, PageQuery pageQuery) {
+    public TableDataInfo<SysUserVo> getPageByUserList(SysUserBo sysUserBo, PageQuery pageQuery) {
         LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(sysUserBo.getDeptId() != null, SysUser::getDeptId, sysUserBo.getDeptId());
         queryWrapper.eq(SysUser::getStatus, UserStatus.OK.getCode());