From 412bba8d3d9ba456971b3686ba22a7042097dfe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 12 Aug 2024 10:42:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ProcessMarketStandardReleaseConstants.java | 1 + ...rocessMarketStandardReleaseController.java | 5 +---- .../IProcessMarketStandardReleaseService.java | 2 +- ...ocessMarketStandardReleaseServiceImpl.java | 19 +++++-------------- .../ProcessNewStandardImportConstants.java | 2 ++ .../ProcessNewStandardImportController.java | 3 +-- .../IProcessNewStandardImportService.java | 3 +-- .../ProcessNewStandardImportServiceImpl.java | 11 ++++++----- 8 files changed, 18 insertions(+), 28 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/common/ProcessMarketStandardReleaseConstants.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/common/ProcessMarketStandardReleaseConstants.java index 02f2c0ee..ed7a2d38 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/common/ProcessMarketStandardReleaseConstants.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/common/ProcessMarketStandardReleaseConstants.java @@ -5,6 +5,7 @@ package com.jero.modules.activiti.process.ms.common; * @date 2024-06-17 15:28 */ public class ProcessMarketStandardReleaseConstants { + private ProcessMarketStandardReleaseConstants(){} /** * 法规工程师发起 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/controller/ProcessMarketStandardReleaseController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/controller/ProcessMarketStandardReleaseController.java index 3a6ca3e3..215c604d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/controller/ProcessMarketStandardReleaseController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/controller/ProcessMarketStandardReleaseController.java @@ -11,9 +11,6 @@ import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.process.ms.entity.ProcessMarketStandardRelease; import com.jero.modules.activiti.process.ms.service.IProcessMarketStandardReleaseService; -import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport; -import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService; -import com.jero.modules.activiti.vo.DelegateTaskParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -103,7 +100,7 @@ public class ProcessMarketStandardReleaseController extends JeroController generate(@RequestPart("scc") ProcessMarketStandardRelease scc, @RequestPart("modelFile") MultipartFile modelFile, - @RequestPart(name = "splitFile", required = false) MultipartFile splitFile) throws Exception { + @RequestPart(name = "splitFile", required = false) MultipartFile splitFile) { return Result.OK(sccService.generate(scc, modelFile, splitFile)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/IProcessMarketStandardReleaseService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/IProcessMarketStandardReleaseService.java index 4c49eafb..9dfaee1a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/IProcessMarketStandardReleaseService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/IProcessMarketStandardReleaseService.java @@ -21,7 +21,7 @@ public interface IProcessMarketStandardReleaseService extends IService processInfoVO); - String generate(ProcessMarketStandardRelease scc, MultipartFile modelFile, MultipartFile splitFile) throws Exception; + String generate(ProcessMarketStandardRelease scc, MultipartFile modelFile, MultipartFile splitFile); void flowListener(DelegateExecution delegateExecution); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java index 3d712dec..418d338c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java @@ -1,8 +1,6 @@ package com.jero.modules.activiti.process.ms.service.impl; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.SendMessageAPI; import com.jero.common.api.dto.message.SendMessageDTO; @@ -10,8 +8,6 @@ import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.common.ActivitiCommon; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.enums.CommitFlagEnum; -import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; @@ -37,7 +33,6 @@ import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -163,12 +158,12 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl generate(@RequestPart("scc") ProcessNewStandardImport scc, @RequestPart("modelFile") MultipartFile modelFile, - @RequestPart(name = "splitFile", required = false) MultipartFile splitFile) throws Exception { + @RequestPart(name = "splitFile", required = false) MultipartFile splitFile) { return Result.OK(sccService.generate(scc, modelFile, splitFile)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/IProcessNewStandardImportService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/IProcessNewStandardImportService.java index 7433bf93..23ea032b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/IProcessNewStandardImportService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/IProcessNewStandardImportService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport; import org.activiti.engine.delegate.DelegateExecution; -import org.activiti.engine.delegate.DelegateTask; import org.springframework.web.multipart.MultipartFile; /** @@ -22,7 +21,7 @@ public interface IProcessNewStandardImportService extends IService processInfoVO); - String generate(ProcessNewStandardImport scc, MultipartFile modelFile, MultipartFile splitFile) throws Exception; + String generate(ProcessNewStandardImport scc, MultipartFile modelFile, MultipartFile splitFile); void flowListener(DelegateExecution delegateExecution); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java index 959b6f84..d3e4a679 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java @@ -34,6 +34,7 @@ import org.activiti.engine.TaskService; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -162,12 +163,12 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl