重命名一些文件

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java

@@ -6,9 +6,9 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO;
 import com.elink.esua.epdc.service.NewsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -34,12 +34,12 @@ public class ApiNewsController {
      *
      * @param userDetail
      * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO>>
      * @author yujintao
      * @date 2019/9/5 20:17
      */
     @GetMapping("notice/list")
-    public Result<List<EpdcNoticeResultDTO>> listNotice(@LoginUser TokenDto userDetail, EpdcNoticeFormDTO formDto) {
+    public Result<List<EpdcNoticeListResultDTO>> listNotice(@LoginUser TokenDto userDetail, EpdcNoticeListFormDTO formDto) {
         return newsService.listNotice(userDetail, formDto);
     }
 
@@ -74,12 +74,12 @@ public class ApiNewsController {
      * @Author qushutong
      * @Date 2019/9/9 9:12
      * @Param [epdcNewsFromDTO]
-     * @Return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO>>
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO>>
      * @Exception
      *
      */
     @GetMapping("news/list")
-    public Result<List<EpdcNewsResultDTO>> listNews(@LoginUser TokenDto userDetail, EpdcNewsFromDTO epdcNewsFromDTO) {
+    public Result<List<EpdcNewsListResultDTO>> listNews(@LoginUser TokenDto userDetail, EpdcNewsListFromDTO epdcNewsFromDTO) {
 
         return newsService.listNews(userDetail, epdcNewsFromDTO);
     }
@@ -139,7 +139,7 @@ public class ApiNewsController {
      * @date 2019/9/10 11:05
      */
     @PostMapping("information/read")
-    public Result readInformation(@RequestBody EpdcReadInformationFormDTO formDto) {
+    public Result readInformation(@RequestBody EpdcInformationReadFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return newsService.readInformation(formDto);
     }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java

@@ -4,9 +4,9 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO;
 import com.elink.esua.epdc.feign.fallback.NewsFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -28,12 +28,12 @@ public interface NewsFeignClient {
      * 获取通知列表
      *
      * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO>>
      * @author yujintao
      * @date 2019/9/5 20:07
      */
     @GetMapping(value = "news/epdc-app/notice/listNotice", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<EpdcNoticeResultDTO>> listNotice(EpdcNoticeFormDTO formDto);
+    Result<List<EpdcNoticeListResultDTO>> listNotice(EpdcNoticeListFormDTO formDto);
 
     /**
      * 获取通知详情
@@ -63,12 +63,12 @@ public interface NewsFeignClient {
      * @Author qushutong
      * @Date 2019/9/9 9:17
      * @Param [formDto]
-     * @Return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO>>
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO>>
      * @Exception
      *
      */
     @GetMapping(value = "news/epdc-app/news/listNews", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<EpdcNewsResultDTO>> listNews(@RequestBody EpdcNewsFromDTO formDto);
+    Result<List<EpdcNewsListResultDTO>> listNews(@RequestBody EpdcNewsListFromDTO formDto);
 
     /***
      * @Description 获取详情
@@ -126,5 +126,5 @@ public interface NewsFeignClient {
      * @date 2019/9/10 11:05
      */
     @PostMapping(value = "news/epdc-app/information/read", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result readInformation(@RequestBody EpdcReadInformationFormDTO formDto);
+    Result readInformation(@RequestBody EpdcInformationReadFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java

@@ -5,9 +5,9 @@ import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO;
 import com.elink.esua.epdc.feign.NewsFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -22,7 +22,7 @@ import java.util.List;
 public class NewsFeignClientFallback implements NewsFeignClient {
 
     @Override
-    public Result<List<EpdcNoticeResultDTO>> listNotice(EpdcNoticeFormDTO formDto) {
+    public Result<List<EpdcNoticeListResultDTO>> listNotice(EpdcNoticeListFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listNotice", formDto);
     }
 
@@ -37,7 +37,7 @@ public class NewsFeignClientFallback implements NewsFeignClient {
     }
 
     @Override
-    public Result<List<EpdcNewsResultDTO>> listNews(EpdcNewsFromDTO formDto) {
+    public Result<List<EpdcNewsListResultDTO>> listNews(EpdcNewsListFromDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listNews", formDto);
     }
 
@@ -62,7 +62,7 @@ public class NewsFeignClientFallback implements NewsFeignClient {
     }
 
     @Override
-    public Result readInformation(EpdcReadInformationFormDTO formDto) {
+    public Result readInformation(EpdcInformationReadFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "readInformation", formDto);
     }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java

@@ -4,11 +4,9 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -26,11 +24,11 @@ public interface NewsService {
      *
      * @param userDetail
      * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO>>
      * @author yujintao
      * @date 2019/9/5 20:17
      */
-    Result<List<EpdcNoticeResultDTO>> listNotice(TokenDto userDetail, EpdcNoticeFormDTO formDto);
+    Result<List<EpdcNoticeListResultDTO>> listNotice(TokenDto userDetail, EpdcNoticeListFormDTO formDto);
 
     /**
      * 查询通知详情
@@ -58,11 +56,11 @@ public interface NewsService {
      * @Author qushutong
      * @Date 2019/9/7 11:34
      * @Param [formDto]
-     * @Return Result<List < EpdcNoticeResultDTO>>
+     * @Return Result<List < EpdcNoticeListResultDTO>>
      * @Exception 移动端新闻列表
      *
      */
-    Result<List<EpdcNewsResultDTO>> listNews(TokenDto userDetail, EpdcNewsFromDTO formDto);
+    Result<List<EpdcNewsListResultDTO>> listNews(TokenDto userDetail, EpdcNewsListFromDTO formDto);
 
     /***
      * @Description 获取新闻详情
@@ -105,5 +103,5 @@ public interface NewsService {
      * @author yujintao
      * @date 2019/9/10 11:05
      */
-    Result readInformation(EpdcReadInformationFormDTO formDto);
+    Result readInformation(EpdcInformationReadFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@@ -4,9 +4,9 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO;
 import com.elink.esua.epdc.feign.NewsFeignClient;
 import com.elink.esua.epdc.service.NewsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +28,7 @@ public class NewsServiceImpl implements NewsService {
     private NewsFeignClient newsFeignClient;
 
     @Override
-    public Result<List<EpdcNoticeResultDTO>> listNotice(TokenDto userDetail, EpdcNoticeFormDTO formDto) {
+    public Result<List<EpdcNoticeListResultDTO>> listNotice(TokenDto userDetail, EpdcNoticeListFormDTO formDto) {
         formDto.setDeptId(userDetail.getGridId());
         return newsFeignClient.listNotice(formDto);
     }
@@ -44,7 +44,7 @@ public class NewsServiceImpl implements NewsService {
     }
 
     @Override
-    public Result<List<EpdcNewsResultDTO>> listNews(TokenDto userDetail, EpdcNewsFromDTO formDto) {
+    public Result<List<EpdcNewsListResultDTO>> listNews(TokenDto userDetail, EpdcNewsListFromDTO formDto) {
         formDto.setDeptId(userDetail.getGridId());
         return newsFeignClient.listNews(formDto);
 
@@ -68,7 +68,7 @@ public class NewsServiceImpl implements NewsService {
     }
 
     @Override
-    public Result readInformation(EpdcReadInformationFormDTO formDto) {
+    public Result readInformation(EpdcInformationReadFormDTO formDto) {
         return newsFeignClient.readInformation(formDto);
     }
 }

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcReadInformationFormDTO.java → esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcInformationReadFormDTO.java

@@ -30,7 +30,7 @@ import java.io.Serializable;
  * @since v1.0.0 2019-09-10
  */
 @Data
-public class EpdcReadInformationFormDTO implements Serializable {
+public class EpdcInformationReadFormDTO implements Serializable {
 
     private static final long serialVersionUID = -1161009882229533832L;
 

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsFromDTO.java → esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java

@@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data
-public class EpdcNewsFromDTO implements Serializable {
+public class EpdcNewsListFromDTO implements Serializable {
 
     private static final long serialVersionUID = 7558948992362027659L;
 

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeFormDTO.java → esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeListFormDTO.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  * @date 2019/9/5 19:40
  */
 @Data
-public class EpdcNoticeFormDTO implements Serializable {
+public class EpdcNoticeListFormDTO implements Serializable {
 
     private static final long serialVersionUID = 4209188661412055700L;
 

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsResultDTO.java → esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsListResultDTO.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  *  @Description: 用于移动端 新闻列表
  */
 @Data
-public class EpdcNewsResultDTO implements Serializable {
+public class EpdcNewsListResultDTO implements Serializable {
 
     private static final long serialVersionUID = -7339344639815196599L;
     /**

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeResultDTO.java → esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java

@@ -14,7 +14,7 @@ import java.util.Date;
  * @date 2019/9/5 19:30
  */
 @Data
-public class EpdcNoticeResultDTO implements Serializable {
+public class EpdcNoticeListResultDTO implements Serializable {
 
     private static final long serialVersionUID = 5512811033767022087L;
 

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java

@@ -21,7 +21,7 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcReadInformationFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcInformationReadFormDTO;
 import com.elink.esua.epdc.service.InformationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -63,7 +63,7 @@ public class EpdcAppInformationController {
      * @date 2019/9/10 11:01
      */
     @PostMapping("read")
-    public Result readInformation(@RequestBody EpdcReadInformationFormDTO formDto) {
+    public Result readInformation(@RequestBody EpdcInformationReadFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return this.informationService.readInformation(formDto);
     }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java

@@ -21,10 +21,10 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcNewsFromDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.service.NewsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -56,9 +56,9 @@ public class EpdcAppNewsController {
      *
      */
     @GetMapping("listNews")
-    public Result<List<EpdcNewsResultDTO>> listNews(@RequestBody EpdcNewsFromDTO epdcNewsFromDTO) {
+    public Result<List<EpdcNewsListResultDTO>> listNews(@RequestBody EpdcNewsListFromDTO epdcNewsFromDTO) {
         ValidatorUtils.validateEntity(epdcNewsFromDTO);
-        Result<List<EpdcNewsResultDTO>> listNews = newsService.listNews(epdcNewsFromDTO);
+        Result<List<EpdcNewsListResultDTO>> listNews = newsService.listNews(epdcNewsFromDTO);
         return listNews;
     }
 

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNoticeController.java

@@ -21,9 +21,9 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeListFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO;
 import com.elink.esua.epdc.service.NoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -48,12 +48,12 @@ public class EpdcAppNoticeController {
      * 移动端通知列表
      *
      * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO>>
      * @author yujintao
      * @date 2019/9/5 19:43
      */
     @GetMapping("listNotice")
-    public Result<List<EpdcNoticeResultDTO>> listNotice(@RequestBody EpdcNoticeFormDTO formDto) {
+    public Result<List<EpdcNoticeListResultDTO>> listNotice(@RequestBody EpdcNoticeListFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return this.noticeService.listNotice(formDto);
     }
@@ -62,7 +62,7 @@ public class EpdcAppNoticeController {
      * 获取通知详情
      *
      * @param noticeId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO>>
      * @author yujintao
      * @date 2019/9/6 14:33
      */

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java

@@ -18,9 +18,9 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.dto.epdc.form.EpdcNewsFromDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.entity.NewsEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -41,11 +41,11 @@ public interface NewsDao extends BaseDao<NewsEntity> {
      * @Author  qushutong
      * @Date   2019/9/7 12:13
      * @Param  [formDto]
-     * @Return      java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO>
+     * @Return      java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO>
      * @Exception
      *
      */
-    List<EpdcNewsResultDTO> selectListAppNews(EpdcNewsFromDTO formDto);
+    List<EpdcNewsListResultDTO> selectListAppNews(EpdcNewsListFromDTO formDto);
 
     /***
      * @Description  获取新闻详情

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java

@@ -18,9 +18,9 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeListFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO;
 import com.elink.esua.epdc.entity.NoticeEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -40,11 +40,11 @@ public interface NoticeDao extends BaseDao<NoticeEntity> {
      * APP端获取通知列表
      *
      * @param formDto
-     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO>
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO>
      * @author yujintao
      * @date 2019/9/5 19:51
      */
-    List<EpdcNoticeResultDTO> selectListAppNotice(EpdcNoticeFormDTO formDto);
+    List<EpdcNoticeListResultDTO> selectListAppNotice(EpdcNoticeListFormDTO formDto);
 
     /**
      * 查询通知详情

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java

@@ -22,7 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.InformationDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcReadInformationFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcInformationReadFormDTO;
 import com.elink.esua.epdc.entity.InformationEntity;
 
 import java.util.List;
@@ -114,5 +114,5 @@ public interface InformationService extends BaseService<InformationEntity> {
      * @author yujintao
      * @date 2019/9/10 11:00
      */
-    Result readInformation(EpdcReadInformationFormDTO formDto);
+    Result readInformation(EpdcInformationReadFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java

@@ -22,12 +22,11 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.NewsDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcNewsFromDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.entity.NewsEntity;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -131,11 +130,11 @@ public interface NewsService extends BaseService<NewsEntity> {
      * @Author qushutong
      * @Date 2019/9/7 11:34
      * @Param [formDto]
-     * @Return Result<List < EpdcNoticeResultDTO>>
+     * @Return Result<List < EpdcNoticeListResultDTO>>
      * @Exception 移动端新闻列表
      *
      */
-    Result<List<EpdcNewsResultDTO>> listNews(EpdcNewsFromDTO formDto);
+    Result<List<EpdcNewsListResultDTO>> listNews(EpdcNewsListFromDTO formDto);
 
     /***
      * @Description 获取新闻详情

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java

@@ -22,9 +22,9 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.NoticeDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeListFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO;
 import com.elink.esua.epdc.entity.NoticeEntity;
 
 import java.util.List;
@@ -112,11 +112,11 @@ public interface NoticeService extends BaseService<NoticeEntity> {
      * 移动端通知列表
      *
      * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO>>
      * @author yujintao
      * @date 2019/9/5 19:37
      */
-    Result<List<EpdcNoticeResultDTO>> listNotice(EpdcNoticeFormDTO formDto);
+    Result<List<EpdcNoticeListResultDTO>> listNotice(EpdcNoticeListFormDTO formDto);
 
     /**
      * 查询通知详情

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java

@@ -28,7 +28,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.InformationDao;
 import com.elink.esua.epdc.dto.InformationDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcReadInformationFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcInformationReadFormDTO;
 import com.elink.esua.epdc.entity.InformationEntity;
 import com.elink.esua.epdc.service.InformationService;
 import org.apache.commons.lang3.StringUtils;
@@ -111,7 +111,7 @@ public class InformationServiceImpl extends BaseServiceImpl<InformationDao, Info
     }
 
     @Override
-    public Result readInformation(EpdcReadInformationFormDTO formDto) {
+    public Result readInformation(EpdcInformationReadFormDTO formDto) {
         InformationEntity entity = new InformationEntity();
         entity.setId(formDto.getInformationId());
         entity.setReadFlag(YesOrNoEnum.YES.value());

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@@ -33,16 +33,15 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.NewsDao;
 import com.elink.esua.epdc.dto.NewsDTO;
 import com.elink.esua.epdc.dto.NewsUserAttitudeDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.entity.NewsUserAttitudeEntity;
 import com.elink.esua.epdc.enums.AppNewsLikeEnum;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcNewsFromDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO;
 import com.elink.esua.epdc.entity.NewsEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
-import com.elink.esua.epdc.redis.NewsRedis;
 import com.elink.esua.epdc.service.NewsDepartmentService;
 import com.elink.esua.epdc.service.NewsService;
 import com.elink.esua.epdc.service.NewsUserAttitudeService;
@@ -258,12 +257,12 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     }
 
     @Override
-    public Result<List<EpdcNewsResultDTO>> listNews(EpdcNewsFromDTO formDto) {
+    public Result<List<EpdcNewsListResultDTO>> listNews(EpdcNewsListFromDTO formDto) {
 
         int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
         formDto.setPageIndex(pageIndex);
 
-        List<EpdcNewsResultDTO> newsList = this.baseDao.selectListAppNews(formDto);
+        List<EpdcNewsListResultDTO> newsList = this.baseDao.selectListAppNews(formDto);
         return new Result().ok(newsList);
     }
 

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java

@@ -33,9 +33,9 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.NoticeDao;
 import com.elink.esua.epdc.dto.NoticeDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeListFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO;
 import com.elink.esua.epdc.entity.NoticeEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.NoticeRedis;
@@ -190,11 +190,11 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
     }
 
     @Override
-    public Result<List<EpdcNoticeResultDTO>> listNotice(EpdcNoticeFormDTO formDto) {
+    public Result<List<EpdcNoticeListResultDTO>> listNotice(EpdcNoticeListFormDTO formDto) {
         int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
         formDto.setPageIndex(pageIndex);
 
-        List<EpdcNoticeResultDTO> noticeList = this.baseDao.selectListAppNotice(formDto);
+        List<EpdcNoticeListResultDTO> noticeList = this.baseDao.selectListAppNotice(formDto);
         return new Result().ok(noticeList);
     }
 

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml

@@ -41,7 +41,7 @@
       WHERE
 	    NEWS_CATERORY_ID = #{categoryId}
     </select>
-    <select id="selectListAppNews" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO">
+    <select id="selectListAppNews" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO">
         SELECT
             en.ID AS id,
             en.NEWS_TITLE AS newsTitle,

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml

@@ -7,7 +7,7 @@
     </update>
 
 
-    <select id="selectListAppNotice" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO">
+    <select id="selectListAppNotice" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO">
         SELECT
             en.ID AS id,
             en.NOTICE_TITLE AS noticeTitle,