From c06850be1446fb995522db797bc0930848db955a Mon Sep 17 00:00:00 2001
From: User_cyk <1020691186@qq.com>
Date: Sat, 23 Dec 2023 21:19:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UrlAndCateController.java      | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/src/main/java/com/lovenav/controller/UrlAndCateController.java b/src/main/java/com/lovenav/controller/UrlAndCateController.java
index 86fbb64..cbbcfbd 100644
--- a/src/main/java/com/lovenav/controller/UrlAndCateController.java
+++ b/src/main/java/com/lovenav/controller/UrlAndCateController.java
@@ -457,4 +457,52 @@ public class UrlAndCateController {
         result.put("data",data);
         return JSONObject.toJSONString(result);
     }
+
+    @RequestMapping("/disposeBookmarkExhibitedToJsonNew")
+    public String  disposeBookmarkExhibitedToJsonNew(){
+        List<UrlList> urlLists = urlListService.selectUrListByNeedLogin();
+        List<CateAndUrl> cateAndUrlList = new ArrayList<>();
+        Set<String> parentSet = new HashSet<>();
+        for( int i = 0 ; i < urlLists.size() ; i++)
+        {
+            String parentString = urlCateListService.selectUrListCateByUrlCateId(urlLists.get(i).getCateId());
+            String [] parentList = parentString.split(",");
+            System.out.println(parentString);
+            for(String parent : parentList)
+            {
+                if(parent.equals("0")){
+                    continue;
+                }
+                parentSet.add(parent);
+            }
+        }
+        for (String str : parentSet) {
+            UrlCateList urlCateList =urlCateListService.selectByPrimaryKey(Integer.valueOf(str));
+            CateAndUrl cateAndUrl = new CateAndUrl();
+            cateAndUrl.setFloder("true");
+            cateAndUrl.setName(urlCateList.getName());
+            cateAndUrl.setParentId(urlCateList.getRootCateId());
+            cateAndUrl.setCateId(urlCateList.getId());
+            cateAndUrlList.add(cateAndUrl);
+        }
+        for( int i = 0 ; i < urlLists.size() ; i++){
+            UrlList urlList = urlLists.get(i);
+            CateAndUrl cateAndUrl = new CateAndUrl();
+            cateAndUrl.setFloder("false");
+            cateAndUrl.setName(urlList.getName());
+            cateAndUrl.setParentId(urlList.getCateId());
+            cateAndUrl.setUrlId(urlList.getId());
+            cateAndUrl.setUrl(urlList.getUrl());
+            for(CateAndUrl cateAndUrl1 : cateAndUrlList){
+                if(cateAndUrl.getParentId() == cateAndUrl1.getCateId())
+                {
+                    cateAndUrl1.getChildUC().add(cateAndUrl);
+                    break;
+                }
+            }
+        }
+        return JSONObject.toJSONString(cateAndUrlList);
+
+
+    }
 }