From 481916dec26f82bb2f52d6c3e685bb5a390c2c57 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 1 Jun 2020 16:28:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=88=97=E8=A1=A8(=E9=80=9A)?= =?UTF-8?q?=20=20=E5=A2=9E=E5=8A=A0=E5=AF=8C=E6=96=87=E6=9C=AC=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=AD=97=E6=AE=B5=E3=80=81=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/commons/tools/constant/NumConstant.java | 1 + .../epdc/form/v2/EpdcNoticeListV2FormDTO.java | 4 ++-- .../dto/epdc/result/EpdcNoticeListResultDTO.java | 5 +++++ .../esua/epdc/enums/AppNoticeCategoryEnum.java | 16 +++++++++++----- .../src/main/resources/mapper/NoticeDao.xml | 3 ++- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java index eec5c228..9f4e8f58 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java @@ -41,5 +41,6 @@ public interface NumConstant { String THREE_STR = "3"; String FOUR_STR = "4"; String FIVE_STR = "5"; + String SIX_STR = "6"; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcNoticeListV2FormDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcNoticeListV2FormDTO.java index 0febe675..f90cde71 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcNoticeListV2FormDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcNoticeListV2FormDTO.java @@ -36,8 +36,8 @@ public class EpdcNoticeListV2FormDTO implements Serializable { private Integer pageSize; /** - * 通知类别:模块编码（0-政策导航，1-印象，2-味道） + * 通知类别:模块编码（1-印象，2-味道，5-最新通知，6-最热政策） */ - @NotBlank(message = "通知类别（0-政策导航，1-印象，2-味道）不能为空") + @NotBlank(message = "通知类别（1-印象，2-味道，5-最新通知，6-最热政策）不能为空") private String noticeCategory; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java index 36bb470c..c7c2fb9f 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java @@ -43,4 +43,9 @@ public class EpdcNoticeListResultDTO implements Serializable { * 首图 */ private String imgUrl; + + /** + * 通知内容 + */ + private String noticeContent; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/enums/AppNoticeCategoryEnum.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/enums/AppNoticeCategoryEnum.java index 9f695e2b..06534692 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/enums/AppNoticeCategoryEnum.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/enums/AppNoticeCategoryEnum.java @@ -10,10 +10,6 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant; */ public enum AppNoticeCategoryEnum { - /** - * 0 政策导航 - */ - NOTICE_NAVIGATION("notice_navigation", NumConstant.ZERO_STR), /** * 1 印象 */ @@ -29,7 +25,17 @@ public enum AppNoticeCategoryEnum { /** * 4 档案 */ - NOTICE_FILE("notice_file", NumConstant.FOUR_STR); + NOTICE_FILE("notice_file", NumConstant.FOUR_STR), + + /** + * 5 政策导航-最新通知 + */ + NOTICE_NAVIGATION_NEW("notice_navigation_new", NumConstant.FIVE_STR), + + /** + * 6 政策导航-最热政策 + */ + NOTICE_NAVIGATION_HOT("notice_navigation_hot", NumConstant.SIX_STR); private String name; private String index; diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml index af28d61a..46e22240 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml @@ -102,7 +102,8 @@ en.NOTICE_TITLE AS noticeTitle, en.RELEASE_TIME AS noticeTime, SUBSTRING_INDEX(en.ALL_DEPT_NAMES,'-',-1) AS deptName, - en.NOTICE_IMAGE_URL imgUrl + en.NOTICE_IMAGE_URL imgUrl, + en.NOTICE_CONTENT noticeContent FROM epdc_notice en RIGHT JOIN epdc_notice_department nd ON en.ID = nd.NOTICE_ID