进站逻辑判断

ljq
1 parent 839283e5
Showing 4 changed files with 28 additions and 5 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/gpsdata_v2/cache/GpsCacheData.java
src/main/java/com/bsth/data/zndd/outer_car/Ordehttp.java
src/main/java/com/bsth/data/zndd/outer_car/OrderListThread.java
@@ -208,7 +208,7 @@ public class XDApplication implements CommandLineRunner {
         //智能调度
         sexec.scheduleWithFixedDelay(ZnddtwoThread, 30, 60, TimeUnit.SECONDS);
         //响应式公交自动对接订单
-        sexec.scheduleWithFixedDelay(orderListThread, 60, 60 * 30, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(orderListThread, 120, 60 * 30, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
@@ -258,7 +258,7 @@ public class XDApplication implements CommandLineRunner {
         //智能调度
         sexec.scheduleWithFixedDelay(ZnddtwoThread, 30, 60, TimeUnit.SECONDS);
         //响应式公交自动对接订单
-        sexec.scheduleWithFixedDelay(orderListThread, 60, 60 * 30, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(orderListThread, 120, 60 * 30, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         //dayOfSchedule.dataRecovery();
 package com.bsth.data.gpsdata_v2.cache;
+import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.entity.StationRoute;
 import com.bsth.data.gpsdata_v2.entity.trail.GpsExecTrail;
 import com.bsth.data.gpsdata_v2.utils.CircleQueue;
-import com.google.common.collect.ArrayListMultimap;
+import com.bsth.entity.Line;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -134,8 +135,29 @@ public class GpsCacheData {
         if(gs.isEnd())
             return 0;
+        Boolean hx = false;
+        //判断是否为环线
+        Line line = BasicData.nbbm2LineMap.get(gps.getNbbm());
+        if (line.getLinePlayType() == 1)
+            hx = true;
+        else {
+            //已经确认都是双向或者双环线获取站点路由
+            List<StationRoute> upRoute = GeoCacheData.getStationRoute(line.getLineCode(), 0); //上行
+            List<StationRoute> downRoute = GeoCacheData.getStationRoute(line.getLineCode(), 0); //下行
+            String  up1= upRoute.get(0).getCode(),down1= downRoute.get(0).getCode(),
+                    up2= upRoute.get(upRoute.size()-1).getCode(),down2 =downRoute.get(downRoute.size() - 1).getCode();
+            if (up1.equals(up2) && down1.equals(down2))
+                hx = true;
+
+        }
         Set<String> set = new HashSet<>();
         for(GpsEntity g : gs.getSrs()){
+            //清除经过的起点站和终点站 只保留中途站用于判断 //只判断环线
+            StationRoute r = GeoCacheData.getRouteCode(g);
+            if (hx && (r.getMark().equals("E") || r.getMark().equals("B"))){
+                continue;
+            }
+
             if(g.getInstation() == 1)
                 set.add(g.getStation().getName());
         }
@@ -63,7 +63,8 @@ public class Ordehttp {
             headers.put("token",token);
             StringBuilder sb = HttpClientUtils.post(urll, jsonBody,headers);
             JSONObject obj = JSON.parseObject(sb.toString());
-            mapList= JSON.parseArray(obj.getString("data"), Map.class);
+            if (obj.getString("data") != null)
+                mapList= JSON.parseArray(obj.getString("data"), Map.class);
         }catch (Exception e){
             logger.error("历史订单获取失败-",e);
         }
@@ -91,7 +91,7 @@ public class OrderListThread extends Thread{
                     List ls = new ArrayList();
                     for (Map m : list) {
                         //同一线路并且订单结束
-                        if (t.getValue().contains(m.get("AreaName").toString())) {
+                        if (m.get("AreaName") != null && t.getValue().contains(m.get("AreaName").toString())) {
                             if (Integer.parseInt(m.get("TravelStatus").toString()) == 3)
                                 ls.add(m);
                         }