data-service

src/main/java/com/sxtvs/open/api/news/entity/YoumeiEsData.java

@@ -33,6 +33,8 @@ public class YoumeiEsData{
 
     private String summary;
 
+    private String city;
+
     public YoumeiEsData() {
 
     }
@@ -50,6 +52,7 @@ public class YoumeiEsData{
         data.setSourceWebsite(youmeiData.getSourceWebsite());
         Map<String, Object> mp = getMapFromRaw(youmeiData.getRawData());
         data.setSummary((String) mp.get("summary"));
+        data.setCity((String) ((Map<String, Object>) mp.get("contentExt")).get("contentProvince"));
         data.setCategory(youmeiData.getCategory());
         return data;
     }

src/main/java/com/sxtvs/open/api/news/service/impl/YoumeiDataServiceImpl.java

@@ -3,6 +3,7 @@ package com.sxtvs.open.api.news.service.impl;
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._types.SortOptions;
 import co.elastic.clients.elasticsearch._types.SortOrder;
+import co.elastic.clients.elasticsearch._types.query_dsl.MatchQuery;
 import co.elastic.clients.elasticsearch._types.query_dsl.MultiMatchQuery;
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
 import co.elastic.clients.elasticsearch._types.query_dsl.RangeQuery;
@@ -98,6 +99,15 @@ public class YoumeiDataServiceImpl extends ServiceImpl<YoumeiDataMapper, YoumeiD
                 );
             }
 
+            // 城市
+            if(!TextUtils.isEmpty(dataRequestDTO.getCity())){
+                Arrays.stream(dataRequestDTO.getCity().split(",")).forEach(city -> {
+                    builder.query(
+                            Query.of(y -> y.match(MatchQuery.of(z -> z.field("city").query(city))))
+                    );
+                });
+            }
+
             SearchRequest searchRequest = builder.build();
 
             response = elasticsearchClient.search(searchRequest, YoumeiEsData.class);

src/test/data-service.http

@@ -18,9 +18,9 @@ Authorization: b6af95077bafeccb32ae7a65dadee47d
 
 {
 "keywords": "",
-  "city": "",
+  "city": "安徽省,安庆市",
   "start": "2023-01-01 15:52:52",
-  "end": "2023-02-23 15:52:52",
+  "end": "2023-02-25 15:52:52",
   "page": 0,
   "pageSize": 10
 }