utils

boman-modules/boman-gen/src/main/java/com/boman/gen/util/GenUtils.java

@@ -1,17 +1,13 @@
 package com.boman.gen.util;
 
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.RegExUtils;
 import com.boman.common.core.constant.GenConstants;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.gen.config.GenConfig;
 import com.boman.gen.domain.GenTable;
 import com.boman.gen.domain.GenTableColumn;
+import org.apache.commons.lang3.RegExUtils;
+
+import java.util.Arrays;
 
 /**
  * 代码生成器 工具类
@@ -260,20 +256,4 @@ public class GenUtils
             return 0;
         }
     }
-
-    /**
-     * 功能描述: 数字小的在前面，数字大的在后面
-     *
-     * @param allColumns allColumns
-     * @return java.util.List<com.boman.gen.domain.GenTableColumn>
-     */
-    public static List<GenTableColumn> filterHrAndSort(List<GenTableColumn> allColumns) {
-        if (CollectionUtils.isEmpty(allColumns)) {
-            throw new IllegalArgumentException("GenTableColumn is empty");
-        }
-
-        return allColumns.stream().filter(col -> "HR".equalsIgnoreCase(col.getHtmlType()))
-                .sorted(Comparator.comparing(GenTableColumn::getSort))
-                .collect(Collectors.toList());
-    }
 }

boman-web-core/src/main/java/com/boman/web/core/domain/TableContext.java

@@ -6,14 +6,15 @@ import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
 import com.boman.gen.domain.GenTable;
 import com.boman.gen.domain.GenTableColumn;
-import com.boman.web.core.constant.FormDataConstant;
 import com.boman.web.core.utils.IdUtils;
 
 import java.util.List;
 import java.util.Map;
 
-import static com.boman.common.core.utils.obj.ObjectUtils.*;
+import static com.boman.common.core.utils.obj.ObjectUtils.ltZero;
+import static com.boman.common.core.utils.obj.ObjectUtils.requireNonNull;
 import static com.boman.web.core.constant.MaskConstant.*;
+import static com.boman.web.core.utils.ColumnUtils.withoutHr;
 
 /**
  * @author shiqian
@@ -63,7 +64,7 @@ public class TableContext {
         boolean isInsert = ltZero(objId);
         context.setActionType(isInsert ? ActionType.INSERT : ActionType.UPDATE);
         // 过滤掉hr字段
-        columns = filter(columns, col -> !FormDataConstant.HR.equalsIgnoreCase(col.getHtmlType()));
+        columns = withoutHr(columns);
         for (GenTableColumn column : columns) {
             String[] maskArray = requireNonNull(column.getMask(), "mask is empty, columnName = " + column.getColumnName()).split("");
             assert maskArray.length == 6;

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

@@ -407,7 +407,7 @@ public class TableServiceCmdService {
         JSONObject json = selectService.selectById(tableName, pkName, id);
         requireNonNull(json, "id 为[" + id + "]的数据不存在, 表名为[" + tableName + "]");
         handlerBlobWithJSONObject(genTable.getIsContainsBlob(), Collections.singletonList(json));
-        List<GenTableColumn> parentColumns = GenUtils.filterHrAndSort(columns);
+        List<GenTableColumn> parentColumns = filterHrAndSort(columns);
 
         // 处理成hr的形式
         for (GenTableColumn hrColumn : parentColumns) {
@@ -828,7 +828,7 @@ public class TableServiceCmdService {
 
     public AjaxResult getByTableName(String tableName, List<GenTableColumn> allColumns, Boolean isUi) {
         List<GenTableColumn> resultCols;
-        List<GenTableColumn> parentColumns = GenUtils.filterHrAndSort(allColumns);
+        List<GenTableColumn> parentColumns = filterHrAndSort(allColumns);
         // 所有新增可见的列
         allColumns = filterData(allColumns, 0, MaskConstant.INSERT_VISIBLE::equals);
         // 带折叠

boman-web-core/src/main/java/com/boman/web/core/utils/ColumnUtils.java

@@ -12,9 +12,11 @@ import org.apache.commons.lang3.BooleanUtils;
 
 import java.nio.charset.StandardCharsets;
 import java.sql.Timestamp;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import static com.boman.common.core.utils.obj.ObjectUtils.*;
 import static com.boman.web.core.constant.FormDataConstant.*;
@@ -249,4 +251,30 @@ public class ColumnUtils {
 
         return result;
     }
+
+
+
+    /**
+     * 功能描述: 数字小的在前面，数字大的在后面
+     *
+     * @param allColumns allColumns
+     * @return java.util.List<com.boman.gen.domain.GenTableColumn>
+     */
+    public static List<GenTableColumn> filterHrAndSort(List<GenTableColumn> allColumns) {
+        requireNonNull(allColumns, "columns is empty");
+        return allColumns.stream().filter(col -> HR.equalsIgnoreCase(col.getHtmlType()))
+                .sorted(Comparator.comparing(GenTableColumn::getSort))
+                .collect(Collectors.toList());
+    }
+
+
+    public static List<GenTableColumn> withHr(List<GenTableColumn> columns) {
+        requireNonNull(columns, "columns is empty");
+        return filter(columns, col -> HR.equalsIgnoreCase(col.getHtmlType()));
+    }
+
+    public static List<GenTableColumn> withoutHr(List<GenTableColumn> columns) {
+        requireNonNull(columns, "columns is empty");
+        return filter(columns, col -> !HR.equalsIgnoreCase(col.getHtmlType()));
+    }
 }