diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java index 0854051cf..1a8218c52 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java +++ b/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> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author yujintao * @date 2019/9/5 20:17 */ @GetMapping("notice/list") - public Result> listNotice(@LoginUser TokenDto userDetail, EpdcNoticeFormDTO formDto) { + public Result> 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> + * @Return com.elink.esua.epdc.commons.tools.utils.Result> * @Exception * */ @GetMapping("news/list") - public Result> listNews(@LoginUser TokenDto userDetail, EpdcNewsFromDTO epdcNewsFromDTO) { + public Result> 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); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java index 4c4f22298..6913aed7d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java +++ b/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> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author yujintao * @date 2019/9/5 20:07 */ @GetMapping(value = "news/epdc-app/notice/listNotice", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> listNotice(EpdcNoticeFormDTO formDto); + Result> 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> + * @Return com.elink.esua.epdc.commons.tools.utils.Result> * @Exception * */ @GetMapping(value = "news/epdc-app/news/listNews", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> listNews(@RequestBody EpdcNewsFromDTO formDto); + Result> 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); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java index cffb9a7f4..3257f9fa3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java +++ b/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> listNotice(EpdcNoticeFormDTO formDto) { + public Result> listNotice(EpdcNoticeListFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listNotice", formDto); } @@ -37,7 +37,7 @@ public class NewsFeignClientFallback implements NewsFeignClient { } @Override - public Result> listNews(EpdcNewsFromDTO formDto) { + public Result> 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); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java index 1f6b331b3..8b6f645a0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java +++ b/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 org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; +import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO; import java.util.List; @@ -26,11 +24,11 @@ public interface NewsService { * * @param userDetail * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author yujintao * @date 2019/9/5 20:17 */ - Result> listNotice(TokenDto userDetail, EpdcNoticeFormDTO formDto); + Result> listNotice(TokenDto userDetail, EpdcNoticeListFormDTO formDto); /** * 查询通知详情 @@ -58,11 +56,11 @@ public interface NewsService { * @Author qushutong * @Date 2019/9/7 11:34 * @Param [formDto] - * @Return Result> + * @Return Result> * @Exception 移动端新闻列表 * */ - Result> listNews(TokenDto userDetail, EpdcNewsFromDTO formDto); + Result> 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); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java index 0ec3b3aa9..e41769bc9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/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> listNotice(TokenDto userDetail, EpdcNoticeFormDTO formDto) { + public Result> 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> listNews(TokenDto userDetail, EpdcNewsFromDTO formDto) { + public Result> 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); } } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcReadInformationFormDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcInformationReadFormDTO.java similarity index 94% rename from esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcReadInformationFormDTO.java rename to esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcInformationReadFormDTO.java index f5d902070..cc2b9cdd6 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcReadInformationFormDTO.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsFromDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java similarity index 92% rename from esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsFromDTO.java rename to esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsListFromDTO.java index b590f77b2..f7f4fb757 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsFromDTO.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeFormDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeListFormDTO.java similarity index 93% rename from esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeFormDTO.java rename to esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeListFormDTO.java index 3ca36cb3d..728abca8f 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeFormDTO.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsListResultDTO.java similarity index 91% rename from esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsResultDTO.java rename to esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsListResultDTO.java index 95458dc49..d32d26b4f 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsResultDTO.java +++ b/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; /** diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java similarity index 91% rename from esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeResultDTO.java rename to esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java index f18f6fe94..cfd179060 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeResultDTO.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java index 89e8c600e..00b65fd6c 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java +++ b/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); } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java index 2cbd73ce1..953b04288 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java +++ b/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> listNews(@RequestBody EpdcNewsFromDTO epdcNewsFromDTO) { + public Result> listNews(@RequestBody EpdcNewsListFromDTO epdcNewsFromDTO) { ValidatorUtils.validateEntity(epdcNewsFromDTO); - Result> listNews = newsService.listNews(epdcNewsFromDTO); + Result> listNews = newsService.listNews(epdcNewsFromDTO); return listNews; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNoticeController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNoticeController.java index cd54640c2..38e968c69 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNoticeController.java +++ b/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> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author yujintao * @date 2019/9/5 19:43 */ @GetMapping("listNotice") - public Result> listNotice(@RequestBody EpdcNoticeFormDTO formDto) { + public Result> 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> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author yujintao * @date 2019/9/6 14:33 */ diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java index e6a36f9b6..ae7b5779e 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java +++ b/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 { * @Author qushutong * @Date 2019/9/7 12:13 * @Param [formDto] - * @Return java.util.List + * @Return java.util.List * @Exception * */ - List selectListAppNews(EpdcNewsFromDTO formDto); + List selectListAppNews(EpdcNewsListFromDTO formDto); /*** * @Description 获取新闻详情 diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java index 7632b8b16..d61ad7fae 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java +++ b/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 { * APP端获取通知列表 * * @param formDto - * @return java.util.List + * @return java.util.List * @author yujintao * @date 2019/9/5 19:51 */ - List selectListAppNotice(EpdcNoticeFormDTO formDto); + List selectListAppNotice(EpdcNoticeListFormDTO formDto); /** * 查询通知详情 diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java index c73ffa4ee..3f3eb1e65 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java +++ b/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 { * @author yujintao * @date 2019/9/10 11:00 */ - Result readInformation(EpdcReadInformationFormDTO formDto); + Result readInformation(EpdcInformationReadFormDTO formDto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java index 44b290a7a..e8d888447 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java +++ b/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 { * @Author qushutong * @Date 2019/9/7 11:34 * @Param [formDto] - * @Return Result> + * @Return Result> * @Exception 移动端新闻列表 * */ - Result> listNews(EpdcNewsFromDTO formDto); + Result> listNews(EpdcNewsListFromDTO formDto); /*** * @Description 获取新闻详情 diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java index fe4885b65..cb5bc8106 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java +++ b/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 { * 移动端通知列表 * * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author yujintao * @date 2019/9/5 19:37 */ - Result> listNotice(EpdcNoticeFormDTO formDto); + Result> listNotice(EpdcNoticeListFormDTO formDto); /** * 查询通知详情 diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java index 94f2bc1b1..d0b328577 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java +++ b/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 implem } @Override - public Result> listNews(EpdcNewsFromDTO formDto) { + public Result> listNews(EpdcNewsListFromDTO formDto) { int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); formDto.setPageIndex(pageIndex); - List newsList = this.baseDao.selectListAppNews(formDto); + List newsList = this.baseDao.selectListAppNews(formDto); return new Result().ok(newsList); } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java index 583fdd939..acf8077c8 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java +++ b/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 } @Override - public Result> listNotice(EpdcNoticeFormDTO formDto) { + public Result> listNotice(EpdcNoticeListFormDTO formDto) { int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); formDto.setPageIndex(pageIndex); - List noticeList = this.baseDao.selectListAppNotice(formDto); + List noticeList = this.baseDao.selectListAppNotice(formDto); return new Result().ok(noticeList); } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml index 5d1eaf960..8aa30291b 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml +++ b/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 en.ID AS id, en.NEWS_TITLE AS newsTitle, 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 53409630c..a5ff88f5c 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 @@ -7,7 +7,7 @@ - SELECT en.ID AS id, en.NOTICE_TITLE AS noticeTitle,