From 40eb85a464cbe428e904bb2e31391161872a2289 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 29 Apr 2022 18:14:12 +0800
Subject: [PATCH 01/20] feat: There is no way the,

---
 adc-da-main/src/main/resources/application-dev.properties | 2 +-
 adc-da-main/src/main/resources/application.properties     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties
index 1e3d58ff..a4aa4373 100644
--- a/adc-da-main/src/main/resources/application-dev.properties
+++ b/adc-da-main/src/main/resources/application-dev.properties
@@ -11,7 +11,7 @@ spring.datasource.password = Fting&8g35g#geg2
 
 #==============================================
 # 应用设置
-spring.application.name=FotonLAWSSystem-REST-SEARCH
+spring.application.name=FotonLAWSSystem
 application.code=20200101
 application.center=1
 #==============================================
diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties
index 2bd567fb..e20ed311 100644
--- a/adc-da-main/src/main/resources/application.properties
+++ b/adc-da-main/src/main/resources/application.properties
@@ -9,7 +9,7 @@ spring.profiles.active=dev
 server.compression.enabled=true
 server.compression.mime-types=application/json,application/xml,text/html,text/plain,text/css,application/x-javascript
 # 端口号设置
-server.port=10086
+server.port=4202
 #主服务session超时
 server.servlet.session.timeout =600
 
@@ -155,4 +155,4 @@ convert.host=127.0.0.1
 # =============================================================================
 # scheduled 配置
 # =============================================================================
-isNotScheduled=true
\ No newline at end of file
+isNotScheduled=true

From d5283d582dcc12c0d889fc6afc42bf470a2174c5 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 29 Apr 2022 18:15:00 +0800
Subject: [PATCH 02/20] feat: There is no way the,

---
 adc-da-main/src/main/resources/application.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties
index e20ed311..7a7db19f 100644
--- a/adc-da-main/src/main/resources/application.properties
+++ b/adc-da-main/src/main/resources/application.properties
@@ -155,4 +155,4 @@ convert.host=127.0.0.1
 # =============================================================================
 # scheduled 配置
 # =============================================================================
-isNotScheduled=true
+isNotScheduled=true
\ No newline at end of file

From 6bf0e1260dc1ac6a22c307a2e85b5421646a21d5 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 29 Apr 2022 23:18:02 +0800
Subject: [PATCH 03/20] feat: There is no way the,

---
 adc-da-main/src/main/resources/application-dev.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties
index a4aa4373..f71986ae 100644
--- a/adc-da-main/src/main/resources/application-dev.properties
+++ b/adc-da-main/src/main/resources/application-dev.properties
@@ -63,7 +63,7 @@ file.split.path=/data/slrs/file/splitImage/
 #OCR请求识别URL地址
 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion
 # OCR回调接口地址 配置客户本地的IP及端口号
-OCR.callBackUrl = https://srms.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult
+OCR.callBackUrl = https://slrs.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult
 OCR.userId =dayuzhou1234
 OCR.authCode =123456
 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M

From d4a936a750949d26b86bf0c0df261d7eb4cac2d7 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Mon, 9 May 2022 15:19:35 +0800
Subject: [PATCH 04/20] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9ocr=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E5=9C=B0=E5=9D=80=E4=B8=AD=E7=9A=84=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adc-da-main/src/main/resources/application-dev.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties
index f71986ae..a4aa4373 100644
--- a/adc-da-main/src/main/resources/application-dev.properties
+++ b/adc-da-main/src/main/resources/application-dev.properties
@@ -63,7 +63,7 @@ file.split.path=/data/slrs/file/splitImage/
 #OCR请求识别URL地址
 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion
 # OCR回调接口地址 配置客户本地的IP及端口号
-OCR.callBackUrl = https://slrs.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult
+OCR.callBackUrl = https://srms.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult
 OCR.userId =dayuzhou1234
 OCR.authCode =123456
 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M

From 18e8cca200971ba2db4a8d40ae4ecb99bf0b0e0a Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Thu, 28 Jul 2022 13:43:10 +0800
Subject: [PATCH 05/20] feat: There is no way the, fk

---
 .../src/main/java/com/adc/da/login/util/IDMUtil.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java
index d005404c..73394161 100644
--- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java
+++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java
@@ -18,10 +18,10 @@ public class IDMUtil {
     private OkHttpUtil okHttpUtil;
 
     private final String app_key = "app_slrs";
-    private final String app_secret = "wj5iDTqyguQCxnsoo5VU21BoRSZqevhI";
-    private final String access_url = "http://testsso1.foton.com.cn/oauth2.0/accessTokenByJson";
-    private final String profile_ur = "http://testsso1.foton.com.cn/oauth2.0/profileByJson";
-    private final String redirect_url = "http://127.0.0.1:9090";
+    private final String app_secret = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe";
+    private final String access_url = "http://sso.foton.com.cn/oauth2.0/accessTokenByJson";
+    private final String profile_ur = "http://sso.foton.com.cn/oauth2.0/profileByJson";
+    private final String redirect_url = "https://srms.foton.com.cn";
 
     public String idmLogin(String code){
         try{
@@ -66,6 +66,7 @@ public class IDMUtil {
             }
         }catch(Exception e){
             log.error("单点登录获取用户信息失败");
+            e.printStackTrace();
         }
         return "";
     }

From 9531c2643dd84787d1bf02360cc5a8525b74c72c Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Mon, 1 Aug 2022 15:28:41 +0800
Subject: [PATCH 06/20] feat: There is no way the,
 /data/slrs/system-server/logs

---
 adc-da-main/src/main/resources/logback-spring.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-main/src/main/resources/logback-spring.xml b/adc-da-main/src/main/resources/logback-spring.xml
index 39f90eab..9713a688 100644
--- a/adc-da-main/src/main/resources/logback-spring.xml
+++ b/adc-da-main/src/main/resources/logback-spring.xml
@@ -8,7 +8,7 @@
     <!-- 项目名称 -->
     <property name="PROJECT_NAME" value="adc-da" />
     <!-- 定义日志文件的存储地址,勿在 LogBack的配置中使用相对路径 -->
-    <property name="LOG_HOME" value="/tmp/applog/pcms-rest-system" />
+    <property name="LOG_HOME" value="/data/slrs/system-server/logs" />
     <!--    <property name="LOG_HOME" value="../logs/pcms-rest" />-->
     <!-- 定义系统日志文件的存储地址,勿在 LogBack的配置中使用相对路径 -->
     <property name="LOG_HOME_SYSTEM" value="system" />

From 8c25f8fb735791aeb8f83ba0c535c8965e0542f4 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Tue, 23 Aug 2022 10:14:05 +0800
Subject: [PATCH 07/20] 56708

---
 .../SarStandardComplianceAssessResultController.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
index 15a9d592..4a0efcba 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
@@ -57,8 +57,8 @@ public class SarStandardComplianceAssessResultController {
             QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
             IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
             queryWrapper.select(" STAND_ID,ANY_VALUE(STAND_NUMBER) as STAND_NUMBER, STAND_NAME, STAND_TYPE");
-            if (eo.getStandName() != null ) {
-                queryWrapper.like("STAND_NAME", eo.getStandName().replace(" ",""));
+            if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
+                queryWrapper.like("STAND_NAME", eo.getStandName().trim());
             }
             if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
                 queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim());

From eaec394e0afc0c1b433a495cbdc7610e0363affd Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Tue, 30 Aug 2022 17:21:48 +0800
Subject: [PATCH 08/20] =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/sarUser/TsUserMapper.xml        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
index d68b67e8..e436f7e4 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
@@ -67,13 +67,13 @@
                 #{id}
             </foreach>
         </if>
-        <if test=" null != ids and ids.size()> 0">
-        order by field(INSTITUTION_ID,
-            <foreach item="id" collection="ids" open="" separator="," close="" index="index">
-                #{id}
-            </foreach>)
-        </if>
---         order by u.CREATION_TIME desc,u.USID
+<!--        <if test=" null != ids and ids.size()> 0">-->
+<!--        order by field(INSTITUTION_ID,-->
+<!--            <foreach item="id" collection="ids" open="" separator="," close="" index="index">-->
+<!--                #{id}-->
+<!--            </foreach>)-->
+<!--        </if>-->
+        order by u.CREATION_TIME desc,u.USID
         limit #{start},#{end}
     </select>
 

From 09fd6623144e3a44597b9831f71e7e36be80a571 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Tue, 30 Aug 2022 17:29:33 +0800
Subject: [PATCH 09/20] =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mybatis/mapper/sarUser/TsUserMapper.xml  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
index e436f7e4..a9d22eda 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
@@ -67,12 +67,6 @@
                 #{id}
             </foreach>
         </if>
-<!--        <if test=" null != ids and ids.size()> 0">-->
-<!--        order by field(INSTITUTION_ID,-->
-<!--            <foreach item="id" collection="ids" open="" separator="," close="" index="index">-->
-<!--                #{id}-->
-<!--            </foreach>)-->
-<!--        </if>-->
         order by u.CREATION_TIME desc,u.USID
         limit #{start},#{end}
     </select>

From 460892ce487ebf68c4b8f08ea71c3c7b4eb186c0 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Tue, 30 Aug 2022 18:26:25 +0800
Subject: [PATCH 10/20] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=94=B9?=
 =?UTF-8?q?=E5=9B=9E=E5=8E=9F=E7=8A=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/sarUser/TsUserMapper.xml     | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
index 15d29a7f..a9d22eda 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
@@ -49,10 +49,7 @@
     </select>
 
     <select id="userUnderInstitution" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultMap="UserPosition">
-        select u.USID,u.ACCOUNT,u.PASSWORD,u.OPER_USER,u.UNAME,u.SEX,u.USER_SOURCE,u.PHONE,u.EMAIL,u.INSTITUTION_NAME,u.INSTITUTION_ID
-               ,u.POSITION_NAME,u.STATE,u.POSITION_ID,u.WORK_NUM,u.EXT_INFO,u.CREATION_TIME,u.MODIFY_TIME,u.VALID_FLAG
-             ,u.DISABLE_FLAG,u.UNLOCK_FLAG,u.USER_TYPE,u.SSO_ID,
-               min(p.id) p_id,min(p.name) p_name from ts_user u
+        select u.*,p.id p_id,p.name p_name from ts_user u
         left join ts_user_position up
         on u.usid=up.user_id
         left join ts_position p
@@ -70,20 +67,12 @@
                 #{id}
             </foreach>
         </if>
-        group by u.USID,u.ACCOUNT,u.PASSWORD,u.OPER_USER,u.UNAME,u.SEX,u.USER_SOURCE,u.PHONE,u.EMAIL,u.INSTITUTION_NAME,u.INSTITUTION_ID
-        ,u.POSITION_NAME,u.STATE,u.POSITION_ID,u.WORK_NUM,u.EXT_INFO,u.CREATION_TIME,u.MODIFY_TIME,u.VALID_FLAG
-        ,u.DISABLE_FLAG,u.UNLOCK_FLAG,u.USER_TYPE,u.SSO_ID
-        <if test=" null != ids and ids.size()> 0">
-        order by field(INSTITUTION_ID,
-            <foreach item="id" collection="ids" open="" separator="," close="" index="index">
-                #{id}
-            </foreach>)
-        </if>
+        order by u.CREATION_TIME desc,u.USID
         limit #{start},#{end}
     </select>
 
     <select id="userUnderInstitutionCount" resultType="java.lang.Integer">
-        select count(distinct u.USID) from ts_user u
+        select count(u.USID) from ts_user u
         left join ts_user_position up
         on u.usid=up.user_id
         left join ts_position p

From 001a9287cf093900e817839c7800324e0fcaec12 Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Wed, 31 Aug 2022 01:27:09 +0800
Subject: [PATCH 11/20] =?UTF-8?q?fix:=20=E5=B0=86=E7=BA=BF=E4=B8=8A?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=9A=84=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE=E4=B8=BA=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?jar=E5=8C=85=E6=89=80=E5=9C=A8=E7=9A=84=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adc-da-main/src/main/resources/logback-spring.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/adc-da-main/src/main/resources/logback-spring.xml b/adc-da-main/src/main/resources/logback-spring.xml
index 9713a688..ee61bcce 100644
--- a/adc-da-main/src/main/resources/logback-spring.xml
+++ b/adc-da-main/src/main/resources/logback-spring.xml
@@ -8,7 +8,9 @@
     <!-- 项目名称 -->
     <property name="PROJECT_NAME" value="adc-da" />
     <!-- 定义日志文件的存储地址,勿在 LogBack的配置中使用相对路径 -->
-    <property name="LOG_HOME" value="/data/slrs/system-server/logs" />
+<!--    <property name="LOG_HOME" value="/data/slrs/system-server/logs" />-->
+    <property name="LOG_HOME" value="./logs" />
+
     <!--    <property name="LOG_HOME" value="../logs/pcms-rest" />-->
     <!-- 定义系统日志文件的存储地址,勿在 LogBack的配置中使用相对路径 -->
     <property name="LOG_HOME_SYSTEM" value="system" />

From c68e00e466c906ff43375f15a60075950a5b65d7 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Mon, 26 Sep 2022 17:37:12 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/login/security/WebMvcConfig.java   |  4 ++
 .../search/service/ElasticsearchService.java  |  2 +
 .../impl/ElasticsearchServiceImpl.java        | 31 +++++++++++
 .../search/ResetSearchCenterController.java   | 11 ++++
 .../server/ResetSearchCenterService.java      | 52 +++++++++++++++++++
 5 files changed, 100 insertions(+)

diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
index 85a82ac0..8304ea9d 100644
--- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
+++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
@@ -153,6 +153,10 @@ public class WebMvcConfig implements WebMvcConfigurer {
     addInterceptor.excludePathPatterns("/api/sysLog/sys-log/exportSysLogExcelVOExcelData");
 
 
+
+    addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetALLSearchCenterForExits");
+
+
 ////    //测试接口使用
 //    addInterceptor.excludePathPatterns("/api/**");
 
diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/ElasticsearchService.java b/adc-da-search/src/main/java/com/adc/da/search/service/ElasticsearchService.java
index 3ee60980..861693dc 100644
--- a/adc-da-search/src/main/java/com/adc/da/search/service/ElasticsearchService.java
+++ b/adc-da-search/src/main/java/com/adc/da/search/service/ElasticsearchService.java
@@ -124,6 +124,8 @@ public interface ElasticsearchService {
 
     List<Map<String,Object>> searchAll(String index,String search);
 
+    List<Map<String,Object>> searchAllForExists(String index,String search);
+
     /**
      * 使用分词查询
      *
diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java
index f49aae44..f2a1780a 100644
--- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java
+++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java
@@ -310,6 +310,37 @@ public class ElasticsearchServiceImpl implements ElasticsearchService {
     }
 
 
+    /**
+     * 使用索引查询所有
+     */
+    @Override
+    public  List<Map<String, Object>> searchAllForExists(String index,String search) {
+        List<Map<String, Object>> sourceList = new ArrayList<Map<String, Object>>();
+
+        //1、指定es集群  cluster.name 是固定的key值，my-application是ES集群的名称
+//        Settings settings = Settings.builder().put("cluster.name", "my-application").build();
+        BoolQueryBuilder boolQueryMustNot = QueryBuilders.boolQuery();
+        QueryBuilder qBuilder = boolQueryMustNot.mustNot(QueryBuilders.existsQuery("titleBig"));
+        SearchResponse sResponse = client.prepareSearch(index)
+                .setQuery(qBuilder).setTrackTotalHits(true)
+                .get();
+        SearchHits hits = sResponse.getHits();
+        if(hits.getTotalHits().value > 0){
+//            QueryBuilder queryBuilder1 = QueryBuilders.multiMatchQuery("");
+//            if(StringUtils.isNotBlank(search) && "fulltextserch".equals(index)){
+//                queryBuilder1 = QueryBuilders.multiMatchQuery(search,
+//                        "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time"
+//                ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f);
+//            }
+            SearchResponse scrollResp = search(index,qBuilder, 1,(int) hits.getTotalHits().value);
+            for (SearchHit hit : scrollResp.getHits()) {
+                sourceList.add(hit.getSourceAsMap());
+            }
+        }
+        return sourceList;
+    }
+
+
     public SearchResponse search(String index, QueryBuilder query,int page, int size) {
 
         updateIndex(index, page,size);
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 07a0e863..32d90d5b 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
@@ -61,6 +61,17 @@ public class ResetSearchCenterController extends BaseController<Map<String, Obje
     }
 
 
+    @ApiOperation(value = "|SearchCenter|重新创建ALL标准数据索引")
+    @PostMapping(value="/resetALLSearchCenterForExits")
+    public ResponseMessage resetALLSearchCenterForExits(@RequestBody SearchCenter searchCenter) throws Exception{
+        ResponseMessage x = verifySearchCenter(searchCenter);
+        if (x != null){
+            return x;
+        }
+        return resetSearchCenterService.resetALLSearchCenterForExits(searchCenter);
+    }
+
+
     @ApiOperation(value = "|SearchCenter|手动重新创建（---7天内---）ALL标准数据索引（凌晨有自动程序会跑）")
     @PostMapping(value="/manualResetALLSearchCenter")
     public ResponseMessage manualResetALLSearchCenter(@RequestBody SearchCenter searchCenter) throws Exception{
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 2ed7edc0..2e1755e0 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
@@ -260,6 +260,30 @@ public class ResetSearchCenterService {
         return Result.success(res);
     }
 
+
+    @Async
+    public ResponseMessage resetALLSearchCenterForExits(SearchCenter searchCenter) throws Exception{
+//        Boolean getFulltextserchIndex = elasticsearchService.isIndexExist("fulltextserch");
+        SearchCenter standSearch = new SearchCenter();
+        standSearch.setExecType(searchCenter.getExecType());
+        if(StringUtils.isNotBlank(searchCenter.getSearch())){
+            standSearch.setSearch(searchCenter.getSearch());
+        }
+        if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){
+            standSearch.setIdList(searchCenter.getIdList());
+        }
+        SarStandardsInfoEOPage page = new SarStandardsInfoEOPage();
+        ResponseMessage stand = resetfulltextForExists(page,standSearch);
+        List<String> r = new ArrayList<>();
+        if(stand.isOk() && StringUtils.isNotBlank(stand.getData().toString())){
+            r.add(stand.getData().toString());
+        }
+        String res = String.join(", ", r);
+        logger.info(res);
+
+        return Result.success(res);
+    }
+
     @Async
     public ResponseMessage syncResetALLSearchCenter(SearchCenter searchCenter) throws Exception{
         Boolean getFulltextserchIndex = elasticsearchService.isIndexExist("fulltextserch");
@@ -622,6 +646,34 @@ public class ResetSearchCenterService {
 
     }
 
+    //重建国内外标准
+    @Async
+    public ResponseMessage resetfulltextForExists(SarStandardsInfoEOPage page,SearchCenter searchCenter) throws Exception{
+
+        int countUpdateSuccess = 0;
+        int countAddSuccess = 0;
+
+        Boolean getStandIndex = elasticsearchService.isIndexExist("stand");
+
+        if(!getStandIndex){
+            logger.info("ES 不存在索引:stand");
+            return Result.error("ES 不存在索引:stand");
+        }
+
+        String search = getSearch(searchCenter);
+        String result = "error";
+        List<Map<String, Object>> searchListData = elasticsearchService.searchAllForExists("fulltextserch",search);
+        for (Map<String, Object> map : searchListData) {
+            String title = String.valueOf(map.get("title"));
+            if (!"".equals(title) && !"null".equals(title)) {
+                map.put("titleBig",title.toUpperCase());
+            }
+            result = elasticsearchService.updateDataByIdForMap(map, "fulltextserch", "fulltextserch", String.valueOf(map.get("id")));
+        }
+        return Result.success(result);
+
+    }
+
     //重建国内外标准
     @Async
     public ResponseMessage resetStandSearchCenterId(SarStandardsInfoEOPage page,SearchCenter searchCenter) throws Exception{

From 06ebf1d3fc56a1ed1db3691d255fceea77bf76b9 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 29 Sep 2022 13:09:41 +0800
Subject: [PATCH 13/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=87=8D=E6=9E=84=E5=90=8E=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/mq/SendStandMQService.java     | 31 ++++++++++
 .../server/ResetSearchCenterService.java      | 62 +++++++++++--------
 2 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java
index 80f7c1ec..8c881c6c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java
@@ -7,6 +7,7 @@ import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
 import com.adc.da.sys.dao.DicTypeEODao;
 import com.adc.da.sys.entity.DicTypeEO;
 import com.adc.da.utils.util.InitStandAttrUtil;
+import com.adc.da.utils.util.Utils;
 import com.rabbitmq.client.Channel;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
@@ -82,8 +83,10 @@ public class SendStandMQService {
         }
         String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr();
         Map<String,Object> attrInfoMap = new TreeMap<>();
+        Map<String,Object> attrInfoMapForAuth = new TreeMap<>();
         if(StringUtils.isNotBlank(sarStandAttrEOStr)){
             attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr);
+            attrInfoMapForAuth.putAll(attrInfoMap);
         }
         Map<String,Object> infoMap = infoEO.getAttrInfoMap();
         Map<String,String> infoEOMapItems = infoEO.getMapItems();
@@ -274,6 +277,34 @@ public class SendStandMQService {
         if (!"null".equals(standEnName) && StringUtils.isNotBlank(standEnName)) {
             saveMap.put("standEnNameBig", standEnName.toUpperCase());
         }
+        if ("1".equals(attrInfoMapForAuth.get("updateAuth"))) {
+            Map<String, Object> getAttrMap = new TreeMap<>(attrInfoMapForAuth);
+            if (getAttrMap != null && getAttrMap.size() > 0) {
+                for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
+                    String name = entry.getKey();
+                    String value = "";
+                    List<String> valArr = new ArrayList<>();
+                    if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
+                        if (StringUtils.isNotBlank(entry.getValue().toString())) {
+                            Object json = null;
+                            if (Utils.isJson(entry.getValue().toString())) {
+                                json = new JSONTokener(entry.getValue().toString()).nextValue();
+                            }
+                            if (json instanceof org.json.JSONArray) {
+                                valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class);
+                            } else {
+                                value = entry.getValue().toString();
+                                valArr = Arrays.asList(value.split(","));
+                            }
+                            if (!valArr.isEmpty()) {
+                                value = dicTypeEODao.getDicNamesByCodes(valArr, "");
+                            }
+                        }
+                        saveMap.put(name + "Name",value);
+                    }
+                }
+            }
+        }
         if("add".equals(addOrUpdate)){
             sarStandardsInfoService.insertIntoIndexForMap(saveMap);
         } else {
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 2e1755e0..6913cfc7 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
@@ -27,6 +27,7 @@ import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
 import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
+import com.adc.da.slrs.standardSplit.service.SarStandardsInfoEOService;
 import com.adc.da.sys.dao.DicTypeEODao;
 import com.adc.da.sys.entity.DicTypeEO;
 import com.adc.da.util.http.ResponseMessage;
@@ -37,6 +38,7 @@ import com.adc.da.utils.util.InitStandAttrUtil;
 import com.adc.da.utils.util.Utils;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.client.transport.TransportClient;
@@ -107,6 +109,9 @@ public class ResetSearchCenterService {
     @Autowired
     private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao;
 
+    @Autowired
+    private ISarStandardsInfoService sarStandardsInfoEOService;
+
 
     @PostConstruct
     public void init() {
@@ -854,36 +859,39 @@ public class ResetSearchCenterService {
                         getAttrMap.put(clobField, fieldValue);
                     }
                 }
-
+                getAttrMap.put("updateAuth","1");
                 row.setAttrInfoMap(getAttrMap);
             }
 
-            Map<String, Object> getAttrMap = row.getAttrInfoMap();
-            if (getAttrMap != null && getAttrMap.size() > 0) {
-                for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
-                    String name = entry.getKey();
-                    String value = "";
-                    List<String> valArr = new ArrayList<>();
-                    if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
-                        if (StringUtils.isNotBlank(entry.getValue().toString())) {
-                            Object json = null;
-                            if(Utils.isJson(entry.getValue().toString())){
-                                json = new JSONTokener(entry.getValue().toString()).nextValue();
-                            }
-                            if (json instanceof org.json.JSONArray) {
-                                valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class);
-                            } else {
-                                value = entry.getValue().toString();
-                                valArr = Arrays.asList(value.split(","));
-                            }
-                            if (!valArr.isEmpty()) {
-                                value = dicTypeEODao.getDicNamesByCodes(valArr, "");
-                            }
-                        }
-                        entry.setValue(value);
-                    }
-                }
-            }
+//            Map<String, Object> getAttrMap = row.getAttrInfoMap();
+//            if (getAttrMap != null && getAttrMap.size() > 0) {
+//                for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
+//                    String name = entry.getKey();
+//                    String value = "";
+//                    List<String> valArr = new ArrayList<>();
+//                    if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
+//                        if (StringUtils.isNotBlank(entry.getValue().toString())) {
+//                            Object json = null;
+//                            if(Utils.isJson(entry.getValue().toString())){
+//                                json = new JSONTokener(entry.getValue().toString()).nextValue();
+//                            }
+//                            if (json instanceof org.json.JSONArray) {
+//                                valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class);
+//                            } else {
+//                                value = entry.getValue().toString();
+//                                valArr = Arrays.asList(value.split(","));
+//                            }
+//                            if (!valArr.isEmpty()) {
+//                                value = dicTypeEODao.getDicNamesByCodes(valArr, "");
+//                            }
+//                        }
+//                        entry.setValue(value);
+//                    }
+//                }
+//            }
+//            if (getAttrMap != null) {
+//                row.setSarStandAttrEOStr(JSONObject.toJSONString(getAttrMap));
+//            }
         }
     }
 

From fd855adfc3319a4a5336062d28fe25e86a775dfd Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 29 Sep 2022 14:13:32 +0800
Subject: [PATCH 14/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=B7=BB=E5=8A=A0=E5=B9=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=B1=BB=E5=9E=8B=E3=80=81=E8=83=BD=E6=BA=90?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../search/service/impl/SearchCenterServiceImpl.java   | 10 ++++++----
 .../service/impl/StandLawsSearchServiceImpl.java       |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
index aad97d2d..7afd8604 100644
--- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
@@ -1495,14 +1495,16 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS()) || StringUtils.isNotBlank(searchInfoEO.getCLLX())){
             if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){
                 queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(),
-                        "textContent"
-                ).minimumShouldMatch("100%").field("title",10f));
+                        "NYLXName"
+                ).minimumShouldMatch("100%"));
+//                        .field("title",10f));
             }
 
             if(StringUtils.isNotBlank(searchInfoEO.getCLLX())){
                 queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(),
-                        "textContent"
-                ).minimumShouldMatch("100%").field("title",10f));
+                        "CLLXName"
+                ).minimumShouldMatch("100%"));
+//                        .field("title",10f));
             }
 
             boolQueryBuilder.must(queryBuilder);
diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
index 3ccd1ab0..7cfc4a68 100644
--- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
@@ -466,6 +466,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
         }
         String title = String.valueOf(fullTextSearchEO.getOrDefault("title",""));
         fullTextSearchEO.put("titleBig",title.toUpperCase());
+        fullTextSearchEO.put("CLLXName",attrInfoMap.get("CLLXName"));
+        fullTextSearchEO.put("NYLXName",attrInfoMap.get("NYLXName"));
+        fullTextSearchEO.put("CLLX",attrInfoMap.get("CLLX"));
+        fullTextSearchEO.put("NYLX",attrInfoMap.get("NYLX"));
         return fullTextSearchEO;
     }
 

From 761727e63cabb209d9d44751ebb49434352ee219 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 29 Sep 2022 16:56:13 +0800
Subject: [PATCH 15/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=B7=BB=E5=8A=A0=E5=B9=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=B1=BB=E5=9E=8B=E3=80=81=E8=83=BD=E6=BA=90?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/search/service/impl/StandLawsSearchServiceImpl.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
index 7cfc4a68..36b78425 100644
--- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
@@ -446,6 +446,11 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
                 contentBuilder.append("代替企标编号:").append(attrInfoMap.get("DTQBBHBUSSName")).append("  ");
                 contentBuilder.append("被代替企标编号:").append(attrInfoMap.get("BDTQBBHBUSSName")).append("  ");
 
+                attrInfoMap.put("NYLXName",attrInfoMap.get("SYCXCLASSName"));
+                attrInfoMap.put("CLLXName",attrInfoMap.get("NYLXCLASSName"));
+                attrInfoMap.put("NYLX",attrInfoMap.get("SYCXCLASS"));
+                attrInfoMap.put("CLLX",attrInfoMap.get("NYLXCLASS"));
+
                 if (attrInfoMap.containsKey("content")){
                     if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){
                         String con = String.valueOf(attrInfoMap.get("content"));

From 326c3f1cc9089512330cffb4327f39f222b5f993 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 29 Sep 2022 17:00:42 +0800
Subject: [PATCH 16/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=B7=BB=E5=8A=A0=E5=B9=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=B1=BB=E5=9E=8B=E3=80=81=E8=83=BD=E6=BA=90?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../search/service/impl/StandLawsSearchServiceImpl.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
index 36b78425..ef7681cd 100644
--- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
@@ -446,10 +446,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
                 contentBuilder.append("代替企标编号:").append(attrInfoMap.get("DTQBBHBUSSName")).append("  ");
                 contentBuilder.append("被代替企标编号:").append(attrInfoMap.get("BDTQBBHBUSSName")).append("  ");
 
-                attrInfoMap.put("NYLXName",attrInfoMap.get("SYCXCLASSName"));
-                attrInfoMap.put("CLLXName",attrInfoMap.get("NYLXCLASSName"));
-                attrInfoMap.put("NYLX",attrInfoMap.get("SYCXCLASS"));
-                attrInfoMap.put("CLLX",attrInfoMap.get("NYLXCLASS"));
+                attrInfoMap.put("CLLXName",attrInfoMap.get("SYCXCLASSName"));
+                attrInfoMap.put("NYLXName",attrInfoMap.get("NYLXCLASSName"));
+                attrInfoMap.put("CLLX",attrInfoMap.get("SYCXCLASS"));
+                attrInfoMap.put("NYLX",attrInfoMap.get("NYLXCLASS"));
 
                 if (attrInfoMap.containsKey("content")){
                     if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){

From 40175837521672fe661c9916bde4a276a69998ee Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Sat, 8 Oct 2022 09:01:14 +0800
Subject: [PATCH 17/20] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../search/server/ResetSearchCenterService.java   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

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 6913cfc7..a32cc723 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
@@ -557,7 +557,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]);
@@ -570,6 +570,7 @@ public class ResetSearchCenterService {
             page.setPageSize(count);
             page.setMenuId("nomenu");
             page.setStandType("ALL");
+            logger.info("国内外标准查询：" + page.toString());
             List<SarStandardsInfo> rowsStand = iSarStandardsInfoService.getSarStandardsInfoPage(page);
             List<SarStandardsInfo> insList = new ArrayList<>();
             List<SarStandardsInfo> updList = new ArrayList<>();
@@ -859,7 +860,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);
             }
 
@@ -1653,7 +1659,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);
@@ -1669,11 +1675,12 @@ 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);
 
             List<SarBussionessStand> rowsStand = iSarBussionessStandService.getSarBussionStandPage(sarBussionessStandEOPage);
+            logger.info("企标查询结果" + count3);
             List<SarBussionessStand> insList = new ArrayList<>();
             List<SarBussionessStand> updList = new ArrayList<>();
             List<String> delList = new ArrayList<>();

From 376cc3bab9f57c7290064ac969b4807a0e09f83c Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Tue, 11 Oct 2022 14:59:52 +0800
Subject: [PATCH 18/20] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/search/server/ResetSearchCenterService.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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 a32cc723..4588ef8f 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
@@ -637,8 +637,7 @@ public class ResetSearchCenterService {
                     createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
                 }
             }
-
-            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) && !"sync".equals(page.getSyncParam()))){
+            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
                 elasticsearchService.deleteBatchId(delList,"stand");
                 elasticsearchService.deleteBatchId(delList,"fulltextserch");
                 logger.info("重置国内外标准：删除-共"+delList.size()+"条数据");
@@ -796,7 +795,7 @@ public class ResetSearchCenterService {
                 }
             }
             String a = "";
-            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) && !"sync".equals(page.getSyncParam()))){
+            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
 //                elasticsearchService.deleteBatchId(delList,"stand");
 //                elasticsearchService.deleteBatchId(delList,"fulltextserch");
                 logger.info("重置国内外标准：删除-共"+delList.size()+"条数据");
@@ -1202,7 +1201,7 @@ public class ResetSearchCenterService {
                 }
             }
 
-            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) && !"sync".equals(sarLawsInfoEOPage.getSyncParam()))){
+            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
                 elasticsearchService.deleteBatchId(delList,"laws");
                 elasticsearchService.deleteBatchId(delList,"fulltextserch");
                 logger.info("重置国内外政策：删除-共"+delList.size()+"条数据");
@@ -1367,7 +1366,7 @@ public class ResetSearchCenterService {
             }
             String rett = "";
             String a = "";
-            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) && !"sync".equals(sarLawsInfoEOPage.getSyncParam()))){
+            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
 //                elasticsearchService.deleteBatchId(delList,"laws");
 //                elasticsearchService.deleteBatchId(delList,"fulltextserch");
                 logger.info("国内外政策：应删除-共"+delList.size()+"条数据："+ String.join(",",delList));
@@ -1750,7 +1749,7 @@ public class ResetSearchCenterService {
                 }
             }
 
-            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) && !"sync".equals(sarBussionessStandEOPage.getSyncParam()))){
+            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
                 elasticsearchService.deleteBatchId(delList,"bussstand");
                 elasticsearchService.deleteBatchId(delList,"fulltextserch");
                 logger.info("重置企标：删除-共"+delList.size()+"条数据");
@@ -1885,7 +1884,7 @@ public class ResetSearchCenterService {
                 }
             }
             String a = "";
-            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) && !"sync".equals(sarBussionessStandEOPage.getSyncParam()))){
+            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
 //                elasticsearchService.deleteBatchId(delList,"bussstand");
 //                elasticsearchService.deleteBatchId(delList,"fulltextserch");
                 logger.info("重置企标：删除-共"+delList.size()+"条数据");

From 3f1e3f71aa5830fd3d73d2018d537e1d8453806d Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 13 Oct 2022 09:28:38 +0800
Subject: [PATCH 19/20] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E7=B4=A2=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../search/server/ResetSearchCenterService.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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 fd7cd9e0..eeb2ec26 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
@@ -642,7 +642,7 @@ public class ResetSearchCenterService {
                 for(SarStandardsInfo sarStandardsInfoEO : updList){
                     countUpdateSuccess++;
                     standFunc(sarStandardsInfoEO);
-//                    createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
+                    createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
                 }
             }
 
@@ -653,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()+"条数据");
@@ -1206,7 +1206,7 @@ public class ResetSearchCenterService {
                     if (sarLawsInfoEO.getAttrInfoMap() != null) {
                         sarLawsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarLawsInfoEO.getAttrInfoMap()));
                     }
-//                    createStandMQService.sendLawsMQ(sarLawsInfoEO,"update");
+                    createStandMQService.sendLawsMQ(sarLawsInfoEO,"update");
                 }
             }
 
@@ -1236,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()+"条数据");

From 1372f306ea0a0709b7294bed24006eb360525334 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 24 Nov 2022 17:42:22 +0800
Subject: [PATCH 20/20] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/adc/da/FeignClient/workFlowFeignClient.java | 4 ++--
 adc-da-main/src/main/resources/application.properties         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
index e73960c9..1f1e8fa7 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
@@ -18,8 +18,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-@FeignClient(value = "bat-wkflow-test")
-//@FeignClient(value = "bat-wkflow")
+//@FeignClient(value = "bat-wkflow-test")
+@FeignClient(value = "bat-wkflow")
 //@FeignClient(value = "shan6")
 public interface workFlowFeignClient {
 
diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties
index e8e1c58e..54de627f 100644
--- a/adc-da-main/src/main/resources/application.properties
+++ b/adc-da-main/src/main/resources/application.properties
@@ -144,8 +144,8 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg,rar,zip
 # elasticsearch 配置
 # =============================================================================
 elasticsearch.clustername=elasticsearch
-elasticsearch.ip=127.0.0.1
-elasticsearch.port=9306
+elasticsearch.ip=10.100.5.122
+elasticsearch.port=9300
 elasticsearch.poolSize=5
 elas.flag=true