1.2.8信息中心根据时间排序逻辑调整

src/main/java/com/caimei365/commodity/controller/SearchQueryApi.java

@@ -151,10 +151,10 @@ public class SearchQueryApi {
         @ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
     })
     @GetMapping("/article")
-    public ResponseJson<String> queryArticleByKeyword(String keyword,Integer status,String startDate,String endDate,
+    public ResponseJson<String> queryArticleByKeyword(String keyword,Integer status,
                                            @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
-        return searchQueryService.queryArticleByKeyword(keyword, pageNum, pageSize,status,startDate,endDate);
+        return searchQueryService.queryArticleByKeyword(keyword, pageNum, pageSize,status);
     }
 
     /**

src/main/java/com/caimei365/commodity/mapper/SearchMapper.java

@@ -216,7 +216,7 @@ public interface SearchMapper {
      * @param keyword 关键词
      * @return list
      */
-    List<ArticleListVo> queryArticleByProDate(@Param("keyword") String keyword, @Param("articleId") Integer articleId, @Param("typeId") Integer typeId, @Param("labelText") String labelText, @Param("startDate") String startDate, @Param("endDate") String endDate);
+    List<ArticleListVo> queryArticleByProDate(@Param("keyword") String keyword, @Param("articleId") Integer articleId, @Param("typeId") Integer typeId, @Param("labelText") String labelText);
 
     /**
      * 根据用户ID查找历史记录

src/main/java/com/caimei365/commodity/service/SearchQueryService.java

@@ -74,7 +74,7 @@ public interface SearchQueryService {
      * @param pageSize  每页数量
      * @return JsonStr(list)
      */
-    ResponseJson<String> queryArticleByKeyword(String keyword, int pageNum, int pageSize,Integer status,String startDate,String endDate);
+    ResponseJson<String> queryArticleByKeyword(String keyword, int pageNum, int pageSize,Integer status);
 
     /**
      * 根据文章ID搜索文章

src/main/java/com/caimei365/commodity/service/impl/SearchQueryServiceImpl.java

@@ -329,7 +329,7 @@ public class SearchQueryServiceImpl implements SearchQueryService {
      * @return JsonStr(list)
      */
     @Override
-    public ResponseJson<String> queryArticleByKeyword(String keyword, int pageNum, int pageSize,Integer status,String startDate,String endDate) {
+    public ResponseJson<String> queryArticleByKeyword(String keyword, int pageNum, int pageSize,Integer status) {
         String queryStr = "article:'" + keyword + "'";
         if (StringUtils.isEmpty(keyword)) {
             queryStr = "a_all:'1'";
@@ -356,7 +356,7 @@ public class SearchQueryServiceImpl implements SearchQueryService {
                 return queryArticleFromDatabase(pageNum, pageSize, keyword, null, null, null);
             }else {
                 //根据时间排序
-                return queryArticleFromDatabaseByProDate(pageNum, pageSize, keyword, null, null, null,startDate,endDate);
+                return queryArticleFromDatabaseByProDate(pageNum, pageSize, keyword, null, null, null);
             }
 
         }
@@ -481,16 +481,14 @@ public class SearchQueryServiceImpl implements SearchQueryService {
      * @param labelId       标签Id
      * @param num           页码
      * @param size          每页数量
-     * @param startDate     开始时间
-     * @param endDate       结束时间
      */
-    private ResponseJson<String> queryArticleFromDatabaseByProDate(int num, int size, String keyword, Integer articleId, Integer typeId, Integer labelId,String startDate,String endDate) {
+    private ResponseJson<String> queryArticleFromDatabaseByProDate(int num, int size, String keyword, Integer articleId, Integer typeId, Integer labelId) {
         String labelText = null;
         if (null != labelId){
             labelText = searchMapper.findLabelNameById(labelId);
         }
         PageHelper.startPage(num, size);
-        List<ArticleListVo> articleList = searchMapper.queryArticleByProDate(keyword, articleId, typeId, labelText,startDate,endDate);
+        List<ArticleListVo> articleList = searchMapper.queryArticleByProDate(keyword, articleId, typeId, labelText);
         articleList.forEach(article -> {
             String imagePath = ImageUtils.getImageURL("", article.getImage(), 0, domain);
             article.setImage(imagePath);

src/main/resources/mapper/SearchMapper.xml

@@ -466,9 +466,6 @@
             <if test="labelText != null">
                 and a.label like concat ('%',#{labelText},'%')
             </if>
-            <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
-                AND a.pubdate &gt;= #{startDate}  AND a.pubdate &lt;= #{endDate}
-            </if>
         </where>
 
          order by a.pubdate desc