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

提交ES相关的修改

Browse Source
This commit is contained in:
daihh
2022-10-21 18:26:50 +08:00
parent abcd2832cd
commit d321961022
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,9 +79,13 @@ public class CourseFullTextApi extends ApiBaseController{
for(int i=0;i<crowds.size();i++) {
crowdIds[i]=crowds.get(i).getGroupId();
}
if(crowdIds.length>1) {
System.out.println("课程["+cft.getName()+"]内容："+crowdIds[0]+","+crowdIds[1]);
}
String audienceIds=StringUtils.join(crowdIds,",");
//log.info("受众信息",audienceIds);
cft.setAudience(audienceIds);
//cft.setAudience(audienceIds);
cft.setAudiences(crowdIds);
cft.setIsSetAudience(1);//有受众
}else {
cft.setIsSetAudience(0);//无受众
@@ -130,7 +134,11 @@ public class CourseFullTextApi extends ApiBaseController{
paras.setSysType2(dto.getSysType2());//专业分类二级
paras.setSysType3(dto.getSysType3());//专业分类三级
paras.setDevice(dto.getDevice());
paras.setAudience(dto.getAudiences());
//paras.setAudience(dto.getAudiences());
if(StringUtils.isNotBlank(dto.getAudiences())) {
paras.setAudiences(dto.getAudiences().split(","));
}
paras.setOpenCourse(dto.getOpenCourse());
if(StringUtils.isNotBlank(dto.getOrderField())) {
if(dto.getOrderField().equals("studys")) {

2
servers/boe-server-all/src/main/java/com/xboe/module/course/service/CourseToCourseFullText.java
View File

@@ -13,7 +13,7 @@ public class CourseToCourseFullText {
CourseFullText cft=new CourseFullText();
cft.setId(c.getId());
cft.setName(c.getName());
cft.setAudience("");//受众的id,多个使用逗号分隔
//cft.setAudience("");//受众的id,多个使用逗号分隔
cft.setCompanyId(c.getCompanyId());
cft.setCoverImg(c.getCoverImg());
cft.setCreatedAt(c.getSysCreateTime().toEpochSecond(ZoneOffset.of("+8")));

34
servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
View File

@@ -261,6 +261,7 @@ public class CourseServiceImpl implements ICourseService {
List<IFieldFilter> filters = createFilters(dto);
//自动添加过滤已删除
filters.add(FieldFilters.eq("deleted",false));
filters.add(FieldFilters.eq("enabled",true));
OrderCondition oc=null;
if(StringUtils.isNotBlank(dto.getOrderField())) {
if(dto.getOrderAsc()||dto.getOrderAsc()==null) {
@@ -345,6 +346,15 @@ public class CourseServiceImpl implements ICourseService {
public void update(Course course, boolean log) {
//更新。
courseDao.update(course);
if(StringUtils.isNotBlank(course.getFullTextId())) {
try {
fullTextSearch.remove(ICourseFullTextSearch.DEFAULT_INDEX_NAME,course.getFullTextId());
} catch (Exception e) {
//log.error("删除课程时删除全文索引错误",e);
}
}
//记录日志
// if(log) {
// //记录课程记录
@@ -361,6 +371,14 @@ public class CourseServiceImpl implements ICourseService {
//同时添加发布事件,这里的创建人需要修改为教师
Course c=courseDao.get(id);
eventSender.send("删除课程","PublishCourse", "删除课程【"+c.getName()+"】", c.getId(), "1", c.getName(), c.getSysCreateAid(), c.getSysCreateBy(),"");
//删除
if(c.getFullTextId()!=null) {
try {
fullTextSearch.remove(ICourseFullTextSearch.DEFAULT_INDEX_NAME,c.getFullTextId());
}catch(Exception e) {
log.error("删除课程时删除全文索引错误",e);
}
}
}else {
//彻底删除，课件设置为无课程状态
courseDao.setDeleted(id);
@@ -510,7 +528,14 @@ public class CourseServiceImpl implements ICourseService {
}
}
//更新后需要删除发布
if(StringUtils.isNotBlank(c.getFullTextId())) {
try {
fullTextSearch.remove(ICourseFullTextSearch.DEFAULT_INDEX_NAME,c.getFullTextId());
} catch (Exception e) {
//log.error("删除课程时删除全文索引错误",e);
}
}
}
@@ -583,6 +608,9 @@ public class CourseServiceImpl implements ICourseService {
}
/**
* 撤销发布
*/
@Override
public void update(String id) {
courseDao.updateMultiFieldById(id,UpdateBuilder.create("status",Course.STATUS_SUBMIT),
@@ -627,7 +655,9 @@ public class CourseServiceImpl implements ICourseService {
}
String audienceIds=StringUtils.join(crowdIds,",");
//log.info("受众信息",audienceIds);
cft.setAudience(audienceIds);
//cft.setAudience(audienceIds);
cft.setAudiences(crowdIds);
//cft.setAudience("0C76ECF8-5A14-B6B3-A513-CD22AE912B3E");
cft.setIsSetAudience(1);//有受众
}else {
cft.setIsSetAudience(0);//无受众