计划和实际匹配，并调整部分包结构

潘钊
1 parent 4756d5b0
Showing 15 changed files with 228 additions and 153 deletions
pom.xml
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/realcontrol/ChildTaskPlan.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/security/WebSecurityConfig.java
src/main/java/com/bsth/service/realcontrol/GetSchedulePlanThread.java → src/main/java/com/bsth/service/realcontrol/buffer/GetSchedulePlanThread.java
src/main/java/com/bsth/service/realcontrol/ScheduleBuffer.java → src/main/java/com/bsth/service/realcontrol/buffer/ScheduleBuffer.java
src/main/java/com/bsth/service/realcontrol/SchedulePersistenceThread.java → src/main/java/com/bsth/service/realcontrol/buffer/SchedulePersistenceThread.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/util/BatchSaveUtils.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveServiceImpl.java
src/main/java/com/bsth/vehicle/gpsdata/buffer/GpsRealDataBuffer.java
@@ -115,6 +115,12 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        
+        <dependency>
+			<groupId>c3p0</groupId>
+			<artifactId>c3p0</artifactId>
+			<version>0.9.1.2</version>
+		</dependency>
  
 	</dependencies>
  
@@ -12,10 +12,11 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
  
 import com.bsth.security.SecurityMetadataSourceService;
-import com.bsth.service.realcontrol.GetSchedulePlanThread;
-import com.bsth.service.realcontrol.SchedulePersistenceThread;
+import com.bsth.service.realcontrol.buffer.GetSchedulePlanThread;
+import com.bsth.service.realcontrol.buffer.SchedulePersistenceThread;
 import com.bsth.vehicle.common.CommonRefreshThread;
 import com.bsth.vehicle.directive.DirectivePersistenceThread;
+import com.bsth.vehicle.gpsdata.GpsArrivalStationThread;
 import com.bsth.vehicle.gpsdata.GpsRefreshThread;
  
 /**
@@ -31,22 +32,20 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
 	SecurityMetadataSourceService invocationSecurityMetadataSourceService;
  
-	public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(5);
+	public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(6);
  
 	@Autowired
 	GpsRefreshThread gpsRefreshThread;
-	
 	@Autowired
 	GetSchedulePlanThread getSchedulePlanThread;
-	
 	@Autowired
 	CommonRefreshThread commonRefreshThread;
-	
 	@Autowired
 	DirectivePersistenceThread directivePersistenceThread;
-	
 	@Autowired
 	SchedulePersistenceThread SchedulePersistenceThread;
+	@Autowired
+	GpsArrivalStationThread gpsArrivalStationThread;
  
 	@Override
 	public void run(String... arg0){
@@ -57,20 +56,18 @@ public class StartCommand implements CommandLineRunner{
  
 			//GPS实时数据更新线程，每次执行完成4秒后开始下一次
 			scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 4, TimeUnit.SECONDS);
-			
 			//定时0点从计划排班表抓取当天实际排班
 			scheduler.scheduleAtFixedRate(getSchedulePlanThread
 					, 0//DateUtils.getTimesnight() + 5 - System.currentTimeMillis() / 1000
 					, 60 * 60 * 24, TimeUnit.SECONDS);
-			
 			//两分钟调度指令入库一次
 			scheduler.scheduleWithFixedDelay(directivePersistenceThread, 20, 60 * 1, TimeUnit.SECONDS);
-			
 			//两小时刷新一次对照数据
 			scheduler.scheduleWithFixedDelay(commonRefreshThread, 0, 60 * 60 * 2, TimeUnit.SECONDS);
-			
 			//一分钟持久化一次实际排班
 			scheduler.scheduleWithFixedDelay(SchedulePersistenceThread, 60 * 1, 60 * 1, TimeUnit.SECONDS);
+			//将实际到离站和排班计划进行匹配 12秒一次
+			//scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 20, 1200, TimeUnit.SECONDS);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -10,7 +10,6 @@ package com.bsth.common;
  */
 public class Constants {
  
-	
 	/**
 	 * 不需要拦截的资源
 	 */
@@ -21,6 +20,12 @@ public class Constants {
 	public static final String METRONIC_URL = "/metronic_v4.5.4/**";
 	public static final String LOGIN_FAILURE = "/user/loginFailure";
  
+	/**
+	 * 线调部分子页面不做拦截，便于浏览器缓存
+	 */
+	public static final String  XD_CHILD_PAGES = "/pages/control/line/child_pages/**";
+	public static final String XD_TEMPS = "/pages/control/line/temps/**";
+	
 	//车载网关上行接口
 	public static final String UPSTREAM_URL = "/control/upstream";
 }
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.vehicle.common.CommonMapped;
  
 @RestController
 @RequestMapping("/realSchedule")
@@ -54,4 +55,15 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> destroy(@RequestParam String idsStr,@RequestParam int spaceAdjust,@RequestParam String  remarks,@RequestParam String reason,@RequestParam  int spaceNum){
 		return scheduleRealInfoService.destroy(idsStr, spaceAdjust, remarks, reason, spaceNum);
 	}
+	
+	/**
+	 * 
+	 * @Title: carDeviceMapp 
+	 * @Description: TODO(获取车辆自编号和设备号对照，从缓存取) 
+	 * @throws
+	 */
+	@RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
+	public Map<String, String> carDeviceMapp(){
+		return CommonMapped.vehicDeviceBiMap.inverse();
+	}
 }
 package com.bsth.entity.realcontrol;
  
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.persistence.Table;
  
 /**
  * 
  * @ClassName: ChildTaskPlan
- * @Description: TODO(子任务计划)
+ * @Description: TODO(子任务)
  * @author PanZhao
  * @date 2016年6月20日 上午11:22:22
  *
  */
+@Entity
+@Table(name = "bsth_c_s_child_task")
 public class ChildTaskPlan {
  
+	@Id
+	@GeneratedValue
 	private Long id;
  
 	/**
-	 * 开始时间 HH:mm
+	 * 任务类型1
+	 * 正常，临加
 	 */
-	private String startTimeStr;
+	private String type1;
  
 	/**
-	 * 结束时间 HH:mm
+	 * 任务类型2
 	 */
-	private String endTimeStr;
+	private String type2;
  
 	/**
-	 * 任务类型
-	 */
-	private String type;
-
-	/**
-	 * 起点站名
+	 * 起点
 	 */
 	private String startStation;
  
 	/**
-	 * 终点站名
+	 * 终点
 	 */
 	private String endStation;
  
@@ -50,15 +54,32 @@ public class ChildTaskPlan {
 	private Float mileage;
  
 	/**
-	 * 备注
+	 * 开始时间 HH:mm
 	 */
-	private String remarks;
-	
+	private String startDate;
+
+	/**
+	 * 结束时间 HH:mm
+	 */
+	private String endDate;
+
 	/**
-	 * 主任务
+	 * 是否烂班
+	 */
+	private boolean destroy;
+
+	/**
+	 * 烂班原因
+	 */
+	private String destroyReason;
+
+	/**
+	 * 主排班计划
 	 */
 	@ManyToOne
-	private ScheduleRealInfo schedul;
+	private ScheduleRealInfo schedule;
+	
+	private String remarks;
  
 	public Long getId() {
 		return id;
@@ -68,28 +89,20 @@ public class ChildTaskPlan {
 		this.id = id;
 	}
  
-	public String getStartTimeStr() {
-		return startTimeStr;
-	}
-
-	public void setStartTimeStr(String startTimeStr) {
-		this.startTimeStr = startTimeStr;
-	}
-
-	public String getEndTimeStr() {
-		return endTimeStr;
+	public String getType1() {
+		return type1;
 	}
  
-	public void setEndTimeStr(String endTimeStr) {
-		this.endTimeStr = endTimeStr;
+	public void setType1(String type1) {
+		this.type1 = type1;
 	}
  
-	public String getType() {
-		return type;
+	public String getType2() {
+		return type2;
 	}
  
-	public void setType(String type) {
-		this.type = type;
+	public void setType2(String type2) {
+		this.type2 = type2;
 	}
  
 	public String getStartStation() {
@@ -124,19 +137,51 @@ public class ChildTaskPlan {
 		this.mileage = mileage;
 	}
  
-	public String getRemarks() {
-		return remarks;
+	public String getStartDate() {
+		return startDate;
 	}
  
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+
+	public String getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+
+	public boolean isDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(boolean destroy) {
+		this.destroy = destroy;
 	}
  
-	public ScheduleRealInfo getSchedul() {
-		return schedul;
+	public String getDestroyReason() {
+		return destroyReason;
 	}
  
-	public void setSchedul(ScheduleRealInfo schedul) {
-		this.schedul = schedul;
+	public void setDestroyReason(String destroyReason) {
+		this.destroyReason = destroyReason;
+	}
+
+	public ScheduleRealInfo getSchedule() {
+		return schedule;
+	}
+
+	public void setSchedule(ScheduleRealInfo schedule) {
+		this.schedule = schedule;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
 	}
 }
@@ -4,6 +4,8 @@ import com.bsth.entity.sys.SysUser;
  
 import javax.persistence.*;
 import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
  
 /**
  * 实际排班计划明细。
@@ -19,20 +21,14 @@ public class ScheduleRealInfo {
 	/** 排班计划日期 */
 	private Date scheduleDate;
  
-	/** 关联 bsth_c_line 主键，不做mapping */
-	private Integer xl;
 	/** 线路名称 */
 	private String xlName;
 	/** 线路编码 */
 	private String xlBm;
  
-	/** 关联 bsth_c_s_gbi 主键，不做mapping */
-	private Long lp;
 	/** 路牌名称 */
 	private String lpName;
  
-	/** 关联 bsth_c_cars 主键，不做mapping */
-	private Integer cl;
 	/** 车辆自编号 */
 	private String clZbh;
  
@@ -40,8 +36,7 @@ public class ScheduleRealInfo {
 	private String bdTime;
 	/** 出场时间（格式 HH:mm） */
 	private String ccTime;
-	/** 关联 bsth_c_personnel 主键，不做mapping */
-	private Integer j;
+	
 	/** 驾驶员工号 */
 	private String jGh;
 	/** 驾驶员名字 */
@@ -53,17 +48,28 @@ public class ScheduleRealInfo {
  
 	/** 线路方向 */
 	private String xlDir;
-	/** 起点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
-	private Integer qdz;
+	/** 起点站code*/
+	private String qdzCode;
 	/** 起点站名字 */
 	private String qdzName;
-	/** 终点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
-	private Integer zdz;
+	
+	/** 终点站code*/
+	private String zdzCode;
 	/** 终点站名字 */
 	private String zdzName;
  
 	/** 计划发车时间（格式 HH:mm） */
 	private String fcsj;
+	/** 计划发车时间戳*/
+	@Transient
+	private Long fcsjT;
+	
+	/** 计划终点时间（格式 HH:mm） */
+	private String zdsj;
+	/** 计划终点时间戳*/
+	@Transient
+	private Long zdsjT;
+	
 	/** 发车顺序号 */
 	private Integer fcno;
 	/** 对应班次数 */
@@ -93,8 +99,14 @@ public class ScheduleRealInfo {
  
 	/** 实际发车时间*/
 	private String fcsjActual;
+	/** 实际发车时间戳*/
+	@Transient
+	private Long fcsjActualTime;
 	/**实际终点时间 */
 	private String zdsjActual;
+	/** 实际终点时间戳*/
+	@Transient
+	private Long zdsjActualTime;
  
 	/**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
 	private int status;
@@ -121,10 +133,6 @@ public class ScheduleRealInfo {
 	@Transient
 	private Long dfsjT;
  
-	/** 发车时间戳*/
-	@Transient
-	private Long fcsjT;
-	
 	public void addRemarks(String remark){
 		String newRem = this.getRemarks();
 		if(null == newRem)
@@ -132,7 +140,7 @@ public class ScheduleRealInfo {
 		newRem += remark;
 		this.setRemarks(newRem);
 	}
-	
+
 	public Long getId() {
 		return id;
 	}
@@ -149,14 +157,6 @@ public class ScheduleRealInfo {
 		this.scheduleDate = scheduleDate;
 	}
  
-	public Integer getXl() {
-		return xl;
-	}
-
-	public void setXl(Integer xl) {
-		this.xl = xl;
-	}
-
 	public String getXlName() {
 		return xlName;
 	}
@@ -173,14 +173,6 @@ public class ScheduleRealInfo {
 		this.xlBm = xlBm;
 	}
  
-	public Long getLp() {
-		return lp;
-	}
-
-	public void setLp(Long lp) {
-		this.lp = lp;
-	}
-
 	public String getLpName() {
 		return lpName;
 	}
@@ -189,14 +181,6 @@ public class ScheduleRealInfo {
 		this.lpName = lpName;
 	}
  
-	public Integer getCl() {
-		return cl;
-	}
-
-	public void setCl(Integer cl) {
-		this.cl = cl;
-	}
-
 	public String getClZbh() {
 		return clZbh;
 	}
@@ -221,14 +205,6 @@ public class ScheduleRealInfo {
 		this.ccTime = ccTime;
 	}
  
-	public Integer getJ() {
-		return j;
-	}
-
-	public void setJ(Integer j) {
-		this.j = j;
-	}
-
 	public String getjGh() {
 		return jGh;
 	}
@@ -269,12 +245,12 @@ public class ScheduleRealInfo {
 		this.xlDir = xlDir;
 	}
  
-	public Integer getQdz() {
-		return qdz;
+	public String getQdzCode() {
+		return qdzCode;
 	}
  
-	public void setQdz(Integer qdz) {
-		this.qdz = qdz;
+	public void setQdzCode(String qdzCode) {
+		this.qdzCode = qdzCode;
 	}
  
 	public String getQdzName() {
@@ -285,12 +261,12 @@ public class ScheduleRealInfo {
 		this.qdzName = qdzName;
 	}
  
-	public Integer getZdz() {
-		return zdz;
+	public String getZdzCode() {
+		return zdzCode;
 	}
  
-	public void setZdz(Integer zdz) {
-		this.zdz = zdz;
+	public void setZdzCode(String zdzCode) {
+		this.zdzCode = zdzCode;
 	}
  
 	public String getZdzName() {
@@ -309,6 +285,30 @@ public class ScheduleRealInfo {
 		this.fcsj = fcsj;
 	}
  
+	public Long getFcsjT() {
+		return fcsjT;
+	}
+
+	public void setFcsjT(Long fcsjT) {
+		this.fcsjT = fcsjT;
+	}
+
+	public String getZdsj() {
+		return zdsj;
+	}
+
+	public void setZdsj(String zdsj) {
+		this.zdsj = zdsj;
+	}
+
+	public Long getZdsjT() {
+		return zdsjT;
+	}
+
+	public void setZdsjT(Long zdsjT) {
+		this.zdsjT = zdsjT;
+	}
+
 	public Integer getFcno() {
 		return fcno;
 	}
@@ -389,6 +389,14 @@ public class ScheduleRealInfo {
 		this.fcsjActual = fcsjActual;
 	}
  
+	public Long getFcsjActualTime() {
+		return fcsjActualTime;
+	}
+
+	public void setFcsjActualTime(Long fcsjActualTime) {
+		this.fcsjActualTime = fcsjActualTime;
+	}
+
 	public String getZdsjActual() {
 		return zdsjActual;
 	}
@@ -397,6 +405,14 @@ public class ScheduleRealInfo {
 		this.zdsjActual = zdsjActual;
 	}
  
+	public Long getZdsjActualTime() {
+		return zdsjActualTime;
+	}
+
+	public void setZdsjActualTime(Long zdsjActualTime) {
+		this.zdsjActualTime = zdsjActualTime;
+	}
+
 	public int getStatus() {
 		return status;
 	}
@@ -421,6 +437,22 @@ public class ScheduleRealInfo {
 		this.realMileage = realMileage;
 	}
  
+	public Float getAddMileage() {
+		return addMileage;
+	}
+
+	public void setAddMileage(Float addMileage) {
+		this.addMileage = addMileage;
+	}
+
+	public Float getRemMileage() {
+		return remMileage;
+	}
+
+	public void setRemMileage(Float remMileage) {
+		this.remMileage = remMileage;
+	}
+
 	public String getRemarks() {
 		return remarks;
 	}
@@ -437,14 +469,6 @@ public class ScheduleRealInfo {
 		this.dfsj = dfsj;
 	}
  
-	public Long getFcsjT() {
-		return fcsjT;
-	}
-
-	public void setFcsjT(Long fcsjT) {
-		this.fcsjT = fcsjT;
-	}
-
 	public Long getDfsjT() {
 		return dfsjT;
 	}
@@ -452,20 +476,4 @@ public class ScheduleRealInfo {
 	public void setDfsjT(Long dfsjT) {
 		this.dfsjT = dfsjT;
 	}
-
-	public Float getAddMileage() {
-		return addMileage;
-	}
-
-	public void setAddMileage(Float addMileage) {
-		this.addMileage = addMileage;
-	}
-
-	public Float getRemMileage() {
-		return remMileage;
-	}
-
-	public void setRemMileage(Float remMileage) {
-		this.remMileage = remMileage;
-	}
 }
@@ -24,7 +24,7 @@ public abstract class BaseFilter implements Filter {
 	 * 白名单
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_TEMPS };
  
 	@Override
 	public void destroy() {
@@ -31,12 +31,12 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 	@Autowired
 	SecurityMetadataSourceService securityMetadataSourceService;
  
+	
 	@Override
 	public void configure(WebSecurity web) throws Exception {
 		// 白名单
-		web.ignoring().antMatchers(Constants.ASSETS_URL, Constants.FAVICON_URL,
-				Constants.METRONIC_URL, Constants.LOGIN_PAGE,
-				Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL);
+		web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.ASSETS_URL, Constants.FAVICON_URL,
+				Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_TEMPS);
 	}
  
 	@Override
-package com.bsth.service.realcontrol;
+package com.bsth.service.realcontrol.buffer;
  
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -37,32 +37,37 @@ public class GetSchedulePlanThread  extends Thread{
 	ScheduleRealInfoRepository scheduleRealInfoRepository;
  
 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd")
-				,sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-	
-	
-	SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				,sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm")
+				,sdf3 = new SimpleDateFormat("HH:mm");
  
 	@Override
 	public void run() {
 		try{
 			String dateStr = /*sdf.format(new Date())*/"2016-06-01";
 			List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(dateStr);
-			logger.info("开始................." + sdf3.format(new Date(System.currentTimeMillis())));
  
 			//实际排班计划
 			List<ScheduleRealInfo>  realList = JSONArray.parseArray(JSON.toJSONString(list), ScheduleRealInfo.class);
  
+			Date zdDate;
 			for(ScheduleRealInfo item : realList){
 				item.setDfsj(item.getFcsj());
 				//发车时间戳
 				item.setFcsjT(sdf2.parse(dateStr + " " + item.getFcsj()).getTime());
+				//待发时间
 				item.setDfsjT(item.getFcsjT());
+				
+				//计划终点时间
+				if(item.getBcsj() != null){
+					zdDate = new Date(item.getFcsjT() + (item.getBcsj() * 60 * 1000));
+					item.setZdsjT(zdDate.getTime());
+					item.setZdsj(sdf3.format(zdDate));
+				}
 			}
  
 			//new BatchSaveUtils<ScheduleRealInfo>().saveList(realList, ScheduleRealInfo.class);
 			//写入缓存
 			ScheduleBuffer.init(realList);
-			logger.info("结束................." + sdf3.format(new Date(System.currentTimeMillis())));
  
 			logger.info("获取当天实际排班计划数量：" + realList.size());
 		}catch(Exception e){
-package com.bsth.service.realcontrol;
+package com.bsth.service.realcontrol.buffer;
  
 import java.util.Collections;
 import java.util.Comparator;
-package com.bsth.service.realcontrol;
+package com.bsth.service.realcontrol.buffer;
  
 import java.util.LinkedList;
  
@@ -17,8 +17,8 @@ import com.bsth.common.ResponseCode;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
-import com.bsth.service.realcontrol.ScheduleBuffer;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
@@ -16,8 +16,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-
 /**
  * 
  * @ClassName: BatchSaveUtils 
@@ -115,7 +115,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 		Long timestamp = System.currentTimeMillis();
  
 		//向测试设备发送
-		String deviceId = "229L4041";
+		String deviceId = "ABCDFEGH";
 		Short company = 5;
  
 		/*String deviceId = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
  
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.service.realcontrol.ScheduleBuffer;
+import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
 import com.bsth.vehicle.common.CommonMapped;
 import com.bsth.vehicle.gpsdata.entity.GpsRealData;
 import com.google.common.collect.ArrayListMultimap;
@@ -140,7 +140,6 @@ public class GpsRealDataBuffer {
 				gpsData.setNbbm(nbbm);
 				gpsData.setStationName(CommonMapped.stationCodeMap.get(gpsData.getStopNo()));
  
-				
 				linkedList = ScheduleBuffer.vehLinkedMap.get(nbbm);
 				if(null != linkedList){
 					//为GPS点附加班次信息