新闻相关修改

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/constant/NewsConstant.java

@@ -0,0 +1,17 @@
+package com.elink.esua.epdc.constant;
+
+/**
+ * @author work@yujt.net.cn
+ * @date
+ */
+public class NewsConstant {
+
+    /**
+     * 平安防范
+     */
+    public final static String SAFETY_PRECAUTIONS = "safety_precautions";
+    /**
+     * 警情通报
+     */
+    public final static String POLICE_NOTICE = "police_notice";
+}

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

@@ -60,11 +60,6 @@ public class BannerDTO implements Serializable {
      */
     private String bannerType;
 
-    /**
-     * 新闻类别ID
-     */
-    private String newsCategory;
-
     /**
      * 上下架状态(0-下架，1-上架)
      */

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

@@ -55,6 +55,11 @@ public class NewsDTO implements Serializable {
      */
     private String newsCateroryId;
 
+    /**
+     * 新闻类别编码
+     */
+    private String newsCateroryCode;
+
     /**
      * 新闻属性
      */

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

@@ -1,21 +0,0 @@
-package com.elink.esua.epdc.dto.epdc.form;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author: qushutong
- * @Date: 2019/9/11 17:10
- * @Description: banner列表
- */
-@Data
-public class EpdcBannerListByCategoryFromDTO extends EpdcBannerListFromDTO implements Serializable {
-    private static final long serialVersionUID = -6217459732932501695L;
-
-    /**
-     * 新闻类别编码
-     */
-    private List<String> categoryCodeList;
-}

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/enums/BannerPositionEnum.java

@@ -0,0 +1,39 @@
+package com.elink.esua.epdc.enums;
+
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+
+/**
+ * 拥有独立功能的新闻类别编码
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/5/21 15:22
+ */
+
+public enum BannerPositionEnum {
+
+    HOME_PAGE_HEAD(NumConstant.ZERO_STR, "首页顶部"),
+
+    HOME_PAGE_MIDDLE(NumConstant.ONE_STR, "首页中间"),
+
+    SAFETY(NumConstant.TWO_STR, "平安榆山");
+
+
+    private String value;
+
+    private String name;
+
+
+    BannerPositionEnum(String value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+
+    public String getName() {
+        return name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/enums/IndependentFunctionCodeEnum.java

@@ -1,5 +1,8 @@
 package com.elink.esua.epdc.enums;
 
+import com.elink.esua.epdc.constant.NewsConstant;
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * 拥有独立功能的新闻类别编码
  *
@@ -9,15 +12,35 @@ package com.elink.esua.epdc.enums;
 
 public enum IndependentFunctionCodeEnum {
 
-    SAFETY_PRECAUTIONS("safety_precautions", "平安防范"),
+    SAFETY_PRECAUTIONS(NewsConstant.SAFETY_PRECAUTIONS, "平安防范"),
 
-    POLICE_NOTICE("police_notice", "警情通报");
+    POLICE_NOTICE(NewsConstant.POLICE_NOTICE, "警情通报");
 
 
     private String code;
 
     private String name;
 
+    /**
+     * 根据code 获取枚举对象
+     *
+     * @param code
+     * @return com.elink.esua.epdc.enums.IndependentFunctionCodeEnum
+     * @author work@yujt.net.cn
+     * @date 2020/5/27 10:20
+     */
+    public static IndependentFunctionCodeEnum getByCode(String code) {
+        if (StringUtils.isNotBlank(code)) {
+            IndependentFunctionCodeEnum[] enums = IndependentFunctionCodeEnum.values();
+            for (IndependentFunctionCodeEnum anEnum : enums) {
+                if (anEnum.getCode().equals(code)) {
+                    return anEnum;
+                }
+            }
+        }
+        return null;
+    }
+
 
     IndependentFunctionCodeEnum(String code, String name) {
         this.code = code;