From 35d048aa5c0eecd6a737c04278779b0720b0e3db Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 04 十二月 2023 11:18:12 +0800
Subject: [PATCH] 6
---
zt/core/src/main/java/com/zt/generator/controller/SysGeneratorController.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/zt/core/src/main/java/com/zt/generator/controller/SysGeneratorController.java b/zt/core/src/main/java/com/zt/generator/controller/SysGeneratorController.java
index e9c794b..7024bd1 100644
--- a/zt/core/src/main/java/com/zt/generator/controller/SysGeneratorController.java
+++ b/zt/core/src/main/java/com/zt/generator/controller/SysGeneratorController.java
@@ -1,8 +1,8 @@
/**
* Copyright (c) 2018 浜轰汉寮�婧� All rights reserved.
- *
+ * <p>
* https://www.renren.io
- *
+ * <p>
* 鐗堟潈鎵�鏈夛紝渚垫潈蹇呯┒锛�
*/
@@ -45,7 +45,7 @@
public class SysGeneratorController {
@GetMapping("properties")
- @RequiresPermissions(Constant.Permissions.SUPER_ADMIN)
+ //@RequiresPermissions(Constant.Permissions.SUPER_ADMIN)
public Result<JSONObject> queryProperties() {
JSONObject jsonObject = new JSONObject();
try {
@@ -66,6 +66,35 @@
eqList.add(json);
}
jsonObject.put("eqList", eqList);
+
+ DbProperties jdbc = queryJdbcProperties();
+
+ DataTable table = null;
+ Connection conn = null;
+ try {
+ // 娉ㄥ唽鏁版嵁搴撻┍鍔�
+ Class.forName(jdbc.getDriverClass());
+ Properties props = new Properties();
+ props.put("remarksReporting", "true");// 涓轰簡寰楀埌璇存槑
+ props.setProperty("user", jdbc.getUserName());
+ props.setProperty("password", jdbc.getPassWord());
+ // 鑾峰彇杩炴帴
+ conn = DriverManager.getConnection(jdbc.getUrl(), props);
+ table = DBUtil.getTableList(conn, false);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ if (conn != null) {
+ try {
+ conn.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ jsonObject.put("tableList", table.toJSONArray());
return Result.ok(jsonObject);
}
@@ -133,7 +162,7 @@
JSONObject json = array.getJSONObject(i);
String columnName = json.getString("columnName");
if ("is_delete,dept_id,company_id,tenant_id,creator,create_date,updater,update_date"
- .indexOf(columnName) >= 0) {
+ .indexOf(columnName.toLowerCase()) >= 0) {
json.put("isTableColumn", "false");
}
}
--
Gitblit v1.9.1