kerry 4 년 전
부모
커밋
8e493c10f5

+ 3 - 0
elastic-publish-service/req/http-client.env.json 파일 보기

7
   },
7
   },
8
   "beta-out": {
8
   "beta-out": {
9
     "host": "http://103.239.204.35:8092"
9
     "host": "http://103.239.204.35:8092"
10
+  },
11
+  "beta-out-2": {
12
+    "host": "http://103.239.204.35:8094"
10
   }
13
   }
11
 }
14
 }

+ 16 - 1
elastic-publish-service/req/load.http 파일 보기

1
+
1
 GET http://{{host}}/load
2
 GET http://{{host}}/load
2
 
3
 
3
-### load data
4
+### load data
5
+
6
+GET http://{{host}}/set-load
7
+
8
+### load data
9
+
10
+
11
+GET http://{{host}}/loadByAgencyIds?agencyIds=190084,196581
12
+
13
+### load data
14
+
15
+
16
+GET http://{{host}}/loadByUnitIds?unitIds=545775
17
+
18
+### load by unitId

+ 2 - 20
elastic-publish-service/req/main-controller.http 파일 보기

21
 
21
 
22
 {
22
 {
23
   "agencyPath": "/1",
23
   "agencyPath": "/1",
24
-  "keyword": "33E9D1",
24
+  "keyword": "宁县店",
25
   "page": 1,
25
   "page": 1,
26
-  "size": 10,
26
+  "size": 20,
27
   "regulatoryLevelId": "",
27
   "regulatoryLevelId": "",
28
   "property": "",
28
   "property": "",
29
   "classify": "",
29
   "classify": "",
33
 
33
 
34
 ### 详情信息
34
 ### 详情信息
35
 
35
 
36
-
37
-GET http://{{host}}/load
38
-
39
-### load data
40
-
41
-GET http://{{host}}/set-load
42
-
43
-### load data
44
-
45
-
46
-GET http://{{host}}/loadByAgencyIds?agencyIds=190084,196581
47
-
48
-### load data
49
-
50
-
51
-GET http://{{host}}/loadByUnitIds?unitIds=545775
52
-
53
-### load by unitId

+ 1 - 0
elastic-publish-service/src/main/java/com/vcarecity/publish/elastic/service/ElasticUpdateService.java 파일 보기

34
      * @return
34
      * @return
35
      * @throws IOException
35
      * @throws IOException
36
      */
36
      */
37
+    @Deprecated
37
     List<UnitAgencyMergeEntity> updateDataByQuery(String key, List<UnitAgencyMergeEntity> data) throws IOException;
38
     List<UnitAgencyMergeEntity> updateDataByQuery(String key, List<UnitAgencyMergeEntity> data) throws IOException;
38
 
39
 
39
 
40
 

+ 8 - 1
elastic-publish-service/src/main/java/com/vcarecity/publish/elastic/service/impl/ElasticUpdateServiceImpl.java 파일 보기

32
 import java.util.HashMap;
32
 import java.util.HashMap;
33
 import java.util.List;
33
 import java.util.List;
34
 import java.util.Map;
34
 import java.util.Map;
35
+import java.util.stream.Collectors;
35
 
36
 
36
 /**
37
 /**
37
  * @author Kerry on 12/17/19
38
  * @author Kerry on 12/17/19
107
             return;
108
             return;
108
         }
109
         }
109
         // 更新数据
110
         // 更新数据
110
-        List<UnitAgencyMergeEntity> addData = updateDataByQuery(key, updateList);
111
+        // List<UnitAgencyMergeEntity> addData = updateDataByQuery(key, updateList);
112
+
113
+        // 2020年2月26日
114
+        List<Long> collect = updateList.stream().map(UnitAgencyMergeEntity::getUnitId).collect(Collectors.toList());
115
+        this.deleteByQuery(key, collect);
116
+        List<UnitAgencyMergeEntity> addData = updateList;
111
 
117
 
112
         logger.info("add data size = {}", addData.size());
118
         logger.info("add data size = {}", addData.size());
113
 
119
 
128
         }
134
         }
129
     }
135
     }
130
 
136
 
137
+
131
     @Override
138
     @Override
132
     public List<UnitAgencyMergeEntity> updateDataByQuery(String key, List<UnitAgencyMergeEntity> data) throws IOException {
139
     public List<UnitAgencyMergeEntity> updateDataByQuery(String key, List<UnitAgencyMergeEntity> data) throws IOException {
133
         List<UnitAgencyMergeEntity> addList = new ArrayList<>();
140
         List<UnitAgencyMergeEntity> addList = new ArrayList<>();

+ 5 - 4
elastic-publish-service/src/main/java/com/vcarecity/publish/service/impl/CheckTimeServiceImpl.java 파일 보기

3
 import com.vcarecity.publish.constants.ElasticConstant;
3
 import com.vcarecity.publish.constants.ElasticConstant;
4
 import com.vcarecity.publish.service.CheckTimeService;
4
 import com.vcarecity.publish.service.CheckTimeService;
5
 import com.vcarecity.publish.util.DateUtil;
5
 import com.vcarecity.publish.util.DateUtil;
6
+import org.springframework.beans.factory.annotation.Value;
6
 import org.springframework.data.redis.core.RedisTemplate;
7
 import org.springframework.data.redis.core.RedisTemplate;
7
 import org.springframework.stereotype.Service;
8
 import org.springframework.stereotype.Service;
8
 
9
 
18
 public class CheckTimeServiceImpl implements CheckTimeService {
19
 public class CheckTimeServiceImpl implements CheckTimeService {
19
 
20
 
20
 
21
 
21
-    public static final String REDIS_KEY_PREFIX = "elastic:";
22
-
23
     private final RedisTemplate<String, Object> redisTemplate;
22
     private final RedisTemplate<String, Object> redisTemplate;
24
 
23
 
24
+    @Value("${app.redis-key-prefix}")
25
+    private String redisKeyPrefix;
25
 
26
 
26
     public CheckTimeServiceImpl(RedisTemplate<String, Object> redisTemplate) {
27
     public CheckTimeServiceImpl(RedisTemplate<String, Object> redisTemplate) {
27
         this.redisTemplate = redisTemplate;
28
         this.redisTemplate = redisTemplate;
29
 
30
 
30
     @Override
31
     @Override
31
     public String getLastDateTime(String key) {
32
     public String getLastDateTime(String key) {
32
-        String redisKey = REDIS_KEY_PREFIX + key;
33
+        String redisKey = redisKeyPrefix + key;
33
 
34
 
34
         Object value = redisTemplate.opsForValue().get(redisKey);
35
         Object value = redisTemplate.opsForValue().get(redisKey);
35
         long last;
36
         long last;
45
 
46
 
46
     @Override
47
     @Override
47
     public void setLastDateTime(String key, long lastDateTime) {
48
     public void setLastDateTime(String key, long lastDateTime) {
48
-        String redisKey = REDIS_KEY_PREFIX + key;
49
+        String redisKey = redisKeyPrefix + key;
49
         redisTemplate.opsForValue().set(redisKey, lastDateTime);
50
         redisTemplate.opsForValue().set(redisKey, lastDateTime);
50
     }
51
     }
51
 }
52
 }

+ 1 - 0
elastic-publish-service/src/main/resources/application-beta.yml 파일 보기

24
     map-underscore-to-camel-case: true
24
     map-underscore-to-camel-case: true
25
 debug: true
25
 debug: true
26
 app:
26
 app:
27
+  redis-key-prefix: "elastic:2:"
27
   index:
28
   index:
28
     name: unit-agency
29
     name: unit-agency
29
     config: index-text
30
     config: index-text

+ 1 - 0
elastic-publish-service/src/main/resources/application-dev.yml 파일 보기

25
     map-underscore-to-camel-case: true
25
     map-underscore-to-camel-case: true
26
 debug: true
26
 debug: true
27
 app:
27
 app:
28
+  redis-key-prefix: "elastic:2:"
28
   index:
29
   index:
29
     name: unit-agency
30
     name: unit-agency
30
     config: index-text
31
     config: index-text

+ 1 - 0
elastic-publish-service/src/main/resources/application-production.yml 파일 보기

26
   configuration:
26
   configuration:
27
     map-underscore-to-camel-case: true
27
     map-underscore-to-camel-case: true
28
 app:
28
 app:
29
+  redis-key-prefix: "elastic:2:"
29
   index:
30
   index:
30
     name: unit-agency
31
     name: unit-agency
31
     config: index-text
32
     config: index-text