From 5d15287b2a06f978485ac6af71e33e1a82b43a65 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 15 四月 2020 16:29:55 +0800
Subject: [PATCH] fix 上传后生成版本连接池用完不释放问题
---
src/main/java/com/highdatas/mdm/controller/FlowsController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/FlowsController.java b/src/main/java/com/highdatas/mdm/controller/FlowsController.java
index 9ce118d..a948066 100644
--- a/src/main/java/com/highdatas/mdm/controller/FlowsController.java
+++ b/src/main/java/com/highdatas/mdm/controller/FlowsController.java
@@ -4,14 +4,12 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.highdatas.mdm.entity.Flows;
-import com.highdatas.mdm.entity.SysMenu;
+import com.highdatas.mdm.entity.TUser;
import com.highdatas.mdm.pojo.ActivitiStatus;
import com.highdatas.mdm.pojo.CodeMsg;
import com.highdatas.mdm.pojo.Result;
import com.highdatas.mdm.service.IFlowsService;
-import com.highdatas.mdm.service.ITUserService;
-import com.sun.tools.javac.jvm.Code;
-import org.activiti.engine.HistoryService;
+import com.highdatas.mdm.util.DbUtils;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.runtime.ProcessInstance;
import org.apache.commons.lang3.StringUtils;
@@ -22,8 +20,8 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
/**
* <p>
@@ -38,8 +36,7 @@
public class FlowsController {
@Autowired
IFlowsService flowsService;
- @Autowired
- ITUserService userService;
+
@Autowired
RuntimeService runtimeService;
@RequestMapping(value = "/{pageno}", method = RequestMethod.GET)
@@ -62,7 +59,13 @@
Page page = new Page(pageno, size);
Page<Flows> menuPage = flowsService.selectPage(page, flowsEntityWrapper);
List<Flows> records = menuPage.getRecords();
- List<Flows> recordsStr = records.stream().map(flows -> flows.setBusinessTypeStr(flows.getBusinessType().toString()).setUserName(userService.selectById(flows.getUserId()).getUserName())).collect(Collectors.toList());
+ List<Flows> recordsStr = new ArrayList<>();
+ for (Flows flows : records) {
+ flows.setBusinessTypeStr(flows.getBusinessType().toString());
+ TUser userById = DbUtils.getUserById(flows.getUserId());
+ flows.setUserName(userById.getUserName());
+ recordsStr.add(flows);
+ }
menuPage.setRecords(recordsStr);
return Result.success(menuPage);
}
--
Gitblit v1.8.0