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

Merge branch 'FOTON' into 'develop_master'

Browse Source 
# Conflicts:
#   adc-da-main/src/main/resources/application.properties
This commit is contained in:
李雅玮
2022-12-07 16:38:07 +08:00
parent 35cd42ed14 e7faa9ad2a
commit 23d50e06d1
6 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
+18 -12
View File
@@ -559,7 +559,7 @@ public class ResetSearchCenterService {
List<Map<String, Object>> searchListData = elasticsearchService.searchAll("stand",search);
List<String> esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList());
logger.info("esIdList 的id集合" + esIdList);
page.setValidFlag("0");
if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){
String[] result = searchCenter.getIdList().toArray(new String[0]);
@@ -572,6 +572,7 @@ public class ResetSearchCenterService {
page.setPageSize(count);
page.setMenuId("nomenu");
page.setStandType("ALL");
logger.info("国内外标准查询：" + page.toString());
List<SarStandardsInfo> rowsStand = iSarStandardsInfoService.getSarStandardsInfoPage(page);
//如果时自动触发，删除需要根据全部的结果进行数据处理
SarStandardsInfoEOPage infoEOPage = new SarStandardsInfoEOPage();
@@ -641,7 +642,7 @@ public class ResetSearchCenterService {
for(SarStandardsInfo sarStandardsInfoEO : updList){
countUpdateSuccess++;
standFunc(sarStandardsInfoEO);
// createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
}
}
@@ -652,12 +653,12 @@ public class ResetSearchCenterService {
if (sarStandardsInfoEO.getAttrInfoMap() != null) {
sarStandardsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfoEO.getAttrInfoMap()));
}
// createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
}
}
if(!delList.isEmpty() && !"sync".equals(page.getSyncParam()) && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
// elasticsearchService.deleteBatchId(delList,"stand");
// elasticsearchService.deleteBatchId(delList,"fulltextserch");
elasticsearchService.deleteBatchId(delList,"stand");
elasticsearchService.deleteBatchId(delList,"fulltextserch");
logger.info("重置国内外标准：删除-共"+delList.size()+"条数据");
}else{
logger.info("重置国内外标准：没有删除数据，但应该删除"+delList.size()+"条数据");
@@ -879,7 +880,12 @@ public class ResetSearchCenterService {
getAttrMap.put(clobField, fieldValue);
}
}
getAttrMap.put("updateAuth","1");
logger.info("getAttrMap 查询1前: " + getAttrMap);
if (null == getAttrMap){
logger.info("国内外标准详情表查询出了null");
}else {
getAttrMap.put("updateAuth", "1");
}
row.setAttrInfoMap(getAttrMap);
}
@@ -1200,7 +1206,7 @@ public class ResetSearchCenterService {
if (sarLawsInfoEO.getAttrInfoMap() != null) {
sarLawsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarLawsInfoEO.getAttrInfoMap()));
}
// createStandMQService.sendLawsMQ(sarLawsInfoEO,"update");
createStandMQService.sendLawsMQ(sarLawsInfoEO,"update");
}
}
@@ -1230,13 +1236,13 @@ public class ResetSearchCenterService {
if (sarLawsInfoEO.getAttrInfoMap() != null) {
sarLawsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarLawsInfoEO.getAttrInfoMap()));
}
// createStandMQService.sendLawsMQ(sarLawsInfoEO,"add");
createStandMQService.sendLawsMQ(sarLawsInfoEO,"add");
}
}
if(!delList.isEmpty() && !"sync".equals(sarLawsInfoEOPage.getSyncParam()) && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
// elasticsearchService.deleteBatchId(delList,"laws");
// elasticsearchService.deleteBatchId(delList,"fulltextserch");
elasticsearchService.deleteBatchId(delList,"laws");
elasticsearchService.deleteBatchId(delList,"fulltextserch");
logger.info("重置国内外政策：删除-共"+delList.size()+"条数据");
}else{
logger.info("重置国内外政策：没有删除数据，但应该删除"+delList.size()+"条数据");
@@ -1693,7 +1699,7 @@ public class ResetSearchCenterService {
List<Map<String, Object>> searchListData = elasticsearchService.searchAll("bussstand",search);
List<String> esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList());
logger.info("企标查询ids" + esIdList);
sarBussionessStandEOPage.setValidFlag("0");
sarBussionessStandEOPage.setOrderBy("SAR_BUSSIONESS_STAND.issue_time is null,SAR_BUSSIONESS_STAND.issue_time desc,SAR_BUSSIONESS_STAND.id");
sarBussionessStandEOPage.setMenuRoleList(null);
@@ -1709,7 +1715,7 @@ public class ResetSearchCenterService {
QueryWrapper qw3 = new QueryWrapper();
qw3.eq("VALID_FLAG","0");
int count3 = iSarBussionessStandService.count(qw3);
logger.info("企标查询数量" + count3);
if(count3 > 0){
sarBussionessStandEOPage.setPageSize(count3);