Commit ffffb26a by 朱亚洁

bug:[none]答案搜索书刊分类

parent 3e56350a
...@@ -731,33 +731,6 @@ public class AppletBooklistBizImpl implements AppletBooklistBiz { ...@@ -731,33 +731,6 @@ public class AppletBooklistBizImpl implements AppletBooklistBiz {
@Override @Override
public void autoCreateBooklistByTemplet(Long firstClassify) { public void autoCreateBooklistByTemplet(Long firstClassify) {
Boolean contain4K12 = false;
if ("test".equals(BookProps.getSystemEnv()) && ArrayUtils
.contains(RightsSettingConstant.K12_TEMPLET_ID_TEST, firstClassify)) {
contain4K12 = true;
} else if (!"test".equals(BookProps.getSystemEnv()) && ArrayUtils
.contains(RightsSettingConstant.K12_TEMPLET_ID, firstClassify)) {
contain4K12 = true;
}
//K12
if (contain4K12){
List<BookLabel> gradeLabelList = bookLabelDao.getListByType(1);
List<BookLabel> subjectLabelList = bookLabelDao.getListByType(2);
for (BookLabel grade:gradeLabelList){
for (BookLabel subject:subjectLabelList){
this.autoCreateBooklist(Arrays.asList(firstClassify),new ArrayList<>(),Arrays.asList(grade.getId()),Arrays.asList(subject.getId()));
}
}
return;
}
//医疗保健
if (ArrayUtils.contains(RightsSettingConstant.MEDICAL_INSURANCE_TEMPLET_ID, firstClassify)) {
List<Long> secondList = assistTempletConsr.getChildIdListByParentId(firstClassify);
for (Long secondId:secondList){
this.autoCreateBooklist(Arrays.asList(firstClassify),Arrays.asList(secondId),new ArrayList<>(),new ArrayList<>());
}
return;
}
this.autoCreateBooklist(Arrays.asList(firstClassify),new ArrayList<>(),new ArrayList<>(),new ArrayList<>()); this.autoCreateBooklist(Arrays.asList(firstClassify),new ArrayList<>(),new ArrayList<>(),new ArrayList<>());
} }
......
...@@ -3637,7 +3637,7 @@ public class BookBizImpl implements BookBiz { ...@@ -3637,7 +3637,7 @@ public class BookBizImpl implements BookBiz {
Integer numPerPage = bookSearchParamVO.getNumPerPage() == null?10:bookSearchParamVO.getNumPerPage(); Integer numPerPage = bookSearchParamVO.getNumPerPage() == null?10:bookSearchParamVO.getNumPerPage();
List<Long> templetIds = new ArrayList<>(); List<Long> templetIds = new ArrayList<>();
if (null != graLabelId || null != subLabelId || null != verLabelId){ if (null != graLabelId || null != subLabelId || null != verLabelId){
templetIds = Arrays.asList(RightsSettingConstant.K12_VOLUME_ID); templetIds = Arrays.asList(RightsSettingConstant.K12_TEMPLET_ID_NEW);
} }
Page<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getESAdviserBooks4Answer(bookSearchParamVO.getGrayStatus(), bookSearchParamVO.getKeyword(), Page<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getESAdviserBooks4Answer(bookSearchParamVO.getGrayStatus(), bookSearchParamVO.getKeyword(),
graLabelId, subLabelId, verLabelId, currentPage, numPerPage, templetIds); graLabelId, subLabelId, verLabelId, currentPage, numPerPage, templetIds);
......
...@@ -12,23 +12,6 @@ import java.util.List; ...@@ -12,23 +12,6 @@ import java.util.List;
public class RightsSettingConstant { public class RightsSettingConstant {
/** /**
* 所属k12教育的编辑书刊分类id--生产uat
*/
public static final Long[] K12_TEMPLET_ID = {48L, 59L, 46L, 40L, 65L, 60L, 131L,73L};
/**
* 所属k12教育的编辑书刊分类id--测试环境
*/
public static final Long[] K12_TEMPLET_ID_TEST = {48L, 59L, 46L, 40L, 65L, 60L, 136L, 73L};
/**
* 所属k12教育的书刊分类id---有上下册分类
*/
public static final Long[] K12_VOLUME_ID = {48L, 59L, 46L, 40L, 65L, 10L, 60L};
/**
* 医疗保健编辑书刊分类id
*/
public static final Long[] MEDICAL_INSURANCE_TEMPLET_ID = {63L};
/**
*小程序不支持展示的应用类型 *小程序不支持展示的应用类型
*/ */
public static final String[] APPLET_APP_NOT_SUPPORT = { public static final String[] APPLET_APP_NOT_SUPPORT = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment