From e994527810725c2eed4cb15419a82eb860f0238d Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 20 May 2022 18:11:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A5=E8=B5=84=E6=BA=90=E5=B7=B2=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=B8=8B=E6=9E=B6=EF=BC=8C=E9=87=8D=E5=A4=8D=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=B8=8B=E6=9E=B6=E6=97=B6=20=E6=8A=9B=E5=87=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/ResourceMountController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java b/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java index 61b44423..64bd0343 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java @@ -25,6 +25,9 @@ import io.renren.modules.sys.dto.SysUserDTO; import io.renren.modules.sys.service.SysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.activiti.engine.TaskService; +import org.activiti.engine.task.Task; +import org.activiti.engine.task.TaskQuery; import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,6 +57,9 @@ public class ResourceMountController { @Autowired private SysUserService sysUserService; + @Autowired + protected TaskService taskService; + private static String apply_key = "resourcemountapply"; // 资源上架 private static String undercarriage_key = "resourcundercarriageapply"; // 资源下架 @@ -99,6 +105,11 @@ public class ResourceMountController { } catch (Exception e) { logger.error("", e); } + TaskQuery taskQuery = taskService.createTaskQuery(); + Task task = taskQuery.active().processInstanceBusinessKey(tResourceMountApplyDTO.getId().toString()).singleResult(); + if (task != null) { + throw new RuntimeException("该资源已发起下架"); + } ValidatorUtils.validateEntity(tResourceMountApplyDTO, AddGroup.class, DefaultGroup.class); tResourceMountApplyService.save(tResourceMountApplyDTO); // 保存单条资源申请记录 @@ -128,6 +139,7 @@ public class ResourceMountController { }).filter(index -> ObjectUtil.isNotNull(index)).collect(Collectors.toList())); } + // TODO @PostMapping(value = "/undercarriage") @ApiOperation("批量进行能力下架申请") public Result> undercarriage(@RequestBody TResourceUndercarriageApplyDTO tResourceUndercarriageApplyDTO) {