Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/factorys/EsBuilderFactory/WildcardQueryBuilder.java

@@ -5,6 +5,9 @@ import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
 import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
 
 @Component
 public class WildcardQueryBuilder implements IQueryBuilder{
@@ -15,9 +18,16 @@ public class WildcardQueryBuilder implements IQueryBuilder{
 
     @Override
     public Query creteQuery() throws ParseException {
+        List<String> list = Arrays.asList("patent_no.keyword", "app_no.keyword", "public_no.keyword", "grant_no.keyword");
         String str = "*";
-        String s = str.concat(value).concat("*");
-        return QueryBuilders.wildcard(i -> i.field(field).value(s));
+        String s = "";
+        if (list.contains(field)) {
+            s = str.concat(value.toUpperCase(Locale.ROOT)).concat("*");
+        } else {
+            s = str.concat(value).concat("*");
+        }
+        String result = s;
+        return QueryBuilders.wildcard(i -> i.field(field).value(result));
     }
 
     public String getField() {

src/test/java/cn/cslg/pas/service/EventServiceTests.java

@@ -69,8 +69,9 @@ public class EventServiceTests {
 
     @Autowired
     private ProductMarketDataService productMarketDataService;
-@Autowired
-private AssoProjectEventMapper assoProjectEventMapper;
+    @Autowired
+    private AssoProjectEventMapper assoProjectEventMapper;
+
     @Test
     void test() throws Exception {
         StringRequest queryRequest = new StringRequest();
@@ -383,9 +384,9 @@ private AssoProjectEventMapper assoProjectEventMapper;
             for (int i = 0; i < list.size(); i++) {
                 String s = list.get(i);
                 if (i == list.size() - 1) {
-                    str = str + "\"" +s + "\""  ;
+                    str = str + "\"" + s + "\"";
                 } else {
-                    str = str + "\"" +s + "\"" + "," ;
+                    str = str + "\"" + s + "\"" + ",";
                 }
             }
         } else {
@@ -470,9 +471,9 @@ private AssoProjectEventMapper assoProjectEventMapper;
 
     @Test
     public void test101() {
-        String a =" DESC";
-  List<Integer> ids = assoProjectEventMapper.getEventProjectNumOrder(0,a);
-  System.out.println(ids);
+        String a = " DESC";
+        List<Integer> ids = assoProjectEventMapper.getEventProjectNumOrder(0, a);
+        System.out.println(ids);
     }
 
 }