diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index b1f5a18f7..78a809890 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -94,9 +94,9 @@ lb://epdc-auth-server lb://epdc-admin-server - lb://epdc-activiti-server - - lb://epdc-api-server + lb://epdc-activiti-server + + http://127.0.0.1:9040 lb://epdc-app-server lb://epdc-heart-server diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 9daa044af..04bf197cf 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -123,7 +123,7 @@ epdc elink833066 - true + false 47.104.224.45:8848 wx6ff4e50840cf7dfc 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 b059f7b93..510fbc885 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 @@ -3,8 +3,10 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +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.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.service.NewsService; @@ -66,4 +68,64 @@ public class ApiNewsController { public Result browseNotice(@RequestBody EpdcNoticeBrowseFormDTO formDto) { return newsService.updateReadingAmount(formDto); } + /*** + * @Description 新闻列表 + * @Author qushutong + * @Date 2019/9/9 9:12 + * @Param [epdcNewsFromDTO] + * @Return com.elink.esua.epdc.commons.tools.utils.Result> + * @Exception + * + */ + @GetMapping("news/list") + public Result> listNews(@LoginUser TokenDto userDetail, EpdcNewsFromDTO epdcNewsFromDTO){ + + return newsService.listNews(userDetail,epdcNewsFromDTO); + } + + + /*** + * @Description 新闻详情 + * @Author qushutong + * @Date 2019/9/7 14:13 + * @Param [id] + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Exception + * + */ + @GetMapping("news/detail/{newsId}") + public Result getNewsDetail(@PathVariable("id") String id){ + Result newsDetail = newsService.getNewsDetail(id); + return newsDetail; + } + /*** + * @Description 点赞或踩 + * @Author qushutong + * @Date 2019/9/7 14:15 + * @Param [] + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Exception + * + */ + @PostMapping("statement") + public Result upDateStatement(@LoginUser TokenDto userDetail, EpdcNewsStatementFromDTO newsStatementFromDTO){ + ValidatorUtils.validateEntity(newsStatementFromDTO); + return newsService.upDateStatement(userDetail,newsStatementFromDTO); + } + + /*** + * @Description 新闻浏览 + * @Author qushutong + * @Date 2019/9/7 14:47 + * @Param [newsBrowseFromDTO] + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Exception + * + */ + @PostMapping("browse") + public Result modifyNewsBrowse(@RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO){ + ValidatorUtils.validateEntity(newsBrowseFromDTO); + return newsService.modifyNewsBrowse(newsBrowseFromDTO); + } + } 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 70f21a2cc..6d8722db8 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 @@ -2,8 +2,9 @@ package com.elink.esua.epdc.feign; 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.EpdcNoticeBrowseFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +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.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.feign.fallback.NewsFeignClientFallback; @@ -20,7 +21,7 @@ import java.util.List; * @email yujintao@elink-cn.com * @date 2019/9/5 19:20 */ -@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class,url = "http://localhost:9064") public interface NewsFeignClient { /** @@ -55,4 +56,54 @@ public interface NewsFeignClient { */ @PostMapping(value = "news/epdc-app/notice/browse", consumes = MediaType.APPLICATION_JSON_VALUE) Result browseNotice(@RequestBody EpdcNoticeBrowseFormDTO formDto); + + + + /*** + * @Description 移动端新闻列表 + * @Author qushutong + * @Date 2019/9/9 9:17 + * @Param [formDto] + * @Return com.elink.esua.epdc.commons.tools.utils.Result> + * @Exception + * + */ + @GetMapping("news/epdc-app/news/listNews") + Result> listNews(@RequestBody EpdcNewsFromDTO formDto); + + /*** + * @Description 获取详情 + * @Author qushutong + * @Date 2019/9/9 10:20 + * @Param [id] + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Exception + * + */ + @GetMapping("news/epdc-app/news/detail/{newsId}") + Result getNewsDetail(@PathVariable("id") String id); + + /*** + * @Description 点赞和踩 + * @Author qushutong + * @Date 2019/9/9 10:24 + * @Param [newsStatementFromDTO] + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Exception + * + */ + @PostMapping("news/epdc-app/news/statement") + Result upDateStatement(@RequestBody EpdcNewsStatementFromDTO newsStatementFromDTO); + + /*** + * @Description + * @Author qushutong + * @Date 2019/9/9 10:36 + * @Param [newsBrowseFromDTO] + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Exception + * + */ + @PostMapping("news/epdc-app/news/browse") + Result modifyNewsBrowse(@RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO); } 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 ffb72e6cc..b6d5476bd 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 @@ -3,8 +3,9 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; 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.EpdcNoticeBrowseFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +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.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.feign.NewsFeignClient; @@ -34,4 +35,24 @@ public class NewsFeignClientFallback implements NewsFeignClient { public Result browseNotice(EpdcNoticeBrowseFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "browseNotice", formDto); } + + @Override + public Result> listNews(EpdcNewsFromDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listNews", formDto); + } + + @Override + public Result getNewsDetail(String id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "detail", id); + } + + @Override + public Result upDateStatement(EpdcNewsStatementFromDTO newsStatementFromDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "statement", newsStatementFromDTO); + } + + @Override + public Result modifyNewsBrowse(EpdcNewsBrowseFromDTO newsBrowseFromDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "browse", newsBrowseFromDTO); + } } 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 566963e5d..5733318a4 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 @@ -2,10 +2,13 @@ package com.elink.esua.epdc.service; 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.EpdcNoticeBrowseFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +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.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 java.util.List; @@ -48,4 +51,48 @@ public interface NewsService { * @date 2019/9/6 16:09 */ Result updateReadingAmount(EpdcNoticeBrowseFormDTO formDto); + + + /*** + * @Description + * @Author qushutong + * @Date 2019/9/7 11:34 + * @Param [formDto] + * @Return Result> + * @Exception 移动端新闻列表 + * + */ + Result> listNews(TokenDto userDetail,EpdcNewsFromDTO formDto); + + /*** + * @Description 获取新闻详情 + * @Author qushutong + * @Date 2019/9/9 10:16 + * @Param [id] + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Exception + * + */ + Result getNewsDetail( String id); + /*** + * @Description 点赞踩 + * @Author qushutong + * @Date 2019/9/9 10:17 + * @Param [newsStatementFromDTO] + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Exception + * + */ + Result upDateStatement(TokenDto userDetail, EpdcNewsStatementFromDTO newsStatementFromDTO); + + /*** + * @Description 浏览量 + * @Author qushutong + * @Date 2019/9/9 10:18 + * @Param [newsBrowseFromDTO] + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Exception + * + */ + Result modifyNewsBrowse( EpdcNewsBrowseFromDTO newsBrowseFromDTO); } 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 6be061005..bd36fe0b0 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 @@ -2,8 +2,9 @@ package com.elink.esua.epdc.service.impl; 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.EpdcNoticeBrowseFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; +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.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.feign.NewsFeignClient; @@ -41,4 +42,28 @@ public class NewsServiceImpl implements NewsService { public Result updateReadingAmount(EpdcNoticeBrowseFormDTO formDto) { return newsFeignClient.browseNotice(formDto); } + + @Override + public Result> listNews(TokenDto userDetail,EpdcNewsFromDTO formDto) { + formDto.setDeptId(userDetail.getGridId()); + return newsFeignClient.listNews(formDto); + + } + + @Override + public Result getNewsDetail(String id) { + return newsFeignClient.getNewsDetail(id); + } + + @Override + public Result upDateStatement(TokenDto userDetail, EpdcNewsStatementFromDTO newsStatementFromDTO) { + newsStatementFromDTO.setUserId(userDetail.getUserId()); + return newsFeignClient.upDateStatement(newsStatementFromDTO); + } + + + @Override + public Result modifyNewsBrowse(EpdcNewsBrowseFromDTO newsBrowseFromDTO) { + return newsFeignClient.modifyNewsBrowse(newsBrowseFromDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsStatementFromDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsStatementFromDTO.java index 5dfdee4d2..9ad622fc8 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsStatementFromDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsStatementFromDTO.java @@ -25,4 +25,10 @@ public class EpdcNewsStatementFromDTO implements Serializable { @NotNull(message = "新闻id不能为空") private String newsId; + /** + * 用户ID + */ + @NotNull(message = "用户id不能为空") + private String userId; + } 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 722b79f67..eb3d563b5 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 @@ -66,6 +66,7 @@ public class EpdcAppNewsController { */ @GetMapping("listNews") public Result> listNews(@RequestBody EpdcNewsFromDTO epdcNewsFromDTO){ + ValidatorUtils.validateEntity(epdcNewsFromDTO); Result> listNews = newsService.listNews(epdcNewsFromDTO); return listNews; } @@ -94,6 +95,7 @@ public class EpdcAppNewsController { */ @PostMapping("statement") public Result upDateStatement(@RequestBody EpdcNewsStatementFromDTO newsStatementFromDTO){ + ValidatorUtils.validateEntity(newsStatementFromDTO); return newsService.modifyStatement(newsStatementFromDTO); } @@ -108,6 +110,7 @@ public class EpdcAppNewsController { */ @PostMapping("browse") public Result modifyNewsBrowse(@RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO){ + ValidatorUtils.validateEntity(newsBrowseFromDTO); return newsService.modifyNewsBrowse(newsBrowseFromDTO); } } \ 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/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java index 14e3bf3ac..a38bd37be 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java @@ -267,6 +267,8 @@ public class NewsServiceImpl extends BaseServiceImpl implem newsEntity.setLikeNumber(newsDTO.getLikeNumber()+1); } baseDao.insert(newsEntity); + //插入新闻点赞点踩表 + return new Result(); }