优化

core/src/main/java/com/mooctest/crowd/domain/repository/ITechnicalArticlesRepo.java

@@ -10,6 +10,6 @@ public interface ITechnicalArticlesRepo {
 
     Page<TechnicalArticles> getTechnicalArticles(Pageable pageable, String keyword);
 
-    Page<TechnicalArticles> articlesRanking(Pageable pageable,String keyword);
+    Page<TechnicalArticles> articlesRanking(Pageable pageable);
 
 }

core/src/main/java/com/mooctest/crowd/domain/repository/TechnicalArticlesRepo.java

@@ -33,9 +33,8 @@ public class TechnicalArticlesRepo implements ITechnicalArticlesRepo{
     }
 
     @Override
-    public Page<TechnicalArticles> articlesRanking(Pageable pageable,String keyword) {
-        Specifications<TechnicalArticlesPO> where =  Specifications.where(getArticlesByIsNotDeleted(keyword));
-        return  technicalarticlesDao.findAll(where, pageable).map(TechnicalArticlesPO -> Converter.convert(TechnicalArticles.class, TechnicalArticlesPO));
+    public Page<TechnicalArticles> articlesRanking(Pageable pageable) {
+        return  technicalarticlesDao.findAll(pageable).map(TechnicalArticlesPO -> Converter.convert(TechnicalArticles.class, TechnicalArticlesPO));
     }
 
     private Specification<TechnicalArticlesPO> getArticlesByIsNotDeleted(String keyword) {

site/src/main/java/com/mooctest/crowd/site/controller/TechnicalArticlesController.java

@@ -5,7 +5,6 @@ import com.mooctest.crowd.site.data.dto.TechnicalArticlesDTO;
 import com.mooctest.crowd.site.data.response.ResponseVO;
 import com.mooctest.crowd.site.data.response.ServerCode;
 import com.mooctest.crowd.site.data.vo.SearchConditionVO;
-import com.mooctest.crowd.site.data.vo.TechnicalArticlesVO;
 import com.mooctest.crowd.site.service.TechnicalArticlesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -15,7 +14,6 @@ import org.springframework.data.domain.Sort;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 
@@ -49,18 +47,15 @@ public class TechnicalArticlesController extends BaseSearchController{
         return new PageRequest(activePage-1, CommonConstant.DEFAULT_ROWS_ON_PAGE, sort);
     }
 
-    Pageable getRanking(SearchConditionVO searchConditionVO){
-        int activePage = searchConditionVO.getActivePage() == 0?1:searchConditionVO.getActivePage();
+    Pageable getRanking(){
         Sort sort = new Sort(Sort.Direction.DESC,"reading");
-        return new PageRequest(activePage-1, CommonConstant.DEFAULT_ROWS_ON_PAGE, sort);
+        return  new PageRequest(0,10,sort);
     }
 
-
-    @RequestMapping(value = "/ranking", method = RequestMethod.POST)
-    public ResponseVO<TechnicalArticlesDTO> ranking(@RequestBody SearchConditionVO searchConditionVO){
-        Pageable pageable = this.getRanking(searchConditionVO);
-        String keyword = searchConditionVO.getKeyword();
-        return new ResponseVO<>(ServerCode.SUCCESS, technical.articlesRanking(pageable,keyword));
+    @RequestMapping(value = "/ranking", method = RequestMethod.GET)
+    public ResponseVO<TechnicalArticlesDTO> ranking(){
+        Pageable pageable = this.getRanking();
+        return new ResponseVO<>(ServerCode.SUCCESS, technical.articlesRanking(pageable));
     }
 
     @RequestMapping(value = "/updateranking/{id:\\d+}", method = RequestMethod.GET)

site/src/main/java/com/mooctest/crowd/site/service/TechnicalArticlesService.java

@@ -1,24 +1,17 @@
 package com.mooctest.crowd.site.service;
 
 import com.mooctest.crowd.site.data.dto.TechnicalArticlesDTO;
-import com.mooctest.crowd.site.data.vo.TechnicalArticlesVO;
 import org.springframework.data.domain.Pageable;
 
-import java.util.List;
 import java.util.Map;
 
 
-/**
- * @author: Diors.Po
- * @Email: 171256175@qq.com
- * @date 2019-08-12 01:18
- */
 
 public interface TechnicalArticlesService {
 
     TechnicalArticlesDTO getArticles(Pageable pageable,String keyword,Map<String, String> extraCondition);
 
-    TechnicalArticlesDTO articlesRanking(Pageable pageable,String keyword);
+    TechnicalArticlesDTO articlesRanking(Pageable pageable);
 
     TechnicalArticlesDTO  updateRanking(long id);
 }

site/src/main/java/com/mooctest/crowd/site/service/impl/TechnicalArticlesServiceImpl.java

@@ -44,9 +44,9 @@ public class TechnicalArticlesServiceImpl implements TechnicalArticlesService{
     }
 
     @Override
-    public TechnicalArticlesDTO articlesRanking(Pageable pageable,String keyword) {
+    public TechnicalArticlesDTO articlesRanking(Pageable pageable) {
         TechnicalArticlesDTO  technicalArticlesDTO= new  TechnicalArticlesDTO();
-        technicalArticlesDTO.setTechnicalArticlesPage(technicalArticlesRepo.articlesRanking(pageable, keyword).map(technicalArticles -> new TechnicalArticlesVO(technicalArticles)));
+        technicalArticlesDTO.setTechnicalArticlesPage(technicalArticlesRepo.articlesRanking(pageable).map(technicalArticles -> new TechnicalArticlesVO(technicalArticles)));
         return technicalArticlesDTO;
     }