接口 新闻列表 详情 点赞 阅读量

esua-epdc/epdc-gateway/pom.xml

@@ -94,9 +94,9 @@
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
                 <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
                 <!--                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
+                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
-                </gateway.routes.epdc-activiti-server.uri>
+                <!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
-                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
+                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
                 <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
                 <!--                <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
                 <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>

esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@@ -123,7 +123,7 @@
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
 
-                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
 
                 <wx.mp.configs.appId>wx6ff4e50840cf7dfc</wx.mp.configs.appId>

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.commons.tools.validator.ValidatorUtils;
-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.service.NewsService;
@@ -66,4 +68,64 @@ public class ApiNewsController {
     public Result<EpdcNoticeDetailResultDTO> 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<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO>>
+     * @Exception
+     *
+     */
+    @GetMapping("news/list")
+    public Result<List<EpdcNewsResultDTO>> 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<com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO>
+     * @Exception
+     *
+     */
+    @GetMapping("news/detail/{newsId}")
+    public Result<EpdcNewsDetailResultDTO> getNewsDetail(@PathVariable("id") String id){
+        Result<EpdcNewsDetailResultDTO> 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);
+    }
+
 }

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.*;
-import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
+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<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO>>
+    * @Exception
+    *
+    */
+    @GetMapping("news/epdc-app/news/listNews")
+    Result<List<EpdcNewsResultDTO>> listNews(@RequestBody EpdcNewsFromDTO formDto);
+
+    /***
+     * @Description  获取详情
+     * @Author  qushutong
+     * @Date   2019/9/9 10:20
+     * @Param  [id]
+     * @Return      com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO>
+     * @Exception
+     *
+     */
+    @GetMapping("news/epdc-app/news/detail/{newsId}")
+    Result<EpdcNewsDetailResultDTO> 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);
 }

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.*;
-import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
+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<List<EpdcNewsResultDTO>> listNews(EpdcNewsFromDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listNews", formDto);
+    }
+
+    @Override
+    public Result<EpdcNewsDetailResultDTO> 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);
+    }
 }

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.*;
-import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
+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<EpdcNoticeDetailResultDTO> updateReadingAmount(EpdcNoticeBrowseFormDTO formDto);
+
+
+    /***
+     * @Description
+     * @Author qushutong
+     * @Date 2019/9/7 11:34
+     * @Param [formDto]
+     * @Return Result<List < EpdcNoticeResultDTO>>
+     * @Exception 移动端新闻列表
+     *
+     */
+    Result<List<EpdcNewsResultDTO>> 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<com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO>
+     * @Exception   
+     * 
+     */
+    Result<EpdcNewsDetailResultDTO> 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);
 }

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.*;
-import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
+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<EpdcNoticeDetailResultDTO> updateReadingAmount(EpdcNoticeBrowseFormDTO formDto) {
         return newsFeignClient.browseNotice(formDto);
     }
+
+    @Override
+    public Result<List<EpdcNewsResultDTO>> listNews(TokenDto userDetail,EpdcNewsFromDTO formDto) {
+        formDto.setDeptId(userDetail.getGridId());
+        return newsFeignClient.listNews(formDto);
+
+    }
+
+    @Override
+    public Result<EpdcNewsDetailResultDTO> 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);
+    }
 }

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;
+
 }

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<List<EpdcNewsResultDTO>> listNews(@RequestBody EpdcNewsFromDTO epdcNewsFromDTO){
+        ValidatorUtils.validateEntity(epdcNewsFromDTO);
         Result<List<EpdcNewsResultDTO>> 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);
     }
 }

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<NewsDao, NewsEntity> implem
             newsEntity.setLikeNumber(newsDTO.getLikeNumber()+1);
         }
         baseDao.insert(newsEntity);
+        //插入新闻点赞点踩表
+
         return new Result();
     }