修改县区匹配规则

src/main/java/com/template/common/utils/TimeExchange2.java

@@ -610,18 +610,23 @@ public class TimeExchange2 {
 
 
     public static void main(String[] args) throws ParseException {
-        char a = 'A';
-        char b = 'B';
-        int result = b -a;
-
-        String s = "ZY";
-        int ans = 0;
-        for(int i=0;i<s.length();i++) {
-            int num = s.charAt(i) - 'A' + 1;
-            ans = ans * 26 + num;
-        }
-
-        System.out.println(ans);
+//        char a = 'A';
+//        char b = 'B';
+//        int result = b -a;
+//
+//        String s = "ZY";
+//        int ans = 0;
+//        for(int i=0;i<s.length();i++) {
+//            int num = s.charAt(i) - 'A' + 1;
+//            ans = ans * 26 + num;
+//        }
+
+        String oldStr = "蓝田";
+        String newStr = "蓝田县";
+
+
+        System.out.println(oldStr.contains(newStr));
+        System.out.println(newStr.contains(oldStr));
     }
 
 }

src/main/java/com/template/controller/WelcomeStudentController.java

@@ -1161,7 +1161,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 }
                             }
                             if (addressDatas != null && addressDatas.length >= 3) {
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressDatas[1]) && e.getDistrictZh().equals(addressDatas[2])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressDatas[1]) && addressDatas[2].contains(e.getDistrictZh())).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setOdistrict(addressDatas[2]);
                                     studentData.setOdistrictId(oProvince.get().getId());
@@ -1198,7 +1198,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 }
                             }
                             if (addressPlaces != null && addressPlaces.length >= 3) {
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressPlaces[1]) && e.getDistrictZh().equals(addressPlaces[2])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressPlaces[1]) && addressPlaces[2].contains(e.getDistrictZh())).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setDistrict(addressPlaces[2]);
                                     studentData.setDistrictId(oProvince.get().getId());
@@ -1439,7 +1439,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 }
                             }
                             if (addressDatas != null && addressDatas.length >= 3) {
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressDatas[1]) && e.getDistrictZh().equals(addressDatas[2])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressDatas[1]) && addressDatas[2].contains(e.getDistrictZh())).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setOdistrict(addressDatas[2]);
                                     studentData.setOdistrictId(oProvince.get().getId());
@@ -1476,7 +1476,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 }
                             }
                             if (addressPlaces != null && addressPlaces.length >= 3) {
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressPlaces[1]) && e.getDistrictZh().equals(addressPlaces[2])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressPlaces[1]) && addressPlaces[2].contains(e.getDistrictZh())).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setDistrict(addressPlaces[2]);
                                     studentData.setDistrictId(oProvince.get().getId());