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

---
 .../controller/UrlAndCateController.java      |  13 ++
 src/main/java/com/lovenav/vo/CateAndUrl.java  | 157 ++++++++++++++++++
 2 files changed, 170 insertions(+)

diff --git a/src/main/java/com/lovenav/controller/UrlAndCateController.java b/src/main/java/com/lovenav/controller/UrlAndCateController.java
index 8b91a02..d4a41e6 100644
--- a/src/main/java/com/lovenav/controller/UrlAndCateController.java
+++ b/src/main/java/com/lovenav/controller/UrlAndCateController.java
@@ -496,6 +496,19 @@ public class UrlAndCateController {
             cateAndUrl.setParentId(urlList.getCateId());
             cateAndUrl.setUrlId(urlList.getId());
             cateAndUrl.setUrl(urlList.getUrl());
+            cateAndUrl.setIcon(urlList.getIcon());
+            cateAndUrl.setCreatetime(urlList.getCreatetime());
+            cateAndUrl.setViews(urlList.getViews());
+            cateAndUrl.setTags(urlList.getTags());
+            cateAndUrl.setWeigh(urlList.getWeigh());
+            cateAndUrl.setStatus(urlList.getStatus());
+            cateAndUrl.setDesc(urlList.getDesc());
+            cateAndUrl.setNeedLogin(urlList.getNeedLogin());
+            cateAndUrl.setAgentHint(urlList.getAgentHint());
+            cateAndUrl.setIsNeedAgent(urlList.getIsNeedAgent());
+            cateAndUrl.setIsAd(urlList.getIsAd());
+            cateAndUrl.setIsTop(urlList.getIsTop());
+            cateAndUrl.setIsEncrypt(urlList.getIsEncrypt());
             for(CateAndUrl cateAndUrl1 : cateAndUrlList){
                 if(cateAndUrl.getParentId() == cateAndUrl1.getCateId())
                 {
diff --git a/src/main/java/com/lovenav/vo/CateAndUrl.java b/src/main/java/com/lovenav/vo/CateAndUrl.java
index 0f0be25..7c08545 100644
--- a/src/main/java/com/lovenav/vo/CateAndUrl.java
+++ b/src/main/java/com/lovenav/vo/CateAndUrl.java
@@ -93,4 +93,161 @@ public class CateAndUrl {
 
     List<CateAndUrl> childUC = new ArrayList<>();
 
+
+    /**
+     * 创建时间
+     */
+    private Long createtime;
+
+    /**
+     * 访问数量
+     */
+    private Long views;
+
+    /**
+     * 标签
+     */
+    private String tags;
+
+    /**
+     * 权重
+     */
+    private Long weigh;
+
+    /**
+     * 状态
+     */
+    private Byte status;
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 需要登录才能查看
+     */
+    private Byte needLogin;
+
+    /**
+     * 代理提示语
+     */
+    private String agentHint;
+
+    /**
+     * 是否需要代理 1需要0不需要
+     */
+    private Byte isNeedAgent;
+
+    /**
+     * 是否广告1是0不是
+     */
+    private Byte isAd;
+
+    /**
+     * 是否全局置顶1是0不是
+     */
+    private Byte isTop;
+
+    /**
+     * 是否加密（1加密/0不加密）
+     */
+    private Byte isEncrypt;
+
+
+    public Long getCreatetime() {
+        return createtime;
+    }
+
+    public void setCreatetime(Long createtime) {
+        this.createtime = createtime;
+    }
+
+    public Long getViews() {
+        return views;
+    }
+
+    public void setViews(Long views) {
+        this.views = views;
+    }
+
+    public String getTags() {
+        return tags;
+    }
+
+    public void setTags(String tags) {
+        this.tags = tags;
+    }
+
+    public Long getWeigh() {
+        return weigh;
+    }
+
+    public void setWeigh(Long weigh) {
+        this.weigh = weigh;
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public Byte getNeedLogin() {
+        return needLogin;
+    }
+
+    public void setNeedLogin(Byte needLogin) {
+        this.needLogin = needLogin;
+    }
+
+    public String getAgentHint() {
+        return agentHint;
+    }
+
+    public void setAgentHint(String agentHint) {
+        this.agentHint = agentHint;
+    }
+
+    public Byte getIsNeedAgent() {
+        return isNeedAgent;
+    }
+
+    public void setIsNeedAgent(Byte isNeedAgent) {
+        this.isNeedAgent = isNeedAgent;
+    }
+
+    public Byte getIsAd() {
+        return isAd;
+    }
+
+    public void setIsAd(Byte isAd) {
+        this.isAd = isAd;
+    }
+
+    public Byte getIsTop() {
+        return isTop;
+    }
+
+    public void setIsTop(Byte isTop) {
+        this.isTop = isTop;
+    }
+
+    public Byte getIsEncrypt() {
+        return isEncrypt;
+    }
+
+    public void setIsEncrypt(Byte isEncrypt) {
+        this.isEncrypt = isEncrypt;
+    }
 }