From b4fa928fe3bab728a161ae5eea720581c95fed4c Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Tue, 15 Mar 2022 21:42:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=A3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/search/ResetSearchCenterController.java |  8 +++-----
 .../server/ResetSearchCenterService.java       | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java b/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java
index e7f6f901..76c49725 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/search/ResetSearchCenterController.java
@@ -86,21 +86,19 @@ public class ResetSearchCenterController extends BaseController<Map<String, Obje
     /**
      * 根据资源ID对搜索中心数据进行处理
      * @param standId
-     * @param addOrUp
      * @param dataType(STAND  BUSS)
      * @return
      */
     @ApiOperation(value = "|SearchCenter|根据资源ID对搜索中心数据进行处理")
     @GetMapping(value="/syncSearchCenterData")
     public ResponseMessage syncSearchCenterData(@RequestParam("standId") String standId,
-                                                @RequestParam("addOrUp") Boolean addOrUp,
                                                 @RequestParam("dataType") String dataType){
-        if(StringUtils.isNotBlank(standId) && StringUtils.isNotBlank(dataType) && addOrUp!=null){
+        if(StringUtils.isNotBlank(standId) && StringUtils.isNotBlank(dataType)){
             try {
                 if("STAND".equals(dataType)){
-                    resetSearchCenterService.syncStandSearchCenterData(standId,addOrUp);
+                    resetSearchCenterService.syncStandSearchCenterData(standId);
                 }else if("BUSS".equals(dataType)){
-                    resetSearchCenterService.syncBussStandSearchCenterData(standId,addOrUp);
+                    resetSearchCenterService.syncBussStandSearchCenterData(standId);
                 }else{
                     return Result.error("-1","资源类型错误，请检查",null);
                 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
index a0cd2f34..5d03aafa 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
@@ -304,7 +304,7 @@ public class ResetSearchCenterService {
      * 同步添加标准搜索中心数据内容
      * @param standId
      */
-    public void syncStandSearchCenterData(String standId,boolean addOrUp) throws Exception {
+    public void syncStandSearchCenterData(String standId) throws Exception {
         if(StringUtils.isNotBlank(standId)){
             SarStandardsInfo sarStandardsInfo = iSarStandardsInfoService.selectStandardsInfoByKey(standId);
             logger.debug("本次处理的标准信息："+JSONObject.toJSONString(sarStandardsInfo));
@@ -312,10 +312,11 @@ public class ResetSearchCenterService {
                 if (sarStandardsInfo.getAttrInfoMap() != null) {
                     sarStandardsInfo.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfo.getAttrInfoMap()));
                 }
-                if(addOrUp){
-                    createStandMQService.sendStandMQ(sarStandardsInfo,"add");
-                }else{
+                Map<String, Object> indexstate = elasticsearchService.searchDataById("stand","stand",standId,null);
+                if(!indexstate.isEmpty()){
                     createStandMQService.sendStandMQ(sarStandardsInfo,"update");
+                }else{
+                    createStandMQService.sendStandMQ(sarStandardsInfo,"add");
                 }
             }
         }
@@ -326,7 +327,7 @@ public class ResetSearchCenterService {
      * 同步添加企业标准搜索中心数据内容
      * @param standId
      */
-    public void syncBussStandSearchCenterData(String standId,boolean addOrUp) throws Exception {
+    public void syncBussStandSearchCenterData(String standId) throws Exception {
         if(StringUtils.isNotBlank(standId)){
             SarBussionessStand sarBussionessStand = iSarBussionessStandService.selectStandardsInfoByKey(standId);
             logger.debug("本次处理的标准信息："+JSONObject.toJSONString(sarBussionessStand));
@@ -334,10 +335,11 @@ public class ResetSearchCenterService {
                 if (sarBussionessStand.getAttrInfoMap() != null) {
                     sarBussionessStand.setSarStandAttrEOStr(JSONObject.toJSONString(sarBussionessStand.getAttrInfoMap()));
                 }
-                if(addOrUp){
-                   createStandMQService.sendBussStandMQ(sarBussionessStand,"add");
-                }else{
+                Map<String, Object> indexstate = elasticsearchService.searchDataById("bussstand","bussstand",standId,null);
+                if(!indexstate.isEmpty()){
                     createStandMQService.sendBussStandMQ(sarBussionessStand,"update");
+                }else{
+                    createStandMQService.sendBussStandMQ(sarBussionessStand,"add");
                 }
             }
         }