hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-09 10:56:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

案例萃取，bug修复

Browse Source
This commit is contained in:
yang
2024-09-10 11:32:08 +08:00
parent 8db557a8f6
commit 9758ef056c
3 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
View File

@@ -128,7 +128,6 @@ public class CasesApi extends ApiBaseController {
public JsonResponse<PageList<Cases>> queryCaseBreV2(@Validated @RequestBody CasePageVo req) { public JsonResponse<PageList<Cases>> queryCaseBreV2(@Validated @RequestBody CasePageVo req) {
String type = req.getType(); String type = req.getType();
req.setUserId(getCurrent().getAccountId()); req.setUserId(getCurrent().getAccountId());
req.setUserId("965342027497607168");
PageList<Cases> views = null; PageList<Cases> views = null;
if (type.equals("recommend")) { if (type.equals("recommend")) {
views = casesService.queryRecommendPageCasesV2(req); views = casesService.queryRecommendPageCasesV2(req);
@@ -742,19 +741,14 @@ public class CasesApi extends ApiBaseController {
* 查询收藏 * 查询收藏
* @param pageIndex * @param pageIndex
* @param pageSize * @param pageSize
* @param orderField
* @param orderAsc
* @return * @return
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@GetMapping("/queryFavoriteCaseOfIndex") @GetMapping("/queryFavoriteCaseOfIndex")
public JsonResponse<PageList<FavoriteCaseOfIndexVo>> queryFavoriteCaseOfIndex(@RequestParam(required = false,defaultValue = "1") Integer pageIndex, public JsonResponse<PageList<FavoriteCaseOfIndexVo>> queryFavoriteCaseOfIndex(@RequestParam(required = false,defaultValue = "1") Integer pageIndex,
@RequestParam(required = false,defaultValue = "5") Integer pageSize, @RequestParam(required = false,defaultValue = "5") Integer pageSize) {
@RequestParam(required = false) String orderField, String accountId = this.getCurrent().getAccountId();
@RequestParam(required = false) Boolean orderAsc) { PageList<FavoriteCaseOfIndexVo> casesList = casesService.queryFavoriteCaseOfIndex(pageIndex,pageSize,accountId);
// String accountId = this.getCurrent().getAccountId();
String accountId = "965342027497607168";
PageList<FavoriteCaseOfIndexVo> casesList = casesService.queryFavoriteCaseOfIndex(pageIndex,pageSize,accountId,orderField,orderAsc);
return success(casesList); return success(casesList);
} }

3
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java
View File

@@ -8,7 +8,6 @@ import com.xboe.module.boecase.vo.CaseRankingVo;
import com.xboe.module.boecase.vo.CasesQueryRecommendRankVo; import com.xboe.module.boecase.vo.CasesQueryRecommendRankVo;
import com.xboe.module.boecase.vo.FavoriteCaseOfIndexVo; import com.xboe.module.boecase.vo.FavoriteCaseOfIndexVo;
import com.xboe.module.dict.entity.DictItem; import com.xboe.module.dict.entity.DictItem;
import com.xboe.module.interaction.dto.FavoriteCaseDto;
import com.xboe.school.vo.CasesVo; import com.xboe.school.vo.CasesVo;
import javax.transaction.Transactional; import javax.transaction.Transactional;
@@ -133,6 +132,6 @@ public interface ICasesService{
List<Cases> queryPopularityOfMajor(Integer pageSize, Long majorId, LocalDateTime month, String accountId); 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);
} }

16
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
View File

@@ -1360,7 +1360,7 @@ public class CasesServiceImpl implements ICasesService {
} }
@Override @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"; String from = Favorites.class.getSimpleName()+" f,"+ Cases.class.getSimpleName()+" c";
QueryBuilder builder = QueryBuilder.from(from); QueryBuilder builder = QueryBuilder.from(from);
builder.addFields("f.id","f.sysCreateTime","c"); 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.objType", BoedxResourceType.Case.value()));
builder.addFilter(FieldFilters.eq("f.sysCreateAid",accountId)); builder.addFilter(FieldFilters.eq("f.sysCreateAid",accountId));
builder.addFilter(FieldFilters.eq("c.deleted", false)); 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.setPageIndex(pageIndex);
builder.setPageSize(pageSize); builder.setPageSize(pageSize);