WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

58572修改，搜索中心排序判断条件完善。

Browse Source
This commit is contained in:
wangzhijiang
2022-08-26 13:40:59 +08:00
parent 99a266c77f
commit 1d214373a0
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+4 -4
View File
@@ -222,7 +222,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
public void esFullText(ProblemKnowledgeBaseEO problemKnowledgeBaseEO,StringBuilder sbCn,StringBuilder sbEn,String cut,String fileText,List<DictModel> targetMarketList){ public void esFullText(ProblemKnowledgeBaseEO problemKnowledgeBaseEO,StringBuilder sbCn,StringBuilder sbEn,String cut,String fileText,List<DictModel> targetMarketList){
if(StringUtils.equals(cut,CutEnum.CN.getValue())){ if(StringUtils.equals(cut,CutEnum.CN.getValue())){
if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){ /*if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){
String textByValue = ShowPermissionsEnum.getTextByValue(problemKnowledgeBaseEO.getShowPermissions(), cut); String textByValue = ShowPermissionsEnum.getTextByValue(problemKnowledgeBaseEO.getShowPermissions(), cut);
sbCn.append("展示权限" + ":" + textByValue + " "); sbCn.append("展示权限" + ":" + textByValue + " ");
}else { }else {
@@ -233,7 +233,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
sbCn.append("标题" + ":" + problemKnowledgeBaseEO.getTitle() + " "); sbCn.append("标题" + ":" + problemKnowledgeBaseEO.getTitle() + " ");
}else { }else {
sbCn.append("标题" + ":" + "-- "); sbCn.append("标题" + ":" + "-- ");
} }*/
if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getProblemTypeName())){ if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getProblemTypeName())){
sbCn.append("问题分类" + ":" + problemKnowledgeBaseEO.getProblemTypeName() + " "); sbCn.append("问题分类" + ":" + problemKnowledgeBaseEO.getProblemTypeName() + " ");
@@ -285,7 +285,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
} }
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){ /*if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){
String textByValue = ShowPermissionsEnum.getTextByValue(problemKnowledgeBaseEO.getShowPermissions(), cut); String textByValue = ShowPermissionsEnum.getTextByValue(problemKnowledgeBaseEO.getShowPermissions(), cut);
sbEn.append("Display permission" + ":" + textByValue + " "); sbEn.append("Display permission" + ":" + textByValue + " ");
}else { }else {
@@ -296,7 +296,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
sbEn.append("Title" + ":" + problemKnowledgeBaseEO.getTitle() + " "); sbEn.append("Title" + ":" + problemKnowledgeBaseEO.getTitle() + " ");
}else { }else {
sbEn.append("Title" + ":" + "-- "); sbEn.append("Title" + ":" + "-- ");
} }*/
if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getProblemTypeName())){ if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getProblemTypeName())){
sbEn.append("Problem classification" + ":" + problemKnowledgeBaseEO.getProblemTypeName() + " "); sbEn.append("Problem classification" + ":" + problemKnowledgeBaseEO.getProblemTypeName() + " ");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+5 -2
View File
@@ -33,6 +33,7 @@ import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -49,6 +50,7 @@ import java.util.stream.Collectors;
* @date 2022/3/14 10:03 * @date 2022/3/14 10:03
* @auth zhn * @auth zhn
*/ */
@Slf4j
@Component @Component
public class DocumentSearchServiceImpl implements IDocumentSearchService { public class DocumentSearchServiceImpl implements IDocumentSearchService {
@Autowired @Autowired
@@ -546,7 +548,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
} }
JSONObject sort = new JSONObject(); JSONObject sort = new JSONObject();
if(StringUtils.isEmpty(selectValue)){ if(StringUtils.isEmpty(selectValue) || StringUtils.equals(selectValue,SEARCH_FLAG)){
Map<String,Object> createTime = new HashMap<>(); Map<String,Object> createTime = new HashMap<>();
Map<String,Object> createTime1 = new HashMap<>(); Map<String,Object> createTime1 = new HashMap<>();
createTime.put("order","desc"); createTime.put("order","desc");
@@ -559,6 +561,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
score1.put("_score",score); score1.put("_score",score);
sort.putAll(score1); sort.putAll(score1);
} }
log.info("搜索中心-全部索引，排序方式为：" + sort.toJSONString());
// Map<String,Object> mapSort = new HashMap<>(); // Map<String,Object> mapSort = new HashMap<>();
// Map<String,Object> mapSortTemp = new HashMap<>(); // Map<String,Object> mapSortTemp = new HashMap<>();
@@ -1256,7 +1259,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
queryMapJsonAll.add(jsonObjectThree); queryMapJsonAll.add(jsonObjectThree);
} }
JSONObject sort = new JSONObject(); JSONObject sort = new JSONObject();
if(StringUtils.isEmpty(selectValue)){ if(StringUtils.isEmpty(selectValue) || StringUtils.equals(selectValue,SEARCH_FLAG)){
Map<String,Object> createTime = new HashMap<>(); Map<String,Object> createTime = new HashMap<>();
Map<String,Object> createTime1 = new HashMap<>(); Map<String,Object> createTime1 = new HashMap<>();
createTime.put("order","desc"); createTime.put("order","desc");