胡秀武:模型分类上级父类名称

src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java

@@ -2,8 +2,10 @@ package com.pms.ocp.model.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -75,11 +77,15 @@ public class OcpModelGroupVO implements Serializable {
     /**
     * 创建时间
     */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date groupCtime;
     /**
     * 修改时间
     */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "修改时间")
     private Date groupMtime;
     /**

src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java

@@ -154,11 +154,14 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
         for (OcpModelGroupVO node : nodeMap.values()) {
             //得到自己的父类
             OcpModelGroupVO parent = nodeMap.get(node.getModelGroupPcode());
-            if (parent != null && !(node.getModelGroupCode().equals(parent.getModelGroupCode()))) {
+            if (parent != null && (node.getModelGroupPcode().equals(parent.getModelGroupCode()))
+                    && (!"".equals(node.getModelGroupPcode())|| !"".equals(parent.getModelGroupCode()))) {
                 //防止每次都new list或者只是使用该对象就new对象浪费内存或者覆盖上一次记录
                 if (parent.getChildrenList() == null) {
                     parent.setChildrenList(new LinkedList<>());
                 }
+                //设置上级父类名称
+                node.setModelGroupPName(parent.getModelGroupName());
                 //说明他有父类其下子类都需要加一级
                 addLevel(node,treeNodes);
                 parent.getChildrenList().add(node);
@@ -176,14 +179,21 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
      * @param treeNodes 需要遍历list
      **/
     private void addLevel(OcpModelGroupVO parent, List<OcpModelGroupVO> treeNodes) {
-        parent.setLevel(parent.getLevel()+1);
+        int level = parent.getLevel();
+        parent.setLevel(level++);
         for (OcpModelGroupVO treeNode : treeNodes) {
             if (treeNode != null && parent.getModelGroupCode().equals(treeNode.getModelGroupPcode())){
                 addLevel(treeNode,treeNodes);
             }
         }
     }
-
+    /**
+     * 生成构造器
+     * @author huxiuwu
+     * @date 2022/3/10
+     * @param searchCondition
+     * @return List<com.pms.ocp.model.vo.OcpModelGroupVO>
+     **/
     private List<OcpModelGroupVO> selectByCondition(String... searchCondition) {
         QueryWrapper<OcpModelGroupVO> queryWrapper = new QueryWrapper<>();
         //根据是否传入搜索条件创建构造器进行查询