1.

王通
1 parent 1eb15613
Showing 1 changed file with 12 additions and 5 deletions
src/main/java/com/bsth/service/impl/LsStationRouteServiceImpl.java
@@ -374,8 +374,8 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
                         if ("r".equals(stationRoute.getShapedType())) {
                             org.geolatte.geom.Point center = stationRoute.getStation().getCenterPointWgs();
                             if (GeoUtils.getDistance(p, new Point(center.getPositionN(0).getCoordinate(0), center.getPositionN(0).getCoordinate(1))) <= stationRoute.getRadius()) {
-                                if (indexes.size() == 0 || !indexes.get(indexes.size() - 1).endsWith("-" + j)) {
-                                    indexes.add(stationRoute.getStationCode() + "-" + j);
+                                if (indexes.size() == 0 || !indexes.get(indexes.size() - 1).endsWith(String.format("-%d", j))) {
+                                    indexes.add(String.format("%s-%d", stationRoute.getStationCode(), j));
                                 }
                                 break;
                             }
@@ -387,8 +387,8 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
                             }
                             com.bsth.util.Geo.Polygon polygon1 = new com.bsth.util.Geo.Polygon(polygonPoint);
                             if (GeoUtils.isPointInPolygon(p, polygon1)) {
-                                if (indexes.size() == 0 || !indexes.get(indexes.size() - 1).endsWith("-" + j)) {
-                                    indexes.add(stationRoute.getStationCode() + "-" + j);
+                                if (indexes.size() == 0 || !indexes.get(indexes.size() - 1).endsWith(String.format("-%d", j))) {
+                                    indexes.add(String.format("%s-%d", stationRoute.getStationCode(), j));
                                 }
                                 break;
                             }
@@ -400,8 +400,12 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
         List<String> specialStations = new ArrayList<>();
         result.put("data", specialStations);
         for (int i = 0;i < stationRoutes.size();) {
+            if (indexes.size() == 0) {
+                break;
+            }
             String lastMatch = null;
-            for (int j = 0;j < indexes.size();j++) {
+            int j = 0;
+            for (;j < indexes.size();j++) {
                 String index = indexes.get(j), suffix = String.format("-%d", i);
                 if (index.endsWith(suffix) || isCircularRoute && i == stationRoutes.size() - 1 && index.endsWith("-0")) {
                     lastMatch = index;
@@ -410,6 +414,9 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
                     specialStations.add(String.format("%s, %s", index, lastMatch));
                 }
             }
+            if (j == indexes.size()) {
+                break;
+            }
         }
         return result;