From a5e5a80c18693c48fa372e614a31397ed49e90fc Mon Sep 17 00:00:00 2001 From: ddmte32 Date: Thu, 11 Sep 2025 16:10:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AE=A1=E6=89=B9bu?= =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../approval/SysApprovalController.java | 14 ++++- .../platform/service/ApprovalService.java | 2 +- .../service/impl/ApprovalServiceImpl.java | 57 +++++++++---------- 3 files changed, 39 insertions(+), 34 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/approval/SysApprovalController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/approval/SysApprovalController.java index 83f8d7d7..6f7eb19b 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/approval/SysApprovalController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/approval/SysApprovalController.java @@ -80,7 +80,12 @@ public class SysApprovalController extends BaseController { */ @PostMapping("/approve") public AjaxResult approve(@RequestBody ApprovalRequest approval) { - approvalService.approve(approval); + try { + approvalService.approve(approval); + } catch (Exception e) { + logger.error(e.getMessage()); + return AjaxResult.error("审批异常"); + } return AjaxResult.success("审批完成"); } @@ -92,7 +97,12 @@ public class SysApprovalController extends BaseController { */ @PostMapping("/reject") public AjaxResult reject(@RequestBody ApprovalRequest approval) { - approvalService.reject(approval); + try { + approvalService.reject(approval); + } catch (Exception e) { + logger.error(e.getMessage()); + return AjaxResult.error("审批异常"); + } return AjaxResult.success("审批完成"); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ApprovalService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ApprovalService.java index c3d44399..b05ccfe6 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ApprovalService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ApprovalService.java @@ -11,7 +11,7 @@ public interface ApprovalService { void add(ApprovalRequest approvalRequest); - void approve(ApprovalRequest approval); + void approve(ApprovalRequest approval) throws Exception; void reject(ApprovalRequest approval); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java index d467f85d..788991b4 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.ruoyi.platform.domain.*; import com.ruoyi.platform.mapper.ApprovalInfoMapper; import com.ruoyi.platform.service.ApprovalService; @@ -20,6 +21,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +import java.util.Objects; @Service public class ApprovalServiceImpl implements ApprovalService { @@ -48,17 +50,20 @@ public class ApprovalServiceImpl implements ApprovalService { } @Override - public void approve(ApprovalRequest approval) { + public void approve(ApprovalRequest approval) throws Exception { approval.setStatus(ApprovalStatus.APPROVED.getCode()); //更改审批单状态 approvalInfoMapper.updateApproval(approval); ApprovalRequest approvalRequest = approvalInfoMapper.queryById(approval.getId()); + //审批通过，更改状态 + updateStatus(approvalRequest); + //推送消息给申请人 NewSysNotificationParamsVo newSysNotificationParamsVo = new NewSysNotificationParamsVo(); - String applyContentTemplate="您发布的{}\"{}\"审核已通过"; - String appContentFormat = StrUtil.format(applyContentTemplate,ApprovalType.getDescription(approvalRequest.getType()) - ,getModelNameByType(approvalRequest.getContent(),approvalRequest.getType())); + String applyContentTemplate = "您发布的{}\"{}\"审核已通过"; + String appContentFormat = StrUtil.format(applyContentTemplate, ApprovalType.getDescription(approvalRequest.getType()) + , getModelNameByType(approvalRequest.getContent(), approvalRequest.getType())); newSysNotificationParamsVo.setType(2); newSysNotificationParamsVo.setSender(approvalRequest.getApplicantId()); @@ -70,9 +75,9 @@ public class ApprovalServiceImpl implements ApprovalService { //推送消息给审批人 NewSysNotificationParamsVo approveParamsVo = new NewSysNotificationParamsVo(); - String contentTemplate="{}发布的{}\"{}\"审核已通过"; - String contentFormat = StrUtil.format(contentTemplate,approvalRequest.getApplicantName(),ApprovalType.getDescription(approvalRequest.getType()) - ,getModelNameByType(approvalRequest.getContent(),approvalRequest.getType())); + String contentTemplate = "{}发布的{}\"{}\"审核已通过"; + String contentFormat = StrUtil.format(contentTemplate, approvalRequest.getApplicantName(), ApprovalType.getDescription(approvalRequest.getType()) + , getModelNameByType(approvalRequest.getContent(), approvalRequest.getType())); approveParamsVo.setType(2); approveParamsVo.setContent(contentFormat); @@ -81,8 +86,6 @@ public class ApprovalServiceImpl implements ApprovalService { approveParamsVo.setReceivers(approvalRequest.getApplicantId().toString()); infoPublishService.pushSysInfo(newSysNotificationParamsVo); - //审批通过，更改状态 - updateStatus(approvalRequest); } @Override @@ -93,9 +96,9 @@ public class ApprovalServiceImpl implements ApprovalService { //推送消息给申请人 NewSysNotificationParamsVo newSysNotificationParamsVo = new NewSysNotificationParamsVo(); - String applyContentTemplate="您发布的{}\"{}\"{}审核未通过"; - String appContentFormat = StrUtil.format(applyContentTemplate,ApprovalType.getDescription(approval.getType()) - ,getModelNameByType(approval.getContent(),approval.getType())); + String applyContentTemplate = "您发布的{}\"{}\"{}审核未通过"; + String appContentFormat = StrUtil.format(applyContentTemplate, ApprovalType.getDescription(approval.getType()) + , getModelNameByType(approval.getContent(), approval.getType())); newSysNotificationParamsVo.setType(2); newSysNotificationParamsVo.setSender(approval.getApplicantId()); @@ -107,9 +110,9 @@ public class ApprovalServiceImpl implements ApprovalService { //推送消息给审批人 NewSysNotificationParamsVo approveParamsVo = new NewSysNotificationParamsVo(); - String contentTemplate="{}发布的{}\"{}\"{}审核未通过"; - String contentFormat = StrUtil.format(contentTemplate,approval.getApplicantName(),ApprovalType.getDescription(approval.getType()) - ,getModelNameByType(approval.getContent(),approval.getType())); + String contentTemplate = "{}发布的{}\"{}\"{}审核未通过"; + String contentFormat = StrUtil.format(contentTemplate, approval.getApplicantName(), ApprovalType.getDescription(approval.getType()) + , getModelNameByType(approval.getContent(), approval.getType())); approveParamsVo.setType(2); approveParamsVo.setContent(contentFormat); @@ -135,8 +138,8 @@ public class ApprovalServiceImpl implements ApprovalService { } @Override - public List getMyApproveList(LoginUser loginUser,Integer status) { - return approvalInfoMapper.selectMyApproveList(loginUser.getUserid(), status==null?null:ListUtil.toList(status)); + public List getMyApproveList(LoginUser loginUser, Integer status) { + return approvalInfoMapper.selectMyApproveList(loginUser.getUserid(), status == null ? null : ListUtil.toList(status)); } @Override @@ -149,31 +152,23 @@ public class ApprovalServiceImpl implements ApprovalService { return approvalInfoMapper.selectMyApproveList(loginUser.getUserid(), ListUtil.toList(ApprovalStatus.REJECTED.getCode(), ApprovalStatus.APPROVED.getCode())); } - private void updateStatus(ApprovalRequest approvalRequest) { - if (ApprovalStatus.APPROVED.getCode() == approvalRequest.getStatus()) { + private void updateStatus(ApprovalRequest approvalRequest) throws Exception { + if (Objects.equals(ApprovalStatus.APPROVED.getCode(), approvalRequest.getStatus())) { String content = approvalRequest.getContent(); switch (approvalRequest.getType()) { case "DATASET": - NewDatasetVo dataset = BeanUtil.toBean(content, NewDatasetVo.class); - try { - newDatasetService.privateToPublic(dataset); - } catch (Exception e) { - logger.error(e.getMessage()); - } + NewDatasetVo dataset = JSONUtil.toBean(content, NewDatasetVo.class); + newDatasetService.privateToPublic(dataset); break; case "MODEL": ModelsVo models = BeanUtil.toBean(content, ModelsVo.class); - try { - modelsService.privateToPublic(models); - } catch (Exception e) { - logger.error(e.getMessage()); - } + modelsService.privateToPublic(models); break; } } } - private String getModelNameByType(String content,String type) { + private String getModelNameByType(String content, String type) { if (ApprovalType.DATASET.getCode().equals(type)) { NewDatasetVo newDatasetVo = BeanUtil.toBean(content, NewDatasetVo.class); return newDatasetVo.getName();