From aaf2f719b4c5c548400245eace83f9aa93856d48 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Thu, 29 Jul 2021 22:07:30 +0800
Subject: [PATCH] =?UTF-8?q?top=E6=9D=83=E9=99=90=E7=8B=AC=E7=AB=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ebts-ui/src/api/tool/table.js                 |   8 +
 ebts-ui/src/views/login.vue                   |   6 +-
 .../src/views/tool/table/importTopTable.vue   |  13 +-
 ebts-ui/src/views/tool/table/index.vue        |  11 --
 ebts-ui/src/views/tool/top/index.vue          |   2 +-
 .../top/packages/topology/src/topology.vue    |  16 +-
 .../system/RealQueryController.java           |   3 -
 .../generator/controller/QueryController.java |   2 +-
 .../controller/TopQueryController.java        |   3 -
 .../controller/TopSearchTableController.java  |  24 ++-
 .../generator/dao/SearchTableRoleDao.java     |   1 +
 .../ebts/generator/dao/TopSearchTableDao.java |  11 ++
 .../ebts/generator/entity/TopSearchTable.java |   2 +
 .../service/TopSearchTableService.java        |   3 +
 .../impl/TopSearchTableServiceImpl.java       | 164 ++++++++++--------
 .../mapper/generator/GenTableMapper.xml       |   4 +-
 .../mapper/generator/QueryMapper.xml          |   2 +-
 .../resources/mapper/generator/RelMapper.xml  |   7 +-
 .../mapper/generator/TopSearchTableMapper.xml |  27 ++-
 .../src/main/resources/vm/vue/index.vue.vm    |   7 +-
 .../mapper/system/RealQueryServiceMapper.xml  |   2 +-
 21 files changed, 189 insertions(+), 129 deletions(-)

diff --git a/ebts-ui/src/api/tool/table.js b/ebts-ui/src/api/tool/table.js
index a4d93e8..07f3dd4 100644
--- a/ebts-ui/src/api/tool/table.js
+++ b/ebts-ui/src/api/tool/table.js
@@ -79,3 +79,11 @@ export function delTable(id) {
     method: 'delete'
   })
 }
+// 获取数据库表list
+export function listDbTable(data) {
+  return request({
+    url: '/tool/table/db/list',
+    method: 'post',
+    data:data
+  })
+}
diff --git a/ebts-ui/src/views/login.vue b/ebts-ui/src/views/login.vue
index dcb73ab..994cd2f 100644
--- a/ebts-ui/src/views/login.vue
+++ b/ebts-ui/src/views/login.vue
@@ -66,8 +66,10 @@ export default {
       codeUrl: "",
       cookiePassword: "",
       loginForm: {
-        username: "admin",
-        password: "HCY@2020",
+        username: "clay",
+        password: "926425",
+        // username: "admin",
+        // password: "HCY@2020",
         rememberMe: false,
         code: "",
         uuid: ""
diff --git a/ebts-ui/src/views/tool/table/importTopTable.vue b/ebts-ui/src/views/tool/table/importTopTable.vue
index b0d599c..b71ace4 100644
--- a/ebts-ui/src/views/tool/table/importTopTable.vue
+++ b/ebts-ui/src/views/tool/table/importTopTable.vue
@@ -28,10 +28,10 @@
     <el-row>
       <el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="tableName" label="表名称" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="createTime" label="创建时间"></el-table-column>
-<!--        <el-table-column prop="updateTime" label="更新时间"></el-table-column>-->
+        <el-table-column prop="table_name" label="表名称" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="table_comment" label="表描述" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="create_time" label="创建时间"></el-table-column>
+<!--        <el-table-column prop="update_time" label="更新时间"></el-table-column>-->
       </el-table>
       <pagination
         v-show="total>0"
@@ -49,8 +49,7 @@
 </template>
 
 <script>
-import { listDbTable} from "@/api/tool/gen";
-import {importTopTable} from '../../../api/tool/table'
+import {importTopTable,listDbTable} from '../../../api/tool/table'
 
 export default {
   data() {
@@ -83,7 +82,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.tables = selection.map(item => item.tableName);
+      this.tables = selection.map(item => item.table_name);
     },
     // 查询表数据
     getList() {
diff --git a/ebts-ui/src/views/tool/table/index.vue b/ebts-ui/src/views/tool/table/index.vue
index f9e631f..f830025 100644
--- a/ebts-ui/src/views/tool/table/index.vue
+++ b/ebts-ui/src/views/tool/table/index.vue
@@ -42,16 +42,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['tool:table:add']"
-        >新增</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -81,7 +71,6 @@
           icon="el-icon-upload"
           size="mini"
           @click="openImportTable"
-          v-hasPermi="['tool:gen:import']"
         >导入</el-button>
     </el-col>
       <el-col :span="1.5">
diff --git a/ebts-ui/src/views/tool/top/index.vue b/ebts-ui/src/views/tool/top/index.vue
index 70ebaff..389d706 100644
--- a/ebts-ui/src/views/tool/top/index.vue
+++ b/ebts-ui/src/views/tool/top/index.vue
@@ -112,7 +112,7 @@
             size="small"
             icon="el-icon-edit-outline"
             @click="handleEditTable(scope.row)"
-            v-hasPermi="['tool:query:update']"
+            v-hasPermi="['tool:query:edit']"
           >编辑</el-button>
           <el-button
             size="mini"
diff --git a/ebts-ui/src/views/tool/top/packages/topology/src/topology.vue b/ebts-ui/src/views/tool/top/packages/topology/src/topology.vue
index 8c16419..24e179a 100644
--- a/ebts-ui/src/views/tool/top/packages/topology/src/topology.vue
+++ b/ebts-ui/src/views/tool/top/packages/topology/src/topology.vue
@@ -4,9 +4,6 @@
     <div v-if="toolbarShow && graphMode === 'edit'">
       <toolbar-edit></toolbar-edit>
     </div>
-    <div v-else-if="toolbarShow">
-      <toolbar-preview ref="toolbarPreview"></toolbar-preview>
-    </div>
     <!-- container -->
     <div class="container" :class="graphBg" @contextmenu.prevent>
       <!-- item-pannel -->
@@ -239,9 +236,9 @@
           <el-table-column
             prop="key"
             width="150px"
-            label="字段别名">
+            label="查询条件名称">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.ucName" placeholder="请输入列别名" />
+              <el-input v-model="scope.row.ucName" placeholder="请输入查询条件名称" />
             </template>
           </el-table-column>
           <el-table-column label="条件">
@@ -309,7 +306,6 @@
 import G6 from '@antv/g6'
 
 import { Loading, Checkbox } from '../../elements'
-import ToolbarPreview from './toolbar-preview'
 import ToolbarEdit from './toolbar-edit'
 import registerEdge from './edge'
 import Node from './node'
@@ -328,7 +324,6 @@ export default {
   components: {
     'cc-checkbox': Checkbox,
     'cc-loading': Loading,
-    'toolbar-preview': ToolbarPreview,
     'toolbar-edit': ToolbarEdit
   },
   props: {
@@ -363,7 +358,6 @@ export default {
       graphBg: 'default-style',
       toolbarShow: true,
       rightMenuShow: false,
-      // imgSrc: 'data:image/png;base64,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',
       imgSrc:'data:image/png;base64,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',
       graphData: {
         nodes: [],
@@ -795,9 +789,7 @@ export default {
       self.graph.setMode(self.graphMode)
       self.graph.refresh()
       self.autoZoomHandler()
-      if (this.graphMode === 'preview') {
-        self.$refs.toolbarPreview.changeThemeActiveIndex(1)
-      } else if (this.graphMode === 'edit') {
+      if (this.graphMode === 'edit') {
         // 由于 G6 目前不支持监听 Group 的点击事件，故自行实现
         self.graph.on('click', evt => {
           if (evt.target.cfg.groupId) {
@@ -1216,7 +1208,7 @@ export default {
               item.ucType = ''
               item.type = 1
               item.ucMock = ''
-              item.ucName = ''
+              item.ucName = item.columnComment
               columns.push(item)
             }
           }
diff --git a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/RealQueryController.java b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/RealQueryController.java
index 0306c46..7e486af 100644
--- a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/RealQueryController.java
+++ b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/system/RealQueryController.java
@@ -36,7 +36,6 @@ public class RealQueryController extends BaseController {
      * @param realUniQuery
      * @return
      */
-    @PreAuthorize("@ebts.hasAnyPermi('data:real:export')")
     @PutMapping("/real/export")
     public AjaxResult exportReal(@Validated @RequestBody RealUniQuery realUniQuery) {
         ServerResult<List<Map<String, Object>>> serverResult = realQueryService.RealData(realUniQuery, 1);
@@ -53,7 +52,6 @@ public class RealQueryController extends BaseController {
      * @param id
      * @return
      */
-    @PreAuthorize("@ebts.hasPermi('data:real:data')")
     @GetMapping("/real/{id}")
     public AjaxResult RealInfo(@PathVariable("id") Long id) {
         if (id == null) {
@@ -74,7 +72,6 @@ public class RealQueryController extends BaseController {
      * @param realUniQuery
      * @return
      */
-    @PreAuthorize("@ebts.hasAnyPermi('data:real:list')")
     @PutMapping("/real")
     public Serializable RealData(@Validated @RequestBody RealUniQuery realUniQuery) {
         ServerResult<List<Map<String, Object>>> serverResult = realQueryService.RealData(realUniQuery, 2);
diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/QueryController.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/QueryController.java
index b3ae279..59339d9 100644
--- a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/QueryController.java
+++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/QueryController.java
@@ -39,7 +39,7 @@ public class QueryController extends BaseController {
     private QueryService queryService;
 
     /**
-     * 获取编辑sql的基本信息
+     * todo 获取编辑sql的基本信息
      *
      * @param id
      * @return
diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopQueryController.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopQueryController.java
index 15fb86f..82bb1b3 100644
--- a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopQueryController.java
+++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopQueryController.java
@@ -31,9 +31,6 @@ import java.util.Map;
 @RequestMapping("/top")
 public class TopQueryController extends BaseController {
 
-    @Autowired
-    private TopSearchTableService topSearchTableService;
-
     @Autowired
     private UniQueryService uniQueryService;
 
diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopSearchTableController.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopSearchTableController.java
index 32b5f96..832ed1c 100644
--- a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopSearchTableController.java
+++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopSearchTableController.java
@@ -1,12 +1,15 @@
 package com.ebts.generator.controller;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 import com.ebts.common.core.controller.EBTSController;
 import com.ebts.common.core.text.Convert;
 import com.ebts.common.utils.ServerResult;
+import com.ebts.generator.entity.GenTable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -122,6 +125,9 @@ public class TopSearchTableController extends EBTSController {
     @Log(title = "top万能查询主", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody TopSearchTable topSearchTable) {
+        if (topSearchTable.getRoleIds().length==0){
+            return AjaxResult.error("角色不能为空!");
+        }
         ServerResult<Integer> genServerResult = topSearchTableService.updateTopSearchTable(topSearchTable);
         if (genServerResult.isStart()) {
             return AjaxResult.success();
@@ -150,15 +156,29 @@ public class TopSearchTableController extends EBTSController {
     /**
      * 导入表结构（保存）
      */
-    @PreAuthorize("@ebts.hasPermi('tool:gen:list')")
+    @PreAuthorize("@ebts.hasPermi('tool:table:import')")
     @Log(title = "代码生成", businessType = BusinessType.IMPORT)
     @PostMapping("/importTopTable")
     public AjaxResult importTableSave(String tables) {
         String[] tableNames = Convert.toStrArray(tables);
         // 查询表信息
-
         List<TopSearchTable> tableList = topSearchTableService.selectDbTableListByNames(tableNames);
         topSearchTableService.importGenTable(tableList);
         return AjaxResult.success();
     }
+
+
+    /**
+     * 导入表结构（获取）
+     */
+    @PreAuthorize("@ebts.hasPermi('tool:table:db:list')")
+    @PostMapping("/db/list")
+    public Serializable dbList(@RequestBody Map<String,Object> params){
+        startPage(params);
+        List<Map<String,Object>> list = topSearchTableService.selectDbTableList(params);
+        return getDataTable(list);
+    }
+
+
+
 }
diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/SearchTableRoleDao.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/SearchTableRoleDao.java
index 4c2ea8c..9654eb2 100644
--- a/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/SearchTableRoleDao.java
+++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/SearchTableRoleDao.java
@@ -25,6 +25,7 @@ public interface SearchTableRoleDao {
      * @return 结果
      */
     int deleteSearchTableRoleById(Long searchTableId);
+    int deleteSearchTableRoleByIds(Long[] searchTableIds);
 
     /**
      * 批量添加top万能查询角色关系
diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/TopSearchTableDao.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/TopSearchTableDao.java
index e9881ca..2d5a954 100644
--- a/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/TopSearchTableDao.java
+++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/TopSearchTableDao.java
@@ -1,6 +1,9 @@
 package com.ebts.generator.dao;
 
 import java.util.List;
+import java.util.Map;
+
+import com.ebts.generator.entity.GenTable;
 import com.ebts.generator.entity.TopSearchTable;
 import com.ebts.generator.entity.TopSearchColumn;
 
@@ -45,6 +48,14 @@ public interface TopSearchTableDao {
      */
     List<TopSearchTable> selectDbTableListByNames(String[] tableNames);
 
+
+    /**
+     * 获取数据库表信息
+     *
+     * @param params 表名称组
+     * @return 数据库表集合
+     */
+    List<Map<String,Object>> selectDbTableList(Map<String,Object> params);
     /**
      * 根据表名查询列
      * @param tableName
diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/entity/TopSearchTable.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/entity/TopSearchTable.java
index 0d0d6ea..8d54176 100644
--- a/ebts/ebts-generator/src/main/java/com/ebts/generator/entity/TopSearchTable.java
+++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/entity/TopSearchTable.java
@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * top万能查询主对象 gen_top_search_table
  * 
diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/TopSearchTableService.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/TopSearchTableService.java
index 08aee3b..8fb33c6 100644
--- a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/TopSearchTableService.java
+++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/TopSearchTableService.java
@@ -1,6 +1,7 @@
 package com.ebts.generator.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.ebts.common.utils.ServerResult;
 import com.ebts.generator.entity.TopSearchColumn;
@@ -54,6 +55,8 @@ public interface TopSearchTableService {
 
     List<TopSearchTable> selectDbTableListByNames(String[] tableNames);
 
+    List<Map<String,Object>> selectDbTableList(Map<String,Object> params);
+
     void importGenTable(List<TopSearchTable> tableList);
 
     /**
diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopSearchTableServiceImpl.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopSearchTableServiceImpl.java
index 31d9ea7..b47629f 100644
--- a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopSearchTableServiceImpl.java
+++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopSearchTableServiceImpl.java
@@ -5,9 +5,6 @@ import java.util.List;
 import com.ebts.common.constant.ReturnConstants;
 import com.ebts.common.exception.EbtsException;
 import com.ebts.common.utils.SecurityUtils;
-import com.ebts.common.utils.DateUtils;
-import com.ebts.common.utils.SecurityUtils;
-import com.ebts.common.utils.DateUtils;
 import com.ebts.common.utils.ServerResult;
 import com.ebts.generator.dao.RelationalMapDao;
 import com.ebts.generator.dao.SearchTableRoleDao;
@@ -17,7 +14,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.ArrayList;
+import java.util.Map;
+
 import com.ebts.common.utils.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import com.ebts.generator.entity.TopSearchColumn;
@@ -27,7 +27,7 @@ import com.ebts.generator.service.TopSearchTableService;
 
 /**
  * top万能查询主Service业务层处理
- * 
+ *
  * @author clay
  * @date 2021-07-20
  */
@@ -44,7 +44,7 @@ public class TopSearchTableServiceImpl implements TopSearchTableService {
 
     /**
      * 查询top万能查询主
-     * 
+     *
      * @param id top万能查询主ID
      * @return top万能查询主
      */
@@ -52,26 +52,26 @@ public class TopSearchTableServiceImpl implements TopSearchTableService {
     public ServerResult<TopSearchTable> selectTopSearchTableById(Long id) {
         try {
             TopSearchTable topSearchTable = topSearchTableDao.selectTopSearchTableById(id);
-            List<SearchTableRole> roleList = searchTableRoleDao.selectSearchTableRoleList(new SearchTableRole(id,null));
-            Long[] roles = new Long[roleList.size()] ;
+            List<SearchTableRole> roleList = searchTableRoleDao.selectSearchTableRoleList(new SearchTableRole(id, null));
+            Long[] roles = new Long[roleList.size()];
             for (int i = 0; i < roleList.size(); i++) {
                 roles[i] = roleList.get(i).getRoleId();
             }
             topSearchTable.setRoleIds(roles);
-            if (topSearchTable != null){
-                return new ServerResult<>(true,topSearchTable);
-            }else {
+            if (topSearchTable != null) {
+                return new ServerResult<>(true, topSearchTable);
+            } else {
                 return new ServerResult<>(false, ReturnConstants.RESULT_EMPTY);
             }
-        }catch (RuntimeException e){
+        } catch (RuntimeException e) {
             logger.error(e.getMessage());
-            throw new EbtsException(ReturnConstants.OP_ERROR,e);
+            throw new EbtsException(ReturnConstants.OP_ERROR, e);
         }
     }
 
     /**
      * 查询top万能查询主列表
-     * 
+     *
      * @param topSearchTable top万能查询主
      * @return top万能查询主
      */
@@ -79,14 +79,14 @@ public class TopSearchTableServiceImpl implements TopSearchTableService {
     public ServerResult<List<TopSearchTable>> selectTopSearchTableList(TopSearchTable topSearchTable) {
         try {
             List<TopSearchTable> topSearchTableList = topSearchTableDao.selectTopSearchTableList(topSearchTable);
-            if (topSearchTableList.size()>0){
-                return new ServerResult<>(true,topSearchTableList);
-            }else {
-                return new ServerResult<>(false,ReturnConstants.RESULT_EMPTY);
+            if (topSearchTableList.size() > 0) {
+                return new ServerResult<>(true, topSearchTableList);
+            } else {
+                return new ServerResult<>(false, ReturnConstants.RESULT_EMPTY);
             }
-        }catch (RuntimeException e){
+        } catch (RuntimeException e) {
             logger.error(e.getMessage());
-            throw new EbtsException(ReturnConstants.OP_ERROR,e);
+            throw new EbtsException(ReturnConstants.OP_ERROR, e);
         }
     }
 
@@ -94,20 +94,20 @@ public class TopSearchTableServiceImpl implements TopSearchTableService {
     public ServerResult<List<TopSearchTable>> selectTopSearchTableInfo() {
         try {
             List<TopSearchTable> tableList = topSearchTableDao.selectTopSearchTableInfo();
-            return new ServerResult<>(true,tableList);
-        }catch (RuntimeException e){
+            return new ServerResult<>(true, tableList);
+        } catch (RuntimeException e) {
             logger.error(e.getMessage());
-            throw new EbtsException(ReturnConstants.OP_ERROR,e);
+            throw new EbtsException(ReturnConstants.OP_ERROR, e);
         }
     }
 
-    public List<TopSearchColumn> selectTableColumns(Long id){
+    public List<TopSearchColumn> selectTableColumns(Long id) {
         return topSearchTableDao.selectTableColumns(id);
     }
 
     /**
      * 新增top万能查询主
-     * 
+     *
      * @param topSearchTable top万能查询主
      * @return 结果
      */
@@ -117,23 +117,23 @@ public class TopSearchTableServiceImpl implements TopSearchTableService {
         try {
             topSearchTable.setCreateBy(SecurityUtils.getUserId());
             int renewal = topSearchTableDao.insertTopSearchTable(topSearchTable);
-            if (insertTopSearchColumn(topSearchTable)){
-                return new ServerResult<>(false,ReturnConstants.DB_EX);
+            if (insertTopSearchColumn(topSearchTable)) {
+                return new ServerResult<>(false, ReturnConstants.DB_EX);
             }
-            if (renewal >0){
-                return new ServerResult<>(true,renewal);
-            }else {
-                return new ServerResult<>(false,ReturnConstants.SYS_FAILL);
+            if (renewal > 0) {
+                return new ServerResult<>(true, renewal);
+            } else {
+                return new ServerResult<>(false, ReturnConstants.SYS_FAILL);
             }
-        }catch (RuntimeException e){
+        } catch (RuntimeException e) {
             logger.error(e.getMessage());
-            throw new EbtsException(ReturnConstants.OP_ERROR,e);
+            throw new EbtsException(ReturnConstants.OP_ERROR, e);
         }
     }
 
     /**
      * 修改top万能查询主
-     * 
+     *
      * @param topSearchTable top万能查询主
      * @return 结果
      */
@@ -143,35 +143,42 @@ public class TopSearchTableServiceImpl implements TopSearchTableService {
         try {
             topSearchTable.setUpdateBy(SecurityUtils.getUserId());
             topSearchTableDao.deleteTopSearchColumnBySearchTableId(topSearchTable.getId());
-            if (insertTopSearchColumn(topSearchTable)){
-                return new ServerResult<>(false,ReturnConstants.DB_EX);
+            if (insertTopSearchColumn(topSearchTable)) {
+                return new ServerResult<>(false, ReturnConstants.DB_EX);
             }
             List<SearchTableRole> searchTableRoles = new ArrayList<>();
             for (Long roleId : topSearchTable.getRoleIds()) {
-                searchTableRoles.add(new SearchTableRole(topSearchTable.getId(),roleId));
+                searchTableRoles.add(new SearchTableRole(topSearchTable.getId(), roleId));
             }
             relationalMapDao.deleteRelationalMapById(topSearchTable.getId());
             List<RelationalMap> relationalMapList = topSearchTable.getRelationalMapList();
             for (RelationalMap relationalMap : relationalMapList) {
                 relationalMap.setMainId(topSearchTable.getId());
             }
-            boolean renewalMap = insertRelationalMap(relationalMapList);
+            insertRelationalMap(relationalMapList);
 
 
             searchTableRoleDao.deleteSearchTableRoleById(topSearchTable.getId());
             boolean renewalRole = inserTopTableRole(searchTableRoles);
             Integer renewal = topSearchTableDao.updateTopSearchTable(topSearchTable);
-            if (renewal >0 && renewalRole && renewalMap){
-                return new ServerResult<>(true,renewal);
-            }else {
-                return new ServerResult<>(false,ReturnConstants.OP_ERROR);
+            if (renewal > 0 && renewalRole) {
+                return new ServerResult<>(true, renewal);
+            } else {
+                return new ServerResult<>(false, ReturnConstants.OP_ERROR);
             }
-        }catch (RuntimeException e){
+        } catch (RuntimeException e) {
             logger.error(e.getMessage());
             e.printStackTrace();
-            throw new EbtsException(ReturnConstants.OP_ERROR,e);
+            throw new EbtsException(ReturnConstants.OP_ERROR, e);
         }
     }
+//    void deleteSearchTableRoleById(Long id){
+//        try {
+//
+//        }catch (RuntimeException e){
+//            logger.error("无数据");
+//        }
+//    }
 
     @Override
     public List<TopSearchTable> selectDbTableListByNames(String[] tableNames) {
@@ -179,7 +186,17 @@ public class TopSearchTableServiceImpl implements TopSearchTableService {
             return topSearchTableDao.selectDbTableListByNames(tableNames);
         } catch (RuntimeException e) {
             logger.error(e.getMessage());
-            throw new EbtsException(ReturnConstants.OP_ERROR,e);
+            throw new EbtsException(ReturnConstants.OP_ERROR, e);
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> selectDbTableList(Map<String, Object> params) {
+        try {
+            return topSearchTableDao.selectDbTableList(params);
+        } catch (RuntimeException e) {
+            logger.error(e.getMessage());
+            throw new EbtsException(ReturnConstants.OP_ERROR, e);
         }
     }
 
@@ -192,7 +209,7 @@ public class TopSearchTableServiceImpl implements TopSearchTableService {
                 String tableName = table.getTableName();
                 table.setCreateBy(createBy);
                 int row = topSearchTableDao.insertTopSearchTable(table);
-                if (row>0){
+                if (row > 0) {
                     List<TopSearchColumn> searchColumns = topSearchTableDao.selectDbTableColumnsByName(tableName);
                     for (TopSearchColumn searchColumn : searchColumns) {
                         searchColumn.setSearchTableId(table.getId());
@@ -202,16 +219,16 @@ public class TopSearchTableServiceImpl implements TopSearchTableService {
                     }
                 }
             }
-        }catch (RuntimeException e){
+        } catch (RuntimeException e) {
             logger.error(e.getMessage());
-            throw new EbtsException("导入失败：" + e.getMessage(),e);
+            throw new EbtsException("导入失败：" + e.getMessage(), e);
         }
 
     }
 
     /**
      * 批量删除top万能查询主
-     * 
+     *
      * @param ids 需要删除的top万能查询主ID
      * @return 结果
      */
@@ -221,53 +238,56 @@ public class TopSearchTableServiceImpl implements TopSearchTableService {
         try {
             //批量删除子表数据
             topSearchTableDao.deleteTopSearchColumnBySearchTableIds(ids);
+            searchTableRoleDao.deleteSearchTableRoleByIds(ids);
             Integer renewal = topSearchTableDao.deleteTopSearchTableByIds(ids);
-            if (renewal >0){
-                return new ServerResult<>(true,renewal);
-            }else {
-                return new ServerResult<>(false,ReturnConstants.SYS_FAILL);
+            if (renewal > 0) {
+                return new ServerResult<>(true, renewal);
+            } else {
+                return new ServerResult<>(false, ReturnConstants.SYS_FAILL);
             }
-        }catch (RuntimeException e){
+        } catch (RuntimeException e) {
             logger.error(e.getMessage());
-            throw new EbtsException(ReturnConstants.OP_ERROR,e);
+            throw new EbtsException(ReturnConstants.OP_ERROR, e);
         }
     }
 
     /**
      * 删除top万能查询主信息
-     * 
+     *
      * @param id top万能查询主ID
      * @return 结果
      */
     @Override
     public ServerResult<Integer> deleteTopSearchTableById(Long id) {
         try {
-        //删除子表数据
-        topSearchTableDao.deleteTopSearchColumnBySearchTableId(id);
+            //删除子表数据
+            topSearchTableDao.deleteTopSearchColumnBySearchTableId(id);
             Integer renewal = topSearchTableDao.deleteTopSearchTableById(id);
-            if (renewal >0){
-                return new ServerResult<>(true,renewal);
-            }else {
-                return new ServerResult<>(false,ReturnConstants.SYS_FAILL);
+            if (renewal > 0) {
+                return new ServerResult<>(true, renewal);
+            } else {
+                return new ServerResult<>(false, ReturnConstants.SYS_FAILL);
             }
-        }catch (RuntimeException e){
+        } catch (RuntimeException e) {
             logger.error(e.getMessage());
-            throw new EbtsException(ReturnConstants.OP_ERROR,e);
+            throw new EbtsException(ReturnConstants.OP_ERROR, e);
         }
     }
-    public boolean inserTopTableRole(List<SearchTableRole> roleList){
-        if (StringUtils.isNotNull(roleList)){
+
+    public boolean inserTopTableRole(List<SearchTableRole> roleList) {
+        if (StringUtils.isNotNull(roleList)) {
             Integer renewal = searchTableRoleDao.batchSearchTableRole(roleList);
-            if (renewal>0){
+            if (renewal > 0) {
                 return true;
             }
         }
         return false;
     }
-    public boolean insertRelationalMap(List<RelationalMap> relationalMaps){
-        if (StringUtils.isNotNull(relationalMaps)){
+
+    public boolean insertRelationalMap(List<RelationalMap> relationalMaps) {
+        if (StringUtils.isNotNull(relationalMaps) && relationalMaps.size() > 0) {
             Integer renewal = relationalMapDao.batchRelationalMap(relationalMaps);
-            if (renewal>0){
+            if (renewal > 0) {
                 return true;
             }
         }
@@ -276,7 +296,7 @@ public class TopSearchTableServiceImpl implements TopSearchTableService {
 
     /**
      * 新增top万能查询字段信息
-     * 
+     *
      * @param topSearchTable top万能查询主对象
      */
     public boolean insertTopSearchColumn(TopSearchTable topSearchTable) {
@@ -284,13 +304,13 @@ public class TopSearchTableServiceImpl implements TopSearchTableService {
         Long id = topSearchTable.getId();
         if (StringUtils.isNotNull(topSearchColumnList)) {
             List<TopSearchColumn> list = new ArrayList<TopSearchColumn>();
-            for (TopSearchColumn topSearchColumn : topSearchColumnList){
+            for (TopSearchColumn topSearchColumn : topSearchColumnList) {
                 topSearchColumn.setSearchTableId(id);
                 list.add(topSearchColumn);
             }
             if (list.size() > 0) {
                 Integer renewal = topSearchTableDao.batchTopSearchColumn(list);
-                if (renewal>0){
+                if (renewal > 0) {
                     return false;
                 }
             }
diff --git a/ebts/ebts-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ebts/ebts-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index 1537d41..69a637c 100644
--- a/ebts/ebts-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ebts/ebts-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select table_name, table_comment, create_time, update_time from information_schema.tables
 		where table_schema = (select database())
 		AND table_name NOT LIKE 'qrtz_%'
-
+		AND table_name NOT LIKE 'gen_%'
 		AND table_name NOT IN (select table_name from gen_table)
 		<if test="tableName != null and tableName != ''">
 			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDbTableListByNames" resultMap="GenTableResult">
 		select table_name, table_comment, create_time, update_time from information_schema.tables
 		where table_name NOT LIKE 'qrtz_%'
-
+		AND table_name NOT LIKE 'gen_%'
 		AND table_schema = (select database())
 		AND table_name in
 	    <foreach collection="array" item="name" open="(" separator="," close=")">
diff --git a/ebts/ebts-generator/src/main/resources/mapper/generator/QueryMapper.xml b/ebts/ebts-generator/src/main/resources/mapper/generator/QueryMapper.xml
index 1fc782f..536a74c 100644
--- a/ebts/ebts-generator/src/main/resources/mapper/generator/QueryMapper.xml
+++ b/ebts/ebts-generator/src/main/resources/mapper/generator/QueryMapper.xml
@@ -27,7 +27,7 @@
         <result property="ucType"    column="uc_type"    />
         <result property="type"    column="type"    />
     </resultMap>
-    <select id="UniQuery" resultType="java.util.HashMap">
+    <select id="UniQuery" resultType="java.util.Map">
         ${paramSQL}
     </select>
     <delete id="deleteMenu">
diff --git a/ebts/ebts-generator/src/main/resources/mapper/generator/RelMapper.xml b/ebts/ebts-generator/src/main/resources/mapper/generator/RelMapper.xml
index 55aad48..94a9e99 100644
--- a/ebts/ebts-generator/src/main/resources/mapper/generator/RelMapper.xml
+++ b/ebts/ebts-generator/src/main/resources/mapper/generator/RelMapper.xml
@@ -39,12 +39,7 @@
         <result property="createBy" column="create_by"/>
     </resultMap>
 
-
-
-
-
-
-    <select id="tableInfos" resultType="java.util.HashMap">
+    <select id="tableInfos" resultType="java.util.Map">
         select table_name, table_comment
         from information_schema.tables
         where table_schema = (select database())
diff --git a/ebts/ebts-generator/src/main/resources/mapper/generator/TopSearchTableMapper.xml b/ebts/ebts-generator/src/main/resources/mapper/generator/TopSearchTableMapper.xml
index 5ed4099..d25d165 100644
--- a/ebts/ebts-generator/src/main/resources/mapper/generator/TopSearchTableMapper.xml
+++ b/ebts/ebts-generator/src/main/resources/mapper/generator/TopSearchTableMapper.xml
@@ -87,10 +87,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join gen_relational_mapping grm on grm.main_id = gtst.id
     </select>
 
+    <!--AND table_name NOT LIKE 'gen_%'-->
+    <select id="selectDbTableList" resultType="java.util.Map">
+        select table_name, table_comment, create_time, update_time from information_schema.tables
+        where table_schema = (select database())
+        AND table_name NOT LIKE 'qrtz_%'
+        AND table_name NOT LIKE 'gen_%'
+        AND table_name NOT IN (select table_name from gen_top_search_table)
+        <if test="tableName != null and tableName != ''">
+            AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+        </if>
+        <if test="tableComment != null and tableComment != ''">
+            AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+        </if>
+        <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+            AND date_format(create_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
+        </if>
+        <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+            AND date_format(create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+        </if>
+    </select>
+
     <select id="selectDbTableListByNames" resultMap="TopSearchTableResult">
         select table_name, table_comment, create_time, update_time from information_schema.tables
-        where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
-        and table_name in
+        where table_name NOT LIKE 'qrtz_%'
+            and table_name NOT LIKE 'gen_%'
+            and table_schema = (select database())
+            and table_name in
         <foreach collection="array" item="name" open="(" separator="," close=")">
             #{name}
         </foreach>
diff --git a/ebts/ebts-generator/src/main/resources/vm/vue/index.vue.vm b/ebts/ebts-generator/src/main/resources/vm/vue/index.vue.vm
index 16c32ca..5bd38f9 100644
--- a/ebts/ebts-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ebts/ebts-generator/src/main/resources/vm/vue/index.vue.vm
@@ -527,10 +527,11 @@ export default {
 #foreach($column in $table.relColumns)
 #if($column.isQuery == '1' && $column.htmlType != "datetime" && $column.queryType != "BETWEEN")
             ${column.javaField}: null#if($velocityCount != $columns.size()),#end
-#end
-#end
 
-        params:{},
+#end
+#end
+            params:{},
+        },
         #if($velocityCount != $relTables.size()),#end
 #end
 #end
diff --git a/ebts/ebts-system/src/main/resources/mapper/system/RealQueryServiceMapper.xml b/ebts/ebts-system/src/main/resources/mapper/system/RealQueryServiceMapper.xml
index 58c0864..04188a3 100644
--- a/ebts/ebts-system/src/main/resources/mapper/system/RealQueryServiceMapper.xml
+++ b/ebts/ebts-system/src/main/resources/mapper/system/RealQueryServiceMapper.xml
@@ -40,7 +40,7 @@
         where id = #{id}
     </select>
 
-    <select id="realUniQuery" resultType="java.util.HashMap">
+    <select id="realUniQuery" resultType="java.util.Map">
         ${paramSQL}
     </select>
 </mapper>
\ No newline at end of file