From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/controller/SysAssembleDbController.java | 82 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 72 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/SysAssembleDbController.java b/src/main/java/com/highdatas/mdm/controller/SysAssembleDbController.java
index f53f966..5026b26 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysAssembleDbController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysAssembleDbController.java
@@ -17,6 +17,7 @@
import com.highdatas.mdm.service.ISysAssembleService;
import com.highdatas.mdm.util.Constant;
import com.highdatas.mdm.util.DbUtils;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -39,8 +40,9 @@
* @since 2020-02-19
*/
@RestController
+@Slf4j
@RequestMapping("/assemble/db")
-public class SysAssembleDbController {
+public class SysAssembleDbController {
@Autowired
ISysAssembleDbService dbService;
@Autowired
@@ -51,9 +53,16 @@
@Autowired
ISysAssembleService assembleService;
-
+ /**
+ *
+ * @description: 閫氳繃姹囬泦id鑾峰彇淇濆瓨鐨勬簮淇℃伅
+ * @param id 姹囬泦id
+ * @return: 婧恖ist
+ *
+ */
@RequestMapping(value = "/get/parent/{id}", method = RequestMethod.GET)
public Result get(@PathVariable String id, HttpServletRequest request) {
+ //閫氳繃assemble 鑾峰彇姹囬泦淇℃伅
SysAssemble assemble = assembleService.selectById(id);
if (assemble == null) {
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
@@ -75,13 +84,40 @@
return Result.success(result);
}
-
+ /**
+ *
+ * @description: 娴嬭瘯杩炴帴
+ * @param id 鏁版嵁婧恑d
+ * @return: 娴嬭瘯杩炴帴缁撴灉
+ *
+ */
@RequestMapping(value = "/testConnection/{id}", method = RequestMethod.GET)
public Result testConnection(@PathVariable String id, HttpServletRequest request) {
boolean b = dbService.testConnection(id);
return Result.success(b);
}
-
+ /**
+ *
+ * @description: 娴嬭瘯杩炴帴
+ * @param id 鏁版嵁婧恑d
+ * @return: 娴嬭瘯杩炴帴缁撴灉
+ *
+ */
+ @ResponseBody
+ @RequestMapping(value = "/testConnection", method = RequestMethod.POST)
+ public Result testConnection(@RequestBody SysAssembleDb sysAssembleDb) {
+ if (sysAssembleDb == null) {
+ return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
+ }
+ boolean b = dbService.testConnection(sysAssembleDb);
+ return Result.success(b);
+ }
+ /**
+ *
+ * @description: 鑾峰彇鐩墠鐢ㄥ埌鐨勬暟鎹簮list
+ * @return: 鏁版嵁婧恖ist
+ *
+ */
@RequestMapping(value = "/getSet", method = RequestMethod.GET)
public Result getSet(HttpServletRequest request) {
List<SysAssembleDb> dbList = dbService.selectList(null);
@@ -93,7 +129,13 @@
}
-
+ /**
+ *
+ * @description: 鏁版嵁婧愯幏鍙栬〃list
+ * @param id 鏁版嵁婧恑d
+ * @return: 婧愯〃list
+ *
+ */
@RequestMapping(value = "/getTableList/{id}", method = RequestMethod.GET)
public Result getTable(@PathVariable String id, HttpServletRequest request) {
Connection connection = null;
@@ -102,17 +144,20 @@
String username = sysAssembleDb.getDatasourceUser();
connection = dbService.getConnection(id);
DatabaseMetaData metaData = connection.getMetaData();
- ResultSet tables = metaData.getTables( null, username.toUpperCase(), null, new String[]{ "TABLE" } );
+ String dbStr = sysAssembleDb.toString();
+ log.info(dbStr);
+ ResultSet tables = metaData.getTables(null, "%", "%", new String[]{ "TABLE" } );
ArrayList<String> tableNameList = new ArrayList<>();
while (tables.next()) {
String tableName = tables.getString(Constant.TABLE_NAME);
+ log.info(tableName);
tableNameList.add(tableName);
}
+
List<SysAssembleDbTable> tableList = dbTableService.selectList(new EntityWrapper<SysAssembleDbTable>().eq(Constant.PARENT_ID, id));
List<String> selectedTableNameList = tableList.stream().map(sysAssembleDbTable -> sysAssembleDbTable.getTableName()).collect(Collectors.toList());
List<String> result = tableNameList.stream().filter(s -> !selectedTableNameList.contains(s)).collect(Collectors.toList());
-
return Result.success(result);
}
@@ -132,7 +177,13 @@
}
}
-
+ /**
+ *
+ * @description: 婧愯〃鑾峰彇瀛楁list
+ * @param id 鏁版嵁婧愯〃id
+ * @return: 婧愯〃瀛楁list
+ *
+ */
@RequestMapping(value = "/getFields/{id}", method = RequestMethod.GET)
public Result getFields(@PathVariable String id, @RequestParam String tableName, HttpServletRequest request) {
List<String> fieldsByTableName = dbService.getFieldsByTableName(id, tableName);
@@ -142,7 +193,13 @@
return Result.success(fieldsByTableName);
}
-
+ /**
+ *
+ * @description: 鍒犻櫎鏁版嵁婧�
+ * @param id 鏁版嵁婧恑d
+ * @return: 鍒犻櫎缁撴灉
+ *
+ */
@Transactional(rollbackFor=Exception.class)
@RequestMapping(value = "/delete/{id}", method = RequestMethod.GET)
public Result delete(@PathVariable String id) {
@@ -174,7 +231,12 @@
}
}
-
+ /**
+ *
+ * @description: 娣诲姞鏁版嵁婧�
+ * @return: 鏁版嵁婧愭坊鍔犵粨鏋�
+ *
+ */
@ResponseBody
@RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST)
public Result addOne(@RequestBody SysAssembleDb sysAssembleDb) {
--
Gitblit v1.8.0