abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化接口请求路径

Browse Source
This commit is contained in:
疯狂的狮子Li 2024-12-09 23:29:54 +08:00
parent 1723a63138
commit 11caba8832
10 changed files with 87 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java
View File

@ -129,9 +129,9 @@ public class FlwDefinitionController extends BaseController {
* @param id 流程定义id * @param id 流程定义id
*/ */
@Log(title = "流程定义", businessType = BusinessType.INSERT) @Log(title = "流程定义", businessType = BusinessType.INSERT)
@PostMapping("/copyDef/{id}") @PostMapping("/copy/{id}")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public R<Boolean> copyDef(@PathVariable Long id) { public R<Boolean> copy(@PathVariable Long id) {
return R.ok(defService.copyDef(id)); return R.ok(defService.copyDef(id));
} }
@ -141,9 +141,9 @@ public class FlwDefinitionController extends BaseController {
* @param file 文件 * @param file 文件
*/ */
@Log(title = "流程定义", businessType = BusinessType.IMPORT) @Log(title = "流程定义", businessType = BusinessType.IMPORT)
@PostMapping("/importDefinition") @PostMapping("/importDef")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public R<Boolean> importDefinition(MultipartFile file) { public R<Boolean> importDef(MultipartFile file) {
return R.ok(iFlwDefinitionService.importXml(file)); return R.ok(iFlwDefinitionService.importXml(file));
} }
@ -155,9 +155,9 @@ public class FlwDefinitionController extends BaseController {
* @throws IOException 异常 * @throws IOException 异常
*/ */
@Log(title = "流程定义", businessType = BusinessType.EXPORT) @Log(title = "流程定义", businessType = BusinessType.EXPORT)
@PostMapping("/exportDefinition/{id}") @PostMapping("/exportDef/{id}")
public void exportDefinition(@PathVariable Long id, HttpServletResponse response) throws IOException { public void exportDef(@PathVariable Long id, HttpServletResponse response) throws IOException {
iFlwDefinitionService.exportDefinition(id, response); iFlwDefinitionService.exportDef(id, response);
} }
/** /**
@ -176,8 +176,8 @@ public class FlwDefinitionController extends BaseController {
* @param id 流程定义id * @param id 流程定义id
* @param active 激活/挂起 * @param active 激活/挂起
*/ */
@PutMapping("/updateDefinitionState/{id}/{active}") @PutMapping("/active/{id}")
public R<Boolean> active(@PathVariable Long id, @PathVariable boolean active) { public R<Boolean> active(@PathVariable Long id, @RequestParam boolean active) {
return R.ok(active ? defService.unActive(id) : defService.active(id)); return R.ok(active ? defService.unActive(id) : defService.active(id));
} }

40
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
View File

@ -29,7 +29,7 @@ import java.util.Map;
@Validated @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/workflow/processInstance") @RequestMapping("/workflow/instance")
public class FlwInstanceController extends BaseController { public class FlwInstanceController extends BaseController {
private final IFlwInstanceService flwInstanceService; private final IFlwInstanceService flwInstanceService;
@ -41,9 +41,9 @@ public class FlwInstanceController extends BaseController {
* @param instance 参数 * @param instance 参数
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@GetMapping("/getPageByRunning") @GetMapping("/pageByRunning")
public TableDataInfo<FlowInstanceVo> getPageByRunning(Instance instance, PageQuery pageQuery) { public TableDataInfo<FlowInstanceVo> pageByRunning(Instance instance, PageQuery pageQuery) {
return flwInstanceService.getPageByRunning(instance, pageQuery); return flwInstanceService.pageByRunning(instance, pageQuery);
} }
/** /**
@ -52,9 +52,9 @@ public class FlwInstanceController extends BaseController {
* @param instance 参数 * @param instance 参数
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@GetMapping("/getPageByFinish") @GetMapping("/pageByFinish")
public TableDataInfo<FlowInstanceVo> getPageByFinish(Instance instance, PageQuery pageQuery) { public TableDataInfo<FlowInstanceVo> pageByFinish(Instance instance, PageQuery pageQuery) {
return flwInstanceService.getPageByFinish(instance, pageQuery); return flwInstanceService.pageByFinish(instance, pageQuery);
} }
/** /**
@ -93,8 +93,8 @@ public class FlwInstanceController extends BaseController {
* @param id 流程定义id * @param id 流程定义id
* @param active 激活/挂起 * @param active 激活/挂起
*/ */
@PutMapping("/active/{id}/{active}") @PutMapping("/active/{id}")
public R<Boolean> active(@PathVariable Long id, @PathVariable boolean active) { public R<Boolean> active(@PathVariable Long id, @RequestParam boolean active) {
if (active) { if (active) {
return R.ok(insService.unActive(id)); return R.ok(insService.unActive(id));
} else { } else {
@ -109,9 +109,9 @@ public class FlwInstanceController extends BaseController {
* @param flowInstanceBo 参数 * @param flowInstanceBo 参数
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@GetMapping("/getPageByCurrent") @GetMapping("/pageByCurrent")
public TableDataInfo<FlowInstanceVo> getPageByCurrent(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { public TableDataInfo<FlowInstanceVo> pageByCurrent(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
return flwInstanceService.getPageByCurrent(flowInstanceBo, pageQuery); return flwInstanceService.pageByCurrent(flowInstanceBo, pageQuery);
} }
@ -120,9 +120,9 @@ public class FlwInstanceController extends BaseController {
* *
* @param businessId 业务id * @param businessId 业务id
*/ */
@GetMapping("/getFlowImage/{businessId}") @GetMapping("/flowImage/{businessId}")
public R<Map<String, Object>> getFlowImage(@PathVariable String businessId) { public R<Map<String, Object>> flowImage(@PathVariable String businessId) {
return R.ok(flwInstanceService.getFlowImage(businessId)); return R.ok(flwInstanceService.flowImage(businessId));
} }
/** /**
@ -130,9 +130,9 @@ public class FlwInstanceController extends BaseController {
* *
* @param instanceId 流程实例id * @param instanceId 流程实例id
*/ */
@GetMapping("/getInstanceVariable/{instanceId}") @GetMapping("/instanceVariable/{instanceId}")
public R<Map<String, Object>> getInstanceVariable(@PathVariable String instanceId) { public R<Map<String, Object>> instanceVariable(@PathVariable String instanceId) {
return R.ok(flwInstanceService.getInstanceVariable(instanceId)); return R.ok(flwInstanceService.instanceVariable(instanceId));
} }
/** /**
@ -142,8 +142,8 @@ public class FlwInstanceController extends BaseController {
*/ */
@Log(title = "流程实例管理", businessType = BusinessType.INSERT) @Log(title = "流程实例管理", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/processInvalid") @PostMapping("/invalid")
public R<Boolean> processInvalid(@Validated @RequestBody FlowInvalidBo bo) { public R<Boolean> invalid(@Validated @RequestBody FlowInvalidBo bo) {
return R.ok(flwInstanceService.processInvalid(bo)); return R.ok(flwInstanceService.processInvalid(bo));
} }

40
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java
View File

@ -69,9 +69,9 @@ public class FlwTaskController extends BaseController {
* @param flowTaskBo 参数 * @param flowTaskBo 参数
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@GetMapping("/getPageByTaskWait") @GetMapping("/pageByTaskWait")
public TableDataInfo<FlowTaskVo> getPageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { public TableDataInfo<FlowTaskVo> pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
return flwTaskService.getPageByTaskWait(flowTaskBo, pageQuery); return flwTaskService.pageByTaskWait(flowTaskBo, pageQuery);
} }
/** /**
@ -81,9 +81,9 @@ public class FlwTaskController extends BaseController {
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@GetMapping("/getPageByTaskFinish") @GetMapping("/pageByTaskFinish")
public TableDataInfo<FlowHisTaskVo> getPageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { public TableDataInfo<FlowHisTaskVo> pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
return flwTaskService.getPageByTaskFinish(flowTaskBo, pageQuery); return flwTaskService.pageByTaskFinish(flowTaskBo, pageQuery);
} }
/** /**
@ -92,9 +92,9 @@ public class FlwTaskController extends BaseController {
* @param flowTaskBo 参数 * @param flowTaskBo 参数
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@GetMapping("/getPageByAllTaskWait") @GetMapping("/pageByAllTaskWait")
public TableDataInfo<FlowTaskVo> getPageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { public TableDataInfo<FlowTaskVo> pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
return flwTaskService.getPageByAllTaskWait(flowTaskBo, pageQuery); return flwTaskService.pageByAllTaskWait(flowTaskBo, pageQuery);
} }
/** /**
@ -104,9 +104,9 @@ public class FlwTaskController extends BaseController {
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@GetMapping("/getPageByAllTaskFinish") @GetMapping("/pageByAllTaskFinish")
public TableDataInfo<FlowHisTaskVo> getPageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { public TableDataInfo<FlowHisTaskVo> pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
return flwTaskService.getPageByAllTaskFinish(flowTaskBo, pageQuery); return flwTaskService.pageByAllTaskFinish(flowTaskBo, pageQuery);
} }
/** /**
@ -115,9 +115,9 @@ public class FlwTaskController extends BaseController {
* @param flowTaskBo 参数 * @param flowTaskBo 参数
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@GetMapping("/getPageByTaskCopy") @GetMapping("/pageByTaskCopy")
public TableDataInfo<FlowTaskVo> getPageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { public TableDataInfo<FlowTaskVo> pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
return flwTaskService.getPageByTaskCopy(flowTaskBo, pageQuery); return flwTaskService.pageByTaskCopy(flowTaskBo, pageQuery);
} }
/** /**
@ -125,8 +125,8 @@ public class FlwTaskController extends BaseController {
* *
* @param taskId 任务id * @param taskId 任务id
*/ */
@GetMapping("/getTaskById/{taskId}") @GetMapping("/getTask/{taskId}")
public R<FlowTaskVo> getTaskById(@PathVariable Long taskId) { public R<FlowTaskVo> getTask(@PathVariable Long taskId) {
return R.ok(flwTaskService.selectById(taskId)); return R.ok(flwTaskService.selectById(taskId));
} }
@ -195,9 +195,9 @@ public class FlwTaskController extends BaseController {
* *
* @param taskId 任务id * @param taskId 任务id
*/ */
@GetMapping("/getUserListTaskId/{taskId}") @GetMapping("/currentTaskAllUser/{taskId}")
public R<List<UserDTO>> getUserListTaskId(@PathVariable Long taskId) { public R<List<UserDTO>> currentTaskAllUser(@PathVariable Long taskId) {
return R.ok(flwTaskService.getUserListTaskId(taskId)); return R.ok(flwTaskService.currentTaskAllUser(taskId));
} }
} }

27
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java
View File

@ -1,20 +1,21 @@
package org.dromara.workflow.controller; package org.dromara.workflow.controller;
import java.util.List; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import jakarta.validation.constraints.*;
import org.dromara.workflow.domain.bo.WfDefinitionConfigBo;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup; 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.log.enums.BusinessType;
import org.dromara.common.web.core.BaseController;
import org.dromara.workflow.domain.bo.WfDefinitionConfigBo;
import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; import org.dromara.workflow.domain.vo.WfDefinitionConfigVo;
import org.dromara.workflow.service.IWfDefinitionConfigService; import org.dromara.workflow.service.IWfDefinitionConfigService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* 流程定义配置 * 流程定义配置
@ -25,7 +26,7 @@ import org.dromara.workflow.service.IWfDefinitionConfigService;
@Validated @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/workflow/definitionConfig") @RequestMapping("/workflow/defConfig")
public class WfDefinitionConfigController extends BaseController { public class WfDefinitionConfigController extends BaseController {
private final IWfDefinitionConfigService wfDefinitionConfigService; private final IWfDefinitionConfigService wfDefinitionConfigService;
@ -70,9 +71,9 @@ public class WfDefinitionConfigController extends BaseController {
* @param tableName 表名 * @param tableName 表名
* @param definitionId 流程定义id * @param definitionId 流程定义id
*/ */
@GetMapping("/getByTableNameNotDefId/{tableName}/{definitionId}") @GetMapping("/getByTableNameNotDefId")
public R<List<WfDefinitionConfigVo>> getByTableNameNotDefId(@NotBlank(message = "表名不能为空") @PathVariable String tableName, public R<List<WfDefinitionConfigVo>> getByTableNameNotDefId(@NotBlank(message = "表名不能为空") @RequestParam String tableName,
@NotBlank(message = "流程定义ID不能为空") @PathVariable String definitionId) { @NotBlank(message = "流程定义ID不能为空") @RequestParam String definitionId) {
return R.ok(wfDefinitionConfigService.getByTableNameNotDefId(tableName, definitionId)); return R.ok(wfDefinitionConfigService.getByTableNameNotDefId(tableName, definitionId));
} }

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java
View File

@ -40,7 +40,7 @@ public interface IFlwDefinitionService {
* @param response 响应 * @param response 响应
* @throws IOException 异常 * @throws IOException 异常
*/ */
void exportDefinition(Long id, HttpServletResponse response) throws IOException; void exportDef(Long id, HttpServletResponse response) throws IOException;
/** /**
* 导入流程定义 * 导入流程定义

10
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java
View File

@ -26,7 +26,7 @@ public interface IFlwInstanceService {
* @param pageQuery 分页 * @param pageQuery 分页
* @return 结果 * @return 结果
*/ */
TableDataInfo<FlowInstanceVo> getPageByRunning(Instance instance, PageQuery pageQuery); TableDataInfo<FlowInstanceVo> pageByRunning(Instance instance, PageQuery pageQuery);
/** /**
* 分页查询已结束的流程实例 * 分页查询已结束的流程实例
@ -35,7 +35,7 @@ public interface IFlwInstanceService {
* @param pageQuery 分页 * @param pageQuery 分页
* @return 结果 * @return 结果
*/ */
TableDataInfo<FlowInstanceVo> getPageByFinish(Instance instance, PageQuery pageQuery); TableDataInfo<FlowInstanceVo> pageByFinish(Instance instance, PageQuery pageQuery);
/** /**
* 按照业务id查询流程实例 * 按照业务id查询流程实例
@ -92,7 +92,7 @@ public interface IFlwInstanceService {
* @param pageQuery 分页 * @param pageQuery 分页
* @return 结果 * @return 结果
*/ */
TableDataInfo<FlowInstanceVo> getPageByCurrent(FlowInstanceBo instanceBo, PageQuery pageQuery); TableDataInfo<FlowInstanceVo> pageByCurrent(FlowInstanceBo instanceBo, PageQuery pageQuery);
/** /**
* 获取流程图,流程记录 * 获取流程图,流程记录
@ -100,7 +100,7 @@ public interface IFlwInstanceService {
* @param businessId 业务id * @param businessId 业务id
* @return 结果 * @return 结果
*/ */
Map<String, Object> getFlowImage(String businessId); Map<String, Object> flowImage(String businessId);
/** /**
* 按照实例id更新状态 * 按照实例id更新状态
@ -116,7 +116,7 @@ public interface IFlwInstanceService {
* @param instanceId 实例id * @param instanceId 实例id
* @return 结果 * @return 结果
*/ */
Map<String, Object> getInstanceVariable(String instanceId); Map<String, Object> instanceVariable(String instanceId);
/** /**
* 设置流程变量 * 设置流程变量

12
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java
View File

@ -43,7 +43,7 @@ public interface IFlwTaskService {
* @param pageQuery 分页 * @param pageQuery 分页
* @return 结果 * @return 结果
*/ */
TableDataInfo<FlowTaskVo> getPageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery); TableDataInfo<FlowTaskVo> pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery);
/** /**
* 查询当前租户所有待办任务 * 查询当前租户所有待办任务
@ -52,7 +52,7 @@ public interface IFlwTaskService {
* @param pageQuery 分页 * @param pageQuery 分页
* @return 结果 * @return 结果
*/ */
TableDataInfo<FlowHisTaskVo> getPageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery); TableDataInfo<FlowHisTaskVo> pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery);
/** /**
@ -62,7 +62,7 @@ public interface IFlwTaskService {
* @param pageQuery 分页 * @param pageQuery 分页
* @return 结果 * @return 结果
*/ */
TableDataInfo<FlowTaskVo> getPageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery); TableDataInfo<FlowTaskVo> pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery);
/** /**
* 查询已办任务 * 查询已办任务
@ -71,7 +71,7 @@ public interface IFlwTaskService {
* @param pageQuery 分页 * @param pageQuery 分页
* @return 结果 * @return 结果
*/ */
TableDataInfo<FlowHisTaskVo> getPageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery); TableDataInfo<FlowHisTaskVo> pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery);
/** /**
* 查询当前用户的抄送 * 查询当前用户的抄送
@ -80,7 +80,7 @@ public interface IFlwTaskService {
* @param pageQuery 分页 * @param pageQuery 分页
* @return 结果 * @return 结果
*/ */
TableDataInfo<FlowTaskVo> getPageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery); TableDataInfo<FlowTaskVo> pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery);
/** /**
* 修改任务办理人 * 修改任务办理人
@ -178,5 +178,5 @@ public interface IFlwTaskService {
* @param taskId 任务id * @param taskId 任务id
* @return 结果 * @return 结果
*/ */
List<UserDTO> getUserListTaskId(Long taskId); List<UserDTO> currentTaskAllUser(Long taskId);
} }

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
View File

@ -101,7 +101,7 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
* @throws IOException 异常 * @throws IOException 异常
*/ */
@Override @Override
public void exportDefinition(Long id, HttpServletResponse response) throws IOException { public void exportDef(Long id, HttpServletResponse response) throws IOException {
Document document = defService.exportXml(id); Document document = defService.exportXml(id);
// 设置生成xml的格式 // 设置生成xml的格式
OutputFormat of = OutputFormat.createPrettyPrint(); OutputFormat of = OutputFormat.createPrettyPrint();

10
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
View File

@ -80,7 +80,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@Override @Override
public TableDataInfo<FlowInstanceVo> getPageByRunning(Instance instance, PageQuery pageQuery) { public TableDataInfo<FlowInstanceVo> pageByRunning(Instance instance, PageQuery pageQuery) {
QueryWrapper<FlowInstanceBo> queryWrapper = new QueryWrapper<>(); QueryWrapper<FlowInstanceBo> queryWrapper = new QueryWrapper<>();
queryWrapper.in("t.flow_status", BusinessStatusEnum.runningStatus()); queryWrapper.in("t.flow_status", BusinessStatusEnum.runningStatus());
Page<FlowInstanceVo> page = flwInstanceMapper.page(pageQuery.build(), queryWrapper); Page<FlowInstanceVo> page = flwInstanceMapper.page(pageQuery.build(), queryWrapper);
@ -97,7 +97,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@Override @Override
public TableDataInfo<FlowInstanceVo> getPageByFinish(Instance instance, PageQuery pageQuery) { public TableDataInfo<FlowInstanceVo> pageByFinish(Instance instance, PageQuery pageQuery) {
QueryWrapper<FlowInstanceBo> queryWrapper = new QueryWrapper<>(); QueryWrapper<FlowInstanceBo> queryWrapper = new QueryWrapper<>();
queryWrapper.in("t.flow_status", BusinessStatusEnum.finishStatus()); queryWrapper.in("t.flow_status", BusinessStatusEnum.finishStatus());
Page<FlowInstanceVo> page = flwInstanceMapper.page(pageQuery.build(), queryWrapper); Page<FlowInstanceVo> page = flwInstanceMapper.page(pageQuery.build(), queryWrapper);
@ -209,7 +209,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@Override @Override
public TableDataInfo<FlowInstanceVo> getPageByCurrent(FlowInstanceBo instanceBo, PageQuery pageQuery) { public TableDataInfo<FlowInstanceVo> pageByCurrent(FlowInstanceBo instanceBo, PageQuery pageQuery) {
LambdaQueryWrapper<FlowInstance> wrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<FlowInstance> wrapper = Wrappers.lambdaQuery();
if (StringUtils.isNotBlank(instanceBo.getFlowCode())) { if (StringUtils.isNotBlank(instanceBo.getFlowCode())) {
List<FlowDefinition> flowDefinitions = flowDefinitionMapper.selectList( List<FlowDefinition> flowDefinitions = flowDefinitionMapper.selectList(
@ -248,7 +248,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
* @param businessId 业务id * @param businessId 业务id
*/ */
@Override @Override
public Map<String, Object> getFlowImage(String businessId) { public Map<String, Object> flowImage(String businessId) {
Map<String, Object> map = new HashMap<>(16); Map<String, Object> map = new HashMap<>(16);
FlowInstance flowInstance = selectInstByBusinessId(businessId); FlowInstance flowInstance = selectInstByBusinessId(businessId);
if (flowInstance == null) { if (flowInstance == null) {
@ -290,7 +290,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
* @param instanceId 实例id * @param instanceId 实例id
*/ */
@Override @Override
public Map<String, Object> getInstanceVariable(String instanceId) { public Map<String, Object> instanceVariable(String instanceId) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
FlowInstance flowInstance = flowInstanceMapper.selectById(instanceId); FlowInstance flowInstance = flowInstanceMapper.selectById(instanceId);
Map<String, Object> variableMap = flowInstance.getVariableMap(); Map<String, Object> variableMap = flowInstance.getVariableMap();

12
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
View File

@ -255,7 +255,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@Override @Override
public TableDataInfo<FlowTaskVo> getPageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { public TableDataInfo<FlowTaskVo> pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo); QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo);
queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey());
queryWrapper.in("t.processed_by", SpringUtils.getBean(WorkflowPermissionHandler.class).permissions()); queryWrapper.in("t.processed_by", SpringUtils.getBean(WorkflowPermissionHandler.class).permissions());
@ -271,7 +271,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@Override @Override
public TableDataInfo<FlowHisTaskVo> getPageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { public TableDataInfo<FlowHisTaskVo> pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo); QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo);
queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey());
queryWrapper.in("t.approver", LoginHelper.getUserIdStr()); queryWrapper.in("t.approver", LoginHelper.getUserIdStr());
@ -287,7 +287,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@Override @Override
public TableDataInfo<FlowTaskVo> getPageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { public TableDataInfo<FlowTaskVo> pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo); QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo);
queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey());
Page<FlowTaskVo> page = flwTaskMapper.getTaskWaitByPage(pageQuery.build(), queryWrapper); Page<FlowTaskVo> page = flwTaskMapper.getTaskWaitByPage(pageQuery.build(), queryWrapper);
@ -301,7 +301,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@Override @Override
public TableDataInfo<FlowHisTaskVo> getPageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { public TableDataInfo<FlowHisTaskVo> pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo); QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo);
Page<FlowHisTaskVo> page = flwTaskMapper.getTaskFinishByPage(pageQuery.build(), queryWrapper); Page<FlowHisTaskVo> page = flwTaskMapper.getTaskFinishByPage(pageQuery.build(), queryWrapper);
return TableDataInfo.build(page); return TableDataInfo.build(page);
@ -314,7 +314,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
* @param pageQuery 分页 * @param pageQuery 分页
*/ */
@Override @Override
public TableDataInfo<FlowTaskVo> getPageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { public TableDataInfo<FlowTaskVo> pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo); QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo);
queryWrapper.in("t.processed_by", LoginHelper.getUserIdStr()); queryWrapper.in("t.processed_by", LoginHelper.getUserIdStr());
Page<FlowTaskVo> page = flwTaskMapper.getTaskCopyByPage(pageQuery.build(), queryWrapper); Page<FlowTaskVo> page = flwTaskMapper.getTaskCopyByPage(pageQuery.build(), queryWrapper);
@ -646,7 +646,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
* @param taskId 任务id * @param taskId 任务id
*/ */
@Override @Override
public List<UserDTO> getUserListTaskId(Long taskId) { public List<UserDTO> currentTaskAllUser(Long taskId) {
// 获取与当前任务关联的用户列表 // 获取与当前任务关联的用户列表
List<User> associatedUsers = userService.getByAssociateds(Collections.singletonList(taskId)); List<User> associatedUsers = userService.getByAssociateds(Collections.singletonList(taskId));
if (CollUtil.isEmpty(associatedUsers)) { if (CollUtil.isEmpty(associatedUsers)) {