From 9758ef056c2eb7aa8e00fd5ca4ffac012c82fd8f Mon Sep 17 00:00:00 2001
From: yang <1175@qq.com>
Date: Tue, 10 Sep 2024 11:32:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=90=83=E5=8F=96=EF=BC=8Cbu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xboe/module/boecase/api/CasesApi.java  | 12 +++---------
 .../module/boecase/service/ICasesService.java  |  3 +--
 .../boecase/service/impl/CasesServiceImpl.java | 18 ++----------------
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
index 4123186e..4960e3db 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
@@ -128,7 +128,6 @@ public class CasesApi extends ApiBaseController {
     public JsonResponse<PageList<Cases>> queryCaseBreV2(@Validated @RequestBody CasePageVo req) {
         String type = req.getType();
         req.setUserId(getCurrent().getAccountId());
-        req.setUserId("965342027497607168");
         PageList<Cases> views = null;
         if (type.equals("recommend")) {
             views = casesService.queryRecommendPageCasesV2(req);
@@ -742,19 +741,14 @@ public class CasesApi extends ApiBaseController {
      * 查询收藏
      * @param pageIndex
      * @param pageSize
-     * @param orderField
-     * @param orderAsc
      * @return
      */
     @SuppressWarnings("unchecked")
     @GetMapping("/queryFavoriteCaseOfIndex")
     public JsonResponse<PageList<FavoriteCaseOfIndexVo>> queryFavoriteCaseOfIndex(@RequestParam(required = false,defaultValue = "1") Integer pageIndex,
-                                                                            @RequestParam(required = false,defaultValue = "5") Integer pageSize,
-                                                                            @RequestParam(required = false) String orderField,
-                                                                            @RequestParam(required = false) Boolean orderAsc) {
-//        String accountId = this.getCurrent().getAccountId();
-        String accountId = "965342027497607168";
-        PageList<FavoriteCaseOfIndexVo> casesList = casesService.queryFavoriteCaseOfIndex(pageIndex,pageSize,accountId,orderField,orderAsc);
+                                                                            @RequestParam(required = false,defaultValue = "5") Integer pageSize) {
+        String accountId = this.getCurrent().getAccountId();
+        PageList<FavoriteCaseOfIndexVo> casesList = casesService.queryFavoriteCaseOfIndex(pageIndex,pageSize,accountId);
         return success(casesList);
     }
 
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java
index 8e2db196..c167ca1b 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java
@@ -8,7 +8,6 @@ import com.xboe.module.boecase.vo.CaseRankingVo;
 import com.xboe.module.boecase.vo.CasesQueryRecommendRankVo;
 import com.xboe.module.boecase.vo.FavoriteCaseOfIndexVo;
 import com.xboe.module.dict.entity.DictItem;
-import com.xboe.module.interaction.dto.FavoriteCaseDto;
 import com.xboe.school.vo.CasesVo;
 
 import javax.transaction.Transactional;
@@ -133,6 +132,6 @@ public interface ICasesService{
 
     List<Cases> queryPopularityOfMajor(Integer pageSize, Long majorId, LocalDateTime month, String accountId);
 
-    PageList<FavoriteCaseOfIndexVo> queryFavoriteCaseOfIndex(Integer pageIndex, Integer pageSize, String accountId, String orderField, Boolean orderAsc);
+    PageList<FavoriteCaseOfIndexVo> queryFavoriteCaseOfIndex(Integer pageIndex, Integer pageSize, String accountId);
 }
 
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
index af19cc97..63d3c260 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
@@ -1360,7 +1360,7 @@ public class CasesServiceImpl implements ICasesService {
     }
 
     @Override
-    public PageList<FavoriteCaseOfIndexVo> queryFavoriteCaseOfIndex(Integer pageIndex, Integer pageSize, String accountId, String orderField, Boolean orderAsc) {
+    public PageList<FavoriteCaseOfIndexVo> queryFavoriteCaseOfIndex(Integer pageIndex, Integer pageSize, String accountId) {
         String from = Favorites.class.getSimpleName()+" f,"+ Cases.class.getSimpleName()+" c";
         QueryBuilder builder = QueryBuilder.from(from);
         builder.addFields("f.id","f.sysCreateTime","c");
@@ -1369,21 +1369,7 @@ public class CasesServiceImpl implements ICasesService {
         builder.addFilter(FieldFilters.eq("f.objType", BoedxResourceType.Case.value()));
         builder.addFilter(FieldFilters.eq("f.sysCreateAid",accountId));
         builder.addFilter(FieldFilters.eq("c.deleted", false));
-
-        if (StringUtils.isNotBlank(orderField) && orderAsc != null) {
-            switch (orderField) {
-                case "sysCreateTime":
-                    builder.addOrder(orderAsc ? OrderCondition.asc("f.sysCreateTime") : OrderCondition.desc("f.sysCreateTime"));
-                    break;
-                case "views":
-                    builder.addOrder(orderAsc ? OrderCondition.asc("c.views") : OrderCondition.desc("c.views"));
-                    break;
-                default:
-                    break;
-            }
-        }else {
-            builder.addOrder(OrderCondition.desc("f.sysCreateTime"));
-        }
+        builder.addOrder(OrderCondition.desc("f.sysCreateTime"));
 
         builder.setPageIndex(pageIndex);
         builder.setPageSize(pageSize);