增加范围值

aidex-system/src/main/java/com/aidex/common/app/server/impl/AppService.java

@@ -96,19 +96,24 @@ public class AppService implements IAppService {
         Integer inStopTime = Integer.valueOf(ConfigUtils.getConfigByKey("pull.in.time").getConfigValue());
         // 停靠速度
         Integer stopSpeed = Integer.valueOf(ConfigUtils.getConfigByKey("stop.speed").getConfigValue());
+        // 停靠误差范围
+        Integer stopRadius = Integer.valueOf(ConfigUtils.getConfigByKey("stop.ship.radius").getConfigValue());
 
         // 查找未经过该站点的船只
         SysShipExtendVO noSiteShip = null;
         for (SysShipExtendVO sysShipExtendVO : sysShipExtendVOS) {
-            if(direction && CalcDist.gps2d(Double.valueOf(wharf.getLat()),Double.valueOf(wharf.getLng()),Double.valueOf(sysShipExtendVO.getLat()),Double.valueOf(sysShipExtendVO.getLon())) <= 0){
+            if(direction && CalcDist.gps2d(Double.valueOf(wharf.getLat()),Double.valueOf(wharf.getLng()),Double.valueOf(sysShipExtendVO.getLat()),Double.valueOf(sysShipExtendVO.getLon())) <= Double.valueOf(stopRadius)){
                 noSiteShip = sysShipExtendVO;
                 break;
             }
-            if(!direction && CalcDist.gps2d(Double.valueOf(sysShipExtendVO.getLat()),Double.valueOf(sysShipExtendVO.getLon()),Double.valueOf(wharf.getLat()),Double.valueOf(wharf.getLng())) <= 0){
+            if(!direction && CalcDist.gps2d(Double.valueOf(sysShipExtendVO.getLat()),Double.valueOf(sysShipExtendVO.getLon()),Double.valueOf(wharf.getLat()),Double.valueOf(wharf.getLng())) <= Double.valueOf(stopRadius)){
                 noSiteShip = sysShipExtendVO;
                 break;
             }
         }
+
+
+
         if(noSiteShip == null)
             throw new SysException(8221,"当前运行船只已全部经过该站点！暂无船只！请等待发船");
         SysShipResVO sysShipResVO = new SysShipResVO();
@@ -117,11 +122,11 @@ public class AppService implements IAppService {
         sysShipResVO.setMy(wharf);
 
         Long defaultSpeed = 0L;
-        if(sysShipResVO.getTravel() == 1L)
+        if(sysShipResVO.getTravel() == 1L) {
             defaultSpeed = Long.valueOf(ConfigUtils.getConfigByKey("forward.default.speed").getConfigValue());
-        else
+        }else {
             defaultSpeed = Long.valueOf(ConfigUtils.getConfigByKey("reverse.default.speed").getConfigValue());
-
+        }
         // 停靠时间
         Long awaitTime = 0L;
         Double stopDist = 0.0;