Ver Fonte

fix: 设备描述信息equipmentDesc
feat: 获取录入的设备位置信息

Ritchie há 1 ano atrás
pai
commit
71d6f0fe4f

Diff do ficheiro suprimidas por serem muito extensas
+ 385 - 362
src/main/java/com/szwl/controller/IndexController.java


+ 10 - 0
src/main/java/com/szwl/controller/TEquipmentApplyController.java

@@ -210,6 +210,16 @@ public class TEquipmentApplyController {
                                 equipmentService.sentMessage(equipmentApply.getClientId(),PushUtils.buildJson("endDate",String.valueOf(equipment.getEndDate().getTime()) ).toString());
                                 PushUtils.push(equipmentApply.getGtClientId(), "", "", PushUtils.buildJson("endDate",String.valueOf(equipment.getEndDate().getTime()) ).toString());
                             }
+
+                            LambdaQueryWrapper<TEquipmentDesc> lqw = Wrappers.lambdaQuery();
+                            lqw.eq(TEquipmentDesc::getEquipmentId, equipment.getId());
+                            List<TEquipmentDesc> equipmentDescs = equipmentDescService.list(lqw);
+                            if (equipmentDescs.size() == 0) {
+                                TEquipmentDesc equipmentDesc = new TEquipmentDesc();
+                                equipmentDesc.setEquipmentId(equipment.getId());
+                                equipmentDescService.save(equipmentDesc);
+                            }
+
                             return R.ok(null,"审核成功");
                         }
                         TEquipment equipment = new TEquipment();

+ 46 - 12
src/main/java/com/szwl/controller/TLocationCheckController.java

@@ -46,6 +46,28 @@ public class TLocationCheckController {
         this.adminService = adminService;
     }
 
+    @ApiOperation(value = "获取录入的位置信息")
+    @GetMapping("/getLocInfo")
+    public ResponseModel<?> getLocInfo(String clientId) {
+        if (StringUtils.isEmpty(clientId)) {
+            return R.fail("设备id不能为空");
+        }
+        // 根据设备id查询位置信息
+        LambdaQueryWrapper<TLocationCheck> lqw = Wrappers.lambdaQuery();
+        lqw.eq(TLocationCheck::getClientId, clientId);
+        TLocationCheck locationCheck = locationCheckService.getOne(lqw);
+        if (Objects.nonNull(locationCheck)) {
+            String country = locationCheck.getCountry();
+            if (country.equals("中国")) {
+                String location = locationCheck.getLocation();
+                return R.ok(country + location);
+            } else {
+                return R.ok(country);
+            }
+
+        }
+        return R.fail("地区信息未录入");
+    }
 
 //    @ApiOperation(value = "根据ip校验clientId设备位置")
 //    @PostMapping("/ipCheck")
@@ -76,8 +98,11 @@ public class TLocationCheckController {
         }
 
         // 售后部同事修改的信息:姓名,电话,username,clientId,国家
+        String modUsername = locationCheck.getModUsername();
+        if (!Objects.equals("shouhoumi", modUsername) || !Objects.equals("admin", modUsername)) {
+            return R.fail("该账号无权操作");
+        }
         String modName = locationCheck.getModName();
-//        String modUsername = locationCheck.getModUsername();
         String modPhone = locationCheck.getModPhone();
         String clientId = locationCheck.getClientId();
         String location = locationCheck.getLocation();
@@ -154,20 +179,29 @@ public class TLocationCheckController {
         if (checks.size() > 0) {
             return R.fail("此设备信息已录入");
         }
-        LambdaQueryWrapper<TAdmin> lqw = Wrappers.lambdaQuery();
-        lqw.eq(TAdmin::getUsername, username);
-        TAdmin admin = adminService.getOne(lqw);
-        if (Objects.isNull(admin)) {
-            return R.fail("adminId账号不存在");
-        }
-        Long adminId = admin.getId();
+//        LambdaQueryWrapper<TAdmin> lqw = Wrappers.lambdaQuery();
+//        lqw.eq(TAdmin::getUsername, username);
+//        TAdmin admin = adminService.getOne(lqw);
+//        if (Objects.isNull(admin)) {
+//            return R.fail("adminId账号不存在");
+//        }
+//        Long adminId = admin.getId();
 //        String phone1 = admin.getPhone();
 //        if (!Objects.equals(phone1, phone)) {
 //            return R.fail("手机号码有误");
 //        }
-        String name1 = admin.getName();
-        if (!Objects.equals(name1, name)) {
-            return R.fail("姓名有误");
+        // 孙超,黄堪通
+//        String sunPhone = "15546789003";
+//        String huangPhone = "18320396362";
+//        if (!Objects.equals(sunPhone, phone) || !Objects.equals(huangPhone, phone)) {
+//            return R.fail("手机号有误");
+//        }
+//        String name1 = admin.getName();
+        String adminStr = "admin";
+        String sun = "sunchao";
+        String huang = "huangkantong";
+        if (!Objects.equals(sun, username) || !Objects.equals(huang, username) || !Objects.equals(adminStr, username)) {
+            return R.fail("该账号无权操作");
         }
 
         TLocationCheck tLocationCheck = new TLocationCheck();
@@ -175,7 +209,7 @@ public class TLocationCheckController {
         String uuid = IdUtil.simpleUUID();
         tLocationCheck.setId(uuid);
         tLocationCheck.setCreateTime(new Date());
-        tLocationCheck.setAdminId(adminId);
+//        tLocationCheck.setAdminId(adminId);
         tLocationCheck.setPhone(phone);
         tLocationCheck.setUsername(username);
         tLocationCheck.setClientId(clientId);

+ 39 - 0
src/test/java/com/szwl/model/utils/usaEquipment/AClz.java

@@ -0,0 +1,39 @@
+package com.szwl.model.utils.usaEquipment;
+
+import java.util.*;
+
+public class AClz {
+    public static void main(String[] args) {
+        String a = "-80.127714,25.955181\n" +
+                "-80.333225,25.645918\n" +
+                "-80.142757,25.957812\n" +
+                "-80.322943,25.868225";
+
+        String[] aa = {"-80.127714,25.955181", "-80.333225,25.645918", "-80.142757,25.957812", "-80.322943,25.868225"};
+        for (String s : aa) {
+            System.out.println(s);
+        }
+        System.out.println("*******************");
+
+        String b = "-80.127714,25.955181\n" +
+                "-80.333225,25.645918\n" +
+                "-80.142757,25.957812\n" +
+                "-80.322943,25.868225";
+
+//        String str = "-80.127714,25.955181:Miami-Dade, Florida, United States\n" +
+//                "-80.142757,25.957812:Spring Circle Drive, Broward, Florida, United States\n" +
+//                "-80.322943,25.868225:Palmetto Expressway, Hialeah, Florida, United States\n" +
+//                "-80.333225,25.645918:Miami-Dade, Florida, United States";
+
+        String[] strings = strToArray(a);
+        for (String ss : strings) {
+            System.out.println(ss);
+        }
+//        System.out.println(a);
+    }
+
+    public static String[] strToArray(String str) {
+        String[] split = str.split("\\n");
+        return split;
+    }
+}

Diff do ficheiro suprimidas por serem muito extensas
+ 102 - 0
src/test/java/com/szwl/model/utils/usaEquipment/CoordinateUtils.java


Diff do ficheiro suprimidas por serem muito extensas
+ 240 - 0
src/test/java/com/szwl/model/utils/usaEquipment/RegexpTemp.java


+ 466 - 0
src/test/java/com/szwl/model/utils/usaEquipment/StringMatcher.java

@@ -0,0 +1,466 @@
+package com.szwl.model.utils.usaEquipment;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+public class StringMatcher {
+
+    public static void main(String[] args) {
+        String laStr = "-80.127714,25.955181\n" +
+                "-80.333225,25.645918\n" +
+                "-80.142757,25.957812\n" +
+                "-80.322943,25.868225\n" +
+                "-80.244328,26.244963\n" +
+                "-80.365384,25.787479\n" +
+                "-80.247484,26.240933\n" +
+                "-80.336566,26.006578\n" +
+                "-80.14672,25.947551\n" +
+                "-80.237363,25.958205\n" +
+                "-82.725138,27.791522\n" +
+                "-82.732037,27.79326\n" +
+                "-80.143727,25.958121\n" +
+                "-80.310041,25.913599\n" +
+                "-80.127714,25.955181\n" +
+                "-80.23849,25.956545\n" +
+                "-80.323004,25.865907\n" +
+                "-81.488929,28.395474\n" +
+                "-81.33871,28.804041\n" +
+                "-81.494663,28.386985\n" +
+                "-80.369312,25.780731\n" +
+                "-81.341074,28.804355\n" +
+                "-81.476665,28.452999\n" +
+                "-81.339111,28.803329\n" +
+                "-81.502327,28.36207\n" +
+                "-80.128351,25.955404\n" +
+                "-81.491729,28.386725\n" +
+                "-80.104383,26.122208\n" +
+                "-80.142671,25.958025\n" +
+                "-80.128351,25.955403\n" +
+                "-82.510796,27.540516\n" +
+                "-84.080793,33.980651\n" +
+                "-81.55391,30.184654\n" +
+                "-118.016353,34.104601\n" +
+                "-117.576026,34.110408\n" +
+                "113.392747,22.981579\n" +
+                "-119.732667,39.527135\n" +
+                "-84.287354,33.907686\n" +
+                "145.735405,15.150408\n" +
+                "113.392182,22.917437\n" +
+                "113.392224,22.917394\n" +
+                "-105.004751,39.554863\n" +
+                "-119.166897,34.163878\n" +
+                "-97.042481,32.968185\n" +
+                "-0.128544,51.525525\n" +
+                "-74.365611,40.540369\n" +
+                "113.392631,22.981589\n" +
+                "-74.554987,40.907923\n" +
+                "-73.130388,40.865565\n" +
+                "-74.17127,40.65954\n" +
+                "-74.334746,40.547832\n" +
+                "-74.002978,40.759209\n" +
+                "-117.852745,33.852574\n" +
+                "113.392721,22.981697\n" +
+                "-74.037737,40.727023\n" +
+                "111,22\n" +
+                "-77.17348,38.774803\n" +
+                "-77.174867,38.774532\n" +
+                "-77.220235,38.918008\n" +
+                "-77.219779,38.917977\n" +
+                "113.392039,22.917224\n" +
+                "-54.608215,-16.472348\n" +
+                "-61.915014,-10.893926\n" +
+                "-38.907076,-12.245805\n" +
+                "-46.811803,-23.208086\n" +
+                "-46.617272,-23.555077\n" +
+                "-43.177372,-22.512528\n" +
+                "-77.267596,38.611135\n" +
+                "-118.360533,34.229339\n" +
+                "-115.169034,36.051693\n" +
+                "-115.168847,36.056273\n" +
+                "-115.169005,36.056192\n" +
+                "113.392616,22.981579\n" +
+                "-118.011984,33.747111\n" +
+                "-81.450357,28.475563\n" +
+                "-82.39038,28.190882\n" +
+                "-81.560594,28.441274\n" +
+                "-81.392169,28.444729\n" +
+                "-80.274972,27.240639\n" +
+                "-87.206867,30.474804\n" +
+                "-80.724341,35.370627\n" +
+                "-80.275152,27.242981\n" +
+                "-80.719451,35.367911\n" +
+                "-87.207584,30.474648\n" +
+                "-82.980867,40.145788\n" +
+                "113.392422,22.917043\n" +
+                "-118.309381,34.096314\n" +
+                "-117.69474,34.087077\n" +
+                "-82.956676,42.548853\n" +
+                "-81.644474,26.208243\n" +
+                "-81.868739,26.601567\n" +
+                "-81.794257,26.169435\n" +
+                "-7.840661,37.034955\n" +
+                "-7.637642,37.130394\n" +
+                "-7.945027,37.029384\n" +
+                "-8.249007,37.087889\n" +
+                "-80.197911,25.799352\n" +
+                "-80.12096,25.943221\n" +
+                "-122.417479,37.636554\n" +
+                "120.350352,22.622136\n" +
+                "-71.613017,42.355307\n" +
+                "-71.834082,42.202213\n" +
+                "-71.201856,42.746776\n" +
+                "-71.067989,41.877483\n" +
+                "-71.584786,42.338639\n" +
+                "-71.584702,42.338476\n" +
+                "-70.940058,42.553752\n" +
+                "-71.514564,43.001086\n" +
+                "-117.614111,33.963204\n" +
+                "-80.076458,26.700722\n" +
+                "-80.175353,26.619524\n" +
+                "-80.167004,26.618373\n" +
+                "-80.167105,26.618394\n" +
+                "-80.111696,26.618608\n" +
+                "-82.444572,38.420662\n" +
+                "-93.433452,44.862823\n" +
+                "-93.126942,44.96338\n" +
+                "-93.377535,45.09619\n" +
+                "-122.079086,37.393601\n" +
+                "-121.97972,37.372081\n" +
+                "-121.306967,38.776415\n" +
+                "-112.393779,33.638479\n" +
+                "-121.260276,38.611617\n" +
+                "-121.268991,38.018874\n" +
+                "-118.133621,34.068239\n" +
+                "-81.786374,41.336373\n" +
+                "-80.659794,41.021111\n" +
+                "-119.06077,34.21602\n" +
+                "-119.060053,34.216159\n" +
+                "-111.885523,33.544822\n" +
+                "-121.949255,38.269044\n" +
+                "-122.878144,45.157105\n" +
+                "-87.55959,41.702866\n" +
+                "-117.236076,32.801025\n" +
+                "-81.361078,41.657446\n" +
+                "-80.751726,41.214624\n" +
+                "-87.641586,41.853902\n" +
+                "-117.907234,33.987544\n" +
+                "-117.911392,33.805007\n" +
+                "-118.555262,34.238457\n" +
+                "-118.027374,33.7657\n" +
+                "-88.27376,41.800911\n" +
+                "-84.379809,33.916722\n" +
+                "-86.376107,30.376896\n" +
+                "-117.065957,33.071125\n" +
+                "-117.320549,33.123089\n" +
+                "-117.065865,33.071069\n" +
+                "-117.33028,33.178116\n" +
+                "-116.967897,32.624118\n" +
+                "-116.968255,32.804879\n" +
+                "-117.085991,32.629922\n" +
+                "-117.066674,33.071759\n" +
+                "-116.704738,32.840804\n" +
+                "-116.70598,32.840407\n" +
+                "-117.321671,33.126269\n" +
+                "-85.668618,42.792107\n" +
+                "-85.671066,42.809978\n" +
+                "-71.093211,42.462135\n" +
+                "-70.990086,41.641248\n" +
+                "-70.716197,41.968933\n" +
+                "-70.716396,41.972128\n" +
+                "-80.305822,26.010673\n" +
+                "-118.076858,34.099519\n" +
+                "-118.088657,34.080204\n" +
+                "-121.928869,37.695217\n" +
+                "-121.844542,37.699135\n" +
+                "-122.878002,42.345146\n" +
+                "-93.325076,44.880759\n" +
+                "-92.478528,44.003817\n" +
+                "-111.890009,40.697807\n" +
+                "-84.650279,38.995754\n" +
+                "113.39236,22.917268\n" +
+                "-77.146967,39.02464\n" +
+                "-93.951591,44.18286\n" +
+                "-93.263914,45.1248\n" +
+                "-93.02323,45.031451\n" +
+                "-75.655317,41.458838\n" +
+                "-75.652955,41.459418\n" +
+                "-75.123565,40.140291\n" +
+                "-76.933683,40.222769\n" +
+                "-87.693884,41.950241\n" +
+                "-120.433275,34.951781\n" +
+                "-84.217202,31.617213\n" +
+                "-76.287873,36.849199\n" +
+                "-115.164289,36.141098\n" +
+                "-119.695541,36.806879\n" +
+                "-119.680127,36.736545\n" +
+                "-106.588285,35.140141\n" +
+                "-111.610898,40.16554\n" +
+                "-87.794292,41.748285\n" +
+                "-87.847435,41.619121\n" +
+                "-73.920905,40.751934\n" +
+                "-115.197256,36.127916\n" +
+                "-115.199121,36.129366\n" +
+                "-93.171609,45.013036\n" +
+                "-82.172902,29.158571\n" +
+                "-80.647937,28.081448\n" +
+                "-91.607039,41.693984\n" +
+                "-96.069192,41.266578\n" +
+                "-97.205371,32.82634\n" +
+                "-97.494424,35.232164\n" +
+                "-93.738961,32.518979\n" +
+                "-95.635791,30.394019\n" +
+                "-121.187153,38.64297\n";
+//        String[] laArr = laStr.split("\\n");
+        
+
+        String addStr = "-80.127714,25.955181:Miami-Dade, Florida, United States\n" +
+                "-80.244328,26.244963:Spring Circle Drive, Broward, Florida, United States\n" +
+                "-80.322943,25.868225:Palmetto Expressway, Hialeah, Florida, United States\n" +
+                "-80.333225,25.645918:Miami-Dade, Florida, United States\n" +
+                "-80.142757,25.957812:Miami-Dade, Florida, United States\n" +
+                "-80.365384,25.787479:Miami-Dade, Florida, United States\n" +
+                "-80.247484,26.240933:Broward, Florida, United States\n" +
+                "-80.237363,25.958205:Miami-Dade, Florida, United States\n" +
+                "-80.336566,26.006578:201 SW 145th Terrace, Broward, Florida, United States\n" +
+                "-82.725138,27.791522:22nd Avenue North, St. Petersburg, Florida, United States\n" +
+                "-80.14672,25.947551:Northeast 186th Street, Miami-Dade, Florida, United States\n" +
+                "-82.732037,27.79326:2468 Tyrone Boulevard North, St. Petersburg, Florida, United States\n" +
+                "-80.143727,25.958121:Miami-Dade, Florida, United States\n" +
+                "-80.310041,25.913599:Main Street, Miami-Dade, Florida, United States\n" +
+                "-80.127714,25.955181:Miami-Dade, Florida, United States\n" +
+                "-80.23849,25.956545:Miami-Dade, Florida, United States\n" +
+                "-80.323004,25.865907:Palmetto Expressway, Hialeah, Florida, United States\n" +
+                "-81.494663,28.386985:Orange, Florida, United States\n" +
+                "-81.488929,28.395474:Orange, Florida, United States\n" +
+                "-80.369312,25.780731:Dolphin Expressway, Miami-Dade, Florida, United States\n" +
+                "-81.33871,28.804041:Seminole, Florida, United States\n" +
+                "-81.476665,28.452999:Turkey Lake Road, Orange, Florida, United States\n" +
+                "-81.339111,28.803329:Seminole, Florida, United States\n" +
+                "-80.128351,25.955404:Miami-Dade, Florida, United States\n" +
+                "-81.341074,28.804355:Seminole, Florida, United States\n" +
+                "-81.491729,28.386725:Orange, Florida, United States\n" +
+                "-80.104383,26.122208:South Atlantic Boulevard, Fort Lauderdale, Florida, United States\n" +
+                "-81.502327,28.36207:Orange, Florida, United States\n" +
+                "-82.510796,27.540516:Manatee, Florida, United States\n" +
+                "-84.080793,33.980651:Gwinnett, Georgia, United States\n" +
+                "-81.55391,30.184654:Jacksonville, Florida, United States\n" +
+                "-118.016353,34.104601:Hempstead Avenue, Los Angeles, California, United States\n" +
+                "113.392747,22.981579:广东省广州市番禺区\n" +
+                "-80.142671,25.958025:Miami-Dade, Florida, United States\n" +
+                "-117.576026,34.110408:Haven Avenue, Rancho Cucamonga, San Bernardino, California, United States\n" +
+                "-84.287354,33.907686:DeKalb, Georgia, United States\n" +
+                "113.392182,22.917437:广东省广州市番禺区蚬涌南西街\n" +
+                "-119.732667,39.527135:East Glendale Avenue, Washoe, Nevada, United States\n" +
+                "-80.128351,25.955403:Miami-Dade, Florida, United States\n" +
+                "145.735405,15.150408:Saipan, Northern Mariana Islands\n" +
+                "-105.004751,39.554863:West Plaza Drive, Douglas, Colorado, United States\n" +
+                "-97.042481,32.968185:Tarrant, Texas, United States\n" +
+                "-74.365611,40.540369:Middlesex, New Jersey, United States\n" +
+                "113.392631,22.981589:广东省广州市番禺区\n" +
+                "-119.166897,34.163878:San Simeon Avenue, Ventura, California, United States\n" +
+                "113.392224,22.917394:广东省广州市番禺区蚬涌南西街\n" +
+                "-0.128544,51.525525:Tavistock Square, London, England\n" +
+                "-74.554987,40.907923:Morris, New Jersey, United States\n" +
+                "-74.002978,40.759209:12th Avenue, New York, United States\n" +
+                "-73.130388,40.865565:Suffolk, New York, United States\n" +
+                "113.392721,22.981697:广东省广州市番禺区\n" +
+                "111,22:广东省茂名市高州市\n" +
+                "-74.334746,40.547832:Middlesex, New Jersey, United States\n" +
+                "-117.852745,33.852574:La Palma Avenue, Anaheim, California, United States\n" +
+                "-74.17127,40.65954:Union, New Jersey, United States\n" +
+                "-74.037737,40.727023:Jersey City, New Jersey, United States\n" +
+                "-77.17348,38.774803:Fairfax, Virginia, United States\n" +
+                "113.392039,22.917224:广东省广州市番禺区蚬涌南西街\n" +
+                "-77.220235,38.918008:Fairfax, Virginia, United States\n" +
+                "-54.608215,-16.472348:Mato Grosso, Brazil\n" +
+                "-77.174867,38.774532:Fairfax, Virginia, United States\n" +
+                "-38.907076,-12.245805:Rua Artêmia Pires de Freitas, Bahia, Brazil\n" +
+                "-46.811803,-23.208086:Sao Paulo, Brazil\n" +
+                "-46.617272,-23.555077:Rua Barão de Jaguara, Sao Paulo, Brazil\n" +
+                "-61.915014,-10.893926:Avenida das Seringueiras, Rondonia, Brazil\n" +
+                "-77.219779,38.917977:Tysons Corner Center, Fairfax, Virginia, United States\n" +
+                "-43.177372,-22.512528:Rua Aureliano Coutinho, Rio de Janeiro, Brazil\n" +
+                "-118.360533,34.229339:Los Angeles, California, United States\n" +
+                "-115.168847,36.056273:East Warm Springs Road, Clark, Nevada, United States\n" +
+                "-115.169034,36.051693:Clark, Nevada, United States\n" +
+                "-77.267596,38.611135:Prince William, Virginia, United States\n" +
+                "-115.169005,36.056192:East Warm Springs Road, Clark, Nevada, United States\n" +
+                "-118.011984,33.747111:Orange, California, United States\n" +
+                "-81.560594,28.441274:Iron Mountain Trail, Orange, Florida, United States\n" +
+                "-82.39038,28.190882:Pasco, Florida, United States\n" +
+                "-81.392169,28.444729:Orange, Florida, United States\n" +
+                "-81.450357,28.475563:Orlando, Florida, United States\n" +
+                "-80.274972,27.240639:Martin, Florida, United States\n" +
+                "113.392616,22.981579:广东省广州市番禺区\n" +
+                "-87.206867,30.474804:Grande Drive, Escambia, Florida, United States\n" +
+                "-80.724341,35.370627:Cabarrus, North Carolina, United States\n" +
+                "-80.275152,27.242981:Martin, Florida, United States\n" +
+                "-80.719451,35.367911:Cabarrus, North Carolina, United States\n" +
+                "-87.207584,30.474648:Escambia, Florida, United States\n" +
+                "-82.980867,40.145788:Polaris Pkwy, Delaware, Ohio, United States\n" +
+                "-117.69474,34.087077:San Bernardino, California, United States\n" +
+                "-118.309381,34.096314:Los Angeles, California, United States\n" +
+                "-82.956676,42.548853:Macomb, Michigan, United States\n" +
+                "-81.644474,26.208243:19th Street Southwest, Collier, Florida, United States\n" +
+                "113.392422,22.917043:广东省广州市番禺区蚬涌南东街\n" +
+                "-81.868739,26.601567:4125 Cleveland Avenue, Lee, Florida, United States\n" +
+                "-81.794257,26.169435:Collier, Florida, United States\n" +
+                "-7.840661,37.034955:Faro, Portugal\n" +
+                "-8.249007,37.087889:Faro, Portugal\n" +
+                "-80.197911,25.799352:Northwest 23rd Street, Miami, Florida, United States\n" +
+                "-80.12096,25.943221:Collins Avenue, Miami-Dade, Florida, United States\n" +
+                "-7.637642,37.130394:Faro, Portugal\n" +
+                "-71.613017,42.355307:601 Donald Lynch Boulevard, Middlesex, Massachusetts, United States\n" +
+                "-7.945027,37.029384:Faro, Portugal\n" +
+                "-71.834082,42.202213:Worcester, Massachusetts, United States\n" +
+                "120.350352,22.622136:台湾省高雄市苓雅区\n" +
+                "-122.417479,37.636554:San Mateo, California, United States\n" +
+                "-71.067989,41.877483:Bristol, Massachusetts, United States\n" +
+                "-71.584786,42.338639:Middlesex, Massachusetts, United States\n" +
+                "-70.940058,42.553752:Essex, Massachusetts, United States\n" +
+                "-71.584702,42.338476:Middlesex, Massachusetts, United States\n" +
+                "-71.201856,42.746776:Rockingham, New Hampshire, United States\n" +
+                "-80.175353,26.619524:Palm Beach, Florida, United States\n" +
+                "-71.514564,43.001086:Hillsborough, New Hampshire, United States\n" +
+                "-117.614111,33.963204:San Bernardino, California, United States\n" +
+                "-80.167004,26.618373:Palm Beach, Florida, United States\n" +
+                "-80.167105,26.618394:Palm Beach, Florida, United States\n" +
+                "-80.076458,26.700722:Palm Beach, Florida, United States\n" +
+                "-82.444572,38.420662:4th Avenue, Cabell, West Virginia, United States\n" +
+                "-93.433452,44.862823:Hennepin, Minnesota, United States\n" +
+                "-93.377535,45.09619:Brooklyn Boulevard, Hennepin, Minnesota, United States\n" +
+                "-93.126942,44.96338:Dale Street, Saint Paul, Minnesota, United States\n" +
+                "-80.111696,26.618608:Lake Worth Road, Palm Beach, Florida, United States\n" +
+                "-121.97972,37.372081:Mead Avenue, Santa Clara, California, United States\n" +
+                "-112.393779,33.638479:West Bell Road, Maricopa, Arizona, United States\n" +
+                "-118.133621,34.068239:N Atlantic Boulevard, Los Angeles, California, United States\n" +
+                "-122.079086,37.393601:Castro Street, Mountain View, California, United States\n" +
+                "-121.306967,38.776415:Galilee Road, Placer, California, United States\n" +
+                "-121.260276,38.611617:Sacramento, California, United States\n" +
+                "-121.268991,38.018874:Stockton, California, United States\n" +
+                "-81.786374,41.336373:Cuyahoga, Ohio, United States\n" +
+                "-80.659794,41.021111:Mahoning, Ohio, United States\n" +
+                "-119.06077,34.21602:Ventura, California, United States\n" +
+                "-119.060053,34.216159:Ventura, California, United States\n" +
+                "-111.885523,33.544822:Maricopa, Arizona, United States\n" +
+                "-122.878144,45.157105:Marion, Oregon, United States\n" +
+                "-87.55959,41.702866:Chicago, Illinois, United States\n" +
+                "-117.236076,32.801025:1886 Garnet Avenue, San Diego, California, United States\n" +
+                "-121.949255,38.269044:Solano, California, United States\n" +
+                "-80.751726,41.214624:Trumbull, Ohio, United States\n" +
+                "-87.641586,41.853902:South Jefferson Street, Chicago, Illinois, United States\n" +
+                "-81.361078,41.657446:Lake, Ohio, United States\n" +
+                "-118.555262,34.238457:Los Angeles, California, United States\n" +
+                "-117.911392,33.805007:South Clementine Street, Anaheim, California, United States\n" +
+                "-88.27376,41.800911:Kane, Illinois, United States\n" +
+                "-84.379809,33.916722:Fulton, Georgia, United States\n" +
+                "-117.907234,33.987544:East Via Amorosa, Los Angeles, California, United States\n" +
+                "-117.065957,33.071125:San Diego, California, United States\n" +
+                "-118.027374,33.7657:Allison Circle, Orange, California, United States\n" +
+                "-117.320549,33.123089:800 Palomar Airport Rd, Carlsbad, California, United States\n" +
+                "-86.376107,30.376896:Old Highway 98, Walton, Florida, United States\n" +
+                "-117.33028,33.178116:2525 El Camino Real, Carlsbad, California, United States\n" +
+                "-117.065865,33.071069:San Diego, California, United States\n" +
+                "-116.967897,32.624118:Chula Vista, California, United States\n" +
+                "-116.968255,32.804879:San Diego, California, United States\n" +
+                "-117.085991,32.629922:Chula Vista, California, United States\n" +
+                "-116.704738,32.840804:Willows Road, San Diego, California, United States\n" +
+                "-116.70598,32.840407:Willows Road, San Diego, California, United States\n" +
+                "-117.066674,33.071759:San Diego, California, United States\n" +
+                "-85.668618,42.792107:Kent, Michigan, United States\n" +
+                "-85.671066,42.809978:Kent, Michigan, United States\n" +
+                "-71.093211,42.462135:Middlesex, Massachusetts, United States\n" +
+                "-70.990086,41.641248:Bristol, Massachusetts, United States\n" +
+                "-70.716197,41.968933:Plymouth, Massachusetts, United States\n" +
+                "-117.321671,33.126269:Paseo Del Norte, Carlsbad, California, United States\n" +
+                "-70.716396,41.972128:Plymouth, Massachusetts, United States\n" +
+                "-118.076858,34.099519:Los Angeles, California, United States\n" +
+                "-121.928869,37.695217:Alameda, California, United States\n" +
+                "-118.088657,34.080204:East Valley Boulevard, Los Angeles, California, United States\n" +
+                "-121.844542,37.699135:Alameda, California, United States\n" +
+                "-80.305822,26.010673:Broward, Florida, United States\n" +
+                "-122.878002,42.345146:Jackson, Oregon, United States\n" +
+                "-93.325076,44.880759:Hennepin, Minnesota, United States\n" +
+                "113.39236,22.917268:广东省广州市番禺区蚬涌南东街\n" +
+                "-92.478528,44.003817:Olmsted, Minnesota, United States\n" +
+                "-111.890009,40.697807:Salt Lake, Utah, United States\n" +
+                "-84.650279,38.995754:Boone, Kentucky, United States\n" +
+                "-93.02323,45.031451:Ramsey, Minnesota, United States\n" +
+                "-77.146967,39.02464:Montgomery, Maryland, United States\n" +
+                "-93.951591,44.18286:Premiere Drive, Blue Earth, Minnesota, United States\n" +
+                "-75.652955,41.459418:Lackawanna, Pennsylvania, United States\n" +
+                "-75.123565,40.140291:Montgomery, Pennsylvania, United States\n" +
+                "-75.655317,41.458838:Lackawanna, Pennsylvania, United States\n" +
+                "-76.933683,40.222769:Cumberland, Pennsylvania, United States\n" +
+                "-93.263914,45.1248:Anoka, Minnesota, United States\n" +
+                "-87.693884,41.950241:Chicago, Illinois, United States\n" +
+                "-120.433275,34.951781:Town Center East, Santa Barbara, California, United States\n" +
+                "-76.287873,36.849199:Norfolk, Virginia, United States\n" +
+                "-84.217202,31.617213:Dougherty, Georgia, United States\n" +
+                "-119.695541,36.806879:Fresno, California, United States\n" +
+                "-115.164289,36.141098:Clark, Nevada, United States\n" +
+                "-119.680127,36.736545:Fresno, California, United States\n" +
+                "-106.588285,35.140141:Albuquerque, New Mexico, United States\n" +
+                "-87.794292,41.748285:79th Street, Cook, Illinois, United States\n" +
+                "-111.610898,40.16554:South Main Street, Utah, United States\n" +
+                "-73.920905,40.751934:42 Place, New York, United States\n" +
+                "-87.847435,41.619121:Cook, Illinois, United States\n" +
+                "-115.197256,36.127916:Pioneer Avenue, Paradise, Nevada, United States\n" +
+                "-115.199121,36.129366:Arville Street, Paradise, Nevada, United States\n" +
+                "-91.607039,41.693984:Johnson, Iowa, United States\n" +
+                "-96.069192,41.266578:Omaha, Nebraska, United States\n" +
+                "-80.647937,28.081448:1700 West New Haven Avenue, Brevard, Florida, United States\n" +
+                "-82.172902,29.158571:Marion, Florida, United States\n" +
+                "-97.205371,32.82634:Northeast Loop, Tarrant, Texas, United States\n" +
+                "-93.171609,45.013036:Ramsey, Minnesota, United States\n" +
+                "-97.494424,35.232164:36th Avenue Northwest, Cleveland, Oklahoma, United States\n" +
+                "-93.738961,32.518979:Bossier, Louisiana, United States\n" +
+                "-95.635791,30.394019:Montgomery, Texas, United States\n" +
+                "-121.187153,38.64297:Sacramento, California, United States";
+//        String[] addArr = addStr.split("\\n");
+
+        Pattern pattern = Pattern.compile("\\n");
+        String[] laArr = pattern.split(laStr, 0);
+        String[] addArr = pattern.split(addStr, 0);
+
+
+        // 例子数据
+//        String[] la = {"-80.127714,25.955181", "-80.333225,25.645918", "-80.142757,25.957812", "-80.322943,25.868225", "-80.244328,26.244963"};
+//        String[] addr = {"-80.127714,25.955181:Miami-Dade, Florida, United States",
+//                "-80.244328,26.244963:Spring Circle Drive, Broward, Florida, United States",
+//                "-80.322943,25.868225:Palmetto Expressway, Hialeah, Florida, United States",
+//                "-80.333225,25.645918:Miami-Dade, Florida, United States",
+//                "-80.142757,25.957812:Miami-Dade, Florida, United States"};
+
+        // 调用方法进行顺序匹配
+        String[] strings = matchStrings(laArr, addArr);
+
+        // 打印匹配后的结果
+        for (String s : strings) {
+            System.out.println(s);
+        }
+    }
+
+    // 方法实现
+    public static String[] matchStrings(String[] laArr, String[] addArr) {
+        Map<String, String> map = new HashMap<>();
+
+        // 构建经纬度到地址的映射关系
+        for (String s : addArr) {
+            String[] parts = s.split(":");
+            if (parts.length == 2) {
+                map.put(parts[0], parts[1]);
+            }
+        }
+
+        // 将地址信息按照a的顺序重新排列
+        for (int i = 0; i < laArr.length; i++) {
+            String address = map.get(laArr[i]);
+            if (address != null) {
+                addArr[i] = laArr[i] + ":" + address;
+            }
+        }
+        return addArr;
+    }
+}

Diff do ficheiro suprimidas por serem muito extensas
+ 27 - 0
src/test/java/com/szwl/model/utils/usaEquipment/formatUtils.java