refactor: 优化

Author: zhou-hao

hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/query/QueryAnalyzer.java

@@ -95,7 +95,7 @@ enum Type {
     @RequiredArgsConstructor
     @Getter
     class Select {
-        private transient Map<String, Column> columns;
+        private transient volatile Map<String, Column> columns;
 
         final List<Column> columnList;
 
@@ -118,26 +118,31 @@ public Optional<Column> findColumn(String name) {
             }
 
             String snake = QueryHelperUtils.toSnake(name);
-
-            for (Column col : columnList) {
-                if (Objects.equals(col.name, name)
-                    || Objects.equals(col.name, snake)
-                    || Objects.equals(QueryHelperUtils.toSnake(col.alias), snake)
-                    || Objects.equals(col.getFullName(), snake)) {
-                    return Optional.of(col);
-                }
+            column = columnMap.get(snake);
+            if (column != null) {
+                return Optional.of(column);
             }
 
             return Optional.empty();
 
         }
 
+        @Deprecated
         public Map<String, Column> getColumns() {
-            return columns == null
-                ? columns = columnList
-                .stream()
-                .collect(Collectors.toMap(Column::getAlias, Function.identity(), (a, b) -> b))
-                : columns;
+            if (columns == null) {
+                synchronized (this) {
+                    if (columns == null) {
+                        columns = new HashMap<>();
+                        for (Column column : columnList) {
+                            columns.put(column.name, column);
+                            columns.put(column.alias, column);
+                            columns.put(column.getFullName(), column);
+                            columns.put(QueryHelperUtils.toSnake(column.alias), column);
+                        }
+                    }
+                }
+            }
+            return columns;
         }
     }
 

hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/query/QueryAnalyzerImpl.java

@@ -95,7 +95,7 @@ public boolean columnIsExpression(String name, int index) {
             return select.getColumnList().get(index) instanceof ExpressionColumn;
         }
 
-        return select.getColumns().get(name) instanceof ExpressionColumn;
+        return select.findColumn(name).orElse(null) instanceof ExpressionColumn;
     }
 
     private Map<String, Column> getColumnMappings() {
@@ -168,12 +168,8 @@ private Map<String, Column> getColumnMappings() {
     }
 
     private Column getColumnOrSelectColumn(String name) {
-        Column column = select.getColumns().get(name);
+        Column column = select.findColumn(name).orElse(null);
 
-        if (column != null) {
-            return column;
-        }
-        column = select.getColumns().get(QueryHelperUtils.toSnake(name));
         if (column != null) {
             return column;
         }