潘钊 / bsth_control · Commits

Commit c77172a1a55b8d529e8103e9aa1fa8351c24be00

Authored by ljq
1 parent 1eb98e1e
build: skipped

1

Inline Side-by-side
Showing 2 changed files with 17 additions and 11 deletions
src/main/java/com/bsth/data/gpsdata_v2/cache/GpsCacheData.java
  View file @c77172a
... ... @@ -135,7 +135,7 @@ public class GpsCacheData {
135 135 if(gs.isEnd())
136 136 return 0;
137 137  
138   - Boolean hx = false;
  138 +/* Boolean hx = false;
139 139 //判断是否为环线
140 140 Line line = BasicData.nbbm2LineMap.get(gps.getNbbm());
141 141 if (line.getLinePlayType() == 1)
... ... @@ -149,15 +149,15 @@ public class GpsCacheData {
149 149 if (up1.equals(up2) && down1.equals(down2))
150 150 hx = true;
151 151  
152   - }
  152 + }*/
153 153 Set<String> set = new HashSet<>();
154 154 for(GpsEntity g : gs.getSrs()){
155   - //清除经过的起点站和终点站 只保留中途站用于判断 //只判断环线
  155 + /* //清除经过的起点站和终点站 只保留中途站用于判断 //只判断环线
156 156 StationRoute r = GeoCacheData.getRouteCode(g);
157 157 if (hx && (r.getMark().equals("E") || r.getMark().equals("B"))){
158 158 continue;
159 159 }
160   -
  160 +*/
161 161 if(g.getInstation() == 1)
162 162 set.add(g.getStation().getName());
163 163 }
... ...
src/main/java/com/bsth/data/zndd/outer_car/OrderListThread.java
  View file @c77172a
... ... @@ -236,8 +236,8 @@ public class OrderListThread extends Thread{
236 236 for (Map lmp : SchMap) {
237 237 Boolean bcstatus = true;
238 238 ScheduleRealInfo sch = new ScheduleRealInfo();
239   - Long startTime = Long.valueOf(lmp.get("startDate").toString()) - (10 * 60 * 1000);
240   - Long startTime1 = Long.valueOf(lmp.get("startDate").toString()) + (10 * 60 *1000);
  239 + Long startTime = Long.valueOf(lmp.get("startDate").toString()) - (60 * 60 * 1000);
  240 + Long startTime1 = Long.valueOf(lmp.get("startDate").toString()) + (60 * 60 *1000);
241 241 String cl = lmp.get("car_plate").toString();
242 242 String LpName = null;
243 243 for (ScheduleRealInfo sr : schList) {
... ... @@ -326,7 +326,7 @@ public class OrderListThread extends Thread{
326 326 //公司 和 分公司名称
327 327 sch.setGsBm(line.getCompany());
328 328 sch.setFgsBm(line.getBrancheCompany());
329   - sch.setBcType("region");
  329 + sch.setBcType("normal");
330 330 sch.setXlBm(lineCode);
331 331 sch.setXlName(line.getName());
332 332 sch.setLpName(LpName !=null ? LpName : "临1");//临加路牌
... ... @@ -340,8 +340,8 @@ public class OrderListThread extends Thread{
340 340 sch.setFcsjAll(dispatchTime);
341 341 sch.setZdsj(hhmm.print(closeTime));
342 342 sch.setZdsjT(closeTime);
343   - sch.setFcsjActualAll(dispatchTime);
344   - sch.setZdsjActualAll(closeTime);
  343 +/* sch.setFcsjActualAll(dispatchTime);
  344 + sch.setZdsjActualAll(closeTime);*/
345 345 sch.setRemarks(map.get("remark").toString());
346 346 }catch (Exception e){
347 347 logger.error("转换sch异常--",e);
... ... @@ -359,10 +359,16 @@ public class OrderListThread extends Thread{
359 359 if (sch.getRemarks() != null && sch.getRemarks().contains("调整")){
360 360 return sch;
361 361 }
  362 +
362 363 //初始到站时间直接到下一班次10分钟之前了 不用在修改班次了
363   - /*Long closeTime = Long.parseLong(map.get("endDate").toString());
  364 + Long closeTime = Long.valueOf(map.get("endDate").toString());
  365 + Long dispatchTime = Long.valueOf(map.get("startDate").toString());
  366 + //只有当前时间超过订单结束时间才会补上实到和实发
  367 + if (closeTime < System.currentTimeMillis()){
  368 + sch.setFcsjActualAll(dispatchTime);
  369 + sch.setZdsjActualAll(closeTime);
  370 + }
364 371 sch.setZdsj(hhmm.print(closeTime));
365   - sch.setZdsjActualAll(closeTime);*/
366 372 sch.setRemarks(map.get("remark").toString());
367 373 }catch (Exception e){
368 374 logger.error("转换sch异常--",e);
... ...