FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!217
This commit is contained in:
super_liu
2021-11-03 17:55:35 +08:00
parent 1b91101f58 13c66d6b5b
commit e0430dfe5e
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+3 -3
View File
@@ -172,7 +172,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
}else {
boolQueryBuilder.must(boolQueryShould);
}
searchRequestBuilder.setQuery(boolQueryBuilder);
searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true);
//在结果中检索
if (StringUtils.isNotEmpty(searchInfoEO.getResultKeyword()) && StringUtils.isNotBlank(searchInfoEO.getIsHigh())) {
QueryBuilder multiQuery = queryInResult(searchInfoEO);
@@ -310,7 +310,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
boolQueryBuilder.must(multiQuery);
}
searchRequestBuilder.setQuery(boolQueryBuilder);
searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true);
// 获取查询到的结果
result = countStandSearchResult(searchRequestBuilder,searchInfoEO);
@@ -1110,7 +1110,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
// boolQueryBuilder.must(QueryBuilders.matchQuery("valid_flag", 0));
// boolQueryBuilder.should(boolQueryBuilderShould);
searchRequestBuilder.setQuery(boolQueryBuilder);
searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true);
// 获取查询到的结果
SearchResponse response = searchRequestBuilder.get();
for (SearchHit searchHit : response.getHits().getHits()) {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java
+2
View File
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarResource.dao;
import com.adc.da.slrs.sarResource.entity.TsResource;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import java.util.HashMap;
import java.util.List;
@@ -14,6 +15,7 @@ import java.util.List;
* @author zyl
* @since 2021-06-30
*/
@Repository
public interface TsResourceDao extends BaseMapper<TsResource> {
List<TsResource> queryMenuByDis(TsResource sarMenuEO);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
+12 -4
View File
@@ -151,6 +151,10 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide());
}
tsResourceQueryWrapper.isNull("PARENT_ID");
List<String> list = new ArrayList<>();
list.add("INLAND_STAND");
list.add("FOREIGN_STAND");
tsResourceQueryWrapper.notIn("SOR_DIVIDE",list);
tsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
List<TsResource> TsResources=dao.selectList(tsResourceQueryWrapper);
for(TsResource TsResource:TsResources){
@@ -181,7 +185,7 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
TsResources=dao.selectList(tsResourceQueryWrapper);
for(TsResource TsResource:TsResources){
TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList)));
TsResource.setChildren(recursionGetListChildren((tsResource.getSorDivide()),(TsResource),(getMenuIdList)));
}
}
}
@@ -287,14 +291,18 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
* @param parent：父节点
* @return List<TsResource>
*/
private List<TsResource> recursionGetListChildren(TsResource parent,List<String> getMenuIdList){
private List<TsResource> recursionGetListChildren(String sorDivide,TsResource parent,List<String> getMenuIdList){
QueryWrapper<TsResource> TsResourceQueryWrapper=new QueryWrapper<>();
TsResourceQueryWrapper.eq("PARENT_ID",parent.getId());
TsResourceQueryWrapper.in("ID",getMenuIdList);
if(StringUtils.isNotBlank(sorDivide)){
if(!sorDivide.equals("INLAND_STAND") && !sorDivide.equals("FOREIGN_STAND")){
TsResourceQueryWrapper.in("ID",getMenuIdList);
}
}
TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
List<TsResource> children=dao.selectList(TsResourceQueryWrapper);
for(TsResource TsResource:children){
TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList)));
TsResource.setChildren(recursionGetListChildren((sorDivide),(TsResource),(getMenuIdList)));
}
return children;
}