sql执行器增加上下布局拖拽

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/dm/DmBaseMapper.xml

@@ -51,7 +51,7 @@
         left join (
         select s.owner, s.table_name, s.column_name,s.POSITION, cons.constraint_type  from 	all_cons_columns s
         join all_constraints cons on s.owner = cons.owner and
-        s.constraint_name = cons.constraint_name  where cons.constraint_type in ('P', 'U', 'R')
+        s.constraint_name = cons.constraint_name  where cons.constraint_type in ('P', 'U', 'R')--只选择constraint_type为'P'（主键）、'U'（唯一键）和'R'（外键）的约束类型
         )cons on t.owner = cons.owner and t.table_name = cons.table_name and t.column_name = cons.column_name
         left join (
         select comments.owner, comments.table_name, comments.column_name, comments.comments

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/oracle/OracleBaseMapper.xml

@@ -51,7 +51,7 @@
         left join (
             select s.owner, s.table_name, s.column_name,s.POSITION, cons.constraint_type  from 	all_cons_columns s
             join all_constraints cons on s.owner = cons.owner and
-            s.constraint_name = cons.constraint_name  where cons.constraint_type in ('P', 'U', 'R')
+            s.constraint_name = cons.constraint_name  where cons.constraint_type in ('P', 'U', 'R')--只选择constraint_type为'P'（主键）、'U'（唯一键）和'R'（外键）的约束类型
         )cons on t.owner = cons.owner and t.table_name = cons.table_name and t.column_name = cons.column_name
         left join (
             select comments.owner, comments.table_name, comments.column_name, comments.comments

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DmServiceImpl.java

@@ -44,9 +44,8 @@ public class DmServiceImpl extends DbBaseService {
     public String getQueryPageSql(DataViewParam dataViewParam) {
         String queryColumns = StringUtils.defaultIfBlank(dataViewParam.getRetainColumn(), "*");
         if(!Objects.equals(queryColumns, "*")){
-            queryColumns = Arrays.stream(queryColumns.split(","))
-                    .map(word -> "\"" + word + "\"")
-                    .collect(Collectors.joining(","));
+            //给字段加上双引号，解决关键字问题
+            queryColumns = Arrays.stream(queryColumns.split(",")).map(word -> "\"" + word + "\"").collect(Collectors.joining(","));
         }
         StringBuilder sqlSb = new StringBuilder();
         sqlSb.append(String.format("select %s from %s.%s", queryColumns, dataViewParam.getDbName(), dataViewParam.getTableName()));

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/OracleServiceImpl.java

@@ -53,9 +53,8 @@ public class OracleServiceImpl extends DbBaseService {
     public String getQueryPageSql(DataViewParam dataViewParam) {
         String queryColumns = StringUtils.defaultIfBlank(dataViewParam.getRetainColumn(), "*");
         if(!Objects.equals(queryColumns, "*")){
-            queryColumns = Arrays.stream(queryColumns.split(","))
-                    .map(word -> "\"" + word + "\"")
-                    .collect(Collectors.joining(","));
+            //给字段加上双引号，解决关键字问题
+            queryColumns = Arrays.stream(queryColumns.split(",")).map(word -> "\"" + word + "\"").collect(Collectors.joining(","));
         }
         StringBuilder sqlSb = new StringBuilder();
         sqlSb.append(String.format("select %s from %s.%s", queryColumns, dataViewParam.getDbName(), dataViewParam.getTableName()));

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/SqlserverServiceImpl.java

@@ -90,9 +90,8 @@ public class SqlserverServiceImpl extends DbBaseService {
 	public String getQueryPageSql(DataViewParam dataViewParam) {
 		String queryColumns = StringUtils.defaultIfBlank(dataViewParam.getRetainColumn(), "*");
 		if(!Objects.equals(queryColumns, "*")){
-			queryColumns = Arrays.stream(queryColumns.split(","))
-					.map(word -> "\"" + word + "\"")
-					.collect(Collectors.joining(","));
+			//给字段加上双引号，解决关键字问题
+			queryColumns = Arrays.stream(queryColumns.split(",")).map(word -> "\"" + word + "\"").collect(Collectors.joining(","));
 		}
 		Integer pageNum = dataViewParam.getPageNum();
 		Integer pageSize = dataViewParam.getPageSize();

zyplayer-doc-db/src/main/resources/dist/doc-db.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon-db.png"><title>数据库文档管理</title><link href="css/chunk-vendors.2fa4c9b3.css" rel="preload" as="style"><link href="css/index.88462938.css" rel="preload" as="style"><link href="js/chunk-vendors.6270548d.js" rel="preload" as="script"><link href="js/index.dada83b9.js" rel="preload" as="script"><link href="css/chunk-vendors.2fa4c9b3.css" rel="stylesheet"><link href="css/index.88462938.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but zyplayer-db-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.6270548d.js"></script><script src="js/index.dada83b9.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon-db.png"><title>数据库文档管理</title><link href="css/chunk-vendors.2fa4c9b3.css" rel="preload" as="style"><link href="css/index.4edbcddf.css" rel="preload" as="style"><link href="js/chunk-vendors.6270548d.js" rel="preload" as="script"><link href="js/index.8babff14.js" rel="preload" as="script"><link href="css/chunk-vendors.2fa4c9b3.css" rel="stylesheet"><link href="css/index.4edbcddf.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but zyplayer-db-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.6270548d.js"></script><script src="js/index.8babff14.js"></script></body></html>