Merge remote-tracking branch 'origin/master'

ch-admin-api/src/main/java/com/wwdz/ch/admin/config/ShiroConfig.java

@@ -111,6 +111,7 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/admin/auth/403", "anon");
 		filterChainDefinitionMap.put("/actuator/health", "anon");
 		filterChainDefinitionMap.put("/admin/item/updateUrl", "anon");
+		filterChainDefinitionMap.put("/admin/item/synToEs", "anon");
 
 	//	filterChainDefinitionMap.put("/admin/**", "anon");
 		filterChainDefinitionMap.put("/admin/**", "authc");

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/ItemController.java

@@ -65,4 +65,10 @@ public class ItemController {
     public void syn() {
         synCoinJob.updateImageUrlOfsSize();
     }
+
+
+    @GetMapping("/synToEs")
+    public void synToEs() {
+        synCoinJob.synItemToEs();
+    }
 }

ch-admin-api/src/main/java/com/wwdz/ch/admin/job/SynCoinJob.java

@@ -178,6 +178,7 @@ public class SynCoinJob {
 
     public void synItemToEs() {
         try {
+            ExecutorService executorService = Executors.newFixedThreadPool(10);
             CoinRequestDto coinRequestDto = new CoinRequestDto();
             coinRequestDto.setPage(1);
             coinRequestDto.setLimit(100);
@@ -190,7 +191,9 @@ public class SynCoinJob {
                 dto.setPage(i);
                 dto.setLimit(100);
                 List<Item> itemList = itemDao.findListByPage(dto);
-                itemEsDao.create(itemList);
+                executorService.submit(() -> {
+                    itemEsDao.create(itemList);
+                });
                 logger.info(">>>>>>>>>>>>>>>>> 页码 = {}, 同步es 成功 ！ <<<<<<<<<<<<<<<<<", i);
             });
             logger.info(">>>>>>>>>>>>>>>>>数据同步es 完成 SUCCESS!!!!! <<<<<<<<<<<<<<<<<");

ch-dao/src/main/java/com/wwdz/ch/db/es/ItemEsDao.java

 package com.wwdz.ch.db.es;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch._types.FieldValue;
 import co.elastic.clients.elasticsearch._types.query_dsl.*;
 import co.elastic.clients.elasticsearch.core.*;
 import co.elastic.clients.elasticsearch.core.bulk.BulkOperation;
@@ -30,7 +31,7 @@ public class ItemEsDao {
 
     private static final Logger logger = LoggerFactory.getLogger(ItemEsDao.class);
 
-    private final static String INDEX = "quanku_temp";
+    private final static String INDEX = "quanku_new";
 
     //商品来源是中国，所对应的编码
     private final static List<String> CHINESE_SOURCE_LIST = Arrays.asList("1", "2", "3", "7", "11", "1000");
@@ -79,25 +80,18 @@ public class ItemEsDao {
             int page = esSearchRequestDto.getPage();
             int size = esSearchRequestDto.getSize();
             int from = (page - 1) * size;
-           /* Query sourceTermQuery = TermQuery.of(t ->
-                    t.field("source")
-                            .value(2))._toQuery();
-
-            Query sourceTermQuery2 = TermQuery.of(t ->
-                    t.field("source")
-                            .value(7))._toQuery();*/
 
             SearchRequest.Builder builder = new SearchRequest.Builder();
             builder.index(INDEX);
             if (!CollectionUtils.isEmpty(esSearchRequestDto.getIncludes())) {
                 builder.source(sourceBuild->sourceBuild.filter(f->f.includes(esSearchRequestDto.getIncludes())));
             }
-            List<Query> sourceTypeQueryList = new ArrayList<>();
+            List<FieldValue> sourceQueryList = new ArrayList<>();
             SOURCE_LIST.forEach(i -> {
-                Query query = TermQuery.of(t->t.field("source").value(i))._toQuery();
-                sourceTypeQueryList.add(query);
+                sourceQueryList.add(FieldValue.of(i));
             });
-            Query shouldQuery = QueryBuilders.bool(q->q.should(sourceTypeQueryList));
+            Query termsQuery = QueryBuilders.terms(s->s.field("source").terms(t->t.value(sourceQueryList)));
+            Query shouldQuery = QueryBuilders.bool(q->q.should(termsQuery));
 
             BoolQuery.Builder build = QueryBuilders.bool().must(shouldQuery);
             if(StringUtils.hasLength(esSearchRequestDto.getContent())) {
@@ -115,6 +109,8 @@ public class ItemEsDao {
                         .functions(b->b.randomScore(s->s.field("id").seed(String.valueOf(random.nextDouble())))));
                 builder.query(functionScoreQuery._toQuery());
             }
+            Query wildcardQuery = WildcardQuery.of(w->w.field("images").value("*_*"))._toQuery();
+            build.must(wildcardQuery);
             builder.size(size);
             SearchRequest searchRequest = builder.build();
             logger.info("查询语句 : {}", searchRequest.query());