新闻banner接口修改

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
      */

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListByCategoryFromDTO.java

@@ -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;
-
-}

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;
 }

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;
+}

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;
+    }
+}