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

fix -- 将响应体R改回AjaxResult，方便兼容RuoYi-Vue-Plus的同步更新

Browse Source
This commit is contained in:
hewenqiang
2022-01-28 15:30:37 +08:00
parent fe3907e95b
commit 47539482b4
46 changed files with 457 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
package com.ruoyi.workflow.service;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.workflow.domain.vo.FlowTaskVo;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.task.api.Task;
@@ -54,5 +54,5 @@ public interface IFlowInstanceService {
* @param variables 流程变量
* @return
*/
R startProcessInstanceById(String procDefId, Map<String, Object> variables);
AjaxResult startProcessInstanceById(String procDefId, Map<String, Object> variables);
}

24
ruoyi-system/src/main/java/com/ruoyi/workflow/service/IFlowTaskService.java
View File

@@ -1,6 +1,6 @@
package com.ruoyi.workflow.service;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.workflow.domain.vo.FlowTaskVo;
import org.flowable.task.api.Task;
@@ -17,7 +17,7 @@ public interface IFlowTaskService {
*
* @param task 请求实体参数
*/
R complete(FlowTaskVo task);
AjaxResult complete(FlowTaskVo task);
/**
* 驳回任务
@@ -40,7 +40,7 @@ public interface IFlowTaskService {
* @param flowTaskVo
* @return
*/
R findReturnTaskList(FlowTaskVo flowTaskVo);
AjaxResult findReturnTaskList(FlowTaskVo flowTaskVo);
/**
* 删除任务
@@ -84,21 +84,21 @@ public interface IFlowTaskService {
* @param pageSize
* @return
*/
R myProcess(Integer pageNum, Integer pageSize);
AjaxResult myProcess(Integer pageNum, Integer pageSize);
/**
* 取消申请
* @param flowTaskVo
* @return
*/
R stopProcess(FlowTaskVo flowTaskVo);
AjaxResult stopProcess(FlowTaskVo flowTaskVo);
/**
* 撤回流程
* @param flowTaskVo
* @return
*/
R revokeProcess(FlowTaskVo flowTaskVo);
AjaxResult revokeProcess(FlowTaskVo flowTaskVo);
/**
@@ -108,7 +108,7 @@ public interface IFlowTaskService {
* @param pageSize 每页条数
* @return
*/
R todoList(Integer pageNum, Integer pageSize);
AjaxResult todoList(Integer pageNum, Integer pageSize);
/**
@@ -118,7 +118,7 @@ public interface IFlowTaskService {
* @param pageSize 每页条数
* @return
*/
R finishedList(Integer pageNum, Integer pageSize);
AjaxResult finishedList(Integer pageNum, Integer pageSize);
/**
* 流程历史流转记录
@@ -126,7 +126,7 @@ public interface IFlowTaskService {
* @param procInsId 流程实例Id
* @return
*/
R flowRecord(String procInsId,String deployId);
AjaxResult flowRecord(String procInsId, String deployId);
/**
* 根据任务ID查询挂载的表单信息
@@ -148,19 +148,19 @@ public interface IFlowTaskService {
* @param procInsId
* @return
*/
R getFlowViewer(String procInsId);
AjaxResult getFlowViewer(String procInsId);
/**
* 获取流程变量
* @param taskId
* @return
*/
R processVariables(String taskId);
AjaxResult processVariables(String taskId);
/**
* 获取下一节点
* @param flowTaskVo 任务
* @return
*/
R getNextFlowNode(FlowTaskVo flowTaskVo);
AjaxResult getNextFlowNode(FlowTaskVo flowTaskVo);
}

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

@@ -1,7 +1,7 @@
package com.ruoyi.workflow.service.impl;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.LoginUtils;
import com.ruoyi.workflow.domain.vo.FlowTaskVo;
import com.ruoyi.flowable.factory.FlowServiceFactory;
@@ -109,7 +109,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
* @return
*/
@Override
public R startProcessInstanceById(String procDefId, Map<String, Object> variables) {
public AjaxResult startProcessInstanceById(String procDefId, Map<String, Object> variables) {
try {
// 设置流程发起人Id到流程中
@@ -118,10 +118,10 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
variables.put("initiator", userId);
variables.put("_FLOWABLE_SKIP_EXPRESSION_ENABLED", true);
runtimeService.startProcessInstanceById(procDefId, variables);
return R.success("流程启动成功");
return AjaxResult.success("流程启动成功");
} catch (Exception e) {
e.printStackTrace();
return R.error("流程启动错误");
return AjaxResult.error("流程启动错误");
}
}
}

54
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java
View File

@@ -4,7 +4,7 @@ package com.ruoyi.workflow.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.JsonUtils;
@@ -86,10 +86,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
*/
@Transactional(rollbackFor = Exception.class)
@Override
public R complete(FlowTaskVo taskVo) {
public AjaxResult complete(FlowTaskVo taskVo) {
Task task = taskService.createTaskQuery().taskId(taskVo.getTaskId()).singleResult();
if (Objects.isNull(task)) {
return R.error("任务不存在");
return AjaxResult.error("任务不存在");
}
if (DelegationState.PENDING.equals(task.getDelegationState())) {
taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.DELEGATE.getType(), taskVo.getComment());
@@ -104,7 +104,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
taskService.complete(taskVo.getTaskId());
}
}
return R.success();
return AjaxResult.success();
}
/**
@@ -318,7 +318,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
* @return
*/
@Override
public R findReturnTaskList(FlowTaskVo flowTaskVo) {
public AjaxResult findReturnTaskList(FlowTaskVo flowTaskVo) {
// 当前任务 task
Task task = taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult();
// 获取流程定义信息
@@ -349,7 +349,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
userTaskList.retainAll(road);
}
}
return R.success(userTaskList);
return AjaxResult.success(userTaskList);
}
/**
@@ -416,7 +416,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
* @return
*/
@Override
public R myProcess(Integer pageNum, Integer pageSize) {
public AjaxResult myProcess(Integer pageNum, Integer pageSize) {
Page<FlowTaskDto> page = new Page<>();
Long userId = LoginUtils.getUserId();
HistoricProcessInstanceQuery historicProcessInstanceQuery = historyService.createHistoricProcessInstanceQuery()
@@ -460,7 +460,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
flowList.add(flowTask);
}
page.setRecords(flowList);
return R.success(page);
return AjaxResult.success(page);
}
/**
@@ -470,7 +470,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
* @return
*/
@Override
public R stopProcess(FlowTaskVo flowTaskVo) {
public AjaxResult stopProcess(FlowTaskVo flowTaskVo) {
List<Task> task = taskService.createTaskQuery().processInstanceId(flowTaskVo.getInstanceId()).list();
if (CollectionUtils.isEmpty(task)) {
throw new RuntimeException("流程未启动或已执行完成，取消申请失败");
@@ -496,7 +496,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}
}
return R.success();
return AjaxResult.success();
}
/**
@@ -506,7 +506,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
* @return
*/
@Override
public R revokeProcess(FlowTaskVo flowTaskVo) {
public AjaxResult revokeProcess(FlowTaskVo flowTaskVo) {
Task task = taskService.createTaskQuery().processInstanceId(flowTaskVo.getInstanceId()).singleResult();
if (task == null) {
throw new RuntimeException("流程未启动或已执行完成，无法撤回");
@@ -554,7 +554,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
List<SequenceFlow> oriSequenceFlows = new ArrayList<>(flowNode.getOutgoingFlows());
return R.success();
return AjaxResult.success();
}
/**
@@ -565,7 +565,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
* @return
*/
@Override
public R todoList(Integer pageNum, Integer pageSize) {
public AjaxResult todoList(Integer pageNum, Integer pageSize) {
Page<FlowTaskDto> page = new Page<>();
Long userId = LoginUtils.getUserId();
TaskQuery taskQuery = taskService.createTaskQuery()
@@ -606,7 +606,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}
page.setRecords(flowList);
return R.success(page);
return AjaxResult.success(page);
}
@@ -618,7 +618,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
* @return
*/
@Override
public R finishedList(Integer pageNum, Integer pageSize) {
public AjaxResult finishedList(Integer pageNum, Integer pageSize) {
Page<FlowTaskDto> page = new Page<>();
Long userId = LoginUtils.getUserId();
HistoricTaskInstanceQuery taskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
@@ -666,7 +666,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
// Map<String, Object> result = new HashMap<>();
// result.put("result",page);
// result.put("finished",true);
return R.success(page);
return AjaxResult.success(page);
}
private static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
@@ -681,7 +681,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
* @return
*/
@Override
public R flowRecord(String procInsId, String deployId) {
public AjaxResult flowRecord(String procInsId, String deployId) {
Map<String, Object> map = new HashMap<>();
if (StringUtils.isNotBlank(procInsId)) {
List<HistoricActivityInstance> list = historyService
@@ -746,11 +746,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
if (StringUtils.isNotBlank(deployId)) {
SysForm sysForm = sysInstanceFormService.selectSysDeployFormByDeployId(deployId);
if (Objects.isNull(sysForm)) {
return R.error("请先配置流程表单");
return AjaxResult.error("请先配置流程表单");
}
map.put("formData", JsonUtils.parseObject(sysForm.getFormContent(), Map.class));
}
return R.success(map);
return AjaxResult.success(map);
}
/**
@@ -820,7 +820,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
* @return
*/
@Override
public R getFlowViewer(String procInsId) {
public AjaxResult getFlowViewer(String procInsId) {
// 构建查询条件
HistoricActivityInstanceQuery query = historyService.createHistoricActivityInstanceQuery()
.processInstanceId(procInsId);
@@ -833,7 +833,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
.stream().distinct().map(HistoricActivityInstance::getActivityId)
.collect(Collectors.toList());
// 构建视图类
return R.success(new FlowViewerVo(finishedTaskList, unfinishedTaskList));
return AjaxResult.success(new FlowViewerVo(finishedTaskList, unfinishedTaskList));
}
/**
@@ -843,14 +843,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
* @return
*/
@Override
public R processVariables(String taskId) {
public AjaxResult processVariables(String taskId) {
// 流程变量
HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().finished().taskId(taskId).singleResult();
if (Objects.nonNull(historicTaskInstance)) {
return R.success(historicTaskInstance.getProcessVariables());
return AjaxResult.success(historicTaskInstance.getProcessVariables());
} else {
Map<String, Object> variables = taskService.getVariables(taskId);
return R.success(variables);
return AjaxResult.success(variables);
}
}
@@ -861,7 +861,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
* @return
*/
@Override
public R getNextFlowNode(FlowTaskVo flowTaskVo) {
public AjaxResult getNextFlowNode(FlowTaskVo flowTaskVo) {
Task task = taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult();
FlowNextDto flowNextDto = new FlowNextDto();
if (Objects.nonNull(task)) {
@@ -911,10 +911,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}
}
} else {
return R.success("流程已完结", null);
return AjaxResult.success("流程已完结", null);
}
}
return R.success(flowNextDto);
return AjaxResult.success(flowNextDto);
}
/**