From 6ad38eb0b7ae1f477cc37788c69e93b406fe2b14 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Wed, 24 Jun 2020 11:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BBbanner=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/epdc/form/EpdcBannerListFromDTO.java  | 11 +++++
 .../form/EpdcNewsListByCategoryFromDTO.java   | 25 -----------
 .../dto/epdc/form/EpdcNewsListFromDTO.java    | 26 +++++++++---
 .../epdc/result/NewsCategoryResultDTO.java    | 21 ++++++++++
 .../esua/epdc/enums/ArticleSectionEnum.java   | 42 +++++++++++++++++++
 5 files changed, 94 insertions(+), 31 deletions(-)
 delete mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListByCategoryFromDTO.java
 create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/NewsCategoryResultDTO.java
 create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/enums/ArticleSectionEnum.java

diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java
index 7fc2af1..2ca7057 100644
--- a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcBannerListFromDTO.java
@@ -20,6 +20,17 @@ public class EpdcBannerListFromDTO implements Serializable {
      */
     @NotBlank(message = "banner位置不能为空")
     private String position;
+
+
+    /**
+     * 文章/新闻 所属功能版块
+     */
+    @NotBlank(message = "版块编码不能为空")
+    private String sectionCode;
+
+
+    // ---------------- 冗余字段
+
     /**
      * 网格ID
      */
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListByCategoryFromDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListByCategoryFromDTO.java
deleted file mode 100644
index 82d7411..0000000
--- a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListByCategoryFromDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.elink.esua.epdc.dto.epdc.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * 新闻列表查询参数
- *
- * @author work@yujt.net.cn
- * @date 2019/9/7 11:19
- */
-@Data
-public class EpdcNewsListByCategoryFromDTO extends EpdcNewsListFromDTO implements Serializable {
-
-    private static final long serialVersionUID = -6782308933818246525L;
-
-    /**
-     * 新闻类别编码
-     */
-    private String categoryCode;
-
-}
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java
index 97eaebf..0965b74 100644
--- a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java
@@ -17,12 +17,6 @@ public class EpdcNewsListFromDTO implements Serializable {
 
     private static final long serialVersionUID = 7558948992362027659L;
 
-    /**
-     * 用户所属网格ID
-     */
-    @NotNull(message = "用户网格ID不能为空")
-    private Long deptId;
-
     /**
      * 页码
      */
@@ -41,4 +35,24 @@ public class EpdcNewsListFromDTO implements Serializable {
     @NotBlank(message = "时间戳不能为空")
     private String timestamp;
 
+    /**
+     * 文章/新闻类别编码
+     * <li>不为空 按编码查询</li>
+     * <li>为空  默认查询首页新闻列表</li>
+     */
+    private String categoryCode;
+
+    // ----------------------- 冗余字段
+
+    /**
+     * 文章/新闻版块编码
+     */
+    private String sectionCode;
+
+
+    /**
+     * 用户所属网格ID
+     */
+    @NotNull(message = "用户网格ID不能为空")
+    private Long deptId;
 }
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/NewsCategoryResultDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/NewsCategoryResultDTO.java
new file mode 100644
index 0000000..bbfc0d1
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/NewsCategoryResultDTO.java
@@ -0,0 +1,21 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 居民端 - 根据文章/新闻版块编码获取子类别
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/6/24 10:53
+ */
+@Data
+public class NewsCategoryResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2184740649730779528L;
+
+
+    private String categoryCode;
+    private String categoryName;
+}
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/enums/ArticleSectionEnum.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/enums/ArticleSectionEnum.java
new file mode 100644
index 0000000..1ba6b8b
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/enums/ArticleSectionEnum.java
@@ -0,0 +1,42 @@
+package com.elink.esua.epdc.enums;
+
+/**
+ * 文章/新闻 功能版块枚举
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/6/24 10:56
+ */
+public enum ArticleSectionEnum {
+
+    /**
+     * 健康生活
+     */
+    HEALTHY_LIVING("healthy_living"),
+
+    /**
+     * 平安榆山
+     */
+    SAFETY_LIVING("safety_living"),
+
+    /**
+     * 首页新闻
+     */
+    HOME_PAGE_NEWS("home_page_news"),
+
+    /**
+     * 综合服务
+     */
+    INTEGRATED_SERVICES("integrated_services");
+
+
+    private String code;
+
+
+    ArticleSectionEnum(String code) {
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}