fixed

src/main/java/cn/cslg/pas/common/utils/StringUtils.java

@@ -426,6 +426,31 @@ public class StringUtils {
     }
 
     /**
+     * 判断是不是整数数字
+     * @param s
+     * @return
+     */
+    public static boolean isInteger(String s) {
+        if (s == null) {
+            return false;
+        }
+        return s.matches("-?\\d+"); // 匹配整数，包括负数
+    }
+
+    /**
+     * 判断是不是正整数数字
+     * @param s
+     * @return
+     */
+    public static boolean isPositiveInteger(String s) {
+        if (s == null) {
+            return false;
+        }
+        // 正则表达式匹配一个或多个正整数
+        return s.matches("\\d+"); // "\\d+" 匹配一个或多个数字，但不包括负数和小数点
+    }
+
+    /**
      * 某个子串是否在字符串内
      *
      * @param str

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

@@ -1,5 +1,6 @@
 package cn.cslg.pas.factorys.EsBuilderFactory;
 
+import cn.cslg.pas.common.utils.StringUtils;
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
 import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
 import org.springframework.stereotype.Component;
@@ -24,7 +25,7 @@ public class WildcardQueryBuilder implements IQueryBuilder{
         String s = "";
         if (list.contains(field)) {
             String sub = value.substring(0, 2);
-            if ((value.length() == 13 && !sub.equalsIgnoreCase("JP") && !sub.equalsIgnoreCase("KR")) || value.length() == 15) {
+            if ((StringUtils.isPositiveInteger(sub) || sub.equalsIgnoreCase("CN")) && (value.length() == 13|| value.length() == 15)) {
                 String frontPart = value.substring(0, value.length() - 1);
                 String afterPart = value.substring(value.length() - 1);
                 String s1 = frontPart + "." + afterPart;

src/main/java/cn/cslg/pas/service/business/HightlightTemplateService.java

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -64,8 +65,10 @@ public class HightlightTemplateService extends ServiceImpl<HightlightTemplateMap
         if (id != null) {
             //update
             hightlightTemplate = this.getById(id);
+            Date createTime = hightlightTemplate.getCreateTime();
             BeanUtils.copyProperties(hightlightTemplateDTO, hightlightTemplate);
             hightlightTemplate.setConfig(JsonUtils.objectToJson(hightlightTemplateDTO.getConfigs()));
+            hightlightTemplate.setCreateTime(createTime);
             hightlightTemplate.updateById();
         } else {
             String name = hightlightTemplateDTO.getName();

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

@@ -540,4 +540,17 @@ public class EventServiceTests {
         System.out.println(collect.size());
 
     }
+
+    @Test
+    public void test105() {
+        String value = "2003800037580";
+        String sub = value.substring(0, 2);
+        boolean positiveInteger = StringUtils.isPositiveInteger(sub);
+        System.out.println(positiveInteger);
+        if ((StringUtils.isPositiveInteger(sub) || sub.equalsIgnoreCase("CN")) && (value.length() == 13 || value.length() == 15)) {
+            System.out.println("A");
+        } else {
+            System.out.println("B");
+        }
+    }
 }