1

ljq
1 parent 1eb98e1e
Showing 2 changed files with 17 additions and 11 deletions
src/main/java/com/bsth/data/gpsdata_v2/cache/GpsCacheData.java
src/main/java/com/bsth/data/zndd/outer_car/OrderListThread.java
@@ -135,7 +135,7 @@ public class GpsCacheData {
         if(gs.isEnd())
             return 0;
-        Boolean hx = false;
+/*        Boolean hx = false;
         //判断是否为环线
         Line line = BasicData.nbbm2LineMap.get(gps.getNbbm());
         if (line.getLinePlayType() == 1)
@@ -149,15 +149,15 @@ public class GpsCacheData {
             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());
         }
@@ -236,8 +236,8 @@ public class OrderListThread extends Thread{
                 for (Map lmp : SchMap) {
                     Boolean bcstatus = true;
                     ScheduleRealInfo sch = new ScheduleRealInfo();
-                    Long startTime = Long.valueOf(lmp.get("startDate").toString()) - (10 * 60 * 1000);
-                    Long startTime1 = Long.valueOf(lmp.get("startDate").toString()) + (10 * 60 *1000);
+                    Long startTime = Long.valueOf(lmp.get("startDate").toString()) - (60 * 60 * 1000);
+                    Long startTime1 = Long.valueOf(lmp.get("startDate").toString()) + (60 * 60 *1000);
                     String cl = lmp.get("car_plate").toString();
                     String LpName = null;
                     for (ScheduleRealInfo sr : schList) {
@@ -326,7 +326,7 @@ public class OrderListThread extends Thread{
             //公司 和 分公司名称
             sch.setGsBm(line.getCompany());
             sch.setFgsBm(line.getBrancheCompany());
-            sch.setBcType("region");
+            sch.setBcType("normal");
             sch.setXlBm(lineCode);
             sch.setXlName(line.getName());
             sch.setLpName(LpName !=null ? LpName : "临1");//临加路牌
@@ -340,8 +340,8 @@ public class OrderListThread extends Thread{
             sch.setFcsjAll(dispatchTime);
             sch.setZdsj(hhmm.print(closeTime));
             sch.setZdsjT(closeTime);
-            sch.setFcsjActualAll(dispatchTime);
-            sch.setZdsjActualAll(closeTime);
+/*            sch.setFcsjActualAll(dispatchTime);
+            sch.setZdsjActualAll(closeTime);*/
             sch.setRemarks(map.get("remark").toString());
         }catch (Exception e){
             logger.error("转换sch异常--",e);
@@ -359,10 +359,16 @@ public class OrderListThread extends Thread{
             if (sch.getRemarks() != null && sch.getRemarks().contains("调整")){
                 return sch;
             }
+
             //初始到站时间直接到下一班次10分钟之前了 不用在修改班次了
-            /*Long closeTime = Long.parseLong(map.get("endDate").toString());
+            Long closeTime = Long.valueOf(map.get("endDate").toString());
+            Long dispatchTime = Long.valueOf(map.get("startDate").toString());
+            //只有当前时间超过订单结束时间才会补上实到和实发
+            if (closeTime < System.currentTimeMillis()){
+                sch.setFcsjActualAll(dispatchTime);
+                sch.setZdsjActualAll(closeTime);
+            }
             sch.setZdsj(hhmm.print(closeTime));
-            sch.setZdsjActualAll(closeTime);*/
             sch.setRemarks(map.get("remark").toString());
         }catch (Exception e){
             logger.error("转换sch异常--",e);