diff --git a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java index 6b8f7dc..0717f9f 100644 --- a/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java +++ b/diboot-core/src/main/java/com/diboot/core/util/BeanUtils.java @@ -38,7 +38,7 @@ public class BeanUtils { * 忽略对比的字段 */ private static final Set IGNORE_FIELDS = new HashSet(){{ - add("createTime"); + add(Cons.FieldName.createTime.name()); }}; /*** @@ -146,26 +146,26 @@ public class BeanUtils { Object[] args = new Object[1]; String fieldType = type.getName(); // 类型不一致，需转型 - if(!value.getClass().getTypeName().equals(fieldType)){ + if(value != null && !value.getClass().getTypeName().equals(fieldType)){ if(value instanceof String){ // String to Date - if(fieldType.equalsIgnoreCase(Date.class.getName())){ + if(fieldType.equals(Date.class.getName())){ args[0] = D.fuzzyConvert((String)value); } // Map中的String型转换为其他型 - else if(fieldType.equalsIgnoreCase(Boolean.class.getName())){ + else if(fieldType.equals(Boolean.class.getName())){ args[0] = V.isTrue((String)value); } - else if (fieldType.equalsIgnoreCase(Integer.class.getName()) || "int".equals(fieldType)) { + else if (fieldType.equals(Integer.class.getName()) || "int".equals(fieldType)) { args[0] = Integer.parseInt((String)value); } - else if (fieldType.equalsIgnoreCase(Long.class.getName())) { + else if (fieldType.equals(Long.class.getName())) { args[0] = Long.parseLong((String)value); } - else if (fieldType.equalsIgnoreCase(Double.class.getName())) { + else if (fieldType.equals(Double.class.getName())) { args[0] = Double.parseDouble((String)value); } - else if (fieldType.equalsIgnoreCase(Float.class.getName())) { + else if (fieldType.equals(Float.class.getName())) { args[0] = Float.parseFloat((String)value); } else{ @@ -173,9 +173,19 @@ public class BeanUtils { log.warn("类型不一致，暂无法自动绑定，请手动转型一致后调用！字段类型: {} vs {} ", value.getClass().getTypeName(), fieldType); } } + // Integer 向上转型为 Long 绑定 + else if(value.getClass().getTypeName().equals(Integer.class.getName()) && fieldType.equals(Long.class.getName())){ + Integer intValue = (Integer)value; + args[0] = intValue.longValue(); + } + // Float 向上转型为 Double 绑定 + else if(value.getClass().getTypeName().equals(Float.class.getName()) && fieldType.equals(Double.class.getName())){ + Float floatValue = (Float)value; + args[0] = floatValue.doubleValue(); + } else{ args[0] = value; - log.warn("类型不一致，且Map中的value非String类型，暂无法自动绑定，请手动转型一致后调用！ {} vs {} ", value.getClass().getTypeName(), fieldType); + log.warn("类型不一致，暂无法自动绑定，请手动转型一致后调用！ {} vs {} ", value.getClass().getTypeName(), fieldType); } } else{ @@ -319,104 +329,74 @@ public class BeanUtils { } /*** - * 构建上下级关联的树形结构的model - * @param allModels + * 构建上下级关联的树形结构的model（上级parentId、子节点children），根节点=0 + * @param allNodes 所有节点对象 * @param * @return */ - public static List buildTree(List allModels){ - if(V.isEmpty(allModels)){ + public static List buildTree(List allNodes){ + return buildTree(allNodes, 0); + } + + /*** + * 构建指定根节点的上下级关联的树形结构（上级parentId、子节点children） + * @param allNodes 所有节点对象 + * @param rootNodeId 跟节点ID + * @param + * @return + */ + public static List buildTree(List allNodes, Object rootNodeId){ + if(V.isEmpty(allNodes)){ return null; } // 提取所有的top level对象 List topLevelModels = new ArrayList(); - for(T model : allModels){ + for(T model : allNodes){ Object parentId = getProperty(model, Cons.FieldName.parentId.name()); - if(parentId == null || V.fuzzyEqual(parentId, 0)){ + if(parentId == null || V.fuzzyEqual(parentId, rootNodeId)){ topLevelModels.add(model); } } if(V.isEmpty(topLevelModels)){ return topLevelModels; } - // 提取向下一层的对象 - buildDeeperLevelTree(topLevelModels, allModels); - // 返回第一层级节点（二级及以上子级通过children属性获取） + // 遍历第一级节点，并挂载 children 子节点 + for(T node : allNodes) { + Object nodeId = getProperty(node, Cons.FieldName.id.name()); + List children = buildTreeChildren(nodeId, allNodes); + setProperty(node, Cons.FieldName.children.name(), children); + } return topLevelModels; } - /* - * 构建上下级关联的树形结构，去除顶层父级实体的parentId必须是为null或0的限制 - * 注:通常情况下parentModels参数传null值就可以 - * */ - public static List buildTree(List parentModels, List allModels){ - if(V.isEmpty(allModels)){ - return null; - } - //获取顶层父级实体，根据一个实体的parentId是否是allModels中的某个实体的主键来判断该实体是否为顶层父级实体 - if(parentModels == null){ - parentModels = new ArrayList<>(); - Set idSet = new HashSet<>(); - for(T model : allModels){ - idSet.add(model.getId()); - } - for(T model : allModels){ - if(!idSet.contains((Long)getProperty(model, Cons.FieldName.parentId.name()))){ - parentModels.add(model); - } - } - } - - for(T parent : parentModels){ - List children = new ArrayList<>(); - for(T model : allModels){ - if(V.fuzzyEqual(parent.getId(), getProperty(model, Cons.FieldName.parentId.name())) - && !V.fuzzyEqual(model.getId(), getProperty(model, Cons.FieldName.parentId.name()))){ //解除自循环，如：实体的id==parentId的情况 - children.add(model); - } - } - //递归调用 - buildTree(children, allModels); - if(V.notEmpty(children)){ - setProperty(parent, Cons.FieldName.children.name(), children); - } - } - - return parentModels; - } - - /*** - * 构建下一层级树形结构 - * @param parentModels - * @param allModels - * @param + /** + * 递归构建树节点的子节点 + * @param parentId + * @param nodeList + * @return */ - private static void buildDeeperLevelTree(List parentModels, List allModels){ - List deeperLevelModels = new ArrayList(); - Map parentLevelModelMap = convertToStringKeyObjectMap(parentModels, Cons.FieldName.id.name()); - for(T model : allModels){ - Object parentId = getProperty(model, Cons.FieldName.parentId.name()); - if(parentLevelModelMap.keySet().contains(String.valueOf(parentId)) && !parentId.equals(model.getId())){ - deeperLevelModels.add(model); - } - } - if(V.isEmpty(deeperLevelModels)){ - return; - } - for(T model : deeperLevelModels){ - Object parentId = getProperty(model, Cons.FieldName.parentId.name()); - T parentModel = parentLevelModelMap.get(String.valueOf(parentId)); - if(parentModel!=null){ - List children = (List) getProperty(parentModel, Cons.FieldName.children.name()); + private static List buildTreeChildren(Object parentId, List nodeList) { + List children = null; + for(T node : nodeList) { + Object nodeParentId = getProperty(node, Cons.FieldName.parentId.name()); + if(nodeParentId != null && V.equals(nodeParentId, parentId)) { if(children == null){ - children = new ArrayList(); - setProperty(parentModel, Cons.FieldName.children.name(), children); + children = new ArrayList<>(); } - children.add(model); + children.add(node); } } - // 递归进入下一层级 - buildDeeperLevelTree(deeperLevelModels, allModels); + if(children != null){ + for(T child : children) { + Object nodeId = getProperty(child, Cons.FieldName.id.name()); + List childNodeChildren = buildTreeChildren(nodeId, nodeList); + if(childNodeChildren == null) { + childNodeChildren = new ArrayList<>(); + } + setProperty(child, Cons.FieldName.children.name(), childNodeChildren); + } + } + return children; } /***