From 1af5c7d779f451d68545aa6dc1d97a9a8848caee Mon Sep 17 00:00:00 2001 From: jinqiming <45981669@qq.com> Date: Fri, 15 Jan 2021 17:35:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/snow/web/controller/flowable/FlowController.java | 2 ++ .../snow/web/controller/flowable/FlowModelerController.java | 2 ++ .../snow/web/controller/system/PurchaseOrderController.java | 6 +++++- .../flowable/service/impl/FlowablePublishServiceImpl.java | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java index 57f15ca..0cc372d 100644 --- a/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java +++ b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java @@ -2,6 +2,7 @@ package com.snow.web.controller.flowable; import cn.hutool.core.util.ReflectUtil; import com.alibaba.fastjson.JSON; +import com.snow.common.annotation.RepeatSubmit; import com.snow.common.core.controller.BaseController; import com.snow.common.core.domain.AjaxResult; import com.snow.common.core.page.PageModel; @@ -68,6 +69,7 @@ public class FlowController extends BaseController { */ @PostMapping("/finishTask") @ResponseBody + @RepeatSubmit public AjaxResult finishTask(CompleteTaskDTO completeTaskDTO) { SysUser sysUser = ShiroUtils.getSysUser(); diff --git a/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowModelerController.java b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowModelerController.java index 14f4e85..dbfa0c8 100644 --- a/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowModelerController.java +++ b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowModelerController.java @@ -1,6 +1,7 @@ package com.snow.web.controller.flowable; import com.snow.common.annotation.Log; +import com.snow.common.annotation.RepeatSubmit; import com.snow.common.core.controller.BaseController; import com.snow.common.core.domain.AjaxResult; import com.snow.common.core.page.PageModel; @@ -136,6 +137,7 @@ public class FlowModelerController extends BaseController @RequiresPermissions("modeler:deployment:deployment") @PostMapping("/importData") @ResponseBody + @RepeatSubmit public AjaxResult importData(MultipartFile file, String name,String key,String category) throws Exception { InputStream inputStream = file.getInputStream(); diff --git a/snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java b/snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java index 3de24cb..f9830c5 100644 --- a/snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java +++ b/snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java @@ -9,6 +9,7 @@ import com.alibaba.excel.ExcelReader; import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.fastjson.JSON; import com.google.common.collect.Lists; +import com.snow.common.annotation.RepeatSubmit; import com.snow.common.constant.SequenceContants; import com.snow.common.utils.poi.EasyExcelUtil; import com.snow.flowable.domain.CompleteTaskDTO; @@ -143,6 +144,7 @@ public class PurchaseOrderController extends BaseController @Log(title = "采购单主表", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody + @RepeatSubmit public AjaxResult addSave(PurchaseOrderMain purchaseOrderMain) { return toAjax(purchaseOrderMainService.insertPurchaseOrderMain(purchaseOrderMain)); @@ -190,10 +192,11 @@ public class PurchaseOrderController extends BaseController * 修改保存采购单并发起申请 */ @RequiresPermissions("system:purchaseOrder:edit") - @Log(title = "采购单主表", businessType = BusinessType.UPDATE) + @Log(title = "采购单主表", businessType = BusinessType.OTHER) @PostMapping("/edit") @ResponseBody @Transactional + @RepeatSubmit public AjaxResult editSave(PurchaseOrderMain purchaseOrderMain) { SysUser sysUser = ShiroUtils.getSysUser(); @@ -245,6 +248,7 @@ public class PurchaseOrderController extends BaseController @PostMapping("/restart") @ResponseBody @Transactional + @RepeatSubmit public AjaxResult restart(PurchaseOrderMainTask purchaseOrderMainTask) { SysUser sysUser = ShiroUtils.getSysUser(); diff --git a/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowablePublishServiceImpl.java b/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowablePublishServiceImpl.java index 474c9f5..411f0db 100644 --- a/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowablePublishServiceImpl.java +++ b/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowablePublishServiceImpl.java @@ -175,7 +175,7 @@ public class FlowablePublishServiceImpl implements FlowablePublishService { } return null; } catch (IOException e) { - log.error("DeploymentByModelId is fail",e.getMessage()); + log.error("deploymentByModelId is fail",e.getMessage()); throw new RuntimeException("发布流程失败"); } } From a7f100ddfd51270857e8231dc3f62a6ca009fcbd Mon Sep 17 00:00:00 2001 From: jinqiming <45981669@qq.com> Date: Thu, 21 Jan 2021 19:52:59 +0800 Subject: [PATCH 2/2] 11 --- .../com/snow/web/controller/flowable/FlowController.java | 4 ++++ .../src/main/resources/templates/flow/myStartProcess.html | 3 +-- .../com/snow/flowable/service/impl/FlowableServiceImpl.java | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java index 0cc372d..c0930cb 100644 --- a/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java +++ b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java @@ -151,6 +151,10 @@ public class FlowController extends BaseController { return prefix +"/myStartProcessDetail"; } + /** + * 我参与的任务 + * @return + */ @RequiresPermissions("flow:process:getMyTakePartInProcess") @GetMapping("/toMyTakePartInProcess") public String getMyTakePartInProcess() diff --git a/snow-admin/src/main/resources/templates/flow/myStartProcess.html b/snow-admin/src/main/resources/templates/flow/myStartProcess.html index 2d4fb55..0a4b280 100644 --- a/snow-admin/src/main/resources/templates/flow/myStartProcess.html +++ b/snow-admin/src/main/resources/templates/flow/myStartProcess.html @@ -13,7 +13,7 @@