getQueryColumns

boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -401,9 +401,26 @@ public class TableServiceCmdService {
         GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, condition.getTable());
         List<GenTableColumn> columns = genTable.getColumns();
         JSONObject jsonObject = new JSONObject();
+
         // 查询字段
+        jsonObject.put(FormDataConstant.QUERY_LIST, getQueryColumns(columns));
+        // BUTTON_LIST
+        List<String> btns = buildBtnList(genTable.getTableName());
+        jsonObject.put(FormDataConstant.BUTTON_LIST, Strings.nullToEmpty(CollectionUtils.listToString(btns)));
+        jsonObject.put(ViewTypeConst.VIEW_TYPE, Strings.nullToEmpty(genTable.getTplCategory()));
+        jsonObject.put(RULES, packRequireColumn(columns));
+        return AjaxResult.success(jsonObject);
+    }
+
+    /**
+     * 功能描述:  查找表作为查询字段的列，如果有字典值并把字典值赋值
+     *
+     * @param allColumns allColumns
+     * @return java.util.List<com.boman.domain.GenTableColumn>
+     */
+    private List<GenTableColumn> getQueryColumns(List<GenTableColumn> allColumns) {
         ArrayList<GenTableColumn> queryList = Lists.newArrayListWithCapacity(16);
-        for (GenTableColumn column : columns) {
+        for (GenTableColumn column : allColumns) {
             if (GenTableColumn.IS_QUERY.equalsIgnoreCase(column.getIsQuery())) {
                 String dictType = column.getDictType();
                 if (ObjectUtils.isNotEmpty(dictType)) {
@@ -413,14 +430,7 @@ public class TableServiceCmdService {
                 queryList.add(column);
             }
         }
-
-        jsonObject.put(FormDataConstant.QUERY_LIST, queryList);
-
-        List<String> btns = buildBtnList(genTable.getTableName());
-        jsonObject.put(FormDataConstant.BUTTON_LIST, Strings.nullToEmpty(CollectionUtils.listToString(btns)));
-        jsonObject.put(ViewTypeConst.VIEW_TYPE, Strings.nullToEmpty(genTable.getTplCategory()));
-        jsonObject.put(RULES, packRequireColumn(columns));
-        return AjaxResult.success(jsonObject);
+        return queryList;
     }
 
     /**
@@ -462,16 +472,7 @@ public class TableServiceCmdService {
         GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, condition.getTable());
         List<GenTableColumn> columns = genTable.getColumns();
         // 查询字段
-        ArrayList<GenTableColumn> queryList = Lists.newArrayListWithCapacity(16);
-        for (GenTableColumn column : columns) {
-            if (GenTableColumn.IS_QUERY.equalsIgnoreCase(column.getIsQuery())) {
-                String dictType = column.getDictType();
-                if (ObjectUtils.isNotEmpty(dictType)) {
-                    column.setSysDictData(listSysDictDataByType(dictType));
-                }
-                queryList.add(column);
-            }
-        }
+        List<GenTableColumn> queryList = getQueryColumns(columns);
 
         return AjaxResult.success(queryList);
     }