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/MasterDataService.java | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/MasterDataService.java b/src/main/java/com/highdatas/mdm/service/MasterDataService.java
index c130479..1e9ed26 100644
--- a/src/main/java/com/highdatas/mdm/service/MasterDataService.java
+++ b/src/main/java/com/highdatas/mdm/service/MasterDataService.java
@@ -1,14 +1,13 @@
package com.highdatas.mdm.service;
+import com.highdatas.mdm.entity.Character;
import com.highdatas.mdm.entity.Maintain;
-import com.highdatas.mdm.entity.TUser;
import com.highdatas.mdm.pojo.Result;
import com.highdatas.mdm.pojo.SysAssembleUpdateType;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
/**
* @author kimi
* @description
@@ -20,45 +19,45 @@
Result selectById(String tableName, String id);
- Result selectList(TUser user, String tableName);
+ Result selectList(Character character, String tableName);
- Result selectList(TUser user, String tableName, String whereSegment);
- Result selectList(TUser user, String tableName, String whereSegment, String version);
+ Result selectList(Character character, String tableName, String whereSegment);
+ Result selectList(Character character, String tableName, String whereSegment, String version);
- Result selectList(TUser user, String tableName, List<String> fieldList, String whereSegment);
- Result selectList(TUser user, String tableName, List<String> fieldList, String whereSegment,String version);
+ Result selectList(Character character, String tableName, List<String> fieldList, String whereSegment);
+ Result selectList(Character character, String tableName, List<String> fieldList, String whereSegment,String version);
- Result selectList(TUser user, String tableName, List<String> fields);
+ Result selectList(Character character, String tableName, List<String> fields);
- Long getCountByVersion(TUser user, String maintainId, String tableName, String tableTempName, Integer fromOrderNo, Integer toOrderNo, String whereSegment);
+ Long getCountByVersion(Character character, String maintainId, String tableName, String tableTempName, Integer fromOrderNo, Integer toOrderNo, String whereSegment);
String getFields(String tableName);
- String getFields(TUser user, String tableName, Maintain maintain);
+ String getFields(Character character, String tableName, Maintain maintain);
String getFields(String tableName, String alias);
- String getFields(TUser user, String tableName, String alias, Maintain maintain);
+ String getFields(Character character, String tableName, String alias, Maintain maintain);
- String getTempFields(TUser user, String tableName, Maintain maintain);
- String getTempFields(TUser user, String tableName);
+ String getTempFields(Character character, String tableName, Maintain maintain);
+ String getTempFields(Character character, String tableName);
- String getTempFields(TUser user, String tableName, String alias);
- String getTempFields(TUser user, String tableName, String alias, Maintain maintain);
+ String getTempFields(Character character, String tableName, String alias);
+ String getTempFields(Character character, String tableName, String alias, Maintain maintain);
- Result selectListByPageByVersion(TUser user, String tableName, Integer pageNo, Integer pageSize, boolean findMax);
+ Result selectListByPageByVersion(Character character, String tableName, Integer pageNo, Integer pageSize, boolean findMax);
- Result selectListByPageByVersion(TUser user, String tableName, String whereSegment, Integer pageNo, boolean findMax);
+ Result selectListByPageByVersion(Character character, String tableName, String whereSegment, Integer pageNo, boolean findMax);
- Result selectListByPageByVersion(TUser user, String tableName, Integer pageNo, String version, boolean findMax);
+ Result selectListByPageByVersion(Character character, String tableName, Integer pageNo, String version, boolean findMax);
- Result selectListByPageByVersion(TUser user, String tableName, Integer pageNo, boolean findMax);
+ Result selectListByPageByVersion(Character character, String tableName, Integer pageNo, boolean findMax);
- Result selectListByPageByVersion(TUser user, String tableName, String whereSegment, Integer pageno, Integer pageSize, boolean findMax);
+ Result selectListByPageByVersion(Character character, String tableName, String whereSegment, Integer pageno, Integer pageSize, boolean findMax);
- Result selectListByPageByVersion(TUser user, String tableName, List<String> fieldList, String whereSegment, Integer pageNo, boolean findMax);
+ Result selectListByPageByVersion(Character character, String tableName, List<String> fieldList, String whereSegment, Integer pageNo, boolean findMax);
- Result selectListByPageByVersion(TUser user, String tableName, List<String> fieldList, Integer pageNo, boolean findMax);
+ Result selectListByPageByVersion(Character character, String tableName, List<String> fieldList, Integer pageNo, boolean findMax);
- Result selectListByPageByVersion(TUser user, String tableName, List<String> fieldList, String whereSegment, Integer pageNo, Integer pageSize, boolean findMax);
+ Result selectListByPageByVersion(Character character, String tableName, List<String> fieldList, String whereSegment, Integer pageNo, Integer pageSize, boolean findMax);
Result insert(String tableName, String fields, String jsonValues);
Result insert(String tableName, String json);
@@ -84,11 +83,13 @@
Result delete(String tableName, String whereSegment);
- Result selectListByPageByVersion(TUser user, String tableName, String whereSegment, Integer pageNo, String version, boolean findMax);
+ Result selectListByPageByVersion(Character character, String tableName, String whereSegment, Integer pageNo, String version, boolean findMax);
- List<Map<String, Object>> selectListByVersion(TUser user, String tableName, List<String> fieldList, String whereSegment, String version, boolean findMax);
+ List<Map<String, Object>> selectListByVersion(Character character, String tableName, List<String> fieldList, String whereSegment, String version, boolean findMax);
- Result selectListByPageByVersion(TUser user, String tableName, List<String> fieldList, String whereSegment, Integer pageNo, Integer pageSize, String version, boolean findMax);
+ String selectByVersionSql(Character character, String tableName, List<String> fieldList, String whereSegment, String version, boolean findMax);
+
+ Result selectListByPageByVersion(Character character, String tableName, List<String> fieldList, String whereSegment, Integer pageNo, Integer pageSize, String version, boolean findMax);
Maintain uploadedData(String tableName, SysAssembleUpdateType uploadType, String userId);
Maintain uploadedData(String tableName, SysAssembleUpdateType uploadType, String userId, boolean bigVersion);
--
Gitblit v1.8.0