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/service/impl/SysFieldServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
index 0d6c2ff..4e23de4 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
@@ -142,12 +142,12 @@
Map<String, String> maintainFieldMap = maintainFieldMapper.getMappedMatintainId(DbUtils.quotedStr(maintain.getTableName()), maintain.getOrderNo());
if (maintainFieldMap == null) {
- return new MaintainField().setId(Constant.Default);
+ return new MaintainField().setId(Constant.Default).setTableName(maintain.getTableName());
}
String maintainFieldId = maintainFieldMap.get(Constant.ID);
maintainField = maintainFieldService.selectById(maintainFieldId);
if (maintainField == null){
- return new MaintainField().setId(Constant.Default);
+ return new MaintainField().setId(Constant.Default).setTableName(maintain.getTableName());
}
}
@@ -162,7 +162,7 @@
// 褰撳墠鐗堟湰姝ｅ湪瀹℃壒 鎵惧墠涓�鐗堟湰
Integer maintainFieldOrderNo = maintainField.getOrderNo();
if (maintainFieldOrderNo < 1) {
- return new MaintainField().setId(Constant.Default);
+ return new MaintainField().setId(Constant.Default).setTableName(maintain.getTableName());
}else {
Integer preNo = maintainFieldOrderNo - 1;
maintainField = maintainFieldService.selectOne(new EntityWrapper<MaintainField>().eq("table_name", maintain.getTableName()).eq("order_no", preNo));
@@ -260,7 +260,7 @@
List subList = (List) list.stream().skip(page.getBeginRecordNo_1()).limit(page.getPageSize()).collect(Collectors.toList());
result.fluentPut("pages", page.getPageCount());
result.fluentPut("current", pageNo);
- result.fluentPut("size", pageSize);
+ result.fluentPut("passiveQueueSize", pageSize);
result.fluentPut("total", page.getRecordCount());
result.fluentPut("list", subList);
@@ -281,7 +281,7 @@
List<Object> subList = list.stream().skip(page.getBeginRecordNo_1()).limit(page.getPageSize()).collect(Collectors.toList());
result.fluentPut("pages", page.getPageCount());
result.fluentPut("current", pageNo);
- result.fluentPut("size", pageSize);
+ result.fluentPut("passiveQueueSize", pageSize);
result.fluentPut("total", page.getRecordCount());
result.fluentPut("list", subList);
--
Gitblit v1.8.0