From 197a7c4bf65e6a89730afa53186afe387f4d2b61 Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Mon, 27 May 2024 17:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=B9=E8=89=B2=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java    | 1 +
 .../src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java    | 3 +++
 .../main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java    | 3 +++
 .../main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java    | 3 +++
 .../src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java  | 2 ++
 .../src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java      | 3 +++
 6 files changed, 15 insertions(+)

diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java
index ee3b8c2..7eb4a29 100644
--- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java
+++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java
@@ -98,6 +98,7 @@ public class ZoneManage {
         return CollUtils.convert(page.getRecords(),
                 w -> ZoneDetailVO.builder()
                         .id(w.getId())
+                        .specialFeature(w.getSpecialFeature())
                         .zoneName(w.getZoneName())
                         .build());
     }
diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java
index a5adbed..81148a4 100644
--- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java
+++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java
@@ -34,6 +34,9 @@ public class Zone implements Serializable {
     @ApiModelProperty("专区图标")
     private String zoneIcon;
 
+    @ApiModelProperty("特色场景（附件）")
+    private String specialFeature;
+
     @TableLogic
     private Boolean deleted;
 
diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java
index c43ab01..75f6ca5 100644
--- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java
+++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java
@@ -27,4 +27,7 @@ public class ZoneSaveReq {
     @NotBlank(message = "专区图标不能为空")
     private String zoneIcon;
 
+    @ApiModelProperty("特色场景")
+    private String specialFeature;
+
 }
diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java
index 011bcd8..8bcddf9 100644
--- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java
+++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java
@@ -28,4 +28,7 @@ public class ZoneDetailVO {
     @ApiModelProperty("窗口数量")
     private Integer windowCount;
 
+    @ApiModelProperty("特色场景")
+    private String specialFeature;
+
 }
diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java
index 9ea3f2b..a95a15b 100644
--- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java
+++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java
@@ -133,10 +133,12 @@ public class MatterManage {
         return CollUtils.convert(zones, w -> TreeVO.builder()
                 .name(w.getZoneName())
                 .zoneIcon(iconUrlMap.get(w.getId()))
+                .specialFeature(w.getSpecialFeature())
                 .type(ZzsfwMenuConstant.MENU_TYPE_ZONE)
                 .build());
     }
 
+    @Deprecated
     public List<TreeVO> getZonesOld() {
         List<KqZzsfwMenu> matters = menuService.list(Wrappers.lambdaQuery(KqZzsfwMenu.class)
                 .orderByAsc(KqZzsfwMenu::getSort));
diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java
index 8953692..f1997cf 100644
--- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java
+++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java
@@ -59,6 +59,9 @@ public class TreeVO {
     @ApiModelProperty("子级")
     private List<TreeVO> chilren;
 
+    @ApiModelProperty("特色场景")
+    private String specialFeature;
+
     @Tolerate
     public TreeVO() {
         // 无参构造