add test

elastic-publish-service/req/http-client.env.json

@@ -7,5 +7,8 @@
   },
   "beta-out": {
     "host": "http://103.239.204.35:8092"
+  },
+  "beta-out-2": {
+    "host": "http://103.239.204.35:8094"
   }
 }

elastic-publish-service/req/load.http

@@ -1,3 +1,18 @@
+
 GET http://{{host}}/load
 
-### load data
+### load data
+
+GET http://{{host}}/set-load
+
+### load data
+
+
+GET http://{{host}}/loadByAgencyIds?agencyIds=190084,196581
+
+### load data
+
+
+GET http://{{host}}/loadByUnitIds?unitIds=545775
+
+### load by unitId

elastic-publish-service/req/main-controller.http

@@ -21,9 +21,9 @@ Content-Type: application/json
 
 {
   "agencyPath": "/1",
-  "keyword": "33E9D1",
+  "keyword": "宁县店",
   "page": 1,
-  "size": 10,
+  "size": 20,
   "regulatoryLevelId": "",
   "property": "",
   "classify": "",
@@ -33,21 +33,3 @@ Content-Type: application/json
 
 ### 详情信息
 
-
-GET http://{{host}}/load
-
-### load data
-
-GET http://{{host}}/set-load
-
-### load data
-
-
-GET http://{{host}}/loadByAgencyIds?agencyIds=190084,196581
-
-### load data
-
-
-GET http://{{host}}/loadByUnitIds?unitIds=545775
-
-### load by unitId

elastic-publish-service/src/main/java/com/vcarecity/publish/elastic/service/ElasticUpdateService.java

@@ -34,6 +34,7 @@ public interface ElasticUpdateService {
      * @return
      * @throws IOException
      */
+    @Deprecated
     List<UnitAgencyMergeEntity> updateDataByQuery(String key, List<UnitAgencyMergeEntity> data) throws IOException;
 
 

elastic-publish-service/src/main/java/com/vcarecity/publish/elastic/service/impl/ElasticUpdateServiceImpl.java

@@ -32,6 +32,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author Kerry on 12/17/19
@@ -107,7 +108,12 @@ public class ElasticUpdateServiceImpl implements ElasticUpdateService {
             return;
         }
         // 更新数据
-        List<UnitAgencyMergeEntity> addData = updateDataByQuery(key, updateList);
+        // List<UnitAgencyMergeEntity> addData = updateDataByQuery(key, updateList);
+
+        // 2020年2月26日
+        List<Long> collect = updateList.stream().map(UnitAgencyMergeEntity::getUnitId).collect(Collectors.toList());
+        this.deleteByQuery(key, collect);
+        List<UnitAgencyMergeEntity> addData = updateList;
 
         logger.info("add data size = {}", addData.size());
 
@@ -128,6 +134,7 @@ public class ElasticUpdateServiceImpl implements ElasticUpdateService {
         }
     }
 
+
     @Override
     public List<UnitAgencyMergeEntity> updateDataByQuery(String key, List<UnitAgencyMergeEntity> data) throws IOException {
         List<UnitAgencyMergeEntity> addList = new ArrayList<>();

elastic-publish-service/src/main/java/com/vcarecity/publish/service/impl/CheckTimeServiceImpl.java

@@ -3,6 +3,7 @@ package com.vcarecity.publish.service.impl;
 import com.vcarecity.publish.constants.ElasticConstant;
 import com.vcarecity.publish.service.CheckTimeService;
 import com.vcarecity.publish.util.DateUtil;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
@@ -18,10 +19,10 @@ import java.util.Date;
 public class CheckTimeServiceImpl implements CheckTimeService {
 
 
-    public static final String REDIS_KEY_PREFIX = "elastic:";
-
     private final RedisTemplate<String, Object> redisTemplate;
 
+    @Value("${app.redis-key-prefix}")
+    private String redisKeyPrefix;
 
     public CheckTimeServiceImpl(RedisTemplate<String, Object> redisTemplate) {
         this.redisTemplate = redisTemplate;
@@ -29,7 +30,7 @@ public class CheckTimeServiceImpl implements CheckTimeService {
 
     @Override
     public String getLastDateTime(String key) {
-        String redisKey = REDIS_KEY_PREFIX + key;
+        String redisKey = redisKeyPrefix + key;
 
         Object value = redisTemplate.opsForValue().get(redisKey);
         long last;
@@ -45,7 +46,7 @@ public class CheckTimeServiceImpl implements CheckTimeService {
 
     @Override
     public void setLastDateTime(String key, long lastDateTime) {
-        String redisKey = REDIS_KEY_PREFIX + key;
+        String redisKey = redisKeyPrefix + key;
         redisTemplate.opsForValue().set(redisKey, lastDateTime);
     }
 }

elastic-publish-service/src/main/resources/application-beta.yml

@@ -24,6 +24,7 @@ mybatis:
     map-underscore-to-camel-case: true
 debug: true
 app:
+  redis-key-prefix: "elastic:2:"
   index:
     name: unit-agency
     config: index-text

elastic-publish-service/src/main/resources/application-dev.yml

@@ -25,6 +25,7 @@ mybatis:
     map-underscore-to-camel-case: true
 debug: true
 app:
+  redis-key-prefix: "elastic:2:"
   index:
     name: unit-agency
     config: index-text

elastic-publish-service/src/main/resources/application-production.yml

@@ -26,6 +26,7 @@ mybatis:
   configuration:
     map-underscore-to-camel-case: true
 app:
+  redis-key-prefix: "elastic:2:"
   index:
     name: unit-agency
     config: index-text