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

Merge remote-tracking branch 'origin/third' into third

Browse Source
This commit is contained in:
86182
2022-12-14 18:54:33 +08:00
parent 4a6738e99c 7857ae0227
commit bfdb93a99a
3 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/boe-module-course/src/main/java/com/xboe/module/course/dto/CourseFullText.java
View File

@@ -15,7 +15,6 @@ public class CourseFullText {
/**es中的id*/ /**es中的id*/
private String esId; private String esId;
/**名称*/ /**名称*/
private String name; private String name;
@@ -29,6 +28,8 @@ public class CourseFullText {
/**10无目录录播课，20 有目录录播课，30:面授课；40学习项目*/ /**10无目录录播课，20 有目录录播课，30:面授课；40学习项目*/
private Integer type; private Integer type;
/**多个时用到*/
private String types;
/**原系统的企业id,对应sass模式的字段*/ /**原系统的企业id,对应sass模式的字段*/
private String companyId; private String companyId;

34
modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java
View File

@@ -264,8 +264,20 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{
}else { }else {
boolQuery.filter(QueryBuilders.termQuery("type", params.getType())); boolQuery.filter(QueryBuilders.termQuery("type", params.getType()));
} }
}else if(StringUtils.isNotBlank(params.getTypes())) {
List<Integer> typeList=new ArrayList<>();
if(params.getTypes().indexOf("20")>-1) {
typeList.add(10);
}
String[] typeArray=params.getTypes().split("-");
for(String s:typeArray) {
typeList.add(Integer.valueOf(s));
}
boolQuery.filter(QueryBuilders.termsQuery("type", typeList));
} }
if(params.getSource()!=null) { if(params.getSource()!=null) {
boolQuery.filter(QueryBuilders.termQuery("source", params.getSource())); boolQuery.filter(QueryBuilders.termQuery("source", params.getSource()));
} }
@@ -273,13 +285,29 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{
boolQuery.filter(QueryBuilders.termQuery("openCourse", params.getOpenCourse())); boolQuery.filter(QueryBuilders.termQuery("openCourse", params.getOpenCourse()));
} }
if(StringUtils.isNotBlank(params.getSysType1())) { if(StringUtils.isNotBlank(params.getSysType1())) {
boolQuery.filter(QueryBuilders.termQuery("sysType1", params.getSysType1())); if(params.getSysType1().indexOf("-")>-1) {
String[] typeArray=params.getSysType1().split("-");
boolQuery.filter(QueryBuilders.termsQuery("sysType1", typeArray));
}else {
boolQuery.filter(QueryBuilders.termQuery("sysType1", params.getSysType1()));
}
} }
if(StringUtils.isNotBlank(params.getSysType2())) { if(StringUtils.isNotBlank(params.getSysType2())) {
boolQuery.filter(QueryBuilders.termQuery("sysType2", params.getSysType2())); if(params.getSysType2().indexOf("-")>-1) {
String[] typeArray=params.getSysType2().split("-");
boolQuery.filter(QueryBuilders.termsQuery("sysType2", typeArray));
}else {
boolQuery.filter(QueryBuilders.termQuery("sysType2", params.getSysType2()));
}
} }
if(StringUtils.isNotBlank(params.getSysType3())) { if(StringUtils.isNotBlank(params.getSysType3())) {
boolQuery.filter(QueryBuilders.termQuery("sysType3", params.getSysType3())); if(params.getSysType3().indexOf("-")>-1) {
String[] typeArray=params.getSysType3().split("-");
boolQuery.filter(QueryBuilders.termsQuery("sysType3", typeArray));
}else {
boolQuery.filter(QueryBuilders.termQuery("sysType3", params.getSysType3()));
}
} }
//增加companyId过滤 //增加companyId过滤
if(StringUtils.isNotBlank(params.getCompanyId())) { if(StringUtils.isNotBlank(params.getCompanyId())) {

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

@@ -134,6 +134,7 @@ public class CourseFullTextApi extends ApiBaseController{
paras.setSysType2(dto.getSysType2());//专业分类二级 paras.setSysType2(dto.getSysType2());//专业分类二级
paras.setSysType3(dto.getSysType3());//专业分类三级 paras.setSysType3(dto.getSysType3());//专业分类三级
paras.setDevice(dto.getDevice()); paras.setDevice(dto.getDevice());
paras.setTypes(dto.getTypes());//多个分类的情况
//用户的companyId //用户的companyId
paras.setCompanyId(dto.getCompanyId()); paras.setCompanyId(dto.getCompanyId());
//paras.setAudience(dto.getAudiences()); //paras.setAudience(dto.getAudiences());