From 24f4c7f7f03c2c39db0f3db5d603735d2056e155 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 3 May 2022 05:58:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=207=E5=A4=A9=E5=86=85=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20ES=20=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/search/ResetSearchCenterController.java    | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 0635b408..90b7cf85 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
@@ -39,6 +39,17 @@ public class ResetSearchCenterController extends BaseController<Map<String, Obje
         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) {
         if(searchCenter.getExecType() == null || "".equals(searchCenter.getExecType())){
             return Result.error("执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准, DEL 只删除不存在标准库的数据");

From 4b0056aae815aa63b1827e3d57bf1799f817709c Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 3 May 2022 06:05:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../search/service/impl/SearchCenterServiceImpl.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 ddbcd0a8..2a582b0a 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
@@ -80,11 +80,11 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         BoolQueryBuilder boolQueryShould = QueryBuilders.boolQuery();
         BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery();
 
-
+        updateIndex(searchInfoEO.getSelectIndex(),(searchInfoEO.getPage()-1)*searchInfoEO.getPageSize(),searchInfoEO.getPageSize());
         searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex())
                 .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
                 .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize())
-                .addSort("issueTime", SortOrder.DESC)
+                .addSort("issue_time_order", SortOrder.DESC)
                 .setSize(searchInfoEO.getPageSize());
 
         if(searchInfoEO.getSelectIndex().equals("stand")) {
@@ -207,11 +207,11 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         BoolQueryBuilder boolQueryShould = QueryBuilders.boolQuery();
         BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery();
 
-
+        updateIndex(searchInfoEO.getSelectIndex(),(searchInfoEO.getPage()-1)*searchInfoEO.getPageSize(),searchInfoEO.getPageSize());
         searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex())
-                 .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
+                .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
                 .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize())
-                .addSort("issueTime", SortOrder.DESC)
+                .addSort("issue_time_order", SortOrder.DESC)
                 .setSize(searchInfoEO.getPageSize());
 
         if(searchInfoEO.getSelectIndex().equals("stand")) {