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!479
This commit is contained in:
super_liu
2022-05-03 06:06:01 +08:00
parent 65f1a66e01 4b0056aae8
commit f5a25f5c33
2 changed files with 16 additions and 5 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
+5 -5
View File
@@ -80,11 +80,11 @@ public class SearchCenterServiceImpl implements SearchCenterService {
BoolQueryBuilder boolQueryShould = QueryBuilders.boolQuery(); BoolQueryBuilder boolQueryShould = QueryBuilders.boolQuery();
BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery();
updateIndex(searchInfoEO.getSelectIndex(),(searchInfoEO.getPage()-1)*searchInfoEO.getPageSize(),searchInfoEO.getPageSize());
searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex()) searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex())
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
.setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize()) .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize())
.addSort("issueTime", SortOrder.DESC) .addSort("issue_time_order", SortOrder.DESC)
.setSize(searchInfoEO.getPageSize()); .setSize(searchInfoEO.getPageSize());
if(searchInfoEO.getSelectIndex().equals("stand")) { if(searchInfoEO.getSelectIndex().equals("stand")) {
@@ -207,11 +207,11 @@ public class SearchCenterServiceImpl implements SearchCenterService {
BoolQueryBuilder boolQueryShould = QueryBuilders.boolQuery(); BoolQueryBuilder boolQueryShould = QueryBuilders.boolQuery();
BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery();
updateIndex(searchInfoEO.getSelectIndex(),(searchInfoEO.getPage()-1)*searchInfoEO.getPageSize(),searchInfoEO.getPageSize());
searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex()) searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex())
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
.setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize()) .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize())
.addSort("issueTime", SortOrder.DESC) .addSort("issue_time_order", SortOrder.DESC)
.setSize(searchInfoEO.getPageSize()); .setSize(searchInfoEO.getPageSize());
if(searchInfoEO.getSelectIndex().equals("stand")) { if(searchInfoEO.getSelectIndex().equals("stand")) {
adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java
+11
View File
@@ -39,6 +39,17 @@ public class ResetSearchCenterController extends BaseController<Map<String, Obje
return resetSearchCenterService.resetALLSearchCenter(searchCenter); return resetSearchCenterService.resetALLSearchCenter(searchCenter);
} }
@ApiOperation(value = "|SearchCenter|手动重新创建（---7天内---）ALL标准数据索引（凌晨有自动程序会跑）")
@PostMapping(value="/manualResetALLSearchCenter")
public ResponseMessage manualResetALLSearchCenter(@RequestBody SearchCenter searchCenter) throws Exception{
ResponseMessage x = verifySearchCenter(searchCenter);
if (x != null){
return x;
}
return resetSearchCenterService.syncResetALLSearchCenter(searchCenter);
}
private ResponseMessage verifySearchCenter(SearchCenter searchCenter) { private ResponseMessage verifySearchCenter(SearchCenter searchCenter) {
if(searchCenter.getExecType() == null || "".equals(searchCenter.getExecType())){ if(searchCenter.getExecType() == null || "".equals(searchCenter.getExecType())){
return Result.error("执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准, DEL 只删除不存在标准库的数据"); return Result.error("执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准, DEL 只删除不存在标准库的数据");