From 81f7d381c300f6b0a22c00f98517b2619d0094f4 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 23 七月 2025 16:00:27 +0800
Subject: [PATCH] yys 释放javaWork资源路径
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 47 +++++++++++++++++++----
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 25 ------------
src/main/java/com/ruoyi/approve/service/IApproveProcessService.java | 5 --
src/main/resources/application.yml | 2
4 files changed, 41 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java b/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
index 2606599..d212c46 100644
--- a/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
+++ b/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
@@ -32,9 +32,4 @@
ApproveProcess getApproveById(String id);
- /**
- * 瀹℃壒鐘舵�佹洿鏂�
- * @param approveNode
- */
- void updateApproveProcessStatus(ApproveNode approveNode,Integer status);
}
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index 54c153b..201ccb5 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -4,17 +4,15 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.mapper.ApproveNodeMapper;
+import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveNodeService;
-import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
-import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
@@ -29,15 +27,25 @@
@Autowired
private ApproveNodeMapper approveNodeMapper;
@Autowired
- private ApproveProcessServiceImpl approveProcessService;
+ private ApproveProcessMapper approveProcessMapper;
@Autowired
private SysUserMapper sysUserMapper;
+ public ApproveProcess getApproveById(String id) {
+ LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ApproveProcess::getApproveId, id);
+ queryWrapper.eq(ApproveProcess::getApproveDelete, 0);
+ queryWrapper.eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId());
+ queryWrapper.last("limit 1");
+ ApproveProcess one = approveProcessMapper.selectOne(queryWrapper);
+ return one;
+ }
+
@Override
public void initApproveNodes(String approveUserIds,String approveID,Long tenantId) {
Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
- ApproveProcess approve = approveProcessService.getApproveById(approveID);
+ ApproveProcess approve = getApproveById(approveID);
String[] names = approveUserIds.split(",");
String approveId = approve.getApproveId();
for (int i = 0; i < names.length; i++) {
@@ -74,7 +82,7 @@
.eq(ApproveProcess::getApproveDelete, 0)
.eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId())
.last("limit 1");
- ApproveProcess approveProcess = approveProcessService.getOne(approveProcessLambdaQueryWrapper);
+ ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
if(approveProcess != null && approveProcess.getApproveStatus() == 3){
return list;
}
@@ -88,15 +96,38 @@
return list;
}
+ public void updateApproveProcessStatus(ApproveNode approveNode,Integer status) {
+ LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveId, approveNode.getApproveProcessId())
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId())
+ .last("limit 1");
+ ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
+ if(approveProcess == null) throw new RuntimeException("瀹℃壒涓嶅瓨鍦�");
+ LambdaQueryWrapper<ApproveNode> approveNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approveNode.getApproveProcessId())
+ .eq(ApproveNode::getApproveNodeOrder, approveNode.getApproveNodeOrder() + 1)
+ .eq(ApproveNode::getDeleteFlag, 0)
+ .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId())
+ .last("limit 1");
+ ApproveNode approveNode1 = approveNodeMapper.selectOne(approveNodeLambdaQueryWrapper);
+ approveProcess.setApproveStatus(status);
+ if(approveNode1 != null){
+ approveProcess.setApproveUserCurrentId(approveNode.getApproveNodeUserId());
+ approveProcess.setApproveUserCurrentName(approveNode1.getApproveNodeUser());
+ }
+ approveProcessMapper.updateById(approveProcess);
+ }
+
@Override
public void updateApproveNode(ApproveNode approveNode) {
// 瀹℃壒鑺傜偣鐘舵��:1鍚屾剰锛�2鎷掔粷锛�0灏氭湭瀹℃牳
switch (approveNode.getApproveNodeStatus()){
case 1:
- approveProcessService.updateApproveProcessStatus(approveNode, Boolean.TRUE.equals(approveNode.getIsLast()) ? 2 : 1);
+ updateApproveProcessStatus(approveNode, Boolean.TRUE.equals(approveNode.getIsLast()) ? 2 : 1);
break;
case 2:
- approveProcessService.updateApproveProcessStatus(approveNode, 3);
+ updateApproveProcessStatus(approveNode, 3);
break;
default:
break;
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index ea88016..2c04224 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -49,7 +49,7 @@
private final DailyRedisCounter dailyRedisCounter;
private final SysDeptMapper sysDeptMapper;
- private final ApproveNodeServiceImpl approveNodeService;
+ private final IApproveNodeService approveNodeService;
private final SysUserMapper sysUserMapper;
private final ApproveProcessMapper approveProcessMapper;
@@ -147,29 +147,6 @@
private final ApproveNodeMapper approveNodeMapper;
- @Override
- public void updateApproveProcessStatus(ApproveNode approveNode,Integer status) {
- LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
- approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveId, approveNode.getApproveProcessId())
- .eq(ApproveProcess::getApproveDelete, 0)
- .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId())
- .last("limit 1");
- ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
- if(approveProcess == null) throw new RuntimeException("瀹℃壒涓嶅瓨鍦�");
- LambdaQueryWrapper<ApproveNode> approveNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
- approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approveNode.getApproveProcessId())
- .eq(ApproveNode::getApproveNodeOrder, approveNode.getApproveNodeOrder() + 1)
- .eq(ApproveNode::getDeleteFlag, 0)
- .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId())
- .last("limit 1");
- ApproveNode approveNode1 = approveNodeMapper.selectOne(approveNodeLambdaQueryWrapper);
- approveProcess.setApproveStatus(status);
- if(approveNode1 != null){
- approveProcess.setApproveUserCurrentId(approveNode.getApproveNodeUserId());
- approveProcess.setApproveUserCurrentName(approveNode1.getApproveNodeUser());
- }
- updateById(approveProcess);
- }
@Override
public void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a6ce03c..a87ef6b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
# Spring閰嶇疆
spring:
profiles:
- active: dev
\ No newline at end of file
+ active: prod
\ No newline at end of file
--
Gitblit v1.9.3