From 8db9504a60ee90cb68dda023d4ae4ba620d50568 Mon Sep 17 00:00:00 2001
From: xierz <aa1343211992@163.com>
Date: Fri, 30 Oct 2020 18:12:21 +0800
Subject: [PATCH] =?UTF-8?q?5.2=E5=8D=87=E7=BA=A7=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/mingsoft/cms/upgrade/Upgrade.java     | 50 +++++++++++++------
 .../java/net/mingsoft/handler/AppHandler.java |  4 +-
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/upgrade/Upgrade.java b/src/main/java/net/mingsoft/cms/upgrade/Upgrade.java
index 67aa2424..dcd8b2a5 100644
--- a/src/main/java/net/mingsoft/cms/upgrade/Upgrade.java
+++ b/src/main/java/net/mingsoft/cms/upgrade/Upgrade.java
@@ -1,13 +1,16 @@
 package net.mingsoft.cms.upgrade;
 
 import cn.hutool.core.util.StrUtil;
+import io.swagger.models.auth.In;
 import net.mingsoft.basic.util.BasicUtil;
 import net.mingsoft.basic.util.SpringUtil;
 import net.mingsoft.cms.biz.ICategoryBiz;
 import net.mingsoft.cms.entity.CategoryEntity;
 import net.mingsoft.basic.util.PinYinUtil;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author by 铭飞开源团队
@@ -17,29 +20,44 @@ import java.util.List;
 public class Upgrade {
 
     /**
-     * 菜单拼音升级
+     * 更新栏目分类的顶级节点和叶子节点
      */
     public void upgrade(){
         ICategoryBiz categoryBiz = SpringUtil.getBean(ICategoryBiz.class);
         List<CategoryEntity> list = categoryBiz.queryAll();
-        //先更新所有栏目的拼音
+
         list.forEach(x->{
-            String pingYin = PinYinUtil.getPingYin(x.getCategoryTitle());
-            CategoryEntity category=new CategoryEntity();
-            category.setCategoryPinyin(pingYin);
-            CategoryEntity categoryBizEntity = (CategoryEntity)categoryBiz.getEntity(category);
-            x.setCategoryPinyin(pingYin);
-            //拼音存在则拼接id
-            if(categoryBizEntity!=null&&!categoryBizEntity.getId().equals(x.getId())){
-                x.setCategoryPinyin(pingYin+x.getId());
+
+            //将parentId第一行设为顶级节点
+            String topId = "0";
+            String parentId = x.getParentid();
+            if (parentId != null) {
+                topId = parentId.split(",")[0];
             }
-            categoryBiz.update(x);
-        });
-        //再更新路径
-        list.forEach(x->{
-            if(StrUtil.isBlank(x.getCategoryId())||x.getCategoryId().equals("0")){
-                categoryBiz.updateEntity(x);
+            x.setTopId(topId);
+
+            String id = x.getId();
+            boolean leaf = true;
+            //判断是否叶子，循环查找，如果有节点的父节点中包含该节点的id则判断为否跳出循环
+            for (int i = 0; i< list.size(); i++) {
+                String pId = list.get(i).getParentid();
+                if (pId == null) {
+                    continue;
+                }
+                leaf = !pId.contains(id);
+                //如果不是叶子就跳出循环，不需要再判断了
+                if (!leaf) {
+                    break;
+                }
             }
+            x.setLeaf(leaf);
+            //更新
+            Map<String, String> fields = new HashMap<>();
+            fields.put("leaf", x.getLeaf()?"1":"0");
+            fields.put("top_id", x.getTopId());
+            Map<String, String> where = new HashMap<>();
+            where.put("id", x.getId());
+            categoryBiz.updateBySQL("cms_category", fields, where);
         });
 
     }
diff --git a/src/main/java/net/mingsoft/handler/AppHandler.java b/src/main/java/net/mingsoft/handler/AppHandler.java
index b94b3713..dff9516a 100644
--- a/src/main/java/net/mingsoft/handler/AppHandler.java
+++ b/src/main/java/net/mingsoft/handler/AppHandler.java
@@ -24,12 +24,12 @@ public class AppHandler implements TenantLineHandler {
         if(localPage!=null&&localPage.getTotal()==0){
             PageHelper.clearPage();
         }
-        int appId = BasicUtil.getAppId();
+        //int appId = BasicUtil.getAppId();
         if(localPage!=null&&localPage.getTotal()==0){
             PageHelper.startPage(localPage.getPageNum(),localPage.getPageSize(),localPage.isCount());
             PageHelper.orderBy(localPage.getOrderBy());
         }
-        return new LongValue(appId);
+        return new LongValue(1);
     }
 
     @Override