DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 移动 WfProcessBo.java 对象到 ruoyi-flowable 模块下，重命名为 ProcessQuery

Browse Source
This commit is contained in:
konbai
2022-12-11 17:27:31 +08:00
parent aa401c915d
commit 95c4d7bf3f
7 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfDeployController.java
View File

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.JsonUtils; import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.workflow.domain.bo.WfProcessBo; import com.ruoyi.flowable.core.domain.ProcessQuery;
import com.ruoyi.workflow.domain.vo.WfDeployVo; import com.ruoyi.workflow.domain.vo.WfDeployVo;
import com.ruoyi.workflow.domain.vo.WfFormVo; import com.ruoyi.workflow.domain.vo.WfFormVo;
import com.ruoyi.workflow.service.IWfDeployFormService; import com.ruoyi.workflow.service.IWfDeployFormService;
@@ -42,8 +42,8 @@ public class WfDeployController extends BaseController {
*/ */
@SaCheckPermission("workflow:deploy:list") @SaCheckPermission("workflow:deploy:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<WfDeployVo> list(WfProcessBo processBo, PageQuery pageQuery) { public TableDataInfo<WfDeployVo> list(ProcessQuery processQuery, PageQuery pageQuery) {
return deployService.queryPageList(processBo, pageQuery); return deployService.queryPageList(processQuery, pageQuery);
} }
/** /**

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java
View File

@@ -6,8 +6,8 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.JsonUtils; import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.flowable.core.domain.ProcessQuery;
import com.ruoyi.workflow.domain.bo.WfCopyBo; import com.ruoyi.workflow.domain.bo.WfCopyBo;
import com.ruoyi.workflow.domain.bo.WfProcessBo;
import com.ruoyi.workflow.domain.vo.WfCopyVo; import com.ruoyi.workflow.domain.vo.WfCopyVo;
import com.ruoyi.workflow.domain.vo.WfDefinitionVo; import com.ruoyi.workflow.domain.vo.WfDefinitionVo;
import com.ruoyi.workflow.domain.vo.WfTaskVo; import com.ruoyi.workflow.domain.vo.WfTaskVo;
@@ -119,13 +119,13 @@ public class WfProcessController extends BaseController {
/** /**
* 获取待签列表 * 获取待签列表
* *
* @param processBo 流程业务对象 * @param processQuery 流程业务对象
* @param pageQuery 分页参数 * @param pageQuery 分页参数
*/ */
@SaCheckPermission("workflow:process:claimList") @SaCheckPermission("workflow:process:claimList")
@GetMapping(value = "/claimList") @GetMapping(value = "/claimList")
public TableDataInfo<WfTaskVo> claimProcess(WfProcessBo processBo, PageQuery pageQuery) { public TableDataInfo<WfTaskVo> claimProcess(ProcessQuery processQuery, PageQuery pageQuery) {
return processService.queryPageClaimProcessList(processBo, pageQuery); return processService.queryPageClaimProcessList(processQuery, pageQuery);
} }
/** /**

6
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfProcessBo.java → ruoyi-flowable/src/main/java/com/ruoyi/flowable/core/domain/ProcessQuery.java
View File

@@ -1,15 +1,15 @@
package com.ruoyi.workflow.domain.bo; package com.ruoyi.flowable.core.domain;
import lombok.Data; import lombok.Data;
/** /**
* 流程业务对象 * 流程查询实体对象
* *
* @author KonBAI * @author KonBAI
* @createTime 2022/6/11 01:15 * @createTime 2022/6/11 01:15
*/ */
@Data @Data
public class WfProcessBo { public class ProcessQuery {
/** /**
* 流程标识 * 流程标识

4
ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfDeployService.java
View File

@@ -2,7 +2,7 @@ package com.ruoyi.workflow.service;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.workflow.domain.bo.WfProcessBo; import com.ruoyi.flowable.core.domain.ProcessQuery;
import com.ruoyi.workflow.domain.vo.WfDeployVo; import com.ruoyi.workflow.domain.vo.WfDeployVo;
import java.util.List; import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
*/ */
public interface IWfDeployService { public interface IWfDeployService {
TableDataInfo<WfDeployVo> queryPageList(WfProcessBo processBo, PageQuery pageQuery); TableDataInfo<WfDeployVo> queryPageList(ProcessQuery processQuery, PageQuery pageQuery);
TableDataInfo<WfDeployVo> queryPublishList(String processKey, PageQuery pageQuery); TableDataInfo<WfDeployVo> queryPublishList(String processKey, PageQuery pageQuery);

4
ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfProcessService.java
View File

@@ -2,7 +2,7 @@ package com.ruoyi.workflow.service;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.workflow.domain.bo.WfProcessBo; import com.ruoyi.flowable.core.domain.ProcessQuery;
import com.ruoyi.workflow.domain.vo.WfDefinitionVo; import com.ruoyi.workflow.domain.vo.WfDefinitionVo;
import com.ruoyi.workflow.domain.vo.WfDetailVo; import com.ruoyi.workflow.domain.vo.WfDetailVo;
import com.ruoyi.workflow.domain.vo.WfTaskVo; import com.ruoyi.workflow.domain.vo.WfTaskVo;
@@ -73,7 +73,7 @@ public interface IWfProcessService {
* 查询待签任务列表 * 查询待签任务列表
* @param pageQuery 分页参数 * @param pageQuery 分页参数
*/ */
TableDataInfo<WfTaskVo> queryPageClaimProcessList(WfProcessBo processBo, PageQuery pageQuery); TableDataInfo<WfTaskVo> queryPageClaimProcessList(ProcessQuery processQuery, PageQuery pageQuery);
/** /**
* 查询已办任务列表 * 查询已办任务列表

22
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfDeployServiceImpl.java
View File

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.workflow.domain.WfDeployForm; import com.ruoyi.workflow.domain.WfDeployForm;
import com.ruoyi.workflow.domain.bo.WfProcessBo; import com.ruoyi.flowable.core.domain.ProcessQuery;
import com.ruoyi.workflow.domain.vo.WfDeployVo; import com.ruoyi.workflow.domain.vo.WfDeployVo;
import com.ruoyi.workflow.mapper.WfDeployFormMapper; import com.ruoyi.workflow.mapper.WfDeployFormMapper;
import com.ruoyi.workflow.service.IWfDeployService; import com.ruoyi.workflow.service.IWfDeployService;
@@ -38,25 +38,25 @@ public class WfDeployServiceImpl implements IWfDeployService {
private final WfDeployFormMapper deployFormMapper; private final WfDeployFormMapper deployFormMapper;
@Override @Override
public TableDataInfo<WfDeployVo> queryPageList(WfProcessBo processBo, PageQuery pageQuery) { public TableDataInfo<WfDeployVo> queryPageList(ProcessQuery processQuery, PageQuery pageQuery) {
// 流程定义列表数据查询 // 流程定义列表数据查询
ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery() ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
.latestVersion() .latestVersion()
.orderByProcessDefinitionKey() .orderByProcessDefinitionKey()
.asc(); .asc();
if (StringUtils.isNotBlank(processBo.getProcessKey())) { if (StringUtils.isNotBlank(processQuery.getProcessKey())) {
processDefinitionQuery.processDefinitionKeyLike("%" + processBo.getProcessKey() + "%"); processDefinitionQuery.processDefinitionKeyLike("%" + processQuery.getProcessKey() + "%");
} }
if (StringUtils.isNotBlank(processBo.getProcessName())) { if (StringUtils.isNotBlank(processQuery.getProcessName())) {
processDefinitionQuery.processDefinitionNameLike("%" + processBo.getProcessName() + "%"); processDefinitionQuery.processDefinitionNameLike("%" + processQuery.getProcessName() + "%");
} }
if (StringUtils.isNotBlank(processBo.getCategory())) { if (StringUtils.isNotBlank(processQuery.getCategory())) {
processDefinitionQuery.processDefinitionCategory(processBo.getCategory()); processDefinitionQuery.processDefinitionCategory(processQuery.getCategory());
} }
if (StringUtils.isNotBlank(processBo.getState())) { if (StringUtils.isNotBlank(processQuery.getState())) {
if (SuspensionState.ACTIVE.toString().equals(processBo.getState())) { if (SuspensionState.ACTIVE.toString().equals(processQuery.getState())) {
processDefinitionQuery.active(); processDefinitionQuery.active();
} else if (SuspensionState.SUSPENDED.toString().equals(processBo.getState())) { } else if (SuspensionState.SUSPENDED.toString().equals(processQuery.getState())) {
processDefinitionQuery.suspended(); processDefinitionQuery.suspended();
} }
} }

8
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java
View File

@@ -29,7 +29,7 @@ import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.workflow.domain.WfDeployForm; import com.ruoyi.workflow.domain.WfDeployForm;
import com.ruoyi.workflow.domain.bo.WfProcessBo; import com.ruoyi.flowable.core.domain.ProcessQuery;
import com.ruoyi.workflow.domain.vo.*; import com.ruoyi.workflow.domain.vo.*;
import com.ruoyi.workflow.mapper.WfDeployFormMapper; import com.ruoyi.workflow.mapper.WfDeployFormMapper;
import com.ruoyi.workflow.service.IWfProcessService; import com.ruoyi.workflow.service.IWfProcessService;
@@ -332,7 +332,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
} }
@Override @Override
public TableDataInfo<WfTaskVo> queryPageClaimProcessList(WfProcessBo processBo, PageQuery pageQuery) { public TableDataInfo<WfTaskVo> queryPageClaimProcessList(ProcessQuery processQuery, PageQuery pageQuery) {
Page<WfTaskVo> page = new Page<>(); Page<WfTaskVo> page = new Page<>();
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
TaskQuery taskQuery = taskService.createTaskQuery() TaskQuery taskQuery = taskService.createTaskQuery()
@@ -341,8 +341,8 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
.taskCandidateUser(userId.toString()) .taskCandidateUser(userId.toString())
.taskCandidateGroupIn(TaskUtils.getCandidateGroup()) .taskCandidateGroupIn(TaskUtils.getCandidateGroup())
.orderByTaskCreateTime().desc(); .orderByTaskCreateTime().desc();
if (StringUtils.isNotBlank(processBo.getProcessName())) { if (StringUtils.isNotBlank(processQuery.getProcessName())) {
taskQuery.processDefinitionNameLike("%" + processBo.getProcessName() + "%"); taskQuery.processDefinitionNameLike("%" + processQuery.getProcessName() + "%");
} }
page.setTotal(taskQuery.count()); page.setTotal(taskQuery.count());
int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1); int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);