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

fix: 优化同步搜索中心接口代码逻辑

Browse Source
This commit is contained in:
zyd
2022-03-15 21:42:31 +08:00
parent 32f16ee4cf
commit b4fa928fe3
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java
+3 -5
View File
@@ -86,21 +86,19 @@ public class ResetSearchCenterController extends BaseController<Map<String, Obje
/** /**
* 根据资源ID对搜索中心数据进行处理 * 根据资源ID对搜索中心数据进行处理
* @param standId * @param standId
* @param addOrUp
* @param dataType(STAND BUSS) * @param dataType(STAND BUSS)
* @return * @return
*/ */
@ApiOperation(value = "|SearchCenter|根据资源ID对搜索中心数据进行处理") @ApiOperation(value = "|SearchCenter|根据资源ID对搜索中心数据进行处理")
@GetMapping(value="/syncSearchCenterData") @GetMapping(value="/syncSearchCenterData")
public ResponseMessage syncSearchCenterData(@RequestParam("standId") String standId, public ResponseMessage syncSearchCenterData(@RequestParam("standId") String standId,
@RequestParam("addOrUp") Boolean addOrUp,
@RequestParam("dataType") String dataType){ @RequestParam("dataType") String dataType){
if(StringUtils.isNotBlank(standId) && StringUtils.isNotBlank(dataType) && addOrUp!=null){ if(StringUtils.isNotBlank(standId) && StringUtils.isNotBlank(dataType)){
try { try {
if("STAND".equals(dataType)){ if("STAND".equals(dataType)){
resetSearchCenterService.syncStandSearchCenterData(standId,addOrUp); resetSearchCenterService.syncStandSearchCenterData(standId);
}else if("BUSS".equals(dataType)){ }else if("BUSS".equals(dataType)){
resetSearchCenterService.syncBussStandSearchCenterData(standId,addOrUp); resetSearchCenterService.syncBussStandSearchCenterData(standId);
}else{ }else{
return Result.error("-1","资源类型错误，请检查",null); return Result.error("-1","资源类型错误，请检查",null);
} }
adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
+10 -8
View File
@@ -304,7 +304,7 @@ public class ResetSearchCenterService {
* 同步添加标准搜索中心数据内容 * 同步添加标准搜索中心数据内容
* @param standId * @param standId
*/ */
public void syncStandSearchCenterData(String standId,boolean addOrUp) throws Exception { public void syncStandSearchCenterData(String standId) throws Exception {
if(StringUtils.isNotBlank(standId)){ if(StringUtils.isNotBlank(standId)){
SarStandardsInfo sarStandardsInfo = iSarStandardsInfoService.selectStandardsInfoByKey(standId); SarStandardsInfo sarStandardsInfo = iSarStandardsInfoService.selectStandardsInfoByKey(standId);
logger.debug("本次处理的标准信息："+JSONObject.toJSONString(sarStandardsInfo)); logger.debug("本次处理的标准信息："+JSONObject.toJSONString(sarStandardsInfo));
@@ -312,10 +312,11 @@ public class ResetSearchCenterService {
if (sarStandardsInfo.getAttrInfoMap() != null) { if (sarStandardsInfo.getAttrInfoMap() != null) {
sarStandardsInfo.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfo.getAttrInfoMap())); sarStandardsInfo.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfo.getAttrInfoMap()));
} }
if(addOrUp){ Map<String, Object> indexstate = elasticsearchService.searchDataById("stand","stand",standId,null);
createStandMQService.sendStandMQ(sarStandardsInfo,"add"); if(!indexstate.isEmpty()){
}else{
createStandMQService.sendStandMQ(sarStandardsInfo,"update"); createStandMQService.sendStandMQ(sarStandardsInfo,"update");
}else{
createStandMQService.sendStandMQ(sarStandardsInfo,"add");
} }
} }
} }
@@ -326,7 +327,7 @@ public class ResetSearchCenterService {
* 同步添加企业标准搜索中心数据内容 * 同步添加企业标准搜索中心数据内容
* @param standId * @param standId
*/ */
public void syncBussStandSearchCenterData(String standId,boolean addOrUp) throws Exception { public void syncBussStandSearchCenterData(String standId) throws Exception {
if(StringUtils.isNotBlank(standId)){ if(StringUtils.isNotBlank(standId)){
SarBussionessStand sarBussionessStand = iSarBussionessStandService.selectStandardsInfoByKey(standId); SarBussionessStand sarBussionessStand = iSarBussionessStandService.selectStandardsInfoByKey(standId);
logger.debug("本次处理的标准信息："+JSONObject.toJSONString(sarBussionessStand)); logger.debug("本次处理的标准信息："+JSONObject.toJSONString(sarBussionessStand));
@@ -334,10 +335,11 @@ public class ResetSearchCenterService {
if (sarBussionessStand.getAttrInfoMap() != null) { if (sarBussionessStand.getAttrInfoMap() != null) {
sarBussionessStand.setSarStandAttrEOStr(JSONObject.toJSONString(sarBussionessStand.getAttrInfoMap())); sarBussionessStand.setSarStandAttrEOStr(JSONObject.toJSONString(sarBussionessStand.getAttrInfoMap()));
} }
if(addOrUp){ Map<String, Object> indexstate = elasticsearchService.searchDataById("bussstand","bussstand",standId,null);
createStandMQService.sendBussStandMQ(sarBussionessStand,"add"); if(!indexstate.isEmpty()){
}else{
createStandMQService.sendBussStandMQ(sarBussionessStand,"update"); createStandMQService.sendBussStandMQ(sarBussionessStand,"update");
}else{
createStandMQService.sendBussStandMQ(sarBussionessStand,"add");
} }
} }
} }