修复目前先按照精准匹配的逻辑,未来将开放语义匹配(向量搜索)等高级搜索功能。

This commit is contained in:
王卓煜
2025-08-21 13:32:21 +08:00
parent 9588235f87
commit 0e60251121
4 changed files with 37 additions and 7 deletions

View File

@@ -12,6 +12,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.xboe.api.ThirdApi;
import com.xboe.data.outside.IOutSideDataService;
import com.xboe.module.course.entity.CourseTag;
import com.xboe.module.course.service.*;
import com.xboe.module.course.vo.TeacherVo;
import com.xboe.school.study.entity.StudyCourse;
import com.xboe.school.study.service.IStudyCourseService;
@@ -34,11 +36,6 @@ import com.xboe.module.course.dto.CourseTeacherDto;
import com.xboe.module.course.entity.Course;
import com.xboe.module.course.entity.CourseCrowd;
import com.xboe.module.course.entity.CourseTeacher;
import com.xboe.module.course.service.CourseToCourseFullText;
import com.xboe.module.course.service.ICourseContentService;
import com.xboe.module.course.service.ICourseFullTextSearch;
import com.xboe.module.course.service.ICourseService;
import com.xboe.module.course.service.ICourseTeacherService;
import lombok.extern.slf4j.Slf4j;
@@ -63,7 +60,8 @@ public class CourseFullTextApi extends ApiBaseController{
ICourseFullTextSearch fullTextSearch;
@Resource
IOrganizationService organizationService;
@Autowired
ICourseTagService courseTagService;
@Resource
IStudyCourseService IStudyCourseService;
@@ -310,7 +308,18 @@ public class CourseFullTextApi extends ApiBaseController{
}
paras.setDevice(dto.getDevice());
String tagIds = dto.getTags();
if (tagIds != null && tagIds != ""){
paras.setTags(tagIds);
}else {
String tagName = paras.getKeywords();
if (tagName != null && tagName != ""){
CourseTag courseTag = courseTagService.getTagByName(tagName);
if (courseTag != null){
paras.setTags(courseTag.getId().toString()+",");
}
}
}
try {
//后续会根据当前用户的资源归属查询
PageList<CourseFullText> coursePageList = fullTextSearch.search(ICourseFullTextSearch.DEFAULT_INDEX_NAME,pager.getStartRow(), pager.getPageSize(),paras);

View File

@@ -4,6 +4,7 @@ import com.xboe.common.OrderCondition;
import com.xboe.common.PageList;
import com.xboe.core.SysConstant;
import com.xboe.core.orm.BaseDao;
import com.xboe.core.orm.FieldFilters;
import com.xboe.core.orm.IFieldFilter;
import com.xboe.core.orm.IQuery;
import com.xboe.module.course.entity.Course;
@@ -96,4 +97,9 @@ public class CourseTagDao extends BaseDao<CourseTag> {
javax.persistence.Query query = entityManager.createNativeQuery(sql, CourseTag.class);
return query.getResultList();
}
public CourseTag getTagByName(String tagName) {
CourseTag courseTag = this.findOne((FieldFilters.eq("tag_name", tagName)));
return courseTag;
}
}

View File

@@ -80,4 +80,13 @@ public interface ICourseTagService {
* @return
*/
List<CourseTag> getHotTagList(CourseTagRelationDto courseTagRelationDto);
/**
* 根据多个id获取标签
* @param id
* @return
*/
List<CourseTag> getTagsByIds(String id);
CourseTag getTagByName(String tagName);
}

View File

@@ -218,6 +218,12 @@ public class CourseTagServiceImpl implements ICourseTagService {
return courseTag;
}
@Override
public CourseTag getTagByName(String tagName) {
CourseTag courseTag = courseTagDao.getTagByName(tagName);
return courseTag;
}
@Override
public List<CourseTag> getTagsByIds(String id) {
// id=17,18