From 92e0f136bf566f8b3a3be1f08acb9c0e761893d7 Mon Sep 17 00:00:00 2001
From: Binlin B Wang <binlin.b.wang@cn.pwc.com>
Date: Sun, 31 Jul 2022 22:27:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TopSearchTableController.java  |  2 +-
 .../ebts/generator/entity/UniColumnInfo.java  | 22 ++++++++++++++++++-
 .../impl/TopSearchTableServiceImpl.java       |  8 ++++---
 3 files changed, 27 insertions(+), 5 deletions(-)

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 f5d8160..b4dcc1e 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
@@ -135,7 +135,7 @@ public class TopSearchTableController extends EBTSController {
      * 导入表结构（保存）
      */
     @PreAuthorize("@ebts.hasPermi('tool:table:import')")
-    @Log(title = "代码生成", businessType = BusinessType.IMPORT)
+    @Log(title = "top表数据维护", businessType = BusinessType.IMPORT)
     @PostMapping("/importTopTable")
     public Result<String> importTableSave(String tables) {
         String[] tableNames = Convert.toStrArray(tables);
diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/entity/UniColumnInfo.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/entity/UniColumnInfo.java
index a5faab9..6d6c7b3 100644
--- a/ebts/ebts-generator/src/main/java/com/ebts/generator/entity/UniColumnInfo.java
+++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/entity/UniColumnInfo.java
@@ -10,11 +10,23 @@ public class UniColumnInfo {
     private long queryId;
     private String prop;
     private String label;
+    private String dictType;
 
     public UniColumnInfo() {
     }
 
-    public UniColumnInfo(long queryId,String prop, String label) {
+    public UniColumnInfo(long queryId, String prop, String label, String dictType) {
+        this.dictType = dictType;
+        this.queryId = queryId;
+        if (StringUtils.isNull(label)){
+            this.label = prop;
+        }else {
+            this.label = label;
+        }
+        this.prop = prop;
+    }
+
+    public UniColumnInfo(long queryId, String prop, String label) {
         this.queryId = queryId;
         if (StringUtils.isNull(label)){
             this.label = prop;
@@ -47,4 +59,12 @@ public class UniColumnInfo {
     public void setLabel(String label) {
         this.label = label;
     }
+
+    public String getDictType() {
+        return dictType;
+    }
+
+    public void setDictType(String dictType) {
+        this.dictType = dictType;
+    }
 }
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 bba0f11..59343a0 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
@@ -23,6 +23,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * top万能查询主Service业务层处理
@@ -168,9 +169,10 @@ public class TopSearchTableServiceImpl implements TopSearchTableService {
             int row = topSearchTableDao.insertTopSearchTable(table);
             if (row > 0) {
                 List<TopSearchColumn> searchColumns = topSearchTableDao.selectDbTableColumnsByName(tableName);
-                for (TopSearchColumn searchColumn : searchColumns) {
-                    searchColumn.setSearchTableId(table.getId());
-                }
+                searchColumns = searchColumns.stream().peek(column->{
+                    column.setSearchTableId(table.getId());
+                    column.setIsUse(1);
+                }).collect(Collectors.toList());
                 if (searchColumns.size() > 0) {
                     topSearchTableDao.batchTopSearchColumn(searchColumns);
                 }