新闻列表

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/controller/QuanNewsController.java

@@ -27,6 +27,22 @@ public class QuanNewsController {
     private final QuanNewsServiceImpl quanNewsService;
     private final JmsMessagingTemplate jmsMessagingTemplate;
 
+    /**
+     * 首页置顶新闻
+     */
+    @PostMapping("/app/getTopNewsList")
+    public RestResponse getTopNewsList(@RequestBody QuanNewsReq quanNews) {
+        return quanNewsService.getTopNewsList(quanNews);
+    }
+    
+    /**
+     * 获取更多新闻
+     */
+    @PostMapping("/app/getMoreNewsList")
+    public RestResponse getMoreNewsList(@RequestBody QuanNewsReq quanNews) {
+        return quanNewsService.getMoreNewsList(quanNews);
+    }
+    
     /**
      * 分页展示置顶新闻+普通新闻
      *
@@ -34,7 +50,7 @@ public class QuanNewsController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      * @since 2019/12/2 15:39
      */
-    @PostMapping("app/list")
+    @PostMapping("/app/list")
     public RestResponse list(@RequestBody QuanNewsReq quanNews) {
         return quanNewsService.appNews(quanNews);
     }

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/service/impl/QuanNewsServiceImpl.java

@@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.IOException;
@@ -37,6 +38,45 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
 
     private final RedisTemplate<String, Object> redisTemplate;
 
+    /**
+     * 首页置顶新闻
+     * @param request
+     * @return
+     */
+    public RestResponse getTopNewsList(QuanNewsReq request) {
+    	 //全部新闻的浏览量列表
+        Map<Object, Object> lookTimes = redisTemplate.boundHashOps("system-quanNews-look-time").entries();
+        //全部新闻的点赞用户列表
+        Map<Object, Object> likeUsers = redisTemplate.opsForHash().entries("system-quanNews-like-users");
+        Page<QuanNews> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<QuanNews> topNews = this.page(page, Wrappers.<QuanNews>query()
+        		.eq("is_top", true)
+                .orderByAsc("top_serial")
+                .orderByDesc("release_date"));
+        //把点赞的用户数量和浏览量整入新闻字段中
+        newsAddLookAndLike(topNews.getRecords(), lookTimes, likeUsers);
+        return RestResponse.success(topNews);
+    }
+    
+    /**
+     * 获取更多新闻
+     * @param request
+     * @return
+     */
+    public RestResponse getMoreNewsList(QuanNewsReq quanNews) {
+    	Page<QuanNews> page = new Page<>(quanNews.getPageNum(), quanNews.getPageSize());
+        IPage<QuanNews> news = this.page(page, Wrappers.<QuanNews>query()
+                .orderByDesc("is_top")
+                .orderByAsc("top_serial")
+                .orderByDesc("release_date"));
+        //全部新闻的浏览量列表
+        Map<Object, Object> lookTimes = redisTemplate.boundHashOps("system-quanNews-look-time").entries();
+        //全部新闻的点赞用户列表
+        Map<Object, Object> likeUsers = redisTemplate.opsForHash().entries("system-quanNews-like-users");
+        newsAddLookAndLike(news.getRecords(), lookTimes, likeUsers);
+        return RestResponse.success(news);
+    }
+    
     /**
      * 查询置顶新闻+普通新闻列表
      *