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

查询推荐人

Browse Source
This commit is contained in:
Boolean
2023-06-23 17:20:16 +08:00
parent 555039fbcf
commit 989f8ec113
4 changed files with 96 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,6 +109,7 @@ public class CasesApi extends ApiBaseController {
public JsonResponse<PageList<Cases>> queryCaseBreV2(@Validated @RequestBody CasePageVo req){
String type = req.getType();
PageList<Cases> views;
req.setUserId(getCurrent().getAccountId());
if (type.equals("recommend")) {
views = casesService.queryRecommendPageCasesV2(req);
} else {

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

@@ -261,6 +261,9 @@ public class Cases extends BaseEntity {
@Transient
private List<String> majorIds;
@Transient
private String recommendOrgName;
public Cases() {

8
servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendPushRecord.java
View File

@@ -91,5 +91,11 @@ public class CasesRecommendPushRecord extends BaseEntity {
@Column(name = "remark")
private String remark;
public CasesRecommendPushRecord() {
}
public CasesRecommendPushRecord(String recommendId,String caseId) {
this.recommendId = recommendId;
this.caseId = caseId;
}
}

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

@@ -4,17 +4,17 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.split.SplitIter;
import cn.hutool.core.util.StrUtil;
import com.xboe.common.OrderCondition;
import com.xboe.common.OrderDirection;
import com.xboe.common.PageList;
import com.xboe.common.utils.IDGenerator;
import com.xboe.common.utils.StringUtil;
import com.xboe.core.orm.*;
import com.xboe.module.boecase.dao.CasesDao;
import com.xboe.module.boecase.dao.CasesMajorTypeDao;
import com.xboe.module.boecase.dao.CasesMajorTypeRepoDao;
import com.xboe.module.boecase.dao.CasesRecordDao;
import com.xboe.module.boecase.dao.*;
import com.xboe.module.boecase.dto.*;
import com.xboe.module.boecase.entity.Cases;
import com.xboe.module.boecase.entity.CasesMajorType;
import com.xboe.module.boecase.entity.CasesRecommend;
import com.xboe.module.boecase.entity.CasesRecommendPushRecord;
import com.xboe.module.boecase.service.ICasesService;
import com.xboe.module.dict.dao.SysDictionaryDao;
import com.xboe.module.dict.entity.DictItem;
@@ -22,6 +22,7 @@ import com.xboe.orm.CustomFieldInFilter;
import com.xboe.school.vo.CasesVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;
@@ -31,10 +32,8 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.transaction.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@Slf4j
@@ -57,8 +56,11 @@ public class CasesServiceImpl implements ICasesService {
@Resource
private CasesMajorTypeRepoDao casesMajorTypeRepoDao;
@PersistenceContext
private EntityManager entityManager;
@Autowired
private CasesRecommendPushRecordDao casesRecommendPushRecordDao;
@Autowired
private CasesRecommendDao casesRecommendDao;
/**
* 案例分页查询，用于门户的查询
@@ -255,13 +257,6 @@ public class CasesServiceImpl implements ICasesService {
if (StringUtils.isNotBlank(caseVo.getCaseType())) {
filters.add(FieldFilters.eq("caseType", caseVo.getCaseType()));
}
if(caseVo.getBreCommend()!=null){
if(!caseVo.getBreCommend()){
filters.add(FieldFilters.eq("breCommend",0));
}else {
filters.add(FieldFilters.eq("breCommend", 1));
}
}
if (caseVo.getIsTop() != null && caseVo.getIsTop()) {
query.addOrder(OrderCondition.desc("isTop"));
query.addOrder(OrderCondition.desc("topTime"));
@@ -287,6 +282,46 @@ public class CasesServiceImpl implements ICasesService {
query.setPageIndex(caseVo.getPageIndex());
query.setPageSize(caseVo.getPageSize());
page = casesDao.findPage(query.builder());
List<Cases> list = page.getList();
if (CollUtil.isNotEmpty(list)) {
List<String> caseIds = list.stream().map(Cases::getId).collect(Collectors.toList());
QueryBuilder recommendCasesQuery = QueryBuilder.from(CasesRecommendPushRecord.class);
recommendCasesQuery.addField("new CasesRecommendPushRecord(recommendId,caseId)");
List<IFieldFilter> subFilters = new ArrayList<>();
subFilters.add(FieldFilters.eq("pushUserId", caseVo.getUserId()));
subFilters.add(FieldFilters.in("caseId", caseIds));
subFilters.add(FieldFilters.eq("pushStatus", 4));
subFilters.add(FieldFilters.eq("deleted", Boolean.FALSE));
QueryBuilder queryBuilder = recommendCasesQuery.addFilters(subFilters)
.addOrder("sysCreateTime", OrderDirection.DESC)
.addGroupBy("recommendId");
List<CasesRecommendPushRecord> pushRecords = casesRecommendPushRecordDao.findList(queryBuilder.builder());
if (CollUtil.isNotEmpty(pushRecords)) {
List<String> rIds = pushRecords.stream().map(CasesRecommendPushRecord::getRecommendId).collect(Collectors.toList());
QueryBuilder builder = QueryBuilder.from(CasesRecommend.class);
builder.addField("new CasesRecommend(id,recommendOrgName)");
List<IFieldFilter> recommendFilters = new ArrayList<>();
recommendFilters.add(FieldFilters.eq("deleted", Boolean.FALSE));
recommendFilters.add(FieldFilters.in("id", rIds));
builder.addFilters(recommendFilters);
List<CasesRecommend> recommands = casesRecommendDao.findList(builder.builder());
if (CollUtil.isNotEmpty(recommands)) {
Map<String, String> collect = recommands.stream().collect(Collectors.toMap(k -> k.getId(), v -> v.getRecommendOrgName()));
list.forEach(it -> {
CasesRecommendPushRecord one = CollUtil.findOne(pushRecords, (a) -> StrUtil.equals(a.getCaseId(), it.getId()));
if (Objects.nonNull(one)) {
String recommendOrgName = collect.get(one.getRecommendId());
it.setBreCommend(1);
it.setRecommendOrgName(recommendOrgName);
} else {
it.setBreCommend(0);
}
});
}
}
}
return page;
}