update

潘钊
1 parent b41e4c1a
Showing 25 changed files with 363 additions and 493 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/controller/realcontrol/DeviceRevertLineController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/realcontrol/DeviceRevertLine.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/repository/realcontrol/DeviceRevertLineRepository.java
src/main/java/com/bsth/service/realcontrol/DeviceRevertLineService.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/buffer/GetSchedulePlanThread.java
src/main/java/com/bsth/service/realcontrol/buffer/ScheduleBuffer.java
src/main/java/com/bsth/service/realcontrol/impl/DeviceRevertLineServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/vehicle/BorrowCenter.java
src/main/java/com/bsth/vehicle/directive/thread/RevertLineThread.java
src/main/java/com/bsth/vehicle/gpsdata/GpsArrivalStationThread.java
src/main/resources/application-dev.properties
src/main/resources/static/pages/control/line/child_pages/child_task.html
src/main/resources/static/pages/control/line/child_pages/vehicAndper_adjust.html
src/main/resources/static/pages/control/line/css/lineControl.css
src/main/resources/static/pages/control/line/js/data.js
@@ -8,7 +8,6 @@ import com.bsth.util.DateUtils;
 import com.bsth.vehicle.common.CommonRefreshThread;
 import com.bsth.vehicle.directive.thread.DirectivePersistenceThread;
 import com.bsth.vehicle.directive.thread.FirstScheduleIssuedThread;
-import com.bsth.vehicle.directive.thread.RevertLineThread;
 import com.bsth.vehicle.gpsdata.GpsArrivalStationThread;
 import com.bsth.vehicle.gpsdata.GpsRefreshThread;
 import org.slf4j.Logger;
@@ -34,7 +33,7 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
 	SecurityMetadataSourceService invocationSecurityMetadataSourceService;
-	public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(8);
+	public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(7);
 	@Autowired
 	GpsRefreshThread gpsRefreshThread;
@@ -50,8 +49,6 @@ public class StartCommand implements CommandLineRunner{
 	GpsArrivalStationThread gpsArrivalStationThread;
 	@Autowired
 	FirstScheduleIssuedThread firstScheduleIssuedThread;
-	@Autowired
-	RevertLineThread revertLineThread;
 	@Override
 	public void run(String... arg0){
@@ -105,11 +102,6 @@ public class StartCommand implements CommandLineRunner{
 			 */
 			//scheduler.scheduleWithFixedDelay(firstScheduleIssuedThread, 60 , 60 * 2, TimeUnit.SECONDS);
-			/**
-			 * 还车线程（2分钟运行一次）
-			 * 将借出的车刷回原线路
-			 */
-			scheduler.scheduleWithFixedDelay(revertLineThread, 60 , 60 * 2 , TimeUnit.SECONDS);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-package com.bsth.controller.realcontrol;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.realcontrol.DeviceRevertLine;
-
-@RestController
-@RequestMapping("/deviceRevert")
-public class DeviceRevertLineController extends BaseController<DeviceRevertLine, Integer>{
-
-}
@@ -56,8 +56,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
 	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
-			@RequestParam String dfsj) {
-		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj);
+			@RequestParam String dfsj, String clZbh, String jsy, String spy) {
+		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, clZbh, jsy, spy);
 	}
 	/**
@@ -127,9 +127,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * 售票员 @throws
 	 */
 	@RequestMapping(value = "/adjust", method = RequestMethod.POST)
-	public Map<String, Object> adjust(@RequestParam Long id, @RequestParam String nbbm, @RequestParam String jsy,
-			@RequestParam String spy) {
-		return scheduleRealInfoService.adjust(id, nbbm, jsy, spy);
+	public Map<String, Object> adjust(@RequestParam Long id, String nbbm, String jsy,
+			String spy, Integer revertLine, Integer borrowLine, String borrowTimeStr, String revertTimeStr) {
+		return scheduleRealInfoService.adjust(id, nbbm, jsy, spy, revertLine, borrowLine, borrowTimeStr, revertTimeStr);
 	}
 	/**
-package com.bsth.entity.realcontrol;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 
- * @ClassName: VehicleRevertLine
- * @Description: TODO(设备线路还原)
- * @author PanZhao
- * @date 2016年7月6日 下午5:31:13
- *
- */
-@Entity
-@Table(name = "bsth_v_line_revert")
-public class DeviceRevertLine {
-
-	@Id
-	@GeneratedValue
-	private Integer id;
-
-	/**
-	 * 车辆内部编码
-	 */
-	private String nbbm;
-
-	/**
-	 * 出借时间
-	 */
-	private Long borrowTime;
-
-	private String borrowTimeStr;
-
-	/**
-	 * 出借线路
-	 */
-	private String borrowLine;
-
-	/**
-	 * 归还时间
-	 */
-	private Long revertTime;
-
-	private String revertTimeStr;
-
-	/**
-	 * 归还线路
-	 */
-	private String revertLine;
-	
-	/** 创建日期 */
-	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-	private Date createDate;
-
-	/** 状态 1 已还车 */
-	private Integer status;
-	
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getNbbm() {
-		return nbbm;
-	}
-
-	public void setNbbm(String nbbm) {
-		this.nbbm = nbbm;
-	}
-
-	public String getBorrowLine() {
-		return borrowLine;
-	}
-
-	public void setBorrowLine(String borrowLine) {
-		this.borrowLine = borrowLine;
-	}
-
-	public String getRevertLine() {
-		return revertLine;
-	}
-
-	public void setRevertLine(String revertLine) {
-		this.revertLine = revertLine;
-	}
-
-	public Long getBorrowTime() {
-		return borrowTime;
-	}
-
-	public void setBorrowTime(Long borrowTime) {
-		this.borrowTime = borrowTime;
-	}
-
-	public String getBorrowTimeStr() {
-		return borrowTimeStr;
-	}
-
-	public void setBorrowTimeStr(String borrowTimeStr) {
-		this.borrowTimeStr = borrowTimeStr;
-	}
-
-	public Long getRevertTime() {
-		return revertTime;
-	}
-
-	public void setRevertTime(Long revertTime) {
-		this.revertTime = revertTime;
-	}
-
-	public String getRevertTimeStr() {
-		return revertTimeStr;
-	}
-
-	public void setRevertTimeStr(String revertTimeStr) {
-		this.revertTimeStr = revertTimeStr;
-	}
-
-	public Date getCreateDate() {
-		return createDate;
-	}
-
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-}
@@ -151,8 +151,8 @@ public class ScheduleRealInfo {
 	public void addRemarks(String remark){
 		String newRem = this.getRemarks();
-		if(null == newRem)
-			newRem = "";
+		if(null == newRem || newRem.trim() == "")
+			return;
 		newRem += remark + ";";
 		this.setRemarks(newRem);
 	}
@@ -587,6 +587,28 @@ public class ScheduleRealInfo {
 	/**
 	 * 
 	 * @Title: setFcsjActualAll 
+	 * @Description: TODO(设置实际发车时间) 
+	 * @throws
+	 */
+	public void setFcsjActualAll(Long t){
+		this.fcsjActualTime = t;
+		this.fcsjActual = sdfHHmm.format(new Date(t));
+	}
+	
+	/**
+	 * 
+	 * @Title: setFcsjActualAll 
+	 * @Description: TODO(设置实际终点时间) 
+	 * @throws
+	 */
+	public void setZdsjActualAll(Long t){
+		this.zdsjActualTime = t;
+		this.zdsjActual = sdfHHmm.format(new Date(t));
+	}
+	
+	/**
+	 * 
+	 * @Title: setFcsjActualAll 
 	 * @Description: TODO(设置实际终点时间) 
 	 * @throws
 	 */
-package com.bsth.repository.realcontrol;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import com.bsth.entity.realcontrol.DeviceRevertLine;
-import com.bsth.repository.BaseRepository;
-
-@Repository
-public interface DeviceRevertLineRepository extends BaseRepository<DeviceRevertLine, Integer>{
-
-	@Query(value = "select dr from DeviceRevertLine dr where dr.revertTime > ?1 and dr.revertTime < ?2 and dr.status = ?3")
-	public List<DeviceRevertLine> findByDateAndStatus(Long st, Long et, Integer status);
-}
-package com.bsth.service.realcontrol;
-
-import com.bsth.entity.realcontrol.DeviceRevertLine;
-import com.bsth.service.BaseService;
-
-public interface DeviceRevertLineService extends BaseService<DeviceRevertLine, Integer>{
-
-}
@@ -14,7 +14,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Collection<ScheduleRealInfo>> findByLines(String lines);
-	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj);
+	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj,String nbbm,String jsy,String spy);
 	Map<String, Object> destroy(String idsStr, int spaceAdjust, String  remarks, String reason, int spaceNum);
@@ -26,7 +26,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String, String>> sreachVehic(String nbbm);
-	Map<String, Object> adjust(Long id, String nbbm, String jsy, String spy);
+	Map<String, Object> adjust(Long id, String nbbm, String jsy, String spy, Integer revertLine, Integer borrowLine, String borrowTimeStr, String revertTimeStr);
 	/**
 	 * 
@@ -48,13 +48,16 @@ public class GetSchedulePlanThread  extends Thread{
 			ScheduleBuffer.clear();
 			List<ScheduleRealInfo>  realList = null;
-			String dateStr = sdfyyyyMMdd.format(new Date());
+			String dateStr = /*sdfyyyyMMdd.format(new Date())*/"2016-06-01";
 			Date cDate = sdfyyyyMMdd.parse(dateStr);
 			//查询数据库是否有今日排班
 			int size = scheduleRealInfoRepository.countByDate(cDate);
 			if(size > 0){
 				//从数据库恢复当日排班
 				realList = scheduleRealInfoRepository.findByDate(cDate);
+				logger.info("从数据库恢复当日排班 " + realList.size());
+				//写入缓存
+				ScheduleBuffer.init(realList);
 			}
 			else{
 				List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(cDate);
@@ -75,13 +78,12 @@ public class GetSchedulePlanThread  extends Thread{
 					item.setSpId(item.getId());
 					item.setId(id ++);//设置ID
 				}
+				
+				//写入缓存
+				ScheduleBuffer.init(realList);
 				//入库
 				new BatchSaveUtils<ScheduleRealInfo>().saveList(realList, ScheduleRealInfo.class);
 			}
-			
-			//写入缓存
-			ScheduleBuffer.init(realList);
-			
 			logger.info("获取当天实际排班计划数量：" + realList.size());
 		}catch(Exception e){
 			logger.error("",e);
@@ -108,7 +108,7 @@ public class ScheduleBuffer {
 				calcArrDateQd(code);
 			//计算班次平均间隔
-			//calcAvgSpace();
+			calcAvgSpace();
 		}catch(Exception e){
 			logger.error("缓存排班数据失败...", e);
 			return -1;
@@ -148,7 +148,6 @@ public class ScheduleBuffer {
 			schSpaceMap.put(lineCode + "_0", sumUp / upList.size());
 			schSpaceMap.put(lineCode + "_1", sumDown / downList.size());
 		}
-		System.out.println(schSpaceMap);
 	}
 	public static int put(ScheduleRealInfo sch){
@@ -161,7 +160,10 @@ public class ScheduleBuffer {
 		vehLinkedMap.get(zbh).add(sch);
 		//重新排序
-		Collections.sort(vehLinkedMap.get(zbh), scheduleComparator);
+		//Collections.sort(vehLinkedMap.get(zbh), scheduleComparator);
+		
+		//重新计算应到时间
+		calcArrDateQd(vehLinkedMap.get(zbh));
 		return 0;
 	}
@@ -213,6 +215,23 @@ public class ScheduleBuffer {
 		return finishLinkedMap.get(nbbm) == null ? 0 : finishLinkedMap.get(nbbm).size();
 	}
+	public static void calcArrDateQd(List<ScheduleRealInfo> list){
+		//排序
+		Collections.sort(list, scheduleComparator);
+		int len = list.size();
+		if(len == 0)
+			return;
+		
+		ScheduleRealInfo prve = list.get(0), curr;
+		for(int i = 1; i < len; i ++){
+			curr = list.get(i);
+			if(prve.getZdzName().equals(curr.getQdzName()))
+				curr.setQdzArrDateJH(prve.getZdsj());
+			
+			prve = curr;
+		}
+	}
+	
 	/**
 	 * 
 	 * @Title: calcArrDateQd 
@@ -229,25 +248,8 @@ public class ScheduleBuffer {
 		//链接班次
 		Set<String> set = map.keySet();
-		List<ScheduleRealInfo> subList;
-		int len;
-		ScheduleRealInfo prve, curr;
 		for(String k : set){
-			subList = map.get(k);
-			//排序
-			Collections.sort(subList, scheduleComparator);
-			len = subList.size();
-			if(len == 0)
-				continue;
-			
-			prve = subList.get(0);
-			for(int i = 1; i < len; i ++){
-				curr = subList.get(i);
-				if(prve.getZdzName().equals(curr.getQdzName()))
-					curr.setQdzArrDateJH(prve.getZdsj());
-				
-				prve = curr;
-			}
+			calcArrDateQd(map.get(k));
 		}
 	}
-package com.bsth.service.realcontrol.impl;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import com.bsth.entity.realcontrol.DeviceRevertLine;
-import com.bsth.service.impl.BaseServiceImpl;
-import com.bsth.service.realcontrol.DeviceRevertLineService;
-
-@Service
-public class DeviceRevertLineServiceImpl extends BaseServiceImpl<DeviceRevertLine, Integer> implements DeviceRevertLineService  {
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-	
-	SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm")
-					,sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd")
-					,sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-	
-	@Override
-	public Map<String, Object> save(DeviceRevertLine t) {
-		
-		String dateStr = sdfyyyyMMdd.format(new Date());
-		
-		try {
-			t.setStatus(0);
-			t.setBorrowTime(sdfyyyyMMddHHmm.parse(dateStr + " " + t.getBorrowTimeStr()).getTime());
-			t.setRevertTime(sdfyyyyMMddHHmm.parse(dateStr + " " + t.getRevertTimeStr()).getTime());
-		} catch (ParseException e) {
-			logger.error("", e);
-		}
-		return super.save(t);
-	}
-}
 package com.bsth.service.realcontrol.impl;
 import java.io.File;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -34,6 +35,7 @@ import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
 import com.bsth.util.ReportUtils;
+import com.bsth.vehicle.BorrowCenter;
 import com.bsth.vehicle.common.CommonMapped;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
@@ -52,6 +54,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Autowired
 	CarConfigInfoRepository carConfigInfoRepository;
+	
+	@Autowired
+	BorrowCenter borrowCenter;
 	Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -71,7 +76,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	}
 	@Override
-	public Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj) {
+	public Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String nbbm,String jsy,String spy) {
 		Map<String, Object> map = new HashMap<>();
 		try {
@@ -79,12 +84,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			schedule.setDfsjT(sdfMinute.parse(sdfMonth.format(new Date()) + " " + dfsj).getTime());
 			schedule.setDfsj(dfsj);
 			schedule.addRemarks(remarks + ";");
+			schedule.setClZbh(nbbm);
+			if(jsy != null && jsy.indexOf("/") != -1){
+				String[] jsyArray = jsy.split("/");
+				schedule.setjGh(jsyArray[0]);
+				schedule.setjName(jsyArray[1]);
+			}
+			
+			if(spy != null && spy.indexOf("/") != -1){
+				String[] spyArray = spy.split("/");
+				schedule.setsGh(spyArray[0]);
+				schedule.setsName(spyArray[1]);
+			}
+			
 			// 持久化到数据库
 			ScheduleBuffer.persistentList.add(schedule);
 			map.put("status", ResponseCode.SUCCESS);
-			map.put("dfsj", dfsj);
-			map.put("remarks", schedule.getRemarks());
+			map.put("t", schedule);
 		} catch (Exception e) {
 			logger.error("", e);
 			map.put("status", ResponseCode.ERROR);
@@ -246,6 +263,19 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		// 加入缓存
 		ScheduleBuffer.put(t);
+		//将该临加之后的班次作为更新返回页面
+		List<ScheduleRealInfo> list = ScheduleBuffer.vehLinkedMap.get(t.getClZbh())
+				,rsList = null;
+		
+		for(ScheduleRealInfo sch : list){
+			if(sch.getId() == t.getId())
+				rsList = new ArrayList<>();
+			
+			if(rsList != null)
+				rsList.add(sch);
+		}
+		
+		map.put("ups", rsList);
 		return map;
 	}
@@ -281,10 +311,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	}
 	@Override
-	public Map<String, Object> adjust(Long id, String nbbm, String jsy, String spy) {
+	public Map<String, Object> adjust(Long id, String nbbm, String jsy, String spy, Integer revertLine, Integer borrowLine, String borrowTimeStr, String revertTimeStr) {
 		// 班次
 		ScheduleRealInfo schedule = ScheduleBuffer.pkSchedulMap.get(id);
+		String rq = sdfMonth.format(new Date());
 		// 换车
 		if (!StringUtils.isBlank(nbbm)) {
 			adjustCar(schedule, nbbm);
@@ -302,6 +333,26 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			tempArray = Splitter.on("/").splitToList(spy);
 			adjustConductor(schedule, tempArray.get(0), tempArray.get(1));
 		}
+		
+		if(borrowLine != null && borrowTimeStr != null){
+			try {
+				//跨线路借车
+				Long t = sdfMinute.parse(rq + " " + borrowTimeStr).getTime();
+				borrowCenter.put(nbbm, borrowLine, 0, t);
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+		}
+		
+		if(revertLine != null && revertTimeStr != null){
+			//定时还车
+			try {
+				Long t = sdfMinute.parse(rq + " " + revertTimeStr).getTime();
+				borrowCenter.put(nbbm, revertLine, 1, t);
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+		}
 		ScheduleBuffer.persistentList.add(schedule);
@@ -394,7 +445,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			sch.setFcsjActualTime(sdfMinute.parse(rq + " " + fcsjActual).getTime());
 			sch.setFcsjActual(fcsjActual);
 			sch.addRemarks(remarks);
-
+			//改变状态
+			if(sch.getZdsjActual() == null)
+				sch.setStatus(1);
+			
 			ScheduleBuffer.persistentList.add(sch);
 			rs.put("status", ResponseCode.SUCCESS);
 			rs.put("t", sch);
@@ -524,8 +578,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				sch.setBcType(bcType);
 				sch.setClZbh(clZbh);
 				sch.setFcsjAll(fcsj);
-				sch.setFcsjActualAll(fcsjActual);
-				sch.setZdsjActualAll(zdsjActual);
+				if(null == fcsjActual){
+					sch.setFcsjActual(null);
+					sch.setFcsjActualTime(null);
+				}
+				else
+					sch.setFcsjActualAll(fcsjActual);
+				
+				if(null == zdsjActual){
+					sch.setZdsjActual(null);
+					sch.setZdsjActualTime(null);
+				}
+				else
+					sch.setZdsjActualAll(zdsjActual);
+				
 				sch.setjGh(jsy[0]);
 				sch.setjName(jsy[1]);
 				sch.setsGh(spy[0]);
+package com.bsth.vehicle;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.bsth.vehicle.directive.service.DirectiveService;
+
+/**
+ * 
+ * @ClassName: BorrowCenter 
+ * @Description: TODO(借还车中心^_^) 
+ * @author PanZhao
+ * @date 2016年7月12日 下午11:49:36 
+ *
+ */
+@Component
+public class BorrowCenter {
+
+	ScheduledExecutorService scheduler;
+	
+	@Autowired
+	DirectiveService directiveService;
+	
+	Logger logger = LoggerFactory.getLogger(BorrowCenter.class);
+	
+	/**
+	 * 构造函数
+	 */
+	public BorrowCenter() {
+		scheduler = Executors.newScheduledThreadPool(15);
+	}
+	
+	/**
+	 * 
+	 * @Title: put 
+	 * @param @param nbbm 车辆
+	 * @param @param lineCode 线路代码
+	 * @param @param type    0 借出，1归还
+	 * @param @param time    时间
+	 * @throws
+	 */
+	public void put(String nbbm, Integer lineCode, int type, Long time){
+		Long t = System.currentTimeMillis();
+		if(t >= time){
+			//立即执行
+			new Thread(new ChangeThread(nbbm, lineCode, type)).start();
+		}
+		else{
+			//定时线程
+			scheduler.schedule(new ChangeThread(nbbm, lineCode, type), (time - t) / 1000, TimeUnit.SECONDS);
+		}
+	}
+	
+	public class ChangeThread implements Runnable{
+		String nbbm;
+		Integer lineCode;
+		int type;
+		
+		public ChangeThread(String nbbm, Integer lineCode, int type) {
+			this.nbbm = nbbm;
+			this.lineCode = lineCode;
+			this.type = type;
+		}
+
+		@Override
+		public void run() {
+			logger.info("nbbm " + (type==0?"借出":"归还") + "线路代码 " + lineCode);
+			directiveService.lineChange(nbbm, lineCode);
+		}
+	}
+}
-package com.bsth.vehicle.directive.thread;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.bsth.entity.realcontrol.DeviceRevertLine;
-import com.bsth.repository.realcontrol.DeviceRevertLineRepository;
-import com.bsth.vehicle.directive.service.DirectiveService;
-
-/**
- * 
- * @ClassName: DeviceRevertLineThread 
- * @Description: TODO(设备线路还原线程， 将借出的车还原到原线路) 
- * @author PanZhao
- * @date 2016年7月7日 上午11:30:38 
- *
- */
-@Component
-public class RevertLineThread extends Thread{
-	
-	@Autowired
-	DeviceRevertLineRepository deviceRevertLineRepository;
-	
-	@Autowired
-	DirectiveService directiveService;
-	
-	@Override
-	public void run() {
-		Long et = System.currentTimeMillis()
-			,st = et - (1000 * 60 * 5);
-		
-		List<DeviceRevertLine> list = deviceRevertLineRepository.findByDateAndStatus(st, et, 0);
-		
-		if(list.size() == 0)
-			return;
-		
-		int code;
-		for(DeviceRevertLine revertLine : list){
-			//还车
-			code = directiveService.lineChange(revertLine.getNbbm(), Integer.parseInt(revertLine.getRevertLine()));
-			
-			if(code == 0){
-				//改变状态
-				revertLine.setStatus(1);
-				deviceRevertLineRepository.save(revertLine);
-			}
-		}
-	}
-}
@@ -9,7 +9,6 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -50,7 +49,7 @@ public class GpsArrivalStationThread extends Thread{
 	@Autowired
 	RealControlSocketHandler socketHandler;
-	private static int diff = 1000 * 60 * 20;
+	Long diff = 1000 * 60 * 20L;
 	@Override
 	public void run() {
@@ -70,8 +69,7 @@ public class GpsArrivalStationThread extends Thread{
 		List<ArrivalInfo> rsList = null;
 		LinkedList<ScheduleRealInfo> linked = null;
-		int[] status;
-		ScheduleRealInfo sch;
+		ArrivalInfo[] status;
 		for(String nbbm : set){
 			rsList = GpsArrivalDataBuffer.pops(nbbm);
 			//和该车辆未执行班次进行匹配
@@ -79,28 +77,43 @@ public class GpsArrivalStationThread extends Thread{
 			if(null == linked || linked.size() == 0)
 				continue;
-			//第一个未执行班次
-			sch = linked.getFirst();
-			//匹配结果
-			status = match(rsList, sch);
-		}
-		//
-		/*GpsArrivalDataBuffer.putAll(list);
-		//实际到离站和计划排班相匹配
-		
-		Set<String> keySet = GpsArrivalDataBuffer.allMap.keySet();
-		System.out.println("开始...");
-		List<ScheduleRealInfo> schList;
-		for(String key : keySet){
-			schList = extractSched(ScheduleBuffer.vehLinkedMap.get(key));
-			if(null != schList)
-				match(GpsArrivalDataBuffer.allMap.get(key), schList);
+			try{
+				for(ScheduleRealInfo schedule : linked){
+					//匹配结果
+					status = match(rsList, schedule);
+					
+					//发车
+					if(status[0] != null){
+						//班次状态改为正在执行
+						schedule.setStatus(1);
+						ScheduleBuffer.persistentList.add(schedule);
+						//推送到页面
+						sendFcsj(schedule);
+						
+						rsList.remove(status[0]);
+					}
+					
+					//到达终点
+					if(status[1] != null){
+						//完成当前班次
+						ScheduleRealInfo nextSch = ScheduleBuffer.finishSch(schedule);
+						//到达终点，发送下一班次的调度指令
+						int finish = ScheduleBuffer.getFinishSchNo(nextSch.getClZbh());
+						directiveService.send60Dispatch(nextSch, finish);
+						//推送到页面
+						sendZdsj(schedule, nextSch, finish);
+						
+						rsList.remove(status[1]);
+					}
+				}
+			}catch(Exception e){
+				e.printStackTrace();
+			}
 		}
-		System.out.println("结束...");*/
 	}
-	public int[] match(List<ArrivalInfo> arrList, ScheduleRealInfo sch){
+	public ArrivalInfo[] match(List<ArrivalInfo> arrList, ScheduleRealInfo sch){
 		//进出分组
 		List<ArrivalInfo> in = new ArrayList<>(), out = new ArrayList<>();
 		for(ArrivalInfo arr : arrList){
@@ -109,95 +122,46 @@ public class GpsArrivalStationThread extends Thread{
 			else
 				out.add(arr);
 		}
-		int s1 = 0, s2 = 0;
+		ArrivalInfo a1 = null, a2 = null;
 		//匹配发车时间
-		if(sch.getFcsjActual() == null)
-			s1 = matchOut(arrList, sch);
+		if(sch.getFcsjActual() == null && sch.getFcsj() != null)
+			a1 = matchOut(out, sch);
 		//匹配终点时间
-		if(sch.getZdsjActual() == null)
-			s2 = matchIn(arrList, sch);
+		if(sch.getZdsjActual() == null && sch.getZdsj() != null)
+			a2 = matchIn(in, sch);
-		return new int[]{s1,s2};
+		return new ArrivalInfo[]{a1,a2};
 	}
-	public int matchOut(List<ArrivalInfo> arrList, ScheduleRealInfo sch){
-		
+	public ArrivalInfo matchOut(List<ArrivalInfo> arrList, ScheduleRealInfo sch){
+		Long space = /*ScheduleBuffer.schSpaceMap.get(sch.getXlBm() + "_" + sch.getXlDir())*/diff;
 		for(ArrivalInfo arr : arrList){
-			if(arr.getStopNo().equals(sch.getQdzCode())){
+			if(arr.getStopNo().equals(sch.getQdzCode())
+					&& Math.abs((arr.getTs() - sch.getFcsjT())) < space){
+				sch.setFcsjActualAll(arr.getTs());
+				
+				return arr;
 			}
 		}
-		return 0;
+		return null;
 	}
-	public int matchIn(List<ArrivalInfo> arrList, ScheduleRealInfo sch){
-		return 0;
-	}
-	
-	
-	/**
-	 * 
-	 * @Title: match 
-	 * @Description: TODO(实际和计划进行匹配) 
-	 * @param @param arrList 实际GPS到离站链表
-	 * @param @param schList 计划排班链表
-	 * @throws
-	 */
-	/*public void match(List<ArrivalInfo> arrList, List<ScheduleRealInfo> schList){
-		Iterator<ScheduleRealInfo> schIterator = schList.iterator();
-		
-		while(schIterator.hasNext())
-			match(schIterator.next(), arrList);
-	}*/
-	
-	
-	/*public void match(ScheduleRealInfo scInfo, List<ArrivalInfo> arrList){
+	public ArrivalInfo matchIn(List<ArrivalInfo> arrList, ScheduleRealInfo sch){
+		Long space = /*ScheduleBuffer.schSpaceMap.get(sch.getXlBm() + "_" + sch.getXlDir())*/diff;
 		for(ArrivalInfo arr : arrList){
-			match(scInfo, arr);
-		}
-	}*/
-	
-/*	public void match(ScheduleRealInfo scInfo, ArrivalInfo arr){
-		try{
-			//匹配起点
-			matchStart(scInfo, arr);
-			
-			//匹配终点
-			matchEnd(scInfo, arr);
-		}catch(Exception e){
-			e.printStackTrace();
-		}
-	}*/
-	
-	/**
-	 * 
-	 * @Title: matchStart 
-	 * @Description: TODO(匹配起点 出站时间) 
-	 * @param @param scInfo
-	 * @throws
-	 */
-	public void matchStart(ScheduleRealInfo scInfo, ArrivalInfo arr){
-		if(scInfo.getFcsjT() == null
-				|| arr.getInOut() != 1 || scInfo.getFcsjActual() != null)
-			return;
-		
-		Long ts = arr.getTs();
-		//起点站和发车时间比比较
-		if(scInfo.getQdzCode().equals(arr.getStopNo())
-				&& Math.abs(scInfo.getFcsjT() - ts) < diff){
-			scInfo.setFcsjActualTime(ts);
-			scInfo.setFcsjActual(sdf.format(ts));
-			
-			System.out.println("成功匹配一个起点...");
-			//班次状态改为正在执行
-			scInfo.setStatus(1);
-			ScheduleBuffer.persistentList.add(scInfo);
-			//推送到页面
-			sendFcsj(scInfo);
+			if(arr.getStopNo().equals(sch.getZdzCode())
+					&& Math.abs((arr.getTs() - sch.getZdsjT())) < space){
+				sch.setZdsjActualAll(arr.getTs());
+				
+				return arr;
+			}
 		}
+		return null;
 	}
+	
 	/**
 	 * @Title: sendFcsj 
 	 * @Description: TODO(推送发车信息) 
@@ -213,35 +177,6 @@ public class GpsArrivalStationThread extends Thread{
 	}
 	/**
-	 * 
-	 * @Title: matchEnd 
-	 * @Description: TODO(匹配终点 进站时间) 
-	 * @throws
-	 */
-	public void matchEnd(ScheduleRealInfo scInfo, ArrivalInfo arr){
-		if(scInfo.getZdsjT() == null
-				|| arr.getInOut() != 0 || scInfo.getZdsjActual() != null)
-			return;
-		
-		Long ts = arr.getTs();
-		//终点站和发车时间比较
-		if(scInfo.getZdzCode().equals(arr.getStopNo())
-				&& Math.abs(scInfo.getZdsjT() - ts) < diff){
-			scInfo.setZdsjActualTime(ts);
-			scInfo.setZdsjActual(sdf.format(ts));
-			
-			System.out.println("成功匹配一个终点...");
-			//完成当前班次
-			ScheduleRealInfo nextSch = ScheduleBuffer.finishSch(scInfo);
-			//到达终点，发送下一班次的调度指令
-			int finish = ScheduleBuffer.getFinishSchNo(nextSch.getClZbh());
-			directiveService.send60Dispatch(nextSch, finish);
-			//推送到页面
-			sendZdsj(scInfo, nextSch, finish);
-		}
-	}
-	
-	/**
 	 * @Title: sendFcsj 
 	 * @Description: TODO(推送到达终点时间) 
 	 * @param @param schedule    班次
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201:3306/control
+spring.datasource.url= jdbc:mysql://127.0.0.1:3306/control
 spring.datasource.username= root
-spring.datasource.password= 123456
+spring.datasource.password= panzhao
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -441,14 +441,18 @@ $(function(){
 		param.qdzName = searchStationName(route, param.qdzCode);
 		param.zdzName = searchStationName(route, param.zdzCode);
+		layer.msg('操作中...', {icon: 16,time:0});
 		$post('/realSchedule', param, function(rs){
 			var sch = rs.t;
 			//前端缓存更新
 			scheduleLineMap[param.xlBm][param.lpName].push(sch);
 			//刷新表格
 			_alone.addScheduleToTable(sch);
+			_alone.refreshScheduleArray(rs.ups);
+			
 			//关闭弹出层
 			layer.closeAll();
+			layer.alert('临加班次成功！',{icon:1, shift: 5});
 		});
 	});
@@ -192,13 +192,17 @@
 			//驾驶员
 			$.get('/realSchedule/driver', {lineCode: lineCode}, function(rs){
 				rs.splice(0, 0, placeholder);
-				initPinYinSelect2(wrap + ' select[name=jsy]', rs);
+				initPinYinSelect2(wrap + ' select[name=jsy]', rs, function(that){
+					that.val(schedul.jGh + '/' + schedul.jName).change();
+				});
 			});
 			//售票员
 			$.get('/realSchedule/conductor', {lineCode: lineCode}, function(rs){
 				rs.splice(0, 0, placeholder);
-				initPinYinSelect2(wrap + ' select[name=spy]', rs);
+				initPinYinSelect2(wrap + ' select[name=spy]', rs, function(that){
+					that.val(schedul.sGh + '/' + schedul.sName).change();
+				});
 			});
 		};
@@ -243,15 +247,14 @@
 				idArray.push($(this).data('id'));
 			});
+			if(!$("#borrowInfoPanel").is(":hidden")){
+				params.borrowLine = lineSelect.val();
+			}
 			syncSubmit(idArray, params ,function(){
+					layer.closeAll();
 					layer.msg('操作完成！');
 					//刷新表格
 					refreshMainList();
-					//提交借车信息 
-					if(!$("#borrowInfoPanel").is(":hidden")){
-						params.borrowLine = lineSelect.val();
-						$post('/deviceRevert', params);
-					}
 			});
 		}); 
 	});
@@ -1853,7 +1853,8 @@ a.task-item-success{
 }
 select.form-control.custom-val-error,
-input.form-control.custom-val-error{
+input.form-control.custom-val-error,
+.select2-selection.custom-val-error{
 	border: 1px solid #e75555;
   color: #e75555;
 }
@@ -159,6 +159,10 @@ var _data = (function(){
 		//根据设备号获取GPS
 		getGpsByDeviceId: function(deviceId){
 			return allGps[deviceId];
+		},
+		//获取所有GPS
+		findAllGps: function(){
+			return allGps;
 		}
 	};
@@ -176,9 +176,11 @@ var drawSvg = (function(){
 		//画出GPS点
 		drawVehicle: function(gpsArray){
-			
 			for(var i = 0, gps; gps = gpsArray[i ++];){
 				//drawGpsToSvg(gps, aloneSvgMapp[gps.lineId]);
+				
+				//暂时先清空重新画
+				homeSvgMapp[gps.lineId].select('g.gps-g-wrap').html('');
 				drawGpsToSvg(gps, homeSvgMapp[gps.lineId]);
 			}
@@ -59,12 +59,14 @@
 		 	//模拟图GPS刷新事件
 		 	$('#tab_home').on('gps_refresh', function(e, add, up){
-		 		//附加班次信息
-		 		addList = _data.attachSchedulInfo(add);
-		 		drawSvg.drawVehicle(addList);
+		 		//现在先每次全量画
+		 		var list = _data.findAllGps();
+		 		_data.attachSchedulInfo(list);
+		 		
+		 		drawSvg.drawVehicle(list);
 		 		//按线路分组
-		 		var listMap = groupByLine(addList);
+		 		var listMap = groupByLine(list);
 		 		console.log('listMap', listMap);
 		 		for(var key in listMap){
 					var htmlStr = template('home_table_temp', {list: listMap[key]});
@@ -205,15 +205,17 @@ var _menu = (function() {
 					$('#outgoAdjustForm select[name=clZbh]').select2({data: rs}).val(schedul.clZbh).change();
 				  });
-				  $('#outgoAdjustForm button.confirm').one('click', function(){
+				  $('#outgoAdjustForm button.confirm').on('click', function(){
+					  var check = customFormValidate('#outgoAdjustForm');
+					  if(!check)return;
 					  var params = $('#outgoAdjustForm').serializeJSON();
 					  $post('/realSchedule/outgoAdjust', params, function(rs){
 						  layer.close(index);
-						  schedul.dfsj = rs.dfsj;
-						  schedul.remarks = rs.remarks;
-						  _alone.refreshSchedule(schedul);
-						  layer.msg('调整成功！');
+						  if(rs.t){
+							  layer.msg('调整成功！'); 
+							  _alone.refreshSchedule(rs.t);
+						  }
 					  });
 				  });
 			  }
@@ -312,10 +314,8 @@ var _menu = (function() {
 				  $('.confirm', '#realOutgoAdjust').on('click', function(){
 					  var params = $('#realOutgoAdjust').serializeJSON();
 					  if(!params.fcsjActual){
-						  layer.msg('实发时刻不能为空');return;
-					  }
-					  if(!$.trim(params.remarks)){
-						  layer.msg('备注不能为空');return;
+						  layer.msg('实发时刻不能为空');
+						  return;
 					  }
 					  layer.close(index);
 					  $post('/realSchedule/realOutAdjust', params
@@ -478,14 +478,12 @@ var _menu = (function() {
 					});
 					//售票员
-					$.get('/realSchedule/conductor', {lineCode: schedul.xlBm}, function(rs){
-						initPinYinSelect2('#schinfoFineTune select[name=spy]' , rs, function(rs){
-							initPinYinSelect2('#outgoAdjustForm select[name=spy]' , rs, function(that){
-								//默认选中
-								that.val(schedul.sGh + '/' + schedul.sName).change();
-							});
+					 $.get('/realSchedule/conductor', {lineCode: schedul.xlBm}, function(rs){
+						initPinYinSelect2('#schinfoFineTune select[name=spy]' , rs, function(that){
+							//默认选中
+							that.val(schedul.sGh + '/' + schedul.sName).change();
 						});
-					});
+					 });
 					//车辆
 					$.get('/realSchedule/cars', {lineCode: schedul.xlBm}, function(rs){
 						$('#schinfoFineTune select[name=clZbh]').select2({data: rs}).val(schedul.clZbh).change();
@@ -502,10 +500,9 @@ var _menu = (function() {
 					//确定
 					$('#schinfoFineTune button.confirm').on('click', function(){
 						var params = $('form#schinfoFineTune').serializeJSON();
-						if(!$.trim(params.fcsj)){
-							layer.msg('计发时间不能为空！');
-							return;
-						}
+						
+						 if(!customFormValidate('form#schinfoFineTune'))return;
+						 
 						$post('/realSchedule/schInfoFineTune', params, function(rs){
 							layer.close(index);
 							if(rs.t)
@@ -542,5 +539,35 @@ var _menu = (function() {
 		layer.alert('服务器出现异常！', {icon: 2, title: '操作失败'});
 	}
+	/**
+	 * 自定义表单校验
+	 */
+	function customFormValidate(f){
+		var rs = true;
+		//所有可见的项
+		var es = $('input,select', f);
+		
+		for(var i = 0, e; e = es[i++];){
+			if($(e).attr('required') && ( $(e).val() == null || $(e).val() == '')){
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').addClass('custom-val-error');
+				else
+					$(e).addClass('custom-val-error');
+				rs = false;
+			}
+			else{
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').removeClass('custom-val-error');
+				else
+					$(e).removeClass('custom-val-error');
+			}
+		}
+		
+		if(!rs){
+			layer.alert('数据完整性校验失败，请检查输入项', {icon: 2, title: '操作失败',  shift: 5});    
+		}
+		return rs;
+	}
+	
 	return menuObject;
 })();
 \ No newline at end of file
@@ -149,7 +149,7 @@
 {{/if}}
 	<td class="hide-lt-1080" data-name="remarks">
-	{{if item.remarks != null}}
+	{{if item.remarks != null && item.length > 0}}
 		<a class="remarks-popover" href="javascript:;" data-toggle="popover" data-content="{{item.remarks}}" >备注...</a>
 	{{/if}}
 	</td>
@@ -236,7 +236,7 @@
 	<div class="form-custom-row">
    	 	<div class="item">
 			<span class="item-label" style="width: 80px;">车辆编码: </span>
-			<select class="form-control" value="{{clZbh}}"  name="clZbh"></select>
+			<select class="form-control" value="{{clZbh}}" required=1  name="clZbh"></select>
    	 	</div>
 		<div class="item">
 			<span class="item-label" style="width: 80px;">路&nbsp;牌: </span>
@@ -251,14 +251,14 @@
    	 	</div>
 		<div class="item">
 			<span class="item-label" style="width: 80px;">预发时刻: </span>
-	   	 	<input type="time" class="form-control" value="{{dfsj}}"  name="dfsj">
+	   	 	<input type="time" class="form-control" required=1 value="{{dfsj}}"  name="dfsj">
    	 	</div>
    	 </div>
      <div class="form-custom-row">
    	 	<div class="item">
 			<span class="item-label" style="width: 80px;">驾驶员: </span>
-			<select class="form-control" value="{{jName}}" name="jsy"></select>
+			<select class="form-control" value="{{jName}}" required=1 name="jsy"></select>
    	 	</div>
 		<div class="item">
 			<span class="item-label" style="width: 80px;">售票员: </span>
@@ -370,7 +370,7 @@
 	<div class="form-custom-row">
    	 	<div class="item">
 			<span class="item-label" style="width: 80px;">车辆编码: </span>
-			<select class="form-control" value="{{clZbh}}"  name="clZbh"></select>
+			<select class="form-control" value="{{clZbh}}"  name="clZbh" required=1></select>
    	 	</div>
 		<div class="item">
 			<span class="item-label" style="width: 80px;">路&nbsp;牌: </span>
@@ -381,18 +381,18 @@
 	<div class="form-custom-row">
    	 	<div class="item">
 			<span class="item-label" style="width: 80px;">驾驶员: </span>
-			<select class="form-control" value="{{jName}}" name="jsy"></select>
+			<select class="form-control" value="{{jName}}" name="jsy"  required=1></select>
    	 	</div>
 		<div class="item">
 			<span class="item-label" style="width: 80px;">售票员: </span>
-	   	 	<select class="form-control" value="{{sName}}"  name="spy"></select>
+	   	 	<select class="form-control" value="{{sName}}"  name="spy"  ></select>
    	 	</div>
    	 </div>
 	 <div class="form-custom-row">
    	 	<div class="item">
 			<span class="item-label" style="width: 80px;">计发时刻: </span>
-	   	 	<input type="time" class="form-control" value="{{fcsj}}" name="fcsj">
+	   	 	<input type="time" class="form-control" value="{{fcsj}}" name="fcsj"  required=1>
    	 	</div>
 		<div class="item">
 			<span class="item-label" style="width: 80px;">实际时刻: </span>
@@ -7,8 +7,8 @@
   <span class="log-item-text">{{data.nbbm}} {{text}}</span>
   <span class="log-item-time">{{dateStr}}</span>
   <span class="log-item-handle">
-  	<button type="button" class="btn blue btn-sm">同意</button>
-  	<button type="button" class="btn red btn-sm">不同意</button>
+  	<!--<button type="button" class="btn blue btn-sm">同意</button>
+  	<button type="button" class="btn red btn-sm">不同意</button>-->
   </span>
 </div>
 </script>
@@ -19,8 +19,8 @@
   <span class="log-item-text">执行班次  {{t.fcsj}}</span>
   <span class="log-item-time">{{dataStr}}</span>
   <span class="log-item-handle">
- 	<a href="javascript:;" class="font-blue-steel log-close">确定</a>
-	<a href="javascript:;" class="font-red">地图</a>
+ 	<!--<a href="javascript:;" class="font-blue-steel log-close">确定</a>
+	<a href="javascript:;" class="font-red">地图</a>-->
   </span>
 </div>
 </script>
@@ -30,8 +30,8 @@
   <span class="log-item-text">{{t.zdsjActual}} {{t.clZbh}} 到达 {{t.zdzName}};已完成 {{finish}} 个班次;下一发车时间 {{nt.fcsj}};由{{nt.qdzName}} 发往 {{nt.zdzName}};应到{{nt.zdsj}}</span>
   <span class="log-item-time">{{dataStr}}</span>
   <span class="log-item-handle">
-	<a href="javascript:;" class="font-blue-steel log-close">确定</a>
-	<a href="javascript:;" class="font-red">地图</a>
+	<!--<a href="javascript:;" class="font-blue-steel log-close">确定</a>
+	<a href="javascript:;" class="font-red">地图</a>-->
   </span>
 </div>
 </script>
 \ No newline at end of file