Merge branch 'minhang' into pudong

潘钊
2 parents 43e285ed e0064270
Showing 67 changed files with 3092 additions and 3651 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/arrival/AnalyseData.java
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/car_out_info/CarOutInfo.java
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/arrival/ArrivalComparator.java → src/main/java/com/bsth/data/forecast/ArrivalComparator.java
src/main/java/com/bsth/data/arrival/DataLoader.java → src/main/java/com/bsth/data/forecast/ArrivalDataLoader.java
src/main/java/com/bsth/data/arrival/ArrivalEntity.java → src/main/java/com/bsth/data/forecast/entity/ArrivalEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/client/ClientApp.java
src/main/java/com/bsth/data/gpsdata/client/GpsBeforeBuffer.java
src/main/java/com/bsth/data/gpsdata/client/common/ExceptionUtil.java
src/main/java/com/bsth/data/gpsdata/client/common/Protocol2BizUtil.java
src/main/java/com/bsth/data/gpsdata/client/common/ThreadLocalDateUtil.java
src/main/java/com/bsth/data/gpsdata/client/msg/IMessage.java
src/main/java/com/bsth/data/gpsdata/client/msg/IMessageBody.java
src/main/java/com/bsth/data/gpsdata/client/msg/IMessageIO.java
@@ -8,14 +8,16 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.web.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
  
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
  
+@EnableTransactionManagement
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
  
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(13);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(14);
  
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
@@ -330,69 +330,22 @@ public class ExportController {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
-		List<Turnoutrate> turnoutrate = formsService.turnoutrate(map);
 		Map<String, Object> map1 = new HashMap<String, Object>();
-		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		String xlts="";
-		String zsgs="";
-		String jh="";
-		Float j=0f;
-		Float sj=0f;
-		Float qz=0f;
-		Float ccl=0f;
-		Float bcjh=0f;
-		String bcsj="";
-		Float bczxl=0f;
-		String gs="";
-		String zhgs="";
  
-		for (Turnoutrate l : turnoutrate) {
-			Map<String, Object> m = new HashMap<String, Object>();
-			
-			xlts +=l.getGsgs()==""?0:String.valueOf(l.getGsgs());
-			zsgs +=l.getFgsgs()==""?0:String.valueOf(l.getFgsgs());
-			jh +=l.getXl()==""?0:String.valueOf(l.getXl());
-			sj +=l.getCchjh()==""?0f:Float.valueOf(l.getCchjh());
-			ccl +=l.getCchsj()==""?0f:Float.valueOf(l.getCchsj());
-			bcjh +=l.getCchqz()==""?0f:Float.valueOf(l.getCchqz());
-			bcsj +=l.getChl()==""?0:String.valueOf(l.getChl());
-			bczxl +=l.getBcjh()==""?0f:Float.valueOf(l.getBcjh());
-			gs +=l.getBcsj()==""?0:String.valueOf(l.getBcsj());
-			zhgs +=l.getBbzxl()==""?0:String.valueOf(l.getBbzxl());
-			
-			
-			m.put("rq", l.getRq());
-			m.put("gs", l.getGs());
-			m.put("zhgs", l.getZhgs());
-			m.put("xl", l.getXl());
-			m.put("cchjh", l.getCchjh());
-			m.put("cchsj", l.getCchsj());
-			m.put("cchqz", l.getCchqz());
-			m.put("chl", l.getChl());
-			m.put("bcjh", l.getBcjh());
-			m.put("bcsj", l.getBcsj());
-			m.put("bbzxl", l.getBbzxl());
-			m.put("sm", l.getSm());
-			resList.add(m);
-			
-			
-			
-			m=new HashMap<String,Object>();
-			m.put("total_xlts", xlts);
-			m.put("total_zhgs", zsgs);
-			m.put("total_jh", jh);
-			m.put("total_sj", sj);
-			m.put("total_qz", ccl);
-			m.put("total_ccl", bcjh);
-			m.put("total_bcjh",bcsj);
-			m.put("total_bcsj", bczxl);
-			m.put("total_bczxl", bczxl);
-			m.put("total_gs", zhgs);
-			
-
-			map1 = m;
-		}
-
+		List<Map<String, Object>> resList = formsService.turnoutrate(map);
+		Map<String, Object> m = resList.get(resList.size() - 1);
+		map1.put("line", m.get("line"));
+		map1.put("jhcc", m.get("jhcc"));
+		map1.put("sjcc", m.get("sjcc"));
+		map1.put("jhbc", m.get("jhbc"));
+		map1.put("sjbc", m.get("sjbc"));
+		map1.put("ccl", m.get("ccl"));
+		map1.put("zxl", m.get("zxl"));
+		map1.put("qz", m.get("qz"));
+		map1.put("sm", m.get("sm"));
+		
+		resList.remove(m);
+		
 		try {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
@@ -94,7 +94,7 @@ public class MCY_FormsController {
  
 	// 营运线路出车率统计表
 	@RequestMapping(value = "/turnoutrate", method = RequestMethod.POST)
-	public List<Turnoutrate> turnoutrate(@RequestParam Map<String, Object> map) {
+	public List<Map<String, Object>> turnoutrate(@RequestParam Map<String, Object> map) {
  
 		return formsService.turnoutrate(map);
 	}
@@ -40,7 +40,7 @@ public class BasicData implements CommandLineRunner {
     //车辆自编号和公司代码对照 （K: 车辆自编号 ，V：公司代码）
     public static Map<String, String> nbbm2CompanyCodeMap;
  
-    //车辆自编号和公司代码对照 （K: 车辆自编号 ，V：牌照号）
+    //车辆自编号和牌照号对照 （K: 车辆自编号 ，V：牌照号）
     public static Map<String, String> nbbmCompanyPlateMap;
  
     //站点编码和名称对照，包括停车场 （K: lineCode_updown_stationCode ，V：站点名称）
-package com.bsth.data.arrival;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-/**
- * 
- * @ClassName: AnalyseArrivalData 
- * @Description: TODO(分析一下进出站场数据) 
- * @author PanZhao 
- * @date 2016年8月24日 上午11:09:37 
- *
- */
-@Component
-public class AnalyseData {
-	
-	Logger logger = LoggerFactory.getLogger(AnalyseData.class);
-	
-	public void analyse(Set<String> cars){
-		try{
-			List<ArrivalEntity> list, clearList;
-			for(String car : cars){
-				list = ArrivalData_GPS.findByNbbm(car);
-				analyse(list);
-				
-				//清理掉无效的点
-				clearList = new ArrayList<>();
-				for(ArrivalEntity arr : list){
-					if(!arr.isEnable())
-						clearList.add(arr);
-				}
-				list.removeAll(clearList);
-			}
-		}catch(Exception e){
-			logger.error("", e);
-		}
-	}
-	
-	private final static int SHIFT_TIME = 1000 * 60 * 5,
-			SCH_TIME = 1000 * 60 * 10;
-	
-	static ArrivalComparator comp = new ArrivalComparator();
-	
-	public void analyse(List<ArrivalEntity> list){
-		if(list.size() <= 1)
-			return;
-		
-		//排序
-		Collections.sort(list, comp);
-		ArrivalEntity prve = list.get(0)
-					,curr;
-		for(int i = 1; i < list.size(); i ++){
-			curr = list.get(i);
-			//如果第一个点无效
-			if(!effective(prve)){
-				prve.setEnable(false);
-				prve = curr;
-				continue;
-			}
-			//如果第二个点无效
-			else if(!effective(curr)){
-				curr.setEnable(false);
-				continue;
-			}
-			else if(curr.getTs() - prve.getTs() < SCH_TIME){
-				if(prve.getUpDown() == curr.getUpDown()){
-					//信号漂移，出站无效
-					if(curr.getStopNo().equals(prve.getStopNo()) 
-							&& prve.getInOut() == 1 && curr.getInOut() == 0
-							&& curr.getTs() - prve.getTs() < SHIFT_TIME){
-						prve.setEnable(false);
-					}
-//					else if(curr.getInOut()){
-//						//curr.getTs() - prve.getTs() < 30000
-//					}
-				}
-				else{
-					//上下行的同名站，新走向的第一个出站信号开始有效
-					if(prve.getStopName().equals(curr.getStopName())){
-						if(curr.getInOut() == 0)
-							curr.setEnable(false);
-						else
-							prve = curr;
-					}
-				}
-			}
-			else
-				prve = curr;
-		}
-	}
-	
-	private boolean effective(ArrivalEntity arr){
-		/*//停车场
-		if(BasicData.parkCodeList.contains(arr.getStopNo())){
-			arr.setTcc(true);
-			return true;
-		}
-
-		Integer upDown = BasicData.lineStationUpDownMap.get(arr.getLineCode() + "_" + arr.getStopNo());
-
-		return arr.getUpDown() == upDown || BasicData.parkCodeList.contains(arr.getStopNo());*/
-		return false;
-	}
-}
-package com.bsth.data.arrival;
-
-import com.bsth.data.schedule.DayOfSchedule;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-
-/**
- * 
- * @ClassName: ArrivalData_GPS 
- * @Description: TODO(GPS到离站数据) 
- * @author PanZhao 
- * @date 2016年8月18日 下午10:05:27 
- *
- */
-@Component
-public class ArrivalData_GPS implements CommandLineRunner{
-	
-	// 起终点站进出数据  K：车辆编码
-	private static ListMultimap<String, ArrivalEntity> startAndEndMaps;
-	
-	private static Map<String, Integer> carIndexMap;
-	
-	static{
-		startAndEndMaps = ArrayListMultimap.create();
-		
-		carIndexMap = new HashMap<>();
-	}
-	
-	@Autowired
-	DataLoaderThread dataLoaderThread;
-	
-	static Logger logger = LoggerFactory.getLogger(ArrivalData_GPS.class);
-	
-	@Override
-	public void run(String... arg0) throws Exception {
-		logger.info("ArrivalData_GPS,30,06");
-		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 40, 6, TimeUnit.SECONDS);
-	}
-	
-	@Component
-	public static class DataLoaderThread extends Thread {
-
-		@Autowired
-		DataLoader dataLoader;
-		
-		@Autowired
-		DayOfSchedule dayOfSchedule;
-		
-		@Autowired
-		AnalyseData analyseData;
-		
-		@Override
-		public void run() {
-			/*try{
-				logger.info("开始加载到离站数据, " + System.currentTimeMillis());
-				List<ArrivalEntity> arrSets = dataLoader.load();
-				if(null == arrSets || arrSets.size() == 0)
-					return;
-					
-				//有起终点进出的车辆
-				Set<String> carSet = new TreeSet<>();
-				//按车辆起终点站过滤数据
-				String nbbm;
-				Set<String> seList;
-				for(ArrivalEntity arr : arrSets){
-					nbbm = arr.getNbbm();
-					
-					seList = dayOfSchedule.getSEStationList(nbbm);
-					if(seList.contains(arr.getStopNo())){
-						startAndEndMaps.put(nbbm, arr);
-						carSet.add(nbbm);
-					}
-				}
-				//从专业的角度分析一下数据
-				analyseData.analyse(carSet);
-				
-				//开始匹配
-				Arrival2Schedule.start(carSet);
-			}catch(Exception e){
-				logger.error("", e);
-			}*/
-		}
-	}
-	
-	/**
-	 * 
-	 * @Title: clearRAMData 
-	 * @Description: TODO(清理内存数据) 
-	 */
-	public void clearRAMData(String lineCode){
-		
-		List<ArrivalEntity> remList = new ArrayList<>();
-		
-		//车辆映射的进出站数据，遍历删除对应线路数据。
-		Collection<ArrivalEntity> seList = startAndEndMaps.values();
-		for(ArrivalEntity arr : seList){
-			if(arr.getLineCode().equals(lineCode))
-				remList.add(arr);
-		}
-		
-		//删除数据
-		int count = 0;
-		for(ArrivalEntity arr : remList){
-			startAndEndMaps.remove(arr.getNbbm(), arr);
-			count ++;
-		}
-		
-		logger.info(lineCode + " 清除到离站数据 ，" + count);
-	}
-	
-	public synchronized static List<ArrivalEntity> findByNbbm(String nbbm){
-		return startAndEndMaps.get(nbbm);
-	}
-	
-	public static List<ArrivalEntity> getIncrement(String nbbm){
-		Integer mark = null;
-		if (!carIndexMap.containsKey(nbbm))
-			mark = 0;
-		else
-			mark = carIndexMap.get(nbbm);
-
-		List<ArrivalEntity> all = startAndEndMaps.get(nbbm);
-		int size = all.size();
-		if(size == 0)
-			return new ArrayList<>(0);
-		
-		List<ArrivalEntity> rs = all.subList(mark, size);
-		carIndexMap.put(nbbm, size);
-		return rs;
-	}
-}
 \ No newline at end of file
+package com.bsth.data.car_out_info;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/5/7.
+ */
+public interface CarOutInfo {
+
+    void updateAll();
+
+    void update(String lineCode);
+
+    void update(List<ScheduleRealInfo> list) ;
+}
+package com.bsth.data.car_out_info;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.google.common.collect.ArrayListMultimap;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.*;
+
+/**
+ * 发车信息表处理程序
+ * Created by panzhao on 2017/5/5.
+ */
+@Service
+public class CarOutInfoHandler implements CommandLineRunner, CarOutInfo {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    //班次类型对照表
+    Map<String, String> bcTypeMap;
+
+    private static ScheduleComparator.FCSJ schFCSJComparator = new ScheduleComparator.FCSJ();
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    /**
+     * 全量更新发车信息表
+     */
+    @Override
+    public void updateAll() {
+        Set<String> ks = BasicData.lineCode2NameMap.keySet();
+        for (String lineCode : ks) {
+            update(lineCode);
+        }
+    }
+
+    @Override
+    public void update(String lineCode) {
+        try {
+            ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap = dayOfSchedule.getLpScheduleMap();
+            List<ScheduleRealInfo> list = new ArrayList<>();
+
+            Set<String> ks = lpScheduleMap.keySet();
+            String prefix = lineCode + "_";
+            for (String k : ks) {
+                if (k.indexOf(prefix) != -1) {
+                    list.addAll(lpScheduleMap.get(k));
+                }
+            }
+
+            update(list);
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    @Transactional
+    @Override
+    public void update(List<ScheduleRealInfo> list) {
+        if (list.size() == 0)
+            return;
+        String lineCode = list.get(0).getXlBm();
+        //按上下行分组
+        List<ScheduleRealInfo> ups = new ArrayList<>(), downs = new ArrayList<>();
+        for (ScheduleRealInfo sch : list) {
+            if (sch.getXlDir().equals("0"))
+                ups.add(sch);
+            else
+                downs.add(sch);
+        }
+
+        ScheduleRealInfo[] upArray = nexts(ups),
+                downArray = nexts(downs);
+
+        final List<ScheduleRealInfo> pstArray = mergeArray(upArray, downArray);
+        //删除
+        jdbcTemplate.update("delete from bsth_t_clfcxxb where line_code=?", lineCode);
+        //重新写入
+        jdbcTemplate.batchUpdate("insert into bsth_t_clfcxxb(rq, line_code, line_name, lp_name, lp_sn, dfsj, nbbm, cph, bc_type, end_station_name, updown, jGh, jName, remarks, sn)" +
+                " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+            @Override
+            public void setValues(PreparedStatement ps, int i) throws SQLException {
+                ScheduleRealInfo sch = pstArray.get(i);
+                ps.setString(1, sch.getScheduleDateStr());
+                ps.setString(2, sch.getXlBm());
+                ps.setString(3, sch.getXlName());
+                ps.setString(4, sch.getLpName());
+                ps.setInt(5, sch.getFcno());
+                ps.setString(6, sch.getDfsj());
+                ps.setString(7, sch.getClZbh());
+                ps.setString(8, BasicData.nbbmCompanyPlateMap.get(sch.getClZbh()));
+                ps.setString(9, bcTypeMap.containsKey(sch.getBcType()) ? bcTypeMap.get(sch.getBcType()) : sch.getBcType());
+                ps.setString(10, sch.getZdzName());
+                ps.setInt(11, Integer.parseInt(sch.getXlDir()));
+                ps.setString(12, sch.getjGh());
+                ps.setString(13, sch.getjName());
+                ps.setString(14, sch.getRemarks());
+                ps.setInt(15, sch.getFcpSn());
+            }
+
+            @Override
+            public int getBatchSize() {
+                return pstArray.size();
+            }
+        });
+    }
+
+    private List<ScheduleRealInfo> mergeArray(ScheduleRealInfo[] upArray, ScheduleRealInfo[] downArray) {
+        List<ScheduleRealInfo> list = new ArrayList<>();
+        for (int i = 0; i < upArray.length; i++) {
+            if (upArray[i] != null) {
+                upArray[i].setFcpSn(i + 1);
+                list.add(upArray[i]);
+            }
+        }
+        for (int i = 0; i < downArray.length; i++) {
+            if (downArray[i] != null) {
+                downArray[i].setFcpSn(i + 1);
+                list.add(downArray[i]);
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 接下来要执行的3个班次
+     *
+     * @param list
+     * @return
+     */
+    private ScheduleRealInfo[] nexts(List<ScheduleRealInfo> list) {
+        ScheduleRealInfo[] array = new ScheduleRealInfo[3];
+        Collections.sort(list, schFCSJComparator);
+
+        int count = 0, threshold = 1000 * 60 * 30;
+        long t = System.currentTimeMillis();
+        for (ScheduleRealInfo sch : list) {
+            if (count == 3)
+                break;
+
+            //烂班
+            if (sch.isDestroy())
+                continue;
+
+            //进场、出场、2点间空驶
+            if (sch.getBcType().equals("in")
+                    || sch.getBcType().equals("out")
+                    || sch.getBcType().equals("ldks"))
+                continue;
+
+            //有实发实达时间的
+            if (StringUtils.isNotEmpty(sch.getFcsjActual())
+                    || StringUtils.isNotEmpty(sch.getZdsjActual()))
+                continue;
+
+            if (t - sch.getDfsjT() > threshold)
+                continue;
+
+            array[count] = sch;
+            count++;
+        }
+        return array;
+    }
+
+    @Autowired
+    UpdateInfoThread updateInfoThread;
+
+    @Override
+    public void run(String... strings) throws Exception {
+        bcTypeMap = new HashMap<>();
+        bcTypeMap.put("normal", "正常班次");
+        bcTypeMap.put("region", "区间");
+        bcTypeMap.put("venting", "直放");
+        bcTypeMap.put("major", "放站");
+        bcTypeMap.put("ldks", "两点间空驶");
+        //Application.mainServices.scheduleWithFixedDelay(updateInfoThread, 60, 40, TimeUnit.SECONDS);
+    }
+
+    @Component
+    private static class UpdateInfoThread extends Thread {
+
+        @Autowired
+        CarOutInfo carOutInfoHandler;
+
+        @Override
+        public void run() {
+            carOutInfoHandler.updateAll();
+        }
+    }
+}
-package com.bsth.data.arrival;
-
-import java.util.Comparator;
-
-public class ArrivalComparator implements Comparator<ArrivalEntity>{
-
-	@Override
-	public int compare(ArrivalEntity a1, ArrivalEntity a2) {
-		return (int) (a1.getTs() - a2.getTs());
-	}
-}
+package com.bsth.data.forecast;
+
+import com.bsth.data.forecast.entity.ArrivalEntity;
+
+import java.util.Comparator;
+
+public class ArrivalComparator implements Comparator<ArrivalEntity>{
+
+	@Override
+	public int compare(ArrivalEntity a1, ArrivalEntity a2) {
+		return (int) (a1.getTs() - a2.getTs());
+	}
+}
-package com.bsth.data.arrival;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.bsth.data.BasicData;
-import com.bsth.data.LineConfigData;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.util.db.DBUtils_MS;
-
-/**
- * 
- * @ClassName: DataLoader 
- * @Description: TODO(从数据库加载进出站数据) 
- * @author PanZhao 
- * @date 2016年8月19日 上午9:59:21 
- *
- */
-@Component
-public class DataLoader {
-	
-	private static Long prveLoadTime;
-	
-	private final static long DAY_TIME = 1000 * 60 * 60 * 24;
-	
-	private Logger logger = LoggerFactory.getLogger(this.getClass());
-	
-	@Autowired
-	LineConfigData lineConfigData;
-	
-	/**
-	 * 
-	 * @Title: load 
-	 * @Description: TODO(根据上次加载时间，查询之后的增量数据) 
-	 */
-	public List<ArrivalEntity> load(){
-		List<ArrivalEntity> list = null;
-		
-		if(null == prveLoadTime)
-			list = recovery();
-		else{
-			Calendar cal = Calendar.getInstance();
-			//周数，表分区字段
-			int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
-			
-			Connection conn = null;
-			PreparedStatement ps = null;
-			ResultSet rs = null;
-			
-			String sql = "select * from bsth_c_arrival_info where weeks_year=? AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by create_date";
-			try{
-				long t = System.currentTimeMillis();
-				
-				conn = DBUtils_MS.getConnection();
-				ps = conn.prepareStatement(sql);
-				ps.setInt(1, weeks_year);
-				ps.setLong(2, prveLoadTime);
-				ps.setLong(3, t);
-				rs = ps.executeQuery();
-				
-				list = resultSet2Set(rs);
-				
-				prveLoadTime = t;
-			}catch(Exception e){
-				logger.error("", e);
-			}finally {
-				DBUtils_MS.close(rs, ps, conn);
-			}
-		}
-		return list;
-	}
-	
-	/**
-	 * 
-	 * @Title: recovery 
-	 * @Description: TODO(从数据库恢复数据，按照线路的开始运营时间恢复) 
-	 */
-	public List<ArrivalEntity> recovery(){
-		Collection<LineConfig> confs = lineConfigData.getAll();
-		long t = System.currentTimeMillis()
-			,st;
-		
-		List<ArrivalEntity> all = new ArrayList<>();
-		for(LineConfig conf : confs){
-			st = conf.getCurrStartTime();
-			if(t < st)
-				st = st - DAY_TIME;
-			try{
-				all.addAll(loadByLineAndTime(conf.getLine().getLineCode(), st, t));
-			}catch(Exception e){
-				logger.error("", e);
-			}
-		}
-		
-		prveLoadTime = t;
-		return all;
-	}
-	
-	/**
-	 * 
-	 * @Title: loadByLineAndStartTime 
-	 * @Description: TODO(根据线路和时间戳加载数据) 
-	 */
-	public List<ArrivalEntity> loadByLineAndTime(String lineCode, long st, long et){
-		Calendar cal = Calendar.getInstance();
-		cal.setTimeInMillis(st);
-		int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
-		
-		Connection conn = null;
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-		
-		List<ArrivalEntity> list = new ArrayList<>();
-		String sql = "select * from bsth_c_arrival_info where weeks_year=? and line_id=? AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by ts";
-		try{
-			conn = DBUtils_MS.getConnection();
-			ps = conn.prepareStatement(sql);
-			ps.setInt(1, weeks_year);
-			ps.setString(2, lineCode);
-			ps.setLong(3, st);
-			ps.setLong(4, et);
-			rs = ps.executeQuery();
-			
-			list = resultSet2Set(rs);
-		}catch(Exception e){
-			logger.error("", e);
-		}finally {
-			DBUtils_MS.close(rs, ps, conn);
-		}
-		return list;
-	}
-	
-	/**
-	 * 
-	 * @Title: loadByLineAndStartTime 
-	 * @Description: TODO(根据线路，走向和时间戳加载数据) 
-	 */
-	public List<ArrivalEntity> loadByLineAndTime(String lineCode, int updown, long st, long et){
-		Calendar cal = Calendar.getInstance();
-		cal.setTimeInMillis(st);
-		int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
-		
-		Connection conn = null;
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-		
-		List<ArrivalEntity> list = new ArrayList<>();
-		String sql = "select * from bsth_c_arrival_info where weeks_year=? and line_id=? and up_down=? and in_out=0 AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by ts";
-		try{
-			conn = DBUtils_MS.getConnection();
-			ps = conn.prepareStatement(sql);
-			ps.setInt(1, weeks_year);
-			ps.setString(2, lineCode);
-			ps.setInt(3, updown);
-			ps.setLong(4, st);
-			ps.setLong(5, et);
-			rs = ps.executeQuery();
-			
-			list = resultSet2Set(rs);
-		}catch(Exception e){
-			logger.error("", e);
-		}finally {
-			DBUtils_MS.close(rs, ps, conn);
-		}
-		return list;
-	}
-	
-	public List<ArrivalEntity> resultSet2Set(ResultSet rs) throws SQLException{
-		List<ArrivalEntity> list = new ArrayList<>();
-		
-		ArrivalEntity arr;
-		while(rs.next()){
-			arr = new ArrivalEntity();
-			arr.setDeviceId(rs.getString("device_id"));
-			arr.setNbbm(BasicData.deviceId2NbbmMap.get(arr.getDeviceId()));
-			if(null == arr.getNbbm()){
-				logger.warn("未注册的设备号，" + arr.getDeviceId());
-				continue;
-			}
-			
-			arr.setTs(rs.getLong("ts"));
-			arr.setLineCode(rs.getString("line_id"));
-			arr.setUpDown(rs.getInt("up_down"));
-			arr.setStopNo(rs.getString("stop_no"));
-			arr.setStopName(BasicData.stationCode2NameMap.get(arr.getStopNo()));
-			arr.setInOut(rs.getInt("in_out"));
-			arr.setCreateDate(rs.getLong("create_timestamp"));
-			arr.setWeeksYear(rs.getInt("weeks_year"));
-			arr.setEnable(true);
-			
-			list.add(arr);
-		}
-		return list;
-	}
-	
-	public static void setPrveLoadTime(long t){
-		prveLoadTime = t;
-	}
-}
+package com.bsth.data.forecast;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.LineConfigData;
+import com.bsth.data.forecast.entity.ArrivalEntity;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.util.db.DBUtils_MS;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 
+ * @ClassName: DataLoader 
+ * @Description: TODO(从数据库加载进出站数据) 
+ * @author PanZhao 
+ * @date 2016年8月19日 上午9:59:21 
+ *
+ */
+@Component
+public class ArrivalDataLoader {
+	
+	private static Long prveLoadTime;
+	
+	private final static long DAY_TIME = 1000 * 60 * 60 * 24;
+	
+	private Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	@Autowired
+	LineConfigData lineConfigData;
+	
+	/**
+	 * 
+	 * @Title: load 
+	 * @Description: TODO(根据上次加载时间，查询之后的增量数据) 
+	 */
+	public List<ArrivalEntity> load(){
+		List<ArrivalEntity> list = null;
+		
+		if(null == prveLoadTime)
+			list = recovery();
+		else{
+			Calendar cal = Calendar.getInstance();
+			//周数，表分区字段
+			int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
+			
+			Connection conn = null;
+			PreparedStatement ps = null;
+			ResultSet rs = null;
+			
+			String sql = "select * from bsth_c_arrival_info where weeks_year=? AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by create_date";
+			try{
+				long t = System.currentTimeMillis();
+				
+				conn = DBUtils_MS.getConnection();
+				ps = conn.prepareStatement(sql);
+				ps.setInt(1, weeks_year);
+				ps.setLong(2, prveLoadTime);
+				ps.setLong(3, t);
+				rs = ps.executeQuery();
+				
+				list = resultSet2Set(rs);
+				
+				prveLoadTime = t;
+			}catch(Exception e){
+				logger.error("", e);
+			}finally {
+				DBUtils_MS.close(rs, ps, conn);
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * 
+	 * @Title: recovery 
+	 * @Description: TODO(从数据库恢复数据，按照线路的开始运营时间恢复) 
+	 */
+	public List<ArrivalEntity> recovery(){
+		Collection<LineConfig> confs = lineConfigData.getAll();
+		long t = System.currentTimeMillis()
+			,st;
+		
+		List<ArrivalEntity> all = new ArrayList<>();
+		for(LineConfig conf : confs){
+			st = conf.getCurrStartTime();
+			if(t < st)
+				st = st - DAY_TIME;
+			try{
+				all.addAll(loadByLineAndTime(conf.getLine().getLineCode(), st, t));
+			}catch(Exception e){
+				logger.error("", e);
+			}
+		}
+		
+		prveLoadTime = t;
+		return all;
+	}
+	
+	/**
+	 * 
+	 * @Title: loadByLineAndStartTime 
+	 * @Description: TODO(根据线路和时间戳加载数据) 
+	 */
+	public List<ArrivalEntity> loadByLineAndTime(String lineCode, long st, long et){
+		Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(st);
+		int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
+		
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		
+		List<ArrivalEntity> list = new ArrayList<>();
+		String sql = "select * from bsth_c_arrival_info where weeks_year=? and line_id=? AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by ts";
+		try{
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setInt(1, weeks_year);
+			ps.setString(2, lineCode);
+			ps.setLong(3, st);
+			ps.setLong(4, et);
+			rs = ps.executeQuery();
+			
+			list = resultSet2Set(rs);
+		}catch(Exception e){
+			logger.error("", e);
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		return list;
+	}
+	
+	/**
+	 * 
+	 * @Title: loadByLineAndStartTime 
+	 * @Description: TODO(根据线路，走向和时间戳加载数据) 
+	 */
+	public List<ArrivalEntity> loadByLineAndTime(String lineCode, int updown, long st, long et){
+		Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(st);
+		int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
+		
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		
+		List<ArrivalEntity> list = new ArrayList<>();
+		String sql = "select * from bsth_c_arrival_info where weeks_year=? and line_id=? and up_down=? and in_out=0 AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by ts";
+		try{
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setInt(1, weeks_year);
+			ps.setString(2, lineCode);
+			ps.setInt(3, updown);
+			ps.setLong(4, st);
+			ps.setLong(5, et);
+			rs = ps.executeQuery();
+			
+			list = resultSet2Set(rs);
+		}catch(Exception e){
+			logger.error("", e);
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		return list;
+	}
+	
+	public List<ArrivalEntity> resultSet2Set(ResultSet rs) throws SQLException{
+		List<ArrivalEntity> list = new ArrayList<>();
+		
+		ArrivalEntity arr;
+		while(rs.next()){
+			arr = new ArrivalEntity();
+			arr.setDeviceId(rs.getString("device_id"));
+			arr.setNbbm(BasicData.deviceId2NbbmMap.get(arr.getDeviceId()));
+			if(null == arr.getNbbm()){
+				logger.warn("未注册的设备号，" + arr.getDeviceId());
+				continue;
+			}
+			
+			arr.setTs(rs.getLong("ts"));
+			arr.setLineCode(rs.getString("line_id"));
+			arr.setUpDown(rs.getInt("up_down"));
+			arr.setStopNo(rs.getString("stop_no"));
+			arr.setStopName(BasicData.stationCode2NameMap.get(arr.getStopNo()));
+			arr.setInOut(rs.getInt("in_out"));
+			arr.setCreateDate(rs.getLong("create_timestamp"));
+			arr.setWeeksYear(rs.getInt("weeks_year"));
+			arr.setEnable(true);
+			
+			list.add(arr);
+		}
+		return list;
+	}
+	
+	public static void setPrveLoadTime(long t){
+		prveLoadTime = t;
+	}
+}
-package com.bsth.data.arrival;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.bsth.data.BasicData;
-
-/**
- * 
- * @ClassName: ArrivalEntity 
- * @Description: TODO(进出站实体) 
- * @author PanZhao 
- * @date 2016年8月19日 上午9:32:20 
- *
- */
-public class ArrivalEntity {
-	
-	/** 设备号*/
-	private String deviceId;
-	
-	private String nbbm;
-	
-	/** 站点名称 */
-	private String stopName;
-	
-	/** 时间戳*/
-	private Long ts;
-	
-	/** 线路编码*/
-	private String lineCode;
-
-	/** 上下行*/
-	private Integer upDown;
-
-	/**站点编码*/
-	private String stopNo;
-	
-	/** 0: 进 1：出*/
-	private Integer inOut;
-
-	private Long createDate;
-	
-	/** 是否有效 */
-	private boolean enable;
-	
-	/**分区字段，当年的第几周*/
-	private Integer weeksYear;
-	
-	private boolean tcc;
-	
-	//是否被纠正
-	private boolean correct;
-	
-	private String correctText;
-	
-	/** -1 则信号有效，但程序标记为不使用 */
-	private int flag = 0;
-	
-	public ArrivalEntity(){}
-	
-	public ArrivalEntity(String deviceId, long ts, String lineCode, int upDown, String stopNo, int inOut, long createDate,
-			int weeksYear, String stopName) {
-		
-		this.deviceId = deviceId;
-		this.ts = ts;
-		this.lineCode = lineCode;
-		this.upDown = upDown;
-		this.stopNo = stopNo;
-		this.stopName = stopName;
-		this.inOut = inOut;
-		this.createDate = createDate;
-	}
-
-/*	@Override
-	public boolean equals(Object obj) {
-		ArrivalEntity a2 = (ArrivalEntity)obj;
-		
-		return this.toString().equals(a2.toString())
-				&& Math.abs(this.ts - a2.ts) < EQ_RANGE;
-	}
-	
-	@Override
-	public int hashCode() {
-		return this.toString().hashCode();
-	}*/
-	
-	
-	@Override
-	public String toString() {
-		try {
-			SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-			return "["+BasicData.deviceId2NbbmMap.get(this.deviceId)+"， "+sdfHHmm.format(new Date(this.ts))
-			+"，"+(this.getUpDown()==0?"上行":"下行")+"，"+(this.inOut==0?"进":"出")+"，"+this.stopNo+" （"+this.stopName+"）]";
-		} catch (Exception e) {
-			return "";
-		}
-	}
-
-	public String getLineCode() {
-		return lineCode;
-	}
-
-	public void setLineCode(String lineCode) {
-		this.lineCode = lineCode;
-	}
-
-	public Integer getUpDown() {
-		return upDown;
-	}
-
-	public void setUpDown(Integer upDown) {
-		this.upDown = upDown;
-	}
-
-	public String getStopNo() {
-		return stopNo;
-	}
-
-	public void setStopNo(String stopNo) {
-		this.stopNo = stopNo;
-	}
-
-	public Integer getInOut() {
-		return inOut;
-	}
-
-	public void setInOut(Integer inOut) {
-		this.inOut = inOut;
-	}
-
-	public Long getCreateDate() {
-		return createDate;
-	}
-
-	public void setCreateDate(Long createDate) {
-		this.createDate = createDate;
-	}
-
-	public Integer getWeeksYear() {
-		return weeksYear;
-	}
-
-	public void setWeeksYear(Integer weeksYear) {
-		this.weeksYear = weeksYear;
-	}
-
-	public String getDeviceId() {
-		return deviceId;
-	}
-
-	public void setDeviceId(String deviceId) {
-		this.deviceId = deviceId;
-	}
-
-	public Long getTs() {
-		return ts;
-	}
-
-	public void setTs(Long ts) {
-		this.ts = ts;
-	}
-
-	public String getStopName() {
-		return stopName;
-	}
-
-	public void setStopName(String stopName) {
-		this.stopName = stopName;
-	}
-	
-	public String getId(){
-		return this.deviceId + "_" + this.ts;
-	}
-
-	public String getNbbm() {
-		return nbbm;
-	}
-
-	public void setNbbm(String nbbm) {
-		this.nbbm = nbbm;
-	}
-
-	public boolean isEnable() {
-		return enable;
-	}
-
-	public void setEnable(boolean enable) {
-		this.enable = enable;
-	}
-
-	public boolean isTcc() {
-		return tcc;
-	}
-
-	public void setTcc(boolean tcc) {
-		this.tcc = tcc;
-	}
-
-	public boolean isOutTcc() {
-		return isTcc() && inOut == 1;
-	}
-
-	public boolean isCorrect() {
-		return correct;
-	}
-
-	public void setCorrect(boolean correct) {
-		this.correct = correct;
-	}
-
-	public String getCorrectText() {
-		return correctText;
-	}
-
-	public void setCorrectText(String correctText) {
-		this.correctText = correctText;
-	}
-
-	public Integer getFlag() {
-		return flag;
-	}
-
-	public void setFlag(Integer flag) {
-		this.flag = flag;
-	}
-}
+package com.bsth.data.forecast.entity;
+
+import com.bsth.data.BasicData;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 
+ * @ClassName: ArrivalEntity 
+ * @Description: TODO(进出站实体) 
+ * @author PanZhao 
+ * @date 2016年8月19日 上午9:32:20 
+ *
+ */
+public class ArrivalEntity {
+	
+	/** 设备号*/
+	private String deviceId;
+	
+	private String nbbm;
+	
+	/** 站点名称 */
+	private String stopName;
+	
+	/** 时间戳*/
+	private Long ts;
+	
+	/** 线路编码*/
+	private String lineCode;
+
+	/** 上下行*/
+	private Integer upDown;
+
+	/**站点编码*/
+	private String stopNo;
+	
+	/** 0: 进 1：出*/
+	private Integer inOut;
+
+	private Long createDate;
+	
+	/** 是否有效 */
+	private boolean enable;
+	
+	/**分区字段，当年的第几周*/
+	private Integer weeksYear;
+	
+	private boolean tcc;
+	
+	//是否被纠正
+	private boolean correct;
+	
+	private String correctText;
+	
+	/** -1 则信号有效，但程序标记为不使用 */
+	private int flag = 0;
+	
+	public ArrivalEntity(){}
+	
+	public ArrivalEntity(String deviceId, long ts, String lineCode, int upDown, String stopNo, int inOut, long createDate,
+			int weeksYear, String stopName) {
+		
+		this.deviceId = deviceId;
+		this.ts = ts;
+		this.lineCode = lineCode;
+		this.upDown = upDown;
+		this.stopNo = stopNo;
+		this.stopName = stopName;
+		this.inOut = inOut;
+		this.createDate = createDate;
+	}
+
+/*	@Override
+	public boolean equals(Object obj) {
+		ArrivalEntity a2 = (ArrivalEntity)obj;
+		
+		return this.toString().equals(a2.toString())
+				&& Math.abs(this.ts - a2.ts) < EQ_RANGE;
+	}
+	
+	@Override
+	public int hashCode() {
+		return this.toString().hashCode();
+	}*/
+	
+	
+	@Override
+	public String toString() {
+		try {
+			SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+			return "["+BasicData.deviceId2NbbmMap.get(this.deviceId)+"， "+sdfHHmm.format(new Date(this.ts))
+			+"，"+(this.getUpDown()==0?"上行":"下行")+"，"+(this.inOut==0?"进":"出")+"，"+this.stopNo+" （"+this.stopName+"）]";
+		} catch (Exception e) {
+			return "";
+		}
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public Integer getUpDown() {
+		return upDown;
+	}
+
+	public void setUpDown(Integer upDown) {
+		this.upDown = upDown;
+	}
+
+	public String getStopNo() {
+		return stopNo;
+	}
+
+	public void setStopNo(String stopNo) {
+		this.stopNo = stopNo;
+	}
+
+	public Integer getInOut() {
+		return inOut;
+	}
+
+	public void setInOut(Integer inOut) {
+		this.inOut = inOut;
+	}
+
+	public Long getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Long createDate) {
+		this.createDate = createDate;
+	}
+
+	public Integer getWeeksYear() {
+		return weeksYear;
+	}
+
+	public void setWeeksYear(Integer weeksYear) {
+		this.weeksYear = weeksYear;
+	}
+
+	public String getDeviceId() {
+		return deviceId;
+	}
+
+	public void setDeviceId(String deviceId) {
+		this.deviceId = deviceId;
+	}
+
+	public Long getTs() {
+		return ts;
+	}
+
+	public void setTs(Long ts) {
+		this.ts = ts;
+	}
+
+	public String getStopName() {
+		return stopName;
+	}
+
+	public void setStopName(String stopName) {
+		this.stopName = stopName;
+	}
+	
+	public String getId(){
+		return this.deviceId + "_" + this.ts;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public boolean isEnable() {
+		return enable;
+	}
+
+	public void setEnable(boolean enable) {
+		this.enable = enable;
+	}
+
+	public boolean isTcc() {
+		return tcc;
+	}
+
+	public void setTcc(boolean tcc) {
+		this.tcc = tcc;
+	}
+
+	public boolean isOutTcc() {
+		return isTcc() && inOut == 1;
+	}
+
+	public boolean isCorrect() {
+		return correct;
+	}
+
+	public void setCorrect(boolean correct) {
+		this.correct = correct;
+	}
+
+	public String getCorrectText() {
+		return correctText;
+	}
+
+	public void setCorrectText(String correctText) {
+		this.correctText = correctText;
+	}
+
+	public Integer getFlag() {
+		return flag;
+	}
+
+	public void setFlag(Integer flag) {
+		this.flag = flag;
+	}
+}
 package com.bsth.data.gpsdata;
  
+import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
 import com.bsth.data.gpsdata.client.ClientApp;
@@ -16,6 +17,7 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
  
 import java.util.*;
+import java.util.concurrent.TimeUnit;
  
 /**
  * @author PanZhao
@@ -61,7 +63,7 @@ public class GpsRealData implements CommandLineRunner {
         //定时从网关http形式获取GPS数据 --- 已弃用，现socket客户端接入数据
         //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 3, TimeUnit.SECONDS);
         //定时扫描掉离线
-        //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
  
         //gps 客户端
         //clientApp.init();
@@ -15,12 +15,12 @@ import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.apache.mina.filter.logging.LogLevel;
 import org.apache.mina.filter.logging.LoggingFilter;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
 import java.net.InetSocketAddress;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
  
 /**
  * Created by panzhao on 2017/5/4.
@@ -30,7 +30,6 @@ public class ClientApp {
  
     private static NioSocketConnector pdDataConnector;
     private static NioSocketConnector pfDataConnector;
-    private static ExecutorService exec;
  
     @Autowired
     private PdClientHandler pdClient;
@@ -39,6 +38,8 @@ public class ClientApp {
     @Autowired
     GpsBeforeBuffer gpsBeforeBuffer;
  
+    static Logger logger = LoggerFactory.getLogger(ClientApp.class);
+
     public static boolean dconnect(String device) {
         boolean flag = false;
         try {
@@ -59,6 +60,8 @@ public class ClientApp {
             WriteFuture write = session.write(bytes);
             write.awaitUninterruptibly();
             flag = true;
+
+            logger.info("dconnect...");
             //SessionManager.getInstance().register(device, session);
         } catch (Exception e) {
             e.printStackTrace();
@@ -74,6 +77,8 @@ public class ClientApp {
             IoSession session = con.getSession();
             session.setAttribute("deviceId", device);
             flag = true;
+
+            logger.info("fconnect...");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -81,7 +86,7 @@ public class ClientApp {
     }
  
     public void init() {
-        exec = Executors.newFixedThreadPool(4);
+        //exec = Executors.newFixedThreadPool(4);
         //sexec.scheduleAtFixedRate(new SessionChecker(), 1, 1, TimeUnit.MINUTES);
         /*******************************浦东********************************/
         pdDataConnector = new NioSocketConnector();
@@ -128,4 +133,4 @@ public class ClientApp {
  
         gpsBeforeBuffer.init();
     }
 -}
+}
 \ No newline at end of file
@@ -63,7 +63,7 @@ public class GpsBeforeBuffer {
     }
  
     public void init(){
-        Application.mainServices.scheduleWithFixedDelay(gpsHandleThread, 20, 2, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(gpsHandleThread, 20 * 1000, 1100, TimeUnit.MILLISECONDS);
     }
  
     @Component
@@ -100,4 +100,4 @@ public class GpsBeforeBuffer {
             return -1;
         return (byte) (((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
     }
 -}
+}
 \ No newline at end of file
-package com.bsth.data.gpsdata.client.common;
-
-public class ExceptionUtil {
-
-	public static String getTrace(Throwable e) {
-		StringBuilder sb = new StringBuilder();
-		sb.append(e.toString());
-		for (StackTraceElement ste : e.getStackTrace()) {
-			sb.append(ste).append("\r\n");
-		}
-        return sb.toString();
-    }
-}
+package com.bsth.data.gpsdata.client.common;
+
+public class ExceptionUtil {
+
+	public static String getTrace(Throwable e) {
+		StringBuilder sb = new StringBuilder();
+		sb.append(e.toString());
+		for (StackTraceElement ste : e.getStackTrace()) {
+			sb.append(ste).append("\r\n");
+		}
+        return sb.toString();
+    }
+}
-package com.bsth.data.gpsdata.client.common;
-
-//import com.bsth.data.gpsdata.socket_client_001.pd.protocol.BasicInfo;
-//import com.bsth.data.gpsdata.socket_client_001.pf.protocol.PfMessage;
-//import com.bsth.data.gpsdata.socket_client_001.pf.protocol.Pf_1_0;
-
-import com.bsth.data.gpsdata.client.pd.protocol.BasicInfo;
-import com.bsth.data.gpsdata.client.pf.protocol.PfMessage;
-import com.bsth.data.gpsdata.client.pf.protocol.Pf_1_0;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Protocol2BizUtil {
-	
-	private final static Logger log = LoggerFactory.getLogger(Protocol2BizUtil.class);
-	
-	/**
-	 * 从协议数据中获得基本数据
-	 */
-	public static BasicInfo getBasicInfoFromMsg(PfMessage msg) {
-		if (msg == null) return null;
-		BasicInfo info = null;
-		if (msg.getCommandType() == 0x01) {
-			Pf_1_0 pf_1_0 = (Pf_1_0)msg.getMessageBody();
-			info = new BasicInfo();
-			info.setLineId(pf_1_0.getXldm());
-			info.setDeviceId(pf_1_0.getMtd());
-			info.setDriverEmpNo(Integer.parseInt(pf_1_0.getDriver().trim()));
-			info.setCarparkNo(pf_1_0.getTccbh());
-			info.setStopNo(pf_1_0.getZdbh());
-			double lon = pf_1_0.getLon()/1000000, lat = pf_1_0.getLat()/1000000;
-			info.setCarLon(((long)lon) * 1000000 + (long)((lon - (long)lon) * 600000));
-			info.setCarLat(((int)lat) * 1000000 + (int)((lat - (int)lat) * 600000));
-			info.setTimestamp(pf_1_0.getFssj().getTime());
-			info.setSpeedGps((short)pf_1_0.getSpeed());
-			info.setSpeedSensor((short)(pf_1_0.getSpeed()));
-			info.setDirection((short)(pf_1_0.getFx()));
-			info.setServiceState(0);
-			info.setService(pf_1_0.getYyzt() == 0 ? true : false);
-			info.setUpOrDown(pf_1_0.getSxxzt() == 0 ? true : false);
-
-			info.setLon(Float.parseFloat(String.valueOf(lon)));
-			info.setLat(Float.parseFloat(String.valueOf(lat)));
-		}
-		
-		return info;
-	}
-}
+package com.bsth.data.gpsdata.client.common;
+
+//import com.bsth.data.gpsdata.socket_client_001.pd.protocol.BasicInfo;
+//import com.bsth.data.gpsdata.socket_client_001.pf.protocol.PfMessage;
+//import com.bsth.data.gpsdata.socket_client_001.pf.protocol.Pf_1_0;
+
+import com.bsth.data.gpsdata.client.pd.protocol.BasicInfo;
+import com.bsth.data.gpsdata.client.pf.protocol.PfMessage;
+import com.bsth.data.gpsdata.client.pf.protocol.Pf_1_0;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Protocol2BizUtil {
+	
+	private final static Logger log = LoggerFactory.getLogger(Protocol2BizUtil.class);
+	
+	/**
+	 * 从协议数据中获得基本数据
+	 */
+	public static BasicInfo getBasicInfoFromMsg(PfMessage msg) {
+		if (msg == null) return null;
+		BasicInfo info = null;
+		if (msg.getCommandType() == 0x01) {
+			Pf_1_0 pf_1_0 = (Pf_1_0)msg.getMessageBody();
+			info = new BasicInfo();
+			info.setLineId(pf_1_0.getXldm());
+			info.setDeviceId(pf_1_0.getMtd());
+			info.setDriverEmpNo(Integer.parseInt(pf_1_0.getDriver().trim()));
+			info.setCarparkNo(pf_1_0.getTccbh());
+			info.setStopNo(pf_1_0.getZdbh());
+			double lon = pf_1_0.getLon()/1000000, lat = pf_1_0.getLat()/1000000;
+			info.setCarLon(((long)lon) * 1000000 + (long)((lon - (long)lon) * 600000));
+			info.setCarLat(((int)lat) * 1000000 + (int)((lat - (int)lat) * 600000));
+			info.setTimestamp(pf_1_0.getFssj().getTime());
+			info.setSpeedGps((short)pf_1_0.getSpeed());
+			info.setSpeedSensor((short)(pf_1_0.getSpeed()));
+			info.setDirection((short)(pf_1_0.getFx()));
+			info.setServiceState(0);
+			info.setService(pf_1_0.getYyzt() == 0 ? true : false);
+			info.setUpOrDown(pf_1_0.getSxxzt() == 0 ? true : false);
+
+			info.setLon(Float.parseFloat(String.valueOf(lon)));
+			info.setLat(Float.parseFloat(String.valueOf(lat)));
+		}
+		
+		return info;
+	}
+}
-package com.bsth.data.gpsdata.client.common;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class ThreadLocalDateUtil {
-    private static final String date_format = "yyyyMMddHHmmss";
-    private static ThreadLocal<DateFormat> threadLocal = new ThreadLocal<DateFormat>(); 
- 
-    public static DateFormat getDateFormat()   
-    {  
-        DateFormat df = threadLocal.get();  
-        if(df==null){  
-            df = new SimpleDateFormat(date_format);  
-            threadLocal.set(df);  
-        }  
-        return df;  
-    }  
-
-    public static String formatDate(Date date) throws ParseException {
-        return getDateFormat().format(date);
-    }
-
-    public static Date parse(String strDate) throws ParseException {
-        return getDateFormat().parse(strDate);
-    }   
-}
+package com.bsth.data.gpsdata.client.common;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class ThreadLocalDateUtil {
+    private static final String date_format = "yyyyMMddHHmmss";
+    private static ThreadLocal<DateFormat> threadLocal = new ThreadLocal<DateFormat>(); 
+ 
+    public static DateFormat getDateFormat()   
+    {  
+        DateFormat df = threadLocal.get();  
+        if(df==null){  
+            df = new SimpleDateFormat(date_format);  
+            threadLocal.set(df);  
+        }  
+        return df;  
+    }  
+
+    public static String formatDate(Date date) throws ParseException {
+        return getDateFormat().format(date);
+    }
+
+    public static Date parse(String strDate) throws ParseException {
+        return getDateFormat().parse(strDate);
+    }   
+}
-package com.bsth.data.gpsdata.client.msg;
-
-public interface IMessage extends IMessageIO {
-
-	public IMessageBody getMessageBody();
-}
+package com.bsth.data.gpsdata.client.msg;
+
+public interface IMessage extends IMessageIO {
+
+	public IMessageBody getMessageBody();
+}
-package com.bsth.data.gpsdata.client.msg;
-
-public interface IMessageBody extends IMessageIO {
-
-	public String getDeviceId();
-	
-	public long getTimestamp();
-}
+package com.bsth.data.gpsdata.client.msg;
+
+public interface IMessageBody extends IMessageIO {
+
+	public String getDeviceId();
+	
+	public long getTimestamp();
+}
-package com.bsth.data.gpsdata.client.msg;
-
-public interface IMessageIO {
-
-	public void read(byte[] bytes);
-	
-	public byte[] write();
-}
+package com.bsth.data.gpsdata.client.msg;
+
+public interface IMessageIO {
+
+	public void read(byte[] bytes);
+	
+	public byte[] write();
+}
-package com.bsth.data.gpsdata.client.pd.codec;
-
-import com.bsth.data.gpsdata.client.pd.protocol.PdMessage;
-import org.apache.mina.core.buffer.IoBuffer;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
-import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-
-
-public class MessageDecoder extends CumulativeProtocolDecoder {
-
-	@Override
-	protected boolean doDecode(IoSession session, IoBuffer in,
-			ProtocolDecoderOutput out) throws Exception {
-		// TODO Auto-generated method stub
-		while (in.remaining() > 3) {
-			in.mark();
-			byte head1 = in.get(), head2 = in.get(), lenh = in.get(), lenl = in.get();
-			int len = ((lenh & 0xff) << 8) + (lenl & 0xff);
-			if ((head1 & 0xff) == 0xfa && (head2 & 0xff) == 0xf5) {
-				if (in.remaining() > len) {
-					byte[] bytes = new byte[len + 1];
-					in.get(bytes);
-					PdMessage msg = new PdMessage();
-					msg.read(bytes);
-					out.write(msg);
-					/*if ("true".equals(ConfigUtil.getProperty("protocolup", "true"))) {
-						UpProtocolDataService.getInstance().write(new byte[]{ head1, head2, lenh, lenl });
-						UpProtocolDataService.getInstance().write(bytes);
-					}*/
-				} else {
-					in.reset();
-					return false;
-				}
-			}
-		}
-		return false;
-	}
-
-	/*private static String toHexString(byte[] bytes) {
-		StringBuilder sb = new StringBuilder();
-		for (byte b : bytes) {
-			sb.append(Integer.toHexString(b & 0xff) + "|");
-		}
-		return sb.toString();
-	}*/
-}
+package com.bsth.data.gpsdata.client.pd.codec;
+
+import com.bsth.data.gpsdata.client.pd.protocol.PdMessage;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+
+
+public class MessageDecoder extends CumulativeProtocolDecoder {
+
+	@Override
+	protected boolean doDecode(IoSession session, IoBuffer in,
+			ProtocolDecoderOutput out) throws Exception {
+		// TODO Auto-generated method stub
+		while (in.remaining() > 3) {
+			in.mark();
+			byte head1 = in.get(), head2 = in.get(), lenh = in.get(), lenl = in.get();
+			int len = ((lenh & 0xff) << 8) + (lenl & 0xff);
+			if ((head1 & 0xff) == 0xfa && (head2 & 0xff) == 0xf5) {
+				if (in.remaining() > len) {
+					byte[] bytes = new byte[len + 1];
+					in.get(bytes);
+					PdMessage msg = new PdMessage();
+					msg.read(bytes);
+					out.write(msg);
+					/*if ("true".equals(ConfigUtil.getProperty("protocolup", "true"))) {
+						UpProtocolDataService.getInstance().write(new byte[]{ head1, head2, lenh, lenl });
+						UpProtocolDataService.getInstance().write(bytes);
+					}*/
+				} else {
+					in.reset();
+					return false;
+				}
+			}
+		}
+		return false;
+	}
+
+	/*private static String toHexString(byte[] bytes) {
+		StringBuilder sb = new StringBuilder();
+		for (byte b : bytes) {
+			sb.append(Integer.toHexString(b & 0xff) + "|");
+		}
+		return sb.toString();
+	}*/
+}
-package com.bsth.data.gpsdata.client.pd.codec;
-
-import org.apache.mina.core.buffer.IoBuffer;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
-import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-
-
-public class MessageEncoder extends ProtocolEncoderAdapter {
-
-	@Override
-	public void encode(IoSession session, Object message,
-			ProtocolEncoderOutput out) throws Exception {
-		// TODO Auto-generated method stub
-		IoBuffer buf = IoBuffer.allocate(1024).setAutoExpand(true);
-		buf.put((byte[])message);
-		buf.flip();
-		out.write(buf);
-		/*if ("true".equals(ConfigUtil.getProperty("protocoldown", "true"))) {
-			DownProtocolDataService.getInstance().write((byte[])message);
-		}*/
-	}
-
-}
+package com.bsth.data.gpsdata.client.pd.codec;
+
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
+
+
+public class MessageEncoder extends ProtocolEncoderAdapter {
+
+	@Override
+	public void encode(IoSession session, Object message,
+			ProtocolEncoderOutput out) throws Exception {
+		// TODO Auto-generated method stub
+		IoBuffer buf = IoBuffer.allocate(1024).setAutoExpand(true);
+		buf.put((byte[])message);
+		buf.flip();
+		out.write(buf);
+		/*if ("true".equals(ConfigUtil.getProperty("protocoldown", "true"))) {
+			DownProtocolDataService.getInstance().write((byte[])message);
+		}*/
+	}
+
+}
-package com.bsth.data.gpsdata.client.pd.codec;
-
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolCodecFactory;
-import org.apache.mina.filter.codec.ProtocolDecoder;
-import org.apache.mina.filter.codec.ProtocolEncoder;
-
-public class PdMessageCodecFactory implements ProtocolCodecFactory {
-	
-	private ProtocolEncoder encoder;
-	private ProtocolDecoder decoder;
-	
-	public PdMessageCodecFactory() {
-		encoder = new MessageEncoder();
-		decoder = new MessageDecoder();
-	}
-
-	@Override
-	public ProtocolEncoder getEncoder(IoSession session) throws Exception {
-		// TODO Auto-generated method stub
-		return encoder;
-	}
-
-	@Override
-	public ProtocolDecoder getDecoder(IoSession session) throws Exception {
-		// TODO Auto-generated method stub
-		return decoder;
-	}
-
-}
+package com.bsth.data.gpsdata.client.pd.codec;
+
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolEncoder;
+
+public class PdMessageCodecFactory implements ProtocolCodecFactory {
+	
+	private ProtocolEncoder encoder;
+	private ProtocolDecoder decoder;
+	
+	public PdMessageCodecFactory() {
+		encoder = new MessageEncoder();
+		decoder = new MessageDecoder();
+	}
+
+	@Override
+	public ProtocolEncoder getEncoder(IoSession session) throws Exception {
+		// TODO Auto-generated method stub
+		return encoder;
+	}
+
+	@Override
+	public ProtocolDecoder getDecoder(IoSession session) throws Exception {
+		// TODO Auto-generated method stub
+		return decoder;
+	}
+
+}
-package com.bsth.data.gpsdata.client.pd.common;
-
-import com.bsth.data.gpsdata.client.common.ThreadLocalDateUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.ParseException;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-
-
-public class ConvertUtil {
-	
-	private final static Logger log = LoggerFactory.getLogger(ConvertUtil.class);
-	
-	public static int bcd2int(byte[] bytes, int start, int len) {
-		if (len > 4 || len == 0)
-			throw new IllegalArgumentException("bcd2int 字节数不符合要求");
-		String temp = "";
-		for (int i = 0;i < len;i++) {
-			int val = bytes[start + i] & 0xff;
-			if (val < 10) temp += 0;
-			temp += Integer.toHexString(val);
-		}
-		return Integer.parseInt(temp);
-	}
-	
-	public static byte[] int2bcd(int val, int len) {
-		if (len > 4 || len == 0)
-			throw new IllegalArgumentException("int2bcd 字节数不符合要求");
-		byte[] result = new byte[len];
-		for (int i = len - 1;i > -1;i--) {
-			result[i] = (byte)Integer.parseInt(val%100 + "", 16);
-			val = val/100;
-		}
-		return result;
-	}
-	
-	public static long bcd2long(byte[] bytes, int start, int len) {
-		if (len > 8 || len == 0)
-			throw new IllegalArgumentException("bcd2long 字节数不符合要求");
-		String temp = "";
-		for (int i = 0;i < len;i++) {
-			int val = bytes[start + i] & 0xff;
-			if (val < 10) temp += 0;
-			temp += Integer.toHexString(val);
-		}
-		return Long.parseLong(temp);
-	}
-	
-	public static byte[] long2bcd(long val, int len) {
-		if (len > 8 || len == 0)
-			throw new IllegalArgumentException("long2bcd 字节数不符合要求");
-		byte[] result = new byte[len];
-		for (int i = len - 1;i > -1;i--) {
-			result[i] = (byte)Integer.parseInt(val%100 + "", 16);
-			val = val/100;
-		}
-		return result;
-	}
-	
-	public static String ascii2string(byte[] bytes, int start, int len) {
-		return new String(Arrays.copyOfRange(bytes, start, start + len));
-	}
-	
-	public static byte[] string2ascii(String val, int len) {
-		byte[] result = new byte[len];
-		byte[] bytes = val.getBytes();
-		if (bytes.length > len && len != 0)
-			throw new IllegalArgumentException("string2ascii 参数不符合要求");
-		if (len != 0)
-			for (int i = 0, l = bytes.length;i < l;i++) result[i] = bytes[i];
-		else return bytes;
-		return result;
-	}
-	
-	public static long bcd2timestamp(byte[] bytes, int start) {
-		String temp = "20";
-		for (int i = 0;i < 6;i++) {
-			int val = bytes[start + i] & 0xff;
-			if (val < 10) temp += 0;
-			temp += Integer.toHexString(val);
-		}
-		Date date = null;
-		try {
-			date = ThreadLocalDateUtil.parse(temp);
-		} catch (ParseException e) {
-			log.error("协议中时间数据异常：" + temp);
-		}
-		if (date != null) return date.getTime();
-		return -1;
-	}
-	
-	public static byte[] timestamp2bcd(long val) {
-		byte[] result = new byte[6];
-		Calendar c = Calendar.getInstance();
-		c.setTime(new Date(val));
-		result[0] = (byte)(Integer.parseInt(c.get(Calendar.YEAR)%100 + "", 16));
-		result[1] = (byte)(Integer.parseInt(c.get(Calendar.MONTH) + 1 + "", 16));
-		result[2] = (byte)Integer.parseInt(c.get(Calendar.DAY_OF_MONTH) + "", 16);
-		result[3] = (byte)Integer.parseInt(c.get(Calendar.HOUR_OF_DAY) + "", 16);
-		result[4] = (byte)Integer.parseInt(c.get(Calendar.MINUTE) + "", 16);
-		result[5] = (byte)Integer.parseInt(c.get(Calendar.SECOND) + "", 16);
-		return result;
-	}
-	
-	public static byte[] int2hex(int val, int len) {
-		if (len < 1)
-			throw new IllegalArgumentException("int2hex len 参数不符合要求");
-		byte[] result = new byte[len];
-		for (int i = 0;i < len;i++) {
-			result[len - 1 - i] = (byte)(val%100);
-			val = val/100;
-		}
-		
-		return result;
-	}
-	
-	public static int bytes2int(byte[] bytes, int start, int len) {
-		int val = 0;
-        for (int i = 0; i < len; i++) {
-            int shift = (len - 1 - i) * 8;
-            val += (bytes[start + i] & 0x0000FF) << shift;
-        }
-        
-        return val;
-	}
-}
+package com.bsth.data.gpsdata.client.pd.common;
+
+import com.bsth.data.gpsdata.client.common.ThreadLocalDateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+
+
+public class ConvertUtil {
+	
+	private final static Logger log = LoggerFactory.getLogger(ConvertUtil.class);
+	
+	public static int bcd2int(byte[] bytes, int start, int len) {
+		if (len > 4 || len == 0)
+			throw new IllegalArgumentException("bcd2int 字节数不符合要求");
+		String temp = "";
+		for (int i = 0;i < len;i++) {
+			int val = bytes[start + i] & 0xff;
+			if (val < 10) temp += 0;
+			temp += Integer.toHexString(val);
+		}
+		return Integer.parseInt(temp);
+	}
+	
+	public static byte[] int2bcd(int val, int len) {
+		if (len > 4 || len == 0)
+			throw new IllegalArgumentException("int2bcd 字节数不符合要求");
+		byte[] result = new byte[len];
+		for (int i = len - 1;i > -1;i--) {
+			result[i] = (byte)Integer.parseInt(val%100 + "", 16);
+			val = val/100;
+		}
+		return result;
+	}
+	
+	public static long bcd2long(byte[] bytes, int start, int len) {
+		if (len > 8 || len == 0)
+			throw new IllegalArgumentException("bcd2long 字节数不符合要求");
+		String temp = "";
+		for (int i = 0;i < len;i++) {
+			int val = bytes[start + i] & 0xff;
+			if (val < 10) temp += 0;
+			temp += Integer.toHexString(val);
+		}
+		return Long.parseLong(temp);
+	}
+	
+	public static byte[] long2bcd(long val, int len) {
+		if (len > 8 || len == 0)
+			throw new IllegalArgumentException("long2bcd 字节数不符合要求");
+		byte[] result = new byte[len];
+		for (int i = len - 1;i > -1;i--) {
+			result[i] = (byte)Integer.parseInt(val%100 + "", 16);
+			val = val/100;
+		}
+		return result;
+	}
+	
+	public static String ascii2string(byte[] bytes, int start, int len) {
+		return new String(Arrays.copyOfRange(bytes, start, start + len));
+	}
+	
+	public static byte[] string2ascii(String val, int len) {
+		byte[] result = new byte[len];
+		byte[] bytes = val.getBytes();
+		if (bytes.length > len && len != 0)
+			throw new IllegalArgumentException("string2ascii 参数不符合要求");
+		if (len != 0)
+			for (int i = 0, l = bytes.length;i < l;i++) result[i] = bytes[i];
+		else return bytes;
+		return result;
+	}
+	
+	public static long bcd2timestamp(byte[] bytes, int start) {
+		String temp = "20";
+		for (int i = 0;i < 6;i++) {
+			int val = bytes[start + i] & 0xff;
+			if (val < 10) temp += 0;
+			temp += Integer.toHexString(val);
+		}
+		Date date = null;
+		try {
+			date = ThreadLocalDateUtil.parse(temp);
+		} catch (ParseException e) {
+			log.error("协议中时间数据异常：" + temp);
+		}
+		if (date != null) return date.getTime();
+		return -1;
+	}
+	
+	public static byte[] timestamp2bcd(long val) {
+		byte[] result = new byte[6];
+		Calendar c = Calendar.getInstance();
+		c.setTime(new Date(val));
+		result[0] = (byte)(Integer.parseInt(c.get(Calendar.YEAR)%100 + "", 16));
+		result[1] = (byte)(Integer.parseInt(c.get(Calendar.MONTH) + 1 + "", 16));
+		result[2] = (byte)Integer.parseInt(c.get(Calendar.DAY_OF_MONTH) + "", 16);
+		result[3] = (byte)Integer.parseInt(c.get(Calendar.HOUR_OF_DAY) + "", 16);
+		result[4] = (byte)Integer.parseInt(c.get(Calendar.MINUTE) + "", 16);
+		result[5] = (byte)Integer.parseInt(c.get(Calendar.SECOND) + "", 16);
+		return result;
+	}
+	
+	public static byte[] int2hex(int val, int len) {
+		if (len < 1)
+			throw new IllegalArgumentException("int2hex len 参数不符合要求");
+		byte[] result = new byte[len];
+		for (int i = 0;i < len;i++) {
+			result[len - 1 - i] = (byte)(val%100);
+			val = val/100;
+		}
+		
+		return result;
+	}
+	
+	public static int bytes2int(byte[] bytes, int start, int len) {
+		int val = 0;
+        for (int i = 0; i < len; i++) {
+            int shift = (len - 1 - i) * 8;
+            val += (bytes[start + i] & 0x0000FF) << shift;
+        }
+        
+        return val;
+	}
+}
-package com.bsth.data.gpsdata.client.pd.handler;
-
-import com.bsth.data.gpsdata.client.ClientApp;
-import com.bsth.data.gpsdata.client.GpsBeforeBuffer;
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-import com.bsth.data.gpsdata.client.pd.protocol.PdMessage;
-import com.bsth.data.gpsdata.client.pd.protocol.Pd_41_0;
-import com.bsth.data.gpsdata.client.pd.protocol.Pd_42_0;
-import org.apache.mina.core.service.IoHandlerAdapter;
-import org.apache.mina.core.session.IdleStatus;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.transport.socket.SocketSessionConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-
-
-@Service
-public class PdClientHandler extends IoHandlerAdapter{
-	
-	private final static Logger log = LoggerFactory.getLogger(PdClientHandler.class);
-
-    @Autowired
-    GpsBeforeBuffer gpsBeforeBuffer;
-
-	@Override
-    public void sessionCreated(IoSession session) throws Exception {
-		SocketSessionConfig cfg = (SocketSessionConfig) session.getConfig();
-		cfg.setSoLinger(0);
-    }
-
-	@Override
-    public void sessionOpened(IoSession session) throws Exception {
-        
-    }
-
-	@Override
-    public void sessionClosed(IoSession session) throws Exception {
-		String deviceId = (String)session.getAttribute("deviceId");
-        if (deviceId != null) {
-        	//SessionManager.getInstance().unregister(deviceId);
-    		log.info("连网关设备编号:" + deviceId + "断开连接");
-    		log.warn(deviceId + "网关设备注销");
-
-            ClientApp.dconnect(deviceId);
-        } else {
-        	log.info("连网关设备编号:" + deviceId + "断开连接");
-        }
-    }
-
-	@Override
-    public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
-		session.closeNow();
-    }
-
-	@Override
-    public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
-		if (cause instanceof IOException) session.closeNow();
-		log.error("PdClientHandler异常：", cause);
-    }
-
-	@Override
-    public void messageReceived(IoSession session, Object message) throws Exception {
-        PdMessage msg = (PdMessage)message;
-        IMessageBody body = msg.getMessageBody();
-        if (body != null) {
-        	//String deviceId = body.getDeviceId();
-        	if (0x31 == msg.getCommandType()) {
-        		//IoSession regSession = SessionManager.getInstance().getSession(deviceId);
-        		//if (regSession != null) regSession.closeNow();
-        		//SessionManager.getInstance().register(deviceId, session);
-        		log.debug("设备编号:" + body.getDeviceId() + "建立连接");
-        	}
-            else if(0x41 == msg.getCommandType()){
-                Pd_41_0 pd41 = (Pd_41_0)msg.getMessageBody();
-                gpsBeforeBuffer.put(pd41.getInfo());
-            }
-            else if(0x42 == msg.getCommandType()){
-                Pd_42_0 pd42 = (Pd_42_0)msg.getMessageBody();
-                gpsBeforeBuffer.put(pd42.getInfo());
-            }
-        }
-    }
-
-	@Override
-    public void messageSent(IoSession session, Object message) throws Exception {
-        
-    }
-}
+package com.bsth.data.gpsdata.client.pd.handler;
+
+import com.bsth.data.gpsdata.client.ClientApp;
+import com.bsth.data.gpsdata.client.GpsBeforeBuffer;
+import com.bsth.data.gpsdata.client.msg.IMessageBody;
+import com.bsth.data.gpsdata.client.pd.protocol.PdMessage;
+import com.bsth.data.gpsdata.client.pd.protocol.Pd_41_0;
+import com.bsth.data.gpsdata.client.pd.protocol.Pd_42_0;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.transport.socket.SocketSessionConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+
+
+@Service
+public class PdClientHandler extends IoHandlerAdapter{
+	
+	private final static Logger log = LoggerFactory.getLogger(PdClientHandler.class);
+
+    @Autowired
+    GpsBeforeBuffer gpsBeforeBuffer;
+
+	@Override
+    public void sessionCreated(IoSession session) throws Exception {
+		SocketSessionConfig cfg = (SocketSessionConfig) session.getConfig();
+		cfg.setSoLinger(0);
+    }
+
+	@Override
+    public void sessionOpened(IoSession session) throws Exception {
+        
+    }
+
+	@Override
+    public void sessionClosed(IoSession session) throws Exception {
+		String deviceId = (String)session.getAttribute("deviceId");
+        if (deviceId != null) {
+        	//SessionManager.getInstance().unregister(deviceId);
+    		log.info("连网关设备编号:" + deviceId + "断开连接");
+    		log.warn(deviceId + "网关设备注销");
+
+            ClientApp.dconnect(deviceId);
+        } else {
+        	log.info("连网关设备编号:" + deviceId + "断开连接");
+        }
+    }
+
+	@Override
+    public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
+		session.closeNow();
+    }
+
+	@Override
+    public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
+		if (cause instanceof IOException) session.closeNow();
+		log.error("PdClientHandler异常：", cause);
+    }
+
+	@Override
+    public void messageReceived(IoSession session, Object message) throws Exception {
+        PdMessage msg = (PdMessage)message;
+        IMessageBody body = msg.getMessageBody();
+        if (body != null) {
+        	//String deviceId = body.getDeviceId();
+        	if (0x31 == msg.getCommandType()) {
+        		//IoSession regSession = SessionManager.getInstance().getSession(deviceId);
+        		//if (regSession != null) regSession.closeNow();
+        		//SessionManager.getInstance().register(deviceId, session);
+        		log.debug("设备编号:" + body.getDeviceId() + "建立连接");
+        	}
+            else if(0x41 == msg.getCommandType()){
+                Pd_41_0 pd41 = (Pd_41_0)msg.getMessageBody();
+                gpsBeforeBuffer.put(pd41.getInfo());
+            }
+            else if(0x42 == msg.getCommandType()){
+                Pd_42_0 pd42 = (Pd_42_0)msg.getMessageBody();
+                gpsBeforeBuffer.put(pd42.getInfo());
+            }
+        }
+    }
+
+	@Override
+    public void messageSent(IoSession session, Object message) throws Exception {
+        
+    }
+}
-package com.bsth.data.gpsdata.client.pd.protocol;
-
-
-import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
-
-import java.nio.ByteBuffer;
-import java.util.Date;
-
-
-public class BasicInfo {
-
-	private int cityCode;
-	private short industryCode;
-	private short companyCode;
-	private String deviceId;
-	private int lineId;
-	private int driverEmpNo;
-	private short carparkSerialNo;
-	private String carparkNo;
-	private short stopSerialNo;
-	private String stopNo;
-	// 经度 bcd 5 0121245333表示经度为121度24.5333分
-	private long carLon;
-	// 维度
-	private int carLat;
-	private long timestamp;
-	// 速度（传感器）bcd 2 保留一位小数 km/h
-	private short speedSensor;
-	// 速度（gps）bcd 2 保留一位小数 km/h
-	private short speedGps;
-	// 方向 bcd 2 0-359.5 保留一位小数
-	private short direction;
-	// 车内温度 bcd 2 第一字节为符号 00为正 01为负 后一字节为温度
-	private short inTemp;
-	// 营运状态 hex 4高位在前
-	// 第一字节位 7 GPS有/无效|6 场外/内|5 起终点站外/内|4 上/下行|3 已知/未知|2站外/站内|1 营运/非营运|0 在线路上/不在
-	// 7=1时其它位无效|0=1时3,4,5无效 第二字节6,7无效|3=1时2,4无效 第二字节6,7无效
-	// 第二字节位 7 非/标杆点|6 非/中途校时点|5 点/熄火|4 实时/缓存数据|3 门开/关|2 预留|1 非/包车|0预留
-	// 1=1时 第一字节0-6无效 6,7无效
-	// 后两个字节保留
-	private long serviceState;
-	// 调控状态
-	private long controlState;
-	// 累计里程 km 保留两位小数
-	private int totalMiles;
-	// 水温
-	private byte waterTemp;
-	// 油耗 (第一个字节 + 第二个字节/10)升/百公里
-	private int oilConsumption;
-	// 发动机转速 100转/秒
-	private int engineSpeed;
-	private float lon;
-	private float lat;
-	
-	private boolean inOutStopFlag = false;
-	
-	public void read(byte[] bytes, int idx) {
-		// TODO Auto-generated method stub
-		ByteBuffer buf = ByteBuffer.wrap(bytes);
-		cityCode = ConvertUtil.bcd2int(bytes, idx, 3); idx += 3;
-		industryCode = (short)(bytes[idx] & 0xff); idx++;
-		companyCode = (short)(bytes[idx] & 0xff); idx++;
-		deviceId = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
-		lineId = ConvertUtil.bcd2int(bytes, idx, 3); idx += 3;
-		driverEmpNo = ConvertUtil.bcd2int(bytes, idx, 4); idx +=4;
-		carparkSerialNo = (short)(bytes[idx] & 0xff); idx++;
-		carparkNo = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
-		stopSerialNo = (short)(bytes[idx] & 0xff); idx++;
-		stopNo = ConvertUtil.ascii2string(bytes, idx, 8).trim(); idx += 8;
-		carLon = ConvertUtil.bcd2long(bytes, idx, 5); lon = (int)(carLon/1000000) + carLon%1000000/600000f; idx += 5;
-		carLat = ConvertUtil.bcd2int(bytes, idx, 4); lat = carLat/1000000 + carLat%1000000/600000f; idx += 4;
-		timestamp = ConvertUtil.bcd2timestamp(bytes, idx); idx += 6;
-		speedSensor = (short)ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
-		speedGps = (short)ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
-		direction = (short)(ConvertUtil.bcd2int(bytes, idx, 2)); idx += 2;
-		inTemp = (short)ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
-		serviceState = buf.getInt(idx) & 0xffffffff; idx += 4;
-		controlState = buf.getInt(idx) & 0xffffffff; idx += 4;
-		totalMiles = ConvertUtil.bcd2int(bytes, idx, 4); idx += 4;
-		waterTemp = bytes[idx]; idx++;
-		oilConsumption = ConvertUtil.bcd2int(bytes, idx, 4); idx += 4;
-		engineSpeed = buf.getShort(idx) & 0xffff; idx += 2;
-	}
-	
-	public byte[] write() {
-		ByteBuffer buf = ByteBuffer.allocate(80);
-		buf.put(ConvertUtil.int2bcd(cityCode, 3));
-		buf.put((byte)industryCode);
-		buf.put((byte)companyCode);
-		buf.put(ConvertUtil.string2ascii(deviceId, 8));
-		buf.put(ConvertUtil.int2bcd(lineId, 3));
-		buf.put(ConvertUtil.int2bcd(driverEmpNo, 4));
-		buf.put((byte)carparkSerialNo);
-		buf.put(ConvertUtil.string2ascii(carparkNo, 8));
-		buf.put((byte)stopSerialNo);
-		buf.put(ConvertUtil.string2ascii(stopNo, 8));
-		buf.put(ConvertUtil.long2bcd(carLon, 5));
-		buf.put(ConvertUtil.long2bcd(carLat, 4));
-		buf.put(ConvertUtil.timestamp2bcd(timestamp));
-		buf.put(ConvertUtil.int2bcd(speedSensor, 2));
-		buf.put(ConvertUtil.int2bcd(speedGps, 2));
-		buf.put(ConvertUtil.int2bcd(direction, 2));
-		buf.put(ConvertUtil.int2bcd(inTemp, 2));
-		buf.putInt((int)serviceState);
-		buf.putInt((int)controlState);
-		buf.put(ConvertUtil.int2bcd(totalMiles, 4));
-		buf.put(waterTemp);
-		buf.put(ConvertUtil.int2bcd(oilConsumption, 2));
-		buf.putShort((short)engineSpeed);
-		
-		return buf.array();
-	}
-	
-	public String getDeviceId() {
-		// TODO Auto-generated method stub
-		return deviceId;
-	}
-
-	public int getCityCode() {
-		return cityCode;
-	}
-
-	public short getIndustryCode() {
-		return industryCode;
-	}
-
-	public short getCompanyCode() {
-		return companyCode;
-	}
-
-	public int getLineId() {
-		return lineId;
-	}
-
-	public int getDriverEmpNo() {
-		return driverEmpNo;
-	}
-
-	public short getCarparkSerialNo() {
-		return carparkSerialNo;
-	}
-
-	public String getCarparkNo() {
-		return carparkNo;
-	}
-
-	public short getStopSerialNo() {
-		return stopSerialNo;
-	}
-
-	public String getStopNo() {
-		return stopNo;
-	}
-
-	public long getCarLon() {
-		return carLon;
-	}
-
-	public int getCarLat() {
-		return carLat;
-	}
-
-	public long getTimestamp() {
-		return timestamp;
-	}
-
-	public short getSpeedSensor() {
-		return speedSensor;
-	}
-
-	public short getSpeedGps() {
-		return speedGps;
-	}
-
-	public short getDirection() {
-		return direction;
-	}
-
-	public short getInTemp() {
-		return inTemp;
-	}
-
-	public long getServiceState() {
-		return serviceState;
-	}
-
-	public long getControlState() {
-		return controlState;
-	}
-
-	public int getTotalMiles() {
-		return totalMiles;
-	}
-
-	public byte getWaterTemp() {
-		return waterTemp;
-	}
-
-	public int getOilConsumption() {
-		return oilConsumption;
-	}
-
-	public int getEngineSpeed() {
-		return engineSpeed;
-	}
-	
-	public float getLon() {
-		return lon;
-	}
-
-	public void setLon(float lon) {
-		this.lon = lon;
-	}
-
-	public float getLat() {
-		return lat;
-	}
-
-	public void setLat(float lat) {
-		this.lat = lat;
-	}
-	
-	public void setStopNo(String stopNo) {
-		this.stopNo = stopNo;
-	}
-	
-	public byte getGpsValid() {
-		return (byte)(((serviceState & 0x80000000) == 0x80000000) ? 1 : 0);
-	}
-
-	/**
-	 * 获取车辆在场外/内
-	 * @return -1无效 0场外1场内
-	 */
-	public byte getInOrOutCarpark() {
-		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
-				|| (serviceState & 0x01000000) == 0x01000000) return -1;
-		return (byte)(((serviceState & 0x40000000) == 0x40000000) ? 1 : 0);
-	}
-	
-	public void setInOrOutCarpark(boolean inOutFlag) {
-		if (inOutFlag) serviceState |= 0x40000000;
-		else serviceState &= 0xbfffffff;
-	}
-
-	/**
-	 * 获取车辆在起终点站外/内
-	 * @return -1无效 0起终点站外1起终点站内
-	 */
-	public byte getInOrOutStartEnd() {
-		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
-				|| (serviceState & 0x01000000) == 0x01000000) return -1;
-		return (byte)(((serviceState & 0x20000000) == 0x20000000) ? 1 : 0);
-	}
-	
-	/**
-	 * 获取车辆线路上下行
-	 * @return -1无效 0上行 1下行
-	 */
-	public byte getUpOrDown() {
-		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000 
-				|| (serviceState & 0x01000000) == 0x01000000 
-				|| (serviceState & 0x08000000) == 0x08000000) return -1;
-		return (byte)(((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
-	}
-	
-	public void setUpOrDown(boolean upOrDown) {
-		if (!upOrDown) serviceState |= 0x10000000;
-		else serviceState &= 0xefffffff;
-	}
-	
-	/**
-	 * 获取车辆在站外/内
-	 * @return -1无效 0站外 1站内
-	 */
-	public byte getInOrOutStop() {
-		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
-				|| (serviceState & 0x01000000) == 0x01000000 
-				|| (serviceState & 0x08000000) == 0x08000000) return -1;
-		return (byte)(((serviceState & 0x04000000) == 0x04000000) ? 1 : 0);
-	}
-	
-	public void setInOrOutStop(boolean isInOrOutStop) {
-		inOutStopFlag = true;
-		if (isInOrOutStop) serviceState |= 0x04000000;
-		else serviceState &= 0xfbffffff;
-	}
-	
-	/**
-	 * 获取运营状态
-	 * @return -1无效 0运营 1未运营
-	 */
-	public byte getService() {
-		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000) return -1;
-		return (byte)(((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
-	}
-	
-	public void setService(boolean service) {
-		if (!service) serviceState |= 0x02000000;
-		else serviceState &= 0xfdffffff;
-	}
-	
-	/**
-	 * 获得车辆状态
-	 * @return 0点火 1熄火
-	 */
-	public byte getVehicleState() {
-		return (byte)(((serviceState & 0x00200000) == 0x00200000) ? 1 : 0);
-	}
-	
-	public void setInOutStopFlag(boolean inOutStopFlag) {
-		this.inOutStopFlag = inOutStopFlag;
-	}
-	
-	public boolean getInOutStopFlag() {
-		return inOutStopFlag;
-	}
-	
-	public String toString() {
-		Date d = new Date();d.setTime(timestamp);
-		StringBuilder sb = new StringBuilder();
-		sb.append("城市代码：").append(cityCode)
-		.append("行业代码：").append(industryCode)
-		.append("公司代码：").append(companyCode)
-		.append("设备号：").append(deviceId)
-		.append("线路编号：").append(lineId)
-		.append("驾驶员工号：").append(driverEmpNo)
-		.append("停车场序列号：").append(carparkSerialNo)
-		.append("停车场编号：").append(carparkNo)
-		.append("站点序列号").append(stopSerialNo)
-		.append("站点编号：").append(stopNo)
-		.append("经度：").append(carLon)
-		.append("维度：").append(carLat)
-		.append("时间戳：").append(d)
-		.append("速度（传感器）：").append(speedSensor)
-		.append("速度（gps）").append(speedGps)
-		.append("方向：").append(direction)
-		.append("车内温度：").append(inTemp)
-		.append("营运状态：").append(serviceState)
-		.append("调控状态：").append(controlState)
-		.append("总里程：").append(totalMiles)
-		.append("水温：").append(waterTemp)
-		.append("油耗：").append(oilConsumption)
-		.append("发动机速度：").append(engineSpeed);
-		
-		return sb.toString();
-	}
-	/* ----------------------------------------------------- */
-
-	public void setCityCode(int cityCode) {
-		this.cityCode = cityCode;
-	}
-
-	public void setIndustryCode(short industryCode) {
-		this.industryCode = industryCode;
-	}
-
-	public void setCompanyCode(short companyCode) {
-		this.companyCode = companyCode;
-	}
-
-	public void setDeviceId(String deviceId) {
-		this.deviceId = deviceId;
-	}
-
-	public void setLineId(int lineId) {
-		this.lineId = lineId;
-	}
-
-	public void setDriverEmpNo(int driverEmpNo) {
-		this.driverEmpNo = driverEmpNo;
-	}
-
-	public void setCarparkSerialNo(short carparkSerialNo) {
-		this.carparkSerialNo = carparkSerialNo;
-	}
-
-	public void setCarparkNo(String carparkNo) {
-		this.carparkNo = carparkNo;
-	}
-
-	public void setStopSerialNo(short stopSerialNo) {
-		this.stopSerialNo = stopSerialNo;
-	}
-
-	public void setCarLon(long carLon) {
-		this.carLon = carLon;
-	}
-
-	public void setCarLat(int carLat) {
-		this.carLat = carLat;
-	}
-
-	public void setTimestamp(long timestamp) {
-		this.timestamp = timestamp;
-	}
-
-	public void setSpeedSensor(short speedSensor) {
-		this.speedSensor = speedSensor;
-	}
-
-	public void setSpeedGps(short speedGps) {
-		this.speedGps = speedGps;
-	}
-
-	public void setDirection(short direction) {
-		this.direction = direction;
-	}
-
-	public void setInTemp(short inTemp) {
-		this.inTemp = inTemp;
-	}
-
-	public void setServiceState(long serviceState) {
-		this.serviceState = serviceState;
-	}
-
-	public void setControlState(long controlState) {
-		this.controlState = controlState;
-	}
-
-	public void setTotalMiles(int totalMiles) {
-		this.totalMiles = totalMiles;
-	}
-
-	public void setWaterTemp(byte waterTemp) {
-		this.waterTemp = waterTemp;
-	}
-
-	public void setOilConsumption(int oilConsumption) {
-		this.oilConsumption = oilConsumption;
-	}
-
-	public void setEngineSpeed(int engineSpeed) {
-		this.engineSpeed = engineSpeed;
-	}
-}
+package com.bsth.data.gpsdata.client.pd.protocol;
+
+
+import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
+
+import java.nio.ByteBuffer;
+import java.util.Date;
+
+
+public class BasicInfo {
+
+	private int cityCode;
+	private short industryCode;
+	private short companyCode;
+	private String deviceId;
+	private int lineId;
+	private int driverEmpNo;
+	private short carparkSerialNo;
+	private String carparkNo;
+	private short stopSerialNo;
+	private String stopNo;
+	// 经度 bcd 5 0121245333表示经度为121度24.5333分
+	private long carLon;
+	// 维度
+	private int carLat;
+	private long timestamp;
+	// 速度（传感器）bcd 2 保留一位小数 km/h
+	private short speedSensor;
+	// 速度（gps）bcd 2 保留一位小数 km/h
+	private short speedGps;
+	// 方向 bcd 2 0-359.5 保留一位小数
+	private short direction;
+	// 车内温度 bcd 2 第一字节为符号 00为正 01为负 后一字节为温度
+	private short inTemp;
+	// 营运状态 hex 4高位在前
+	// 第一字节位 7 GPS有/无效|6 场外/内|5 起终点站外/内|4 上/下行|3 已知/未知|2站外/站内|1 营运/非营运|0 在线路上/不在
+	// 7=1时其它位无效|0=1时3,4,5无效 第二字节6,7无效|3=1时2,4无效 第二字节6,7无效
+	// 第二字节位 7 非/标杆点|6 非/中途校时点|5 点/熄火|4 实时/缓存数据|3 门开/关|2 预留|1 非/包车|0预留
+	// 1=1时 第一字节0-6无效 6,7无效
+	// 后两个字节保留
+	private long serviceState;
+	// 调控状态
+	private long controlState;
+	// 累计里程 km 保留两位小数
+	private int totalMiles;
+	// 水温
+	private byte waterTemp;
+	// 油耗 (第一个字节 + 第二个字节/10)升/百公里
+	private int oilConsumption;
+	// 发动机转速 100转/秒
+	private int engineSpeed;
+	private float lon;
+	private float lat;
+	
+	private boolean inOutStopFlag = false;
+	
+	public void read(byte[] bytes, int idx) {
+		// TODO Auto-generated method stub
+		ByteBuffer buf = ByteBuffer.wrap(bytes);
+		cityCode = ConvertUtil.bcd2int(bytes, idx, 3); idx += 3;
+		industryCode = (short)(bytes[idx] & 0xff); idx++;
+		companyCode = (short)(bytes[idx] & 0xff); idx++;
+		deviceId = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
+		lineId = ConvertUtil.bcd2int(bytes, idx, 3); idx += 3;
+		driverEmpNo = ConvertUtil.bcd2int(bytes, idx, 4); idx +=4;
+		carparkSerialNo = (short)(bytes[idx] & 0xff); idx++;
+		carparkNo = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
+		stopSerialNo = (short)(bytes[idx] & 0xff); idx++;
+		stopNo = ConvertUtil.ascii2string(bytes, idx, 8).trim(); idx += 8;
+		carLon = ConvertUtil.bcd2long(bytes, idx, 5); lon = (int)(carLon/1000000) + carLon%1000000/600000f; idx += 5;
+		carLat = ConvertUtil.bcd2int(bytes, idx, 4); lat = carLat/1000000 + carLat%1000000/600000f; idx += 4;
+		timestamp = ConvertUtil.bcd2timestamp(bytes, idx); idx += 6;
+		speedSensor = (short)ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
+		speedGps = (short)ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
+		direction = (short)(ConvertUtil.bcd2int(bytes, idx, 2)); idx += 2;
+		inTemp = (short)ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
+		serviceState = buf.getInt(idx) & 0xffffffff; idx += 4;
+		controlState = buf.getInt(idx) & 0xffffffff; idx += 4;
+		totalMiles = ConvertUtil.bcd2int(bytes, idx, 4); idx += 4;
+		waterTemp = bytes[idx]; idx++;
+		oilConsumption = ConvertUtil.bcd2int(bytes, idx, 4); idx += 4;
+		engineSpeed = buf.getShort(idx) & 0xffff; idx += 2;
+	}
+	
+	public byte[] write() {
+		ByteBuffer buf = ByteBuffer.allocate(80);
+		buf.put(ConvertUtil.int2bcd(cityCode, 3));
+		buf.put((byte)industryCode);
+		buf.put((byte)companyCode);
+		buf.put(ConvertUtil.string2ascii(deviceId, 8));
+		buf.put(ConvertUtil.int2bcd(lineId, 3));
+		buf.put(ConvertUtil.int2bcd(driverEmpNo, 4));
+		buf.put((byte)carparkSerialNo);
+		buf.put(ConvertUtil.string2ascii(carparkNo, 8));
+		buf.put((byte)stopSerialNo);
+		buf.put(ConvertUtil.string2ascii(stopNo, 8));
+		buf.put(ConvertUtil.long2bcd(carLon, 5));
+		buf.put(ConvertUtil.long2bcd(carLat, 4));
+		buf.put(ConvertUtil.timestamp2bcd(timestamp));
+		buf.put(ConvertUtil.int2bcd(speedSensor, 2));
+		buf.put(ConvertUtil.int2bcd(speedGps, 2));
+		buf.put(ConvertUtil.int2bcd(direction, 2));
+		buf.put(ConvertUtil.int2bcd(inTemp, 2));
+		buf.putInt((int)serviceState);
+		buf.putInt((int)controlState);
+		buf.put(ConvertUtil.int2bcd(totalMiles, 4));
+		buf.put(waterTemp);
+		buf.put(ConvertUtil.int2bcd(oilConsumption, 2));
+		buf.putShort((short)engineSpeed);
+		
+		return buf.array();
+	}
+	
+	public String getDeviceId() {
+		// TODO Auto-generated method stub
+		return deviceId;
+	}
+
+	public int getCityCode() {
+		return cityCode;
+	}
+
+	public short getIndustryCode() {
+		return industryCode;
+	}
+
+	public short getCompanyCode() {
+		return companyCode;
+	}
+
+	public int getLineId() {
+		return lineId;
+	}
+
+	public int getDriverEmpNo() {
+		return driverEmpNo;
+	}
+
+	public short getCarparkSerialNo() {
+		return carparkSerialNo;
+	}
+
+	public String getCarparkNo() {
+		return carparkNo;
+	}
+
+	public short getStopSerialNo() {
+		return stopSerialNo;
+	}
+
+	public String getStopNo() {
+		return stopNo;
+	}
+
+	public long getCarLon() {
+		return carLon;
+	}
+
+	public int getCarLat() {
+		return carLat;
+	}
+
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+	public short getSpeedSensor() {
+		return speedSensor;
+	}
+
+	public short getSpeedGps() {
+		return speedGps;
+	}
+
+	public short getDirection() {
+		return direction;
+	}
+
+	public short getInTemp() {
+		return inTemp;
+	}
+
+	public long getServiceState() {
+		return serviceState;
+	}
+
+	public long getControlState() {
+		return controlState;
+	}
+
+	public int getTotalMiles() {
+		return totalMiles;
+	}
+
+	public byte getWaterTemp() {
+		return waterTemp;
+	}
+
+	public int getOilConsumption() {
+		return oilConsumption;
+	}
+
+	public int getEngineSpeed() {
+		return engineSpeed;
+	}
+	
+	public float getLon() {
+		return lon;
+	}
+
+	public void setLon(float lon) {
+		this.lon = lon;
+	}
+
+	public float getLat() {
+		return lat;
+	}
+
+	public void setLat(float lat) {
+		this.lat = lat;
+	}
+	
+	public void setStopNo(String stopNo) {
+		this.stopNo = stopNo;
+	}
+	
+	public byte getGpsValid() {
+		return (byte)(((serviceState & 0x80000000) == 0x80000000) ? 1 : 0);
+	}
+
+	/**
+	 * 获取车辆在场外/内
+	 * @return -1无效 0场外1场内
+	 */
+	public byte getInOrOutCarpark() {
+		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
+				|| (serviceState & 0x01000000) == 0x01000000) return -1;
+		return (byte)(((serviceState & 0x40000000) == 0x40000000) ? 1 : 0);
+	}
+	
+	public void setInOrOutCarpark(boolean inOutFlag) {
+		if (inOutFlag) serviceState |= 0x40000000;
+		else serviceState &= 0xbfffffff;
+	}
+
+	/**
+	 * 获取车辆在起终点站外/内
+	 * @return -1无效 0起终点站外1起终点站内
+	 */
+	public byte getInOrOutStartEnd() {
+		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
+				|| (serviceState & 0x01000000) == 0x01000000) return -1;
+		return (byte)(((serviceState & 0x20000000) == 0x20000000) ? 1 : 0);
+	}
+	
+	/**
+	 * 获取车辆线路上下行
+	 * @return -1无效 0上行 1下行
+	 */
+	public byte getUpOrDown() {
+		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000 
+				|| (serviceState & 0x01000000) == 0x01000000 
+				|| (serviceState & 0x08000000) == 0x08000000) return -1;
+		return (byte)(((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
+	}
+	
+	public void setUpOrDown(boolean upOrDown) {
+		if (!upOrDown) serviceState |= 0x10000000;
+		else serviceState &= 0xefffffff;
+	}
+	
+	/**
+	 * 获取车辆在站外/内
+	 * @return -1无效 0站外 1站内
+	 */
+	public byte getInOrOutStop() {
+		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
+				|| (serviceState & 0x01000000) == 0x01000000 
+				|| (serviceState & 0x08000000) == 0x08000000) return -1;
+		return (byte)(((serviceState & 0x04000000) == 0x04000000) ? 1 : 0);
+	}
+	
+	public void setInOrOutStop(boolean isInOrOutStop) {
+		inOutStopFlag = true;
+		if (isInOrOutStop) serviceState |= 0x04000000;
+		else serviceState &= 0xfbffffff;
+	}
+	
+	/**
+	 * 获取运营状态
+	 * @return -1无效 0运营 1未运营
+	 */
+	public byte getService() {
+		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000) return -1;
+		return (byte)(((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
+	}
+	
+	public void setService(boolean service) {
+		if (!service) serviceState |= 0x02000000;
+		else serviceState &= 0xfdffffff;
+	}
+	
+	/**
+	 * 获得车辆状态
+	 * @return 0点火 1熄火
+	 */
+	public byte getVehicleState() {
+		return (byte)(((serviceState & 0x00200000) == 0x00200000) ? 1 : 0);
+	}
+	
+	public void setInOutStopFlag(boolean inOutStopFlag) {
+		this.inOutStopFlag = inOutStopFlag;
+	}
+	
+	public boolean getInOutStopFlag() {
+		return inOutStopFlag;
+	}
+	
+	public String toString() {
+		Date d = new Date();d.setTime(timestamp);
+		StringBuilder sb = new StringBuilder();
+		sb.append("城市代码：").append(cityCode)
+		.append("行业代码：").append(industryCode)
+		.append("公司代码：").append(companyCode)
+		.append("设备号：").append(deviceId)
+		.append("线路编号：").append(lineId)
+		.append("驾驶员工号：").append(driverEmpNo)
+		.append("停车场序列号：").append(carparkSerialNo)
+		.append("停车场编号：").append(carparkNo)
+		.append("站点序列号").append(stopSerialNo)
+		.append("站点编号：").append(stopNo)
+		.append("经度：").append(carLon)
+		.append("维度：").append(carLat)
+		.append("时间戳：").append(d)
+		.append("速度（传感器）：").append(speedSensor)
+		.append("速度（gps）").append(speedGps)
+		.append("方向：").append(direction)
+		.append("车内温度：").append(inTemp)
+		.append("营运状态：").append(serviceState)
+		.append("调控状态：").append(controlState)
+		.append("总里程：").append(totalMiles)
+		.append("水温：").append(waterTemp)
+		.append("油耗：").append(oilConsumption)
+		.append("发动机速度：").append(engineSpeed);
+		
+		return sb.toString();
+	}
+	/* ----------------------------------------------------- */
+
+	public void setCityCode(int cityCode) {
+		this.cityCode = cityCode;
+	}
+
+	public void setIndustryCode(short industryCode) {
+		this.industryCode = industryCode;
+	}
+
+	public void setCompanyCode(short companyCode) {
+		this.companyCode = companyCode;
+	}
+
+	public void setDeviceId(String deviceId) {
+		this.deviceId = deviceId;
+	}
+
+	public void setLineId(int lineId) {
+		this.lineId = lineId;
+	}
+
+	public void setDriverEmpNo(int driverEmpNo) {
+		this.driverEmpNo = driverEmpNo;
+	}
+
+	public void setCarparkSerialNo(short carparkSerialNo) {
+		this.carparkSerialNo = carparkSerialNo;
+	}
+
+	public void setCarparkNo(String carparkNo) {
+		this.carparkNo = carparkNo;
+	}
+
+	public void setStopSerialNo(short stopSerialNo) {
+		this.stopSerialNo = stopSerialNo;
+	}
+
+	public void setCarLon(long carLon) {
+		this.carLon = carLon;
+	}
+
+	public void setCarLat(int carLat) {
+		this.carLat = carLat;
+	}
+
+	public void setTimestamp(long timestamp) {
+		this.timestamp = timestamp;
+	}
+
+	public void setSpeedSensor(short speedSensor) {
+		this.speedSensor = speedSensor;
+	}
+
+	public void setSpeedGps(short speedGps) {
+		this.speedGps = speedGps;
+	}
+
+	public void setDirection(short direction) {
+		this.direction = direction;
+	}
+
+	public void setInTemp(short inTemp) {
+		this.inTemp = inTemp;
+	}
+
+	public void setServiceState(long serviceState) {
+		this.serviceState = serviceState;
+	}
+
+	public void setControlState(long controlState) {
+		this.controlState = controlState;
+	}
+
+	public void setTotalMiles(int totalMiles) {
+		this.totalMiles = totalMiles;
+	}
+
+	public void setWaterTemp(byte waterTemp) {
+		this.waterTemp = waterTemp;
+	}
+
+	public void setOilConsumption(int oilConsumption) {
+		this.oilConsumption = oilConsumption;
+	}
+
+	public void setEngineSpeed(int engineSpeed) {
+		this.engineSpeed = engineSpeed;
+	}
+}
-package com.bsth.data.gpsdata.client.pd.protocol;
-
-
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-
-public class PdFactory {
-
-	public static IMessageBody create(int commandType, byte[] data) {
-		String pkgName = PdFactory.class.getPackage().getName();
-		IMessageBody body = null;
-		try {
-			Class<?> cls = Class.forName(pkgName + ".Pd_" + Integer.toHexString(commandType).toUpperCase() + "_0");
-			body = (IMessageBody)cls.newInstance();
-			body.read(data);
-		} catch (ClassNotFoundException e) {
-			// TODO Auto-generated catch block
-			//e.printStackTrace();
-		} catch (InstantiationException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return body;
-	}
-}
+package com.bsth.data.gpsdata.client.pd.protocol;
+
+
+import com.bsth.data.gpsdata.client.msg.IMessageBody;
+
+public class PdFactory {
+
+	public static IMessageBody create(int commandType, byte[] data) {
+		String pkgName = PdFactory.class.getPackage().getName();
+		IMessageBody body = null;
+		try {
+			Class<?> cls = Class.forName(pkgName + ".Pd_" + Integer.toHexString(commandType).toUpperCase() + "_0");
+			body = (IMessageBody)cls.newInstance();
+			body.read(data);
+		} catch (ClassNotFoundException e) {
+			// TODO Auto-generated catch block
+			//e.printStackTrace();
+		} catch (InstantiationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return body;
+	}
+}
-package com.bsth.data.gpsdata.client.pd.protocol;
-
-
-import com.bsth.data.gpsdata.client.msg.IMessage;
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-
-public class PdMessage implements IMessage {
-	
-	private short version;
-	private short serialNo;
-	private short commandType;
-	private IMessageBody messageBody;
-	private byte checkSum;
-	
-	public short getVersion() {
-		return version;
-	}
-
-	public void setVersion(short version) {
-		this.version = version;
-	}
-
-	public short getSerialNo() {
-		return serialNo;
-	}
-
-	public void setSerialNo(short serialNo) {
-		this.serialNo = serialNo;
-	}
-
-	public short getCommandType() {
-		return commandType;
-	}
-
-	public void setCommandType(short commandType) {
-		this.commandType = commandType;
-	}
-
-	public IMessageBody getMessageBody() {
-		return messageBody;
-	}
-
-	public void setMessageBody(IMessageBody messageBody) {
-		this.messageBody = messageBody;
-	}
-
-	public byte getCheckSum() {
-		return checkSum;
-	}
-
-	public void setCheckSum(byte checkSum) {
-		this.checkSum = checkSum;
-	}
-
-	public void read(byte[] data) {
-		int idx = 0, len = data.length;
-		version = (short)(data[idx] & 0xff); idx++;
-		serialNo = (short)(data[idx] & 0xff); idx++;
-		commandType = (short)(data[idx] & 0xff); idx++;
-		byte[] temp = Arrays.copyOfRange(data, idx, len - 1);
-		checkSum = data[len - 1];
-		byte sum = 0;
-		for (int i = 0;i < len - 1;i++) {
-			sum += data[i];
-		}
-		if (sum == checkSum) {
-			messageBody = PdFactory.create(commandType, temp);
-		}
-	}
-	
-	public byte[] write() {
-		byte[] bytes = messageBody.write();
-		ByteBuffer buf = ByteBuffer.allocate(bytes.length + 8);
-		buf.put(new byte[] { (byte)0xfa, (byte)0xf5 });
-		buf.putShort((short)(bytes.length + 3));
-		buf.put((byte)version);
-		buf.put((byte)serialNo);
-		buf.put((byte)commandType);
-		buf.put(bytes);
-		checkSum = 0;
-		checkSum += (byte)version;
-		checkSum += (byte)serialNo;
-		checkSum += (byte)commandType;
-		for (byte b : bytes) {
-			checkSum += b;
-		}
-		buf.put(checkSum);
-		return buf.array();
-	}
-	
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("报文版本号：").append(version)
-		.append("报文序列号：").append(serialNo)
-		.append("报文命令字：0x").append(Integer.toHexString(commandType))
-		.append("报文主体：(").append(messageBody).append(")")
-		.append("报文校验和：").append(checkSum);
-		
-		return sb.toString();
-	}
-}
+package com.bsth.data.gpsdata.client.pd.protocol;
+
+
+import com.bsth.data.gpsdata.client.msg.IMessage;
+import com.bsth.data.gpsdata.client.msg.IMessageBody;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+
+public class PdMessage implements IMessage {
+	
+	private short version;
+	private short serialNo;
+	private short commandType;
+	private IMessageBody messageBody;
+	private byte checkSum;
+	
+	public short getVersion() {
+		return version;
+	}
+
+	public void setVersion(short version) {
+		this.version = version;
+	}
+
+	public short getSerialNo() {
+		return serialNo;
+	}
+
+	public void setSerialNo(short serialNo) {
+		this.serialNo = serialNo;
+	}
+
+	public short getCommandType() {
+		return commandType;
+	}
+
+	public void setCommandType(short commandType) {
+		this.commandType = commandType;
+	}
+
+	public IMessageBody getMessageBody() {
+		return messageBody;
+	}
+
+	public void setMessageBody(IMessageBody messageBody) {
+		this.messageBody = messageBody;
+	}
+
+	public byte getCheckSum() {
+		return checkSum;
+	}
+
+	public void setCheckSum(byte checkSum) {
+		this.checkSum = checkSum;
+	}
+
+	public void read(byte[] data) {
+		int idx = 0, len = data.length;
+		version = (short)(data[idx] & 0xff); idx++;
+		serialNo = (short)(data[idx] & 0xff); idx++;
+		commandType = (short)(data[idx] & 0xff); idx++;
+		byte[] temp = Arrays.copyOfRange(data, idx, len - 1);
+		checkSum = data[len - 1];
+		byte sum = 0;
+		for (int i = 0;i < len - 1;i++) {
+			sum += data[i];
+		}
+		if (sum == checkSum) {
+			messageBody = PdFactory.create(commandType, temp);
+		}
+	}
+	
+	public byte[] write() {
+		byte[] bytes = messageBody.write();
+		ByteBuffer buf = ByteBuffer.allocate(bytes.length + 8);
+		buf.put(new byte[] { (byte)0xfa, (byte)0xf5 });
+		buf.putShort((short)(bytes.length + 3));
+		buf.put((byte)version);
+		buf.put((byte)serialNo);
+		buf.put((byte)commandType);
+		buf.put(bytes);
+		checkSum = 0;
+		checkSum += (byte)version;
+		checkSum += (byte)serialNo;
+		checkSum += (byte)commandType;
+		for (byte b : bytes) {
+			checkSum += b;
+		}
+		buf.put(checkSum);
+		return buf.array();
+	}
+	
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("报文版本号：").append(version)
+		.append("报文序列号：").append(serialNo)
+		.append("报文命令字：0x").append(Integer.toHexString(commandType))
+		.append("报文主体：(").append(messageBody).append(")")
+		.append("报文校验和：").append(checkSum);
+		
+		return sb.toString();
+	}
+}
-package com.bsth.data.gpsdata.client.pd.protocol;
-
-
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
-
-import java.nio.ByteBuffer;
-import java.util.Date;
-
-
-public class Pd_31_0 implements IMessageBody {
-
-	// bcd 1
-	private short funCode;
-	// bcd 3
-	private int lineId;
-	// ascii 8
-	private String deviceId;
-	// bcd 6 yyMMddhhmmss
-	private long timestamp;
-	// hex 8
-	private String reserved;
-	
-	@Override
-	public void read(byte[] bytes) {
-		// TODO Auto-generated method stub
-		int idx = 0;
-		funCode = (short)(bytes[idx] & 0xff);idx++;
-		lineId = ConvertUtil.bcd2int(bytes, idx, 3);idx += 3;
-		deviceId = ConvertUtil.ascii2string(bytes, idx, 8);idx += 8;
-		timestamp = ConvertUtil.bcd2timestamp(bytes, idx);idx += 6;
-		reserved = ConvertUtil.ascii2string(bytes, idx, 8);idx += 8;
-	}
-	
-	@Override
-	public byte[] write() {
-		// TODO Auto-generated method stub
-		ByteBuffer buf = ByteBuffer.allocate(26);
-		buf.put((byte)funCode);
-		buf.put(ConvertUtil.int2bcd(lineId, 3));
-		buf.put(deviceId.getBytes());
-		buf.put(ConvertUtil.timestamp2bcd(timestamp));
-		buf.put(new byte[]{0,0,0,0,0,0,0,0});
-		return buf.array();
-	}
-	
-	public short getFunCode() {
-		return funCode;
-	}
-	
-	public int getLineId() {
-		return lineId;
-	}
-	
-	public String getDeviceId() {
-		return deviceId;
-	}
-	
-	public long getTimestamp() {
-		return timestamp;
-	}
-	
-	public String getReserved() {
-		return reserved;
-	}
-
-	public void setFunCode(short funCode) {
-		this.funCode = funCode;
-	}
-
-	public void setLineId(int lineId) {
-		this.lineId = lineId;
-	}
-
-	public void setDeviceId(String deviceId) {
-		this.deviceId = deviceId;
-	}
-
-	public void setTimeStamp(long timestamp) {
-		this.timestamp = timestamp;
-	}
-
-	public void setReserved(String reserved) {
-		this.reserved = reserved;
-	}
-	
-	public String toString() {
-		Date d = new Date();
-		d.setTime(timestamp);
-		StringBuilder sb = new StringBuilder();
-		sb.append("功能号：").append(Integer.toHexString(funCode))
-		.append("线路编号：").append(lineId)
-		.append("设备编号：").append(deviceId)
-		.append("时间戳：").append(d);
-		return sb.toString();
-	}
-}
+package com.bsth.data.gpsdata.client.pd.protocol;
+
+
+import com.bsth.data.gpsdata.client.msg.IMessageBody;
+import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
+
+import java.nio.ByteBuffer;
+import java.util.Date;
+
+
+public class Pd_31_0 implements IMessageBody {
+
+	// bcd 1
+	private short funCode;
+	// bcd 3
+	private int lineId;
+	// ascii 8
+	private String deviceId;
+	// bcd 6 yyMMddhhmmss
+	private long timestamp;
+	// hex 8
+	private String reserved;
+	
+	@Override
+	public void read(byte[] bytes) {
+		// TODO Auto-generated method stub
+		int idx = 0;
+		funCode = (short)(bytes[idx] & 0xff);idx++;
+		lineId = ConvertUtil.bcd2int(bytes, idx, 3);idx += 3;
+		deviceId = ConvertUtil.ascii2string(bytes, idx, 8);idx += 8;
+		timestamp = ConvertUtil.bcd2timestamp(bytes, idx);idx += 6;
+		reserved = ConvertUtil.ascii2string(bytes, idx, 8);idx += 8;
+	}
+	
+	@Override
+	public byte[] write() {
+		// TODO Auto-generated method stub
+		ByteBuffer buf = ByteBuffer.allocate(26);
+		buf.put((byte)funCode);
+		buf.put(ConvertUtil.int2bcd(lineId, 3));
+		buf.put(deviceId.getBytes());
+		buf.put(ConvertUtil.timestamp2bcd(timestamp));
+		buf.put(new byte[]{0,0,0,0,0,0,0,0});
+		return buf.array();
+	}
+	
+	public short getFunCode() {
+		return funCode;
+	}
+	
+	public int getLineId() {
+		return lineId;
+	}
+	
+	public String getDeviceId() {
+		return deviceId;
+	}
+	
+	public long getTimestamp() {
+		return timestamp;
+	}
+	
+	public String getReserved() {
+		return reserved;
+	}
+
+	public void setFunCode(short funCode) {
+		this.funCode = funCode;
+	}
+
+	public void setLineId(int lineId) {
+		this.lineId = lineId;
+	}
+
+	public void setDeviceId(String deviceId) {
+		this.deviceId = deviceId;
+	}
+
+	public void setTimeStamp(long timestamp) {
+		this.timestamp = timestamp;
+	}
+
+	public void setReserved(String reserved) {
+		this.reserved = reserved;
+	}
+	
+	public String toString() {
+		Date d = new Date();
+		d.setTime(timestamp);
+		StringBuilder sb = new StringBuilder();
+		sb.append("功能号：").append(Integer.toHexString(funCode))
+		.append("线路编号：").append(lineId)
+		.append("设备编号：").append(deviceId)
+		.append("时间戳：").append(d);
+		return sb.toString();
+	}
+}
-package com.bsth.data.gpsdata.client.pd.protocol;
-
-
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
-
-import java.nio.ByteBuffer;
-
-
-public class Pd_41_0 implements IMessageBody {
-	
-	private BasicInfo info;
-	private short leaveStopDis;
-	
-	public BasicInfo getInfo() {
-		return info;
-	}
-
-	public void setInfo(BasicInfo info) {
-		this.info = info;
-	}
-
-	public short getLeaveStopDis() {
-		return leaveStopDis;
-	}
-
-	public void setLeaveStopDis(short leaveStopDis) {
-		this.leaveStopDis = leaveStopDis;
-	}
-
-	@Override
-	public void read(byte[] bytes) {
-		// TODO Auto-generated method stub
-		int idx = 0;
-		info = new BasicInfo();
-		info.read(bytes, idx); idx += 80;
-		leaveStopDis = (short) ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
-	}
-
-	@Override
-	public byte[] write() {
-		// TODO Auto-generated method stub
-		ByteBuffer buf = ByteBuffer.allocate(82);
-		buf.put(info.write());
-		buf.put(ConvertUtil.int2bcd(leaveStopDis, 2));
-		
-		return buf.array();
-	}
-
-	@Override
-	public String getDeviceId() {
-		// TODO Auto-generated method stub
-		return info.getDeviceId();
-	}
-
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("基本数据：").append(info.toString())
-		.append("离站距离：").append(leaveStopDis);
-		
-		return sb.toString();
-	}
-
-	@Override
-	public long getTimestamp() {
-		// TODO Auto-generated method stub
-		return info.getTimestamp();
-	}
-}
+package com.bsth.data.gpsdata.client.pd.protocol;
+
+
+import com.bsth.data.gpsdata.client.msg.IMessageBody;
+import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
+
+import java.nio.ByteBuffer;
+
+
+public class Pd_41_0 implements IMessageBody {
+	
+	private BasicInfo info;
+	private short leaveStopDis;
+	
+	public BasicInfo getInfo() {
+		return info;
+	}
+
+	public void setInfo(BasicInfo info) {
+		this.info = info;
+	}
+
+	public short getLeaveStopDis() {
+		return leaveStopDis;
+	}
+
+	public void setLeaveStopDis(short leaveStopDis) {
+		this.leaveStopDis = leaveStopDis;
+	}
+
+	@Override
+	public void read(byte[] bytes) {
+		// TODO Auto-generated method stub
+		int idx = 0;
+		info = new BasicInfo();
+		info.read(bytes, idx); idx += 80;
+		leaveStopDis = (short) ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
+	}
+
+	@Override
+	public byte[] write() {
+		// TODO Auto-generated method stub
+		ByteBuffer buf = ByteBuffer.allocate(82);
+		buf.put(info.write());
+		buf.put(ConvertUtil.int2bcd(leaveStopDis, 2));
+		
+		return buf.array();
+	}
+
+	@Override
+	public String getDeviceId() {
+		// TODO Auto-generated method stub
+		return info.getDeviceId();
+	}
+
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("基本数据：").append(info.toString())
+		.append("离站距离：").append(leaveStopDis);
+		
+		return sb.toString();
+	}
+
+	@Override
+	public long getTimestamp() {
+		// TODO Auto-generated method stub
+		return info.getTimestamp();
+	}
+}
-package com.bsth.data.gpsdata.client.pd.protocol;
-
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
-
-import java.nio.ByteBuffer;
-
-public class Pd_42_0 implements IMessageBody {
-
-	private BasicInfo info;
-	// 站间里程 保留两位小数 km
-	private short stopBetMiles;
-	private short frontDoorUp;
-	private short frontDoorDown;
-	private short backDoorUp;
-	private short backDoorDown;
-	// 本站留车人数
-	private int stay;
-	// 本站刷卡次数
-	private short cardCount;
-	// 本站刷卡金额
-	private int cardMoney;
-	// 免费刷卡次数
-	private short freeCardCount;
-	// 免费刷卡金额
-	private int freeCardMoney;
-	// 总刷卡次数
-	private int totalCardCount;
-	// 总数卡金额
-	private long totalCardMoney;
-	// 总免费刷卡次数
-	private int totalFreeCardCount;
-	// 总免费刷卡金额
-	private long totalFreeCardMoney;
-	// 客流站号
-	private short passengerStopNo;
-
-	@Override
-	public void read(byte[] bytes) {
-		// TODO Auto-generated method stub
-		ByteBuffer buf = ByteBuffer.wrap(bytes);
-		int idx = 0;
-		info = new BasicInfo();
-		info.read(bytes, idx); idx += 80;
-		stopBetMiles = (short) ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
-		frontDoorUp = (short)(buf.get(idx) & 0xff); idx++;
-		frontDoorDown = (short)(buf.get(idx) & 0xff); idx++;
-		backDoorUp = (short)(buf.get(idx) & 0xff); idx++;
-		backDoorDown = (short)(buf.get(idx) & 0xff); idx++;
-		stay = buf.getShort(idx) & 0xffff; idx += 2;
-		cardCount = (short)(buf.get(idx) & 0xff); idx++;
-		cardMoney = buf.getShort(idx) & 0xffff; idx += 2;
-		freeCardCount = (short)(buf.get(idx) & 0xff); idx++;
-		freeCardMoney = buf.getShort(idx) & 0xffff; idx += 2;
-		totalCardCount = buf.getShort(idx) & 0xffff; idx += 2;
-		totalCardMoney = buf.getInt(idx) & 0xffffffffl; idx += 4;
-		totalFreeCardCount = buf.getShort(idx) & 0xffff; idx += 2;
-		totalFreeCardMoney = buf.getInt(idx) & 0xffffffffl; idx += 4;
-		passengerStopNo = (short)(buf.get(idx) & 0xff); idx++;
-	}
-
-	@Override
-	public byte[] write() {
-		// TODO Auto-generated method stub
-		ByteBuffer buf = ByteBuffer.allocate(107);
-		buf.put(info.write());
-		buf.put(ConvertUtil.int2bcd(stopBetMiles, 2));
-		buf.put((byte)frontDoorUp);
-		buf.put((byte)frontDoorDown);
-		buf.put((byte)backDoorUp);
-		buf.put((byte)backDoorDown);
-		buf.putShort((short)stay);
-		buf.put((byte)cardCount);
-		buf.putShort((short)cardMoney);
-		buf.put((byte)freeCardCount);
-		buf.putShort((short)freeCardMoney);
-		buf.putShort((short)totalCardCount);
-		buf.putInt((int)totalCardMoney);
-		buf.putShort((short)totalFreeCardCount);
-		buf.putInt((int)totalFreeCardMoney);
-		buf.put((byte)passengerStopNo);
-		
-		return buf.array();
-	}
-
-	@Override
-	public String getDeviceId() {
-		// TODO Auto-generated method stub
-		return info.getDeviceId();
-	}
-	
-	public BasicInfo getInfo() {
-		return info;
-	}
-
-	public short getStopBetMiles() {
-		return stopBetMiles;
-	}
-
-	public short getFrontDoorUp() {
-		return frontDoorUp;
-	}
-
-	public short getFrontDoorDown() {
-		return frontDoorDown;
-	}
-
-	public short getBackDoorUp() {
-		return backDoorUp;
-	}
-
-	public short getBackDoorDown() {
-		return backDoorDown;
-	}
-
-	public int getStay() {
-		return stay;
-	}
-
-	public short getCardCount() {
-		return cardCount;
-	}
-
-	public int getCardMoney() {
-		return cardMoney;
-	}
-
-	public short getFreeCardCount() {
-		return freeCardCount;
-	}
-
-	public int getFreeCardMoney() {
-		return freeCardMoney;
-	}
-
-	public int getTotalCardCount() {
-		return totalCardCount;
-	}
-
-	public long getTotalCardMoney() {
-		return totalCardMoney;
-	}
-
-	public int getTotalFreeCardCount() {
-		return totalFreeCardCount;
-	}
-
-	public long getTotalFreeCardMoney() {
-		return totalFreeCardMoney;
-	}
-
-	public short getPassengerStopNo() {
-		return passengerStopNo;
-	}
-	
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("基本数据：").append(info.toString())
-		.append("站间距离：").append(stopBetMiles)
-		.append("前门上客：").append(frontDoorUp)
-		.append("前门下客：").append(frontDoorDown)
-		.append("后门上客：").append(backDoorUp)
-		.append("后门下客：").append(backDoorDown)
-		.append("本站留车人数：").append(stay)
-		.append("本站刷卡次数：").append(cardCount)
-		.append("本站刷卡金额：").append(cardMoney)
-		.append("免费刷卡次数：").append(freeCardCount)
-		.append("免费刷卡金额：").append(freeCardMoney)
-		.append("总刷卡次数：").append(totalCardCount)
-		.append("总数卡金额：").append(totalCardMoney)
-		.append("总免费刷卡次数：").append(totalFreeCardCount)
-		.append("总免费刷卡金额：").append(totalFreeCardMoney)
-		.append("客流站号：").append(passengerStopNo);
-		
-		return sb.toString();
-	}
-
-	@Override
-	public long getTimestamp() {
-		// TODO Auto-generated method stub
-		return info.getTimestamp();
-	}
-}
+package com.bsth.data.gpsdata.client.pd.protocol;
+
+import com.bsth.data.gpsdata.client.msg.IMessageBody;
+import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
+
+import java.nio.ByteBuffer;
+
+public class Pd_42_0 implements IMessageBody {
+
+	private BasicInfo info;
+	// 站间里程 保留两位小数 km
+	private short stopBetMiles;
+	private short frontDoorUp;
+	private short frontDoorDown;
+	private short backDoorUp;
+	private short backDoorDown;
+	// 本站留车人数
+	private int stay;
+	// 本站刷卡次数
+	private short cardCount;
+	// 本站刷卡金额
+	private int cardMoney;
+	// 免费刷卡次数
+	private short freeCardCount;
+	// 免费刷卡金额
+	private int freeCardMoney;
+	// 总刷卡次数
+	private int totalCardCount;
+	// 总数卡金额
+	private long totalCardMoney;
+	// 总免费刷卡次数
+	private int totalFreeCardCount;
+	// 总免费刷卡金额
+	private long totalFreeCardMoney;
+	// 客流站号
+	private short passengerStopNo;
+
+	@Override
+	public void read(byte[] bytes) {
+		// TODO Auto-generated method stub
+		ByteBuffer buf = ByteBuffer.wrap(bytes);
+		int idx = 0;
+		info = new BasicInfo();
+		info.read(bytes, idx); idx += 80;
+		stopBetMiles = (short) ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
+		frontDoorUp = (short)(buf.get(idx) & 0xff); idx++;
+		frontDoorDown = (short)(buf.get(idx) & 0xff); idx++;
+		backDoorUp = (short)(buf.get(idx) & 0xff); idx++;
+		backDoorDown = (short)(buf.get(idx) & 0xff); idx++;
+		stay = buf.getShort(idx) & 0xffff; idx += 2;
+		cardCount = (short)(buf.get(idx) & 0xff); idx++;
+		cardMoney = buf.getShort(idx) & 0xffff; idx += 2;
+		freeCardCount = (short)(buf.get(idx) & 0xff); idx++;
+		freeCardMoney = buf.getShort(idx) & 0xffff; idx += 2;
+		totalCardCount = buf.getShort(idx) & 0xffff; idx += 2;
+		totalCardMoney = buf.getInt(idx) & 0xffffffffl; idx += 4;
+		totalFreeCardCount = buf.getShort(idx) & 0xffff; idx += 2;
+		totalFreeCardMoney = buf.getInt(idx) & 0xffffffffl; idx += 4;
+		passengerStopNo = (short)(buf.get(idx) & 0xff); idx++;
+	}
+
+	@Override
+	public byte[] write() {
+		// TODO Auto-generated method stub
+		ByteBuffer buf = ByteBuffer.allocate(107);
+		buf.put(info.write());
+		buf.put(ConvertUtil.int2bcd(stopBetMiles, 2));
+		buf.put((byte)frontDoorUp);
+		buf.put((byte)frontDoorDown);
+		buf.put((byte)backDoorUp);
+		buf.put((byte)backDoorDown);
+		buf.putShort((short)stay);
+		buf.put((byte)cardCount);
+		buf.putShort((short)cardMoney);
+		buf.put((byte)freeCardCount);
+		buf.putShort((short)freeCardMoney);
+		buf.putShort((short)totalCardCount);
+		buf.putInt((int)totalCardMoney);
+		buf.putShort((short)totalFreeCardCount);
+		buf.putInt((int)totalFreeCardMoney);
+		buf.put((byte)passengerStopNo);
+		
+		return buf.array();
+	}
+
+	@Override
+	public String getDeviceId() {
+		// TODO Auto-generated method stub
+		return info.getDeviceId();
+	}
+	
+	public BasicInfo getInfo() {
+		return info;
+	}
+
+	public short getStopBetMiles() {
+		return stopBetMiles;
+	}
+
+	public short getFrontDoorUp() {
+		return frontDoorUp;
+	}
+
+	public short getFrontDoorDown() {
+		return frontDoorDown;
+	}
+
+	public short getBackDoorUp() {
+		return backDoorUp;
+	}
+
+	public short getBackDoorDown() {
+		return backDoorDown;
+	}
+
+	public int getStay() {
+		return stay;
+	}
+
+	public short getCardCount() {
+		return cardCount;
+	}
+
+	public int getCardMoney() {
+		return cardMoney;
+	}
+
+	public short getFreeCardCount() {
+		return freeCardCount;
+	}
+
+	public int getFreeCardMoney() {
+		return freeCardMoney;
+	}
+
+	public int getTotalCardCount() {
+		return totalCardCount;
+	}
+
+	public long getTotalCardMoney() {
+		return totalCardMoney;
+	}
+
+	public int getTotalFreeCardCount() {
+		return totalFreeCardCount;
+	}
+
+	public long getTotalFreeCardMoney() {
+		return totalFreeCardMoney;
+	}
+
+	public short getPassengerStopNo() {
+		return passengerStopNo;
+	}
+	
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("基本数据：").append(info.toString())
+		.append("站间距离：").append(stopBetMiles)
+		.append("前门上客：").append(frontDoorUp)
+		.append("前门下客：").append(frontDoorDown)
+		.append("后门上客：").append(backDoorUp)
+		.append("后门下客：").append(backDoorDown)
+		.append("本站留车人数：").append(stay)
+		.append("本站刷卡次数：").append(cardCount)
+		.append("本站刷卡金额：").append(cardMoney)
+		.append("免费刷卡次数：").append(freeCardCount)
+		.append("免费刷卡金额：").append(freeCardMoney)
+		.append("总刷卡次数：").append(totalCardCount)
+		.append("总数卡金额：").append(totalCardMoney)
+		.append("总免费刷卡次数：").append(totalFreeCardCount)
+		.append("总免费刷卡金额：").append(totalFreeCardMoney)
+		.append("客流站号：").append(passengerStopNo);
+		
+		return sb.toString();
+	}
+
+	@Override
+	public long getTimestamp() {
+		// TODO Auto-generated method stub
+		return info.getTimestamp();
+	}
+}
-package com.bsth.data.gpsdata.client.pf.codec;
-
-import com.bsth.data.gpsdata.client.pf.protocol.PfMessage;
-import org.apache.mina.core.buffer.IoBuffer;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
-import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-
-
-public class MessageDecoder extends CumulativeProtocolDecoder {
-
-	@Override
-	protected boolean doDecode(IoSession session, IoBuffer in,
-			ProtocolDecoderOutput out) throws Exception {
-		// TODO Auto-generated method stub
-		while (in.remaining() > 3) {
-			in.mark();
-			byte head1 = in.get(), head2 = in.get(), lenh = in.get(), lenl = in.get();
-			int len = ((lenh & 0xff) << 8) + (lenl & 0xff);
-			if ((head1 & 0xff) == 0xfa && (head2 & 0xff) == 0xf5) {
-				if (in.remaining() > len) {
-					byte[] bytes = new byte[len + 1];
-					in.get(bytes);
-					PfMessage msg = new PfMessage();
-					msg.read(bytes);
-					out.write(msg);
-				} else {
-					in.reset();
-					return false;
-				}
-			}
-		}
-		return false;
-	}
-
-	/*private static String toHexString(byte[] bytes) {
-		StringBuilder sb = new StringBuilder();
-		for (byte b : bytes) {
-			sb.append(Integer.toHexString(b & 0xff) + "|");
-		}
-		return sb.toString();
-	}*/
-}
+package com.bsth.data.gpsdata.client.pf.codec;
+
+import com.bsth.data.gpsdata.client.pf.protocol.PfMessage;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+
+
+public class MessageDecoder extends CumulativeProtocolDecoder {
+
+	@Override
+	protected boolean doDecode(IoSession session, IoBuffer in,
+			ProtocolDecoderOutput out) throws Exception {
+		// TODO Auto-generated method stub
+		while (in.remaining() > 3) {
+			in.mark();
+			byte head1 = in.get(), head2 = in.get(), lenh = in.get(), lenl = in.get();
+			int len = ((lenh & 0xff) << 8) + (lenl & 0xff);
+			if ((head1 & 0xff) == 0xfa && (head2 & 0xff) == 0xf5) {
+				if (in.remaining() > len) {
+					byte[] bytes = new byte[len + 1];
+					in.get(bytes);
+					PfMessage msg = new PfMessage();
+					msg.read(bytes);
+					out.write(msg);
+				} else {
+					in.reset();
+					return false;
+				}
+			}
+		}
+		return false;
+	}
+
+	/*private static String toHexString(byte[] bytes) {
+		StringBuilder sb = new StringBuilder();
+		for (byte b : bytes) {
+			sb.append(Integer.toHexString(b & 0xff) + "|");
+		}
+		return sb.toString();
+	}*/
+}
-package com.bsth.data.gpsdata.client.pf.codec;
-
-import org.apache.mina.core.buffer.IoBuffer;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
-import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-
-public class MessageEncoder extends ProtocolEncoderAdapter {
-
-	@Override
-	public void encode(IoSession session, Object message,
-			ProtocolEncoderOutput out) throws Exception {
-		// TODO Auto-generated method stub
-		IoBuffer buf = IoBuffer.allocate(1024).setAutoExpand(true);
-		buf.put((byte[])message);
-		buf.flip();
-		out.write(buf);
-	}
-
-}
+package com.bsth.data.gpsdata.client.pf.codec;
+
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
+
+public class MessageEncoder extends ProtocolEncoderAdapter {
+
+	@Override
+	public void encode(IoSession session, Object message,
+			ProtocolEncoderOutput out) throws Exception {
+		// TODO Auto-generated method stub
+		IoBuffer buf = IoBuffer.allocate(1024).setAutoExpand(true);
+		buf.put((byte[])message);
+		buf.flip();
+		out.write(buf);
+	}
+
+}
-package com.bsth.data.gpsdata.client.pf.codec;
-
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolCodecFactory;
-import org.apache.mina.filter.codec.ProtocolDecoder;
-import org.apache.mina.filter.codec.ProtocolEncoder;
-
-public class PfMessageCodecFactory implements ProtocolCodecFactory {
-	
-	private ProtocolEncoder encoder;
-	private ProtocolDecoder decoder;
-	
-	public PfMessageCodecFactory() {
-		encoder = new MessageEncoder();
-		decoder = new MessageDecoder();
-	}
-
-	@Override
-	public ProtocolEncoder getEncoder(IoSession session) throws Exception {
-		// TODO Auto-generated method stub
-		return encoder;
-	}
-
-	@Override
-	public ProtocolDecoder getDecoder(IoSession session) throws Exception {
-		// TODO Auto-generated method stub
-		return decoder;
-	}
-
-}
+package com.bsth.data.gpsdata.client.pf.codec;
+
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolEncoder;
+
+public class PfMessageCodecFactory implements ProtocolCodecFactory {
+	
+	private ProtocolEncoder encoder;
+	private ProtocolDecoder decoder;
+	
+	public PfMessageCodecFactory() {
+		encoder = new MessageEncoder();
+		decoder = new MessageDecoder();
+	}
+
+	@Override
+	public ProtocolEncoder getEncoder(IoSession session) throws Exception {
+		// TODO Auto-generated method stub
+		return encoder;
+	}
+
+	@Override
+	public ProtocolDecoder getDecoder(IoSession session) throws Exception {
+		// TODO Auto-generated method stub
+		return decoder;
+	}
+
+}
-package com.bsth.data.gpsdata.client.pf.common;
-
-import com.bsth.data.gpsdata.client.common.ThreadLocalDateUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.ParseException;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-
-
-public class ConvertUtil {
-	
-	private final static Logger log = LoggerFactory.getLogger(ConvertUtil.class);
-	
-	public static int bcd2int(byte[] bytes, int start, int len) {
-		if (len > 4 || len == 0)
-			throw new IllegalArgumentException("bcd2int 字节数不符合要求");
-		String temp = "";
-		for (int i = 0;i < len;i++) {
-			int val = bytes[start + i] & 0xff;
-			if (val < 10) temp += 0;
-			temp += Integer.toHexString(val);
-		}
-		return Integer.parseInt(temp);
-	}
-	
-	public static byte[] int2bcd(int val, int len) {
-		if (len > 4 || len == 0)
-			throw new IllegalArgumentException("int2bcd 字节数不符合要求");
-		byte[] result = new byte[len];
-		for (int i = len - 1;i > -1;i--) {
-			result[i] = (byte)Integer.parseInt(val%100 + "", 16);
-			val = val/100;
-		}
-		return result;
-	}
-	
-	public static long bcd2long(byte[] bytes, int start, int len) {
-		if (len > 8 || len == 0)
-			throw new IllegalArgumentException("bcd2long 字节数不符合要求");
-		String temp = "";
-		for (int i = 0;i < len;i++) {
-			int val = bytes[start + i] & 0xff;
-			if (val < 10) temp += 0;
-			temp += Integer.toHexString(val);
-		}
-		return Long.parseLong(temp);
-	}
-	
-	public static byte[] long2bcd(long val, int len) {
-		if (len > 8 || len == 0)
-			throw new IllegalArgumentException("long2bcd 字节数不符合要求");
-		byte[] result = new byte[len];
-		for (int i = len - 1;i > -1;i--) {
-			result[i] = (byte)Integer.parseInt(val%100 + "", 16);
-			val = val/100;
-		}
-		return result;
-	}
-	
-	public static String ascii2string(byte[] bytes, int start, int len) {
-		return new String(Arrays.copyOfRange(bytes, start, start + len));
-	}
-	
-	public static byte[] string2ascii(String val, int len) {
-		byte[] result = new byte[len];
-		byte[] bytes = val.getBytes();
-		if (bytes.length > len && len != 0)
-			throw new IllegalArgumentException("string2ascii 参数不符合要求");
-		if (len != 0)
-			for (int i = 0, l = bytes.length;i < l;i++) result[i] = bytes[i];
-		else return bytes;
-		return result;
-	}
-	
-	public static long bcd2timestamp(byte[] bytes, int start) {
-		String temp = "20";
-		for (int i = 0;i < 6;i++) {
-			int val = bytes[start + i] & 0xff;
-			if (val < 10) temp += 0;
-			temp += Integer.toHexString(val);
-		}
-		Date date = null;
-		try {
-			date = ThreadLocalDateUtil.parse(temp);
-		} catch (ParseException e) {
-			log.error("协议中时间数据异常：" + temp);
-		}
-		if (date != null) return date.getTime();
-		return -1;
-	}
-	
-	public static byte[] timestamp2bcd(long val) {
-		byte[] result = new byte[6];
-		Calendar c = Calendar.getInstance();
-		c.setTime(new Date(val));
-		result[0] = (byte)(Integer.parseInt(c.get(Calendar.YEAR)%100 + "", 16));
-		result[1] = (byte)(Integer.parseInt(c.get(Calendar.MONTH) + 1 + "", 16));
-		result[2] = (byte)Integer.parseInt(c.get(Calendar.DAY_OF_MONTH) + "", 16);
-		result[3] = (byte)Integer.parseInt(c.get(Calendar.HOUR_OF_DAY) + "", 16);
-		result[4] = (byte)Integer.parseInt(c.get(Calendar.MINUTE) + "", 16);
-		result[5] = (byte)Integer.parseInt(c.get(Calendar.SECOND) + "", 16);
-		return result;
-	}
-	
-	public static byte[] int2hex(int val, int len) {
-		if (len < 1)
-			throw new IllegalArgumentException("int2hex len 参数不符合要求");
-		byte[] result = new byte[len];
-		for (int i = 0;i < len;i++) {
-			result[len - 1 - i] = (byte)(val%100);
-			val = val/100;
-		}
-		
-		return result;
-	}
-}
+package com.bsth.data.gpsdata.client.pf.common;
+
+import com.bsth.data.gpsdata.client.common.ThreadLocalDateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+
+
+public class ConvertUtil {
+	
+	private final static Logger log = LoggerFactory.getLogger(ConvertUtil.class);
+	
+	public static int bcd2int(byte[] bytes, int start, int len) {
+		if (len > 4 || len == 0)
+			throw new IllegalArgumentException("bcd2int 字节数不符合要求");
+		String temp = "";
+		for (int i = 0;i < len;i++) {
+			int val = bytes[start + i] & 0xff;
+			if (val < 10) temp += 0;
+			temp += Integer.toHexString(val);
+		}
+		return Integer.parseInt(temp);
+	}
+	
+	public static byte[] int2bcd(int val, int len) {
+		if (len > 4 || len == 0)
+			throw new IllegalArgumentException("int2bcd 字节数不符合要求");
+		byte[] result = new byte[len];
+		for (int i = len - 1;i > -1;i--) {
+			result[i] = (byte)Integer.parseInt(val%100 + "", 16);
+			val = val/100;
+		}
+		return result;
+	}
+	
+	public static long bcd2long(byte[] bytes, int start, int len) {
+		if (len > 8 || len == 0)
+			throw new IllegalArgumentException("bcd2long 字节数不符合要求");
+		String temp = "";
+		for (int i = 0;i < len;i++) {
+			int val = bytes[start + i] & 0xff;
+			if (val < 10) temp += 0;
+			temp += Integer.toHexString(val);
+		}
+		return Long.parseLong(temp);
+	}
+	
+	public static byte[] long2bcd(long val, int len) {
+		if (len > 8 || len == 0)
+			throw new IllegalArgumentException("long2bcd 字节数不符合要求");
+		byte[] result = new byte[len];
+		for (int i = len - 1;i > -1;i--) {
+			result[i] = (byte)Integer.parseInt(val%100 + "", 16);
+			val = val/100;
+		}
+		return result;
+	}
+	
+	public static String ascii2string(byte[] bytes, int start, int len) {
+		return new String(Arrays.copyOfRange(bytes, start, start + len));
+	}
+	
+	public static byte[] string2ascii(String val, int len) {
+		byte[] result = new byte[len];
+		byte[] bytes = val.getBytes();
+		if (bytes.length > len && len != 0)
+			throw new IllegalArgumentException("string2ascii 参数不符合要求");
+		if (len != 0)
+			for (int i = 0, l = bytes.length;i < l;i++) result[i] = bytes[i];
+		else return bytes;
+		return result;
+	}
+	
+	public static long bcd2timestamp(byte[] bytes, int start) {
+		String temp = "20";
+		for (int i = 0;i < 6;i++) {
+			int val = bytes[start + i] & 0xff;
+			if (val < 10) temp += 0;
+			temp += Integer.toHexString(val);
+		}
+		Date date = null;
+		try {
+			date = ThreadLocalDateUtil.parse(temp);
+		} catch (ParseException e) {
+			log.error("协议中时间数据异常：" + temp);
+		}
+		if (date != null) return date.getTime();
+		return -1;
+	}
+	
+	public static byte[] timestamp2bcd(long val) {
+		byte[] result = new byte[6];
+		Calendar c = Calendar.getInstance();
+		c.setTime(new Date(val));
+		result[0] = (byte)(Integer.parseInt(c.get(Calendar.YEAR)%100 + "", 16));
+		result[1] = (byte)(Integer.parseInt(c.get(Calendar.MONTH) + 1 + "", 16));
+		result[2] = (byte)Integer.parseInt(c.get(Calendar.DAY_OF_MONTH) + "", 16);
+		result[3] = (byte)Integer.parseInt(c.get(Calendar.HOUR_OF_DAY) + "", 16);
+		result[4] = (byte)Integer.parseInt(c.get(Calendar.MINUTE) + "", 16);
+		result[5] = (byte)Integer.parseInt(c.get(Calendar.SECOND) + "", 16);
+		return result;
+	}
+	
+	public static byte[] int2hex(int val, int len) {
+		if (len < 1)
+			throw new IllegalArgumentException("int2hex len 参数不符合要求");
+		byte[] result = new byte[len];
+		for (int i = 0;i < len;i++) {
+			result[len - 1 - i] = (byte)(val%100);
+			val = val/100;
+		}
+		
+		return result;
+	}
+}
-package com.bsth.data.gpsdata.client.pf.handler;
-
-import com.bsth.data.gpsdata.client.ClientApp;
-import com.bsth.data.gpsdata.client.GpsBeforeBuffer;
-import com.bsth.data.gpsdata.client.common.Protocol2BizUtil;
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-import com.bsth.data.gpsdata.client.pd.protocol.BasicInfo;
-import com.bsth.data.gpsdata.client.pf.protocol.PfMessage;
-import org.apache.mina.core.service.IoHandlerAdapter;
-import org.apache.mina.core.session.IdleStatus;
-import org.apache.mina.core.session.IoSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-
-@Service
-public class PfClientHandler extends IoHandlerAdapter{
-	
-	private final static Logger log = LoggerFactory.getLogger(PfClientHandler.class);
-	
-	//@Autowired
-	//private MessageProcessor processor;
-
-	@Autowired
-	GpsBeforeBuffer gpsBeforeBuffer;
-
-	@Override
-    public void sessionCreated(IoSession session) throws Exception {
-        
-    }
-
-	@Override
-    public void sessionOpened(IoSession session) throws Exception {
-        
-    }
-
-	@Override
-    public void sessionClosed(IoSession session) throws Exception {
-		String deviceId = (String)session.getAttribute("deviceId");
-        if (deviceId != null) {
-        	//SessionManager.getInstance().unregister(deviceId);
-    		log.info("连老网关设备编号:" + deviceId + "断开连接");
-    		log.warn(deviceId + "老网关设备注销");
-			ClientApp.fconnect(deviceId);
-        }
-    }
-
-	@Override
-    public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
-		session.closeNow();
-    }
-
-	@Override
-    public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
-		if (cause instanceof IOException) session.closeNow();
-		log.error("PfClientHandler exceptionCaught", cause);
-    }
-
-	@Override
-    public void messageReceived(IoSession session, Object message) throws Exception {
-        PfMessage msg = (PfMessage)message;
-        IMessageBody body = msg.getMessageBody();
-        if (body != null) {
-        	String deviceId = body.getDeviceId();
-        	if (0x1 == msg.getCommandType()) {
-        		log.debug("设备编号:" + body.getDeviceId() + "建立连接");
-        	}
-
-			BasicInfo info = Protocol2BizUtil.getBasicInfoFromMsg(msg);
-			gpsBeforeBuffer.put(info);
-        }
-
-    }
-
-	@Override
-    public void messageSent(IoSession session, Object message) throws Exception {
-        
-    }
-}
+package com.bsth.data.gpsdata.client.pf.handler;
+
+import com.bsth.data.gpsdata.client.ClientApp;
+import com.bsth.data.gpsdata.client.GpsBeforeBuffer;
+import com.bsth.data.gpsdata.client.common.Protocol2BizUtil;
+import com.bsth.data.gpsdata.client.msg.IMessageBody;
+import com.bsth.data.gpsdata.client.pd.protocol.BasicInfo;
+import com.bsth.data.gpsdata.client.pf.protocol.PfMessage;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+
+@Service
+public class PfClientHandler extends IoHandlerAdapter{
+	
+	private final static Logger log = LoggerFactory.getLogger(PfClientHandler.class);
+	
+	//@Autowired
+	//private MessageProcessor processor;
+
+	@Autowired
+	GpsBeforeBuffer gpsBeforeBuffer;
+
+	@Override
+    public void sessionCreated(IoSession session) throws Exception {
+        
+    }
+
+	@Override
+    public void sessionOpened(IoSession session) throws Exception {
+        
+    }
+
+	@Override
+    public void sessionClosed(IoSession session) throws Exception {
+		String deviceId = (String)session.getAttribute("deviceId");
+        if (deviceId != null) {
+        	//SessionManager.getInstance().unregister(deviceId);
+    		log.info("连老网关设备编号:" + deviceId + "断开连接");
+    		log.warn(deviceId + "老网关设备注销");
+			ClientApp.fconnect(deviceId);
+        }
+    }
+
+	@Override
+    public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
+		session.closeNow();
+    }
+
+	@Override
+    public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
+		if (cause instanceof IOException) session.closeNow();
+		log.error("PfClientHandler exceptionCaught", cause);
+    }
+
+	@Override
+    public void messageReceived(IoSession session, Object message) throws Exception {
+        PfMessage msg = (PfMessage)message;
+        IMessageBody body = msg.getMessageBody();
+        if (body != null) {
+        	String deviceId = body.getDeviceId();
+        	if (0x1 == msg.getCommandType()) {
+        		log.debug("设备编号:" + body.getDeviceId() + "建立连接");
+        	}
+
+			BasicInfo info = Protocol2BizUtil.getBasicInfoFromMsg(msg);
+			gpsBeforeBuffer.put(info);
+        }
+
+    }
+
+	@Override
+    public void messageSent(IoSession session, Object message) throws Exception {
+        
+    }
+}
-package com.bsth.data.gpsdata.client.pf.protocol;
-
-
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-
-public class PfFactory {
-
-	public static IMessageBody create(int commandType, byte[] data) {
-		String pkgName = PfFactory.class.getPackage().getName();
-		IMessageBody body = null;
-		try {
-			Class<?> cls = Class.forName(pkgName + ".Pf_" + Integer.toHexString(commandType).toUpperCase() + "_0");
-			body = (IMessageBody)cls.newInstance();
-			body.read(data);
-		} catch (ClassNotFoundException e) {
-			// TODO Auto-generated catch block
-			//e.printStackTrace();
-		} catch (InstantiationException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return body;
-	}
-}
+package com.bsth.data.gpsdata.client.pf.protocol;
+
+
+import com.bsth.data.gpsdata.client.msg.IMessageBody;
+
+public class PfFactory {
+
+	public static IMessageBody create(int commandType, byte[] data) {
+		String pkgName = PfFactory.class.getPackage().getName();
+		IMessageBody body = null;
+		try {
+			Class<?> cls = Class.forName(pkgName + ".Pf_" + Integer.toHexString(commandType).toUpperCase() + "_0");
+			body = (IMessageBody)cls.newInstance();
+			body.read(data);
+		} catch (ClassNotFoundException e) {
+			// TODO Auto-generated catch block
+			//e.printStackTrace();
+		} catch (InstantiationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return body;
+	}
+}
-package com.bsth.data.gpsdata.client.pf.protocol;
-
-import com.bsth.data.gpsdata.client.msg.IMessage;
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-
-import java.util.Arrays;
-
-public class PfMessage implements IMessage {
-	
-	private short version;
-	private short serialNo;
-	private short commandType;
-	private IMessageBody messageBody;
-	private byte checkSum;
-	
-	public short getVersion() {
-		return version;
-	}
-
-	public void setVersion(short version) {
-		this.version = version;
-	}
-
-	public short getSerialNo() {
-		return serialNo;
-	}
-
-	public void setSerialNo(short serialNo) {
-		this.serialNo = serialNo;
-	}
-
-	public short getCommandType() {
-		return commandType;
-	}
-
-	public void setCommandType(short commandType) {
-		this.commandType = commandType;
-	}
-
-	public IMessageBody getMessageBody() {
-		return messageBody;
-	}
-
-	public void setMessageBody(IMessageBody messageBody) {
-		this.messageBody = messageBody;
-	}
-
-	public byte getCheckSum() {
-		return checkSum;
-	}
-
-	public void setCheckSum(byte checkSum) {
-		this.checkSum = checkSum;
-	}
-
-	public void read(byte[] data) {
-		int idx = 0, len = data.length;
-		//version = (short)(data[idx] & 0xff); idx++;
-		//serialNo = (short)(data[idx] & 0xff); idx++;
-		commandType = (short)(data[idx] & 0xff); idx++;
-		byte[] temp = Arrays.copyOfRange(data, idx, len - 1);
-		checkSum = data[len - 1];
-		if (0xff == (checkSum & 0xff)) {
-			try {
-				messageBody = PfFactory.create(commandType, temp);
-			} catch (Exception e) {
-				
-			}
-		}
-	}
-	
-	public byte[] write() {
-		return null;
-	}
-	
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		//sb.append("报文版本号：").append(version)
-		//.append("报文序列号：").append(serialNo)
-		sb.append("报文命令字：0x").append(Integer.toHexString(commandType))
-		.append("报文主体：(").append(messageBody).append(")")
-		.append("报文校验和：").append(checkSum);
-		
-		return sb.toString();
-	}
-}
+package com.bsth.data.gpsdata.client.pf.protocol;
+
+import com.bsth.data.gpsdata.client.msg.IMessage;
+import com.bsth.data.gpsdata.client.msg.IMessageBody;
+
+import java.util.Arrays;
+
+public class PfMessage implements IMessage {
+	
+	private short version;
+	private short serialNo;
+	private short commandType;
+	private IMessageBody messageBody;
+	private byte checkSum;
+	
+	public short getVersion() {
+		return version;
+	}
+
+	public void setVersion(short version) {
+		this.version = version;
+	}
+
+	public short getSerialNo() {
+		return serialNo;
+	}
+
+	public void setSerialNo(short serialNo) {
+		this.serialNo = serialNo;
+	}
+
+	public short getCommandType() {
+		return commandType;
+	}
+
+	public void setCommandType(short commandType) {
+		this.commandType = commandType;
+	}
+
+	public IMessageBody getMessageBody() {
+		return messageBody;
+	}
+
+	public void setMessageBody(IMessageBody messageBody) {
+		this.messageBody = messageBody;
+	}
+
+	public byte getCheckSum() {
+		return checkSum;
+	}
+
+	public void setCheckSum(byte checkSum) {
+		this.checkSum = checkSum;
+	}
+
+	public void read(byte[] data) {
+		int idx = 0, len = data.length;
+		//version = (short)(data[idx] & 0xff); idx++;
+		//serialNo = (short)(data[idx] & 0xff); idx++;
+		commandType = (short)(data[idx] & 0xff); idx++;
+		byte[] temp = Arrays.copyOfRange(data, idx, len - 1);
+		checkSum = data[len - 1];
+		if (0xff == (checkSum & 0xff)) {
+			try {
+				messageBody = PfFactory.create(commandType, temp);
+			} catch (Exception e) {
+				
+			}
+		}
+	}
+	
+	public byte[] write() {
+		return null;
+	}
+	
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		//sb.append("报文版本号：").append(version)
+		//.append("报文序列号：").append(serialNo)
+		sb.append("报文命令字：0x").append(Integer.toHexString(commandType))
+		.append("报文主体：(").append(messageBody).append(")")
+		.append("报文校验和：").append(checkSum);
+		
+		return sb.toString();
+	}
+}
-package com.bsth.data.gpsdata.client.pf.protocol;
-
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
-
-import java.nio.ByteBuffer;
-import java.util.Date;
-
-
-public class Pf_1_0 implements IMessageBody {
-
-	/** 1、车载终端识别码-byte[8] */
-	private String mtd;
-	/** 2、司机工号-byte[8] */
-	private String driver;
-	/** 3、包车状态-byte[1] */
-	private int bczt;
-	/** 4、线路状态-byte[1] */
-	private int xlzt;
-	/** 5、线路代码-byte[6] */
-	private int xldm;
-	/** 6、营运状态-byte[1] */
-	private int yyzt;
-	/** 7、进出站状态-byte[1] */
-	private int jczzt;
-	/** 8、站点编号-byte[8] */
-	private String zdbh;
-	/** 9、进出停车场状态（0：厂内，1：厂外，2：未知）-byte[1] */
-	private int jctcczt;
-	/** 10、停车场编号-byte[8] */
-	private String tccbh;
-	/** 11、路段编码-byte[12] */
-	private String ldbh;
-	/** 12、上下行状态-byte[1] */
-	private int sxxzt;
-	/** 13、速度-byte[1] */
-	private int speed;
-	/** 14、初始异常状态-byte[1] */
-	private int csyczt;
-	/** 15、结束异常状态-byte[1] */
-	private int jsyczt;
-	/** 16、车辆位置经度（纠偏后）-byte[4] */
-	private double lon;
-	/** 17、车辆位置维度（纠偏后）-byte[4] */
-	private double lat;
-	/** 18、方向-byte[2] */
-	private int fx;
-	/** 19、发送时间-byte[4] */
-	private Date fssj;
-	/** 20、离下站距离-byte[2] */
-	private int lxzjl;
-	/** 21、本站留车人数-byte[2] */
-	private int bzlcrs;
-	/** 22、车辆位置经度（未纠偏）-byte[4] */
-	private double lon_old;
-	/** 23、车辆位置经度（未纠偏）-byte[4] */
-	private double lat_old;
-	/** 24、城建X坐标 */
-	private double x;
-	/** 25、城建Y坐标 */
-	private double y;
-	
-	public String getMtd() {
-		return mtd;
-	}
-	
-	public void setMtd(String mtd) {
-		this.mtd = mtd;
-	}
-
-	public String getDriver() {
-		return driver;
-	}
-
-	public void setDriver(String driver) {
-		this.driver = driver;
-	}
-
-	public int getBczt() {
-		return bczt;
-	}
-
-	public void setBczt(int bczt) {
-		this.bczt = bczt;
-	}
-
-	public int getXlzt() {
-		return xlzt;
-	}
-
-	public void setXlzt(int xlzt) {
-		this.xlzt = xlzt;
-	}
-
-	public int getXldm() {
-		return xldm;
-	}
-
-	public void setXldm(int xldm) {
-		this.xldm = xldm;
-	}
-
-	public int getYyzt() {
-		return yyzt;
-	}
-
-	public void setYyzt(int yyzt) {
-		this.yyzt = yyzt;
-	}
-
-	public int getJczzt() {
-		return jczzt;
-	}
-
-	public void setJczzt(int jczzt) {
-		this.jczzt = jczzt;
-	}
-
-	public String getZdbh() {
-		return zdbh;
-	}
-
-	public void setZdbh(String zdbh) {
-		this.zdbh = zdbh;
-	}
-
-	public int getJctcczt() {
-		return jctcczt;
-	}
-
-	public void setJctcczt(int jctcczt) {
-		this.jctcczt = jctcczt;
-	}
-
-	public String getTccbh() {
-		return tccbh;
-	}
-
-	public void setTccbh(String tccbh) {
-		this.tccbh = tccbh;
-	}
-
-	public String getLdbh() {
-		return ldbh;
-	}
-
-	public void setLdbh(String ldbh) {
-		this.ldbh = ldbh;
-	}
-
-	public int getSxxzt() {
-		return sxxzt;
-	}
-
-	public void setSxxzt(int sxxzt) {
-		this.sxxzt = sxxzt;
-	}
-
-	public int getSpeed() {
-		return speed;
-	}
-
-	public void setSpeed(int speed) {
-		this.speed = speed;
-	}
-
-	public int getCsyczt() {
-		return csyczt;
-	}
-
-	public void setCsyczt(int csyczt) {
-		this.csyczt = csyczt;
-	}
-
-	public int getJsyczt() {
-		return jsyczt;
-	}
-
-	public void setJsyczt(int jsyczt) {
-		this.jsyczt = jsyczt;
-	}
-
-	public double getLon() {
-		return lon;
-	}
-
-	public void setLon(double lon) {
-		this.lon = lon;
-	}
-
-	public double getLat() {
-		return lat;
-	}
-
-	public void setLat(double lat) {
-		this.lat = lat;
-	}
-
-	public int getFx() {
-		return fx;
-	}
-
-	public void setFx(int fx) {
-		this.fx = fx;
-	}
-
-	public Date getFssj() {
-		return fssj;
-	}
-
-	public void setFssj(Date fssj) {
-		this.fssj = fssj;
-	}
-
-	public int getLxzjl() {
-		return lxzjl;
-	}
-
-	public void setLxzjl(int lxzjl) {
-		this.lxzjl = lxzjl;
-	}
-
-	public int getBzlcrs() {
-		return bzlcrs;
-	}
-
-	public void setBzlcrs(int bzlcrs) {
-		this.bzlcrs = bzlcrs;
-	}
-
-	public double getLon_old() {
-		return lon_old;
-	}
-
-	public void setLon_old(double lon_old) {
-		this.lon_old = lon_old;
-	}
-
-	public double getLat_old() {
-		return lat_old;
-	}
-
-	public void setLat_old(double lat_old) {
-		this.lat_old = lat_old;
-	}
-
-	public double getX() {
-		return x;
-	}
-
-	public void setX(double x) {
-		this.x = x;
-	}
-
-	public double getY() {
-		return y;
-	}
-
-	public void setY(double y) {
-		this.y = y;
-	}
-	
-	public byte[] write() {
-		return null;
-	}
-
-	@Override
-	public void read(byte[] bytes) {
-		// TODO Auto-generated method stub
-		int idx = 0;
-		ByteBuffer buf = ByteBuffer.wrap(bytes);
-		mtd = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
-		driver = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
-		bczt = buf.get(idx); idx++;
-		xlzt = buf.get(idx); idx++;
-		xldm = Integer.parseInt(ConvertUtil.ascii2string(bytes, idx, 6).trim()); idx += 6;
-		yyzt = buf.get(idx); idx++;
-		jczzt = buf.get(idx); idx++;
-		zdbh = ConvertUtil.ascii2string(bytes, idx, 8).trim(); idx += 8;
-		jctcczt = buf.get(idx); idx++;
-		tccbh = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
-		ldbh = ConvertUtil.ascii2string(bytes, idx, 12).trim(); idx += 12;
-		sxxzt = buf.get(idx); idx++;
-		speed = buf.get(idx)*10; idx++;
-		csyczt = buf.get(idx); idx++;
-		jsyczt = buf.get(idx); idx++;
-		byte flagx = buf.get(idx); idx++;
-		if (flagx == 0) x = ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
-		else x = -ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
-		idx += 3;
-		byte flagy = buf.get(idx); idx++;
-		if (flagy == 0) y = ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
-		else y = -ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
-		idx += 3;
-		fx = buf.getShort(idx)*(short)10; idx += 2;
-		fssj = new Date(ConvertUtil.bytes2int(bytes, idx, 4) * 1000L); idx += 4;
-		lxzjl = buf.getShort(idx); idx += 2;
-		bzlcrs = buf.getShort(idx); idx += 2;
-		lon = ConvertUtil.bytes2int(bytes, idx, 4); idx += 4;
-		lat = ConvertUtil.bytes2int(bytes, idx, 4); idx += 4;
-	}
-
-	@Override
-	public String getDeviceId() {
-		// TODO Auto-generated method stub
-		return mtd;
-	}
-
-	@Override
-	public long getTimestamp() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-}
+package com.bsth.data.gpsdata.client.pf.protocol;
+
+import com.bsth.data.gpsdata.client.msg.IMessageBody;
+import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
+
+import java.nio.ByteBuffer;
+import java.util.Date;
+
+
+public class Pf_1_0 implements IMessageBody {
+
+	/** 1、车载终端识别码-byte[8] */
+	private String mtd;
+	/** 2、司机工号-byte[8] */
+	private String driver;
+	/** 3、包车状态-byte[1] */
+	private int bczt;
+	/** 4、线路状态-byte[1] */
+	private int xlzt;
+	/** 5、线路代码-byte[6] */
+	private int xldm;
+	/** 6、营运状态-byte[1] */
+	private int yyzt;
+	/** 7、进出站状态-byte[1] */
+	private int jczzt;
+	/** 8、站点编号-byte[8] */
+	private String zdbh;
+	/** 9、进出停车场状态（0：厂内，1：厂外，2：未知）-byte[1] */
+	private int jctcczt;
+	/** 10、停车场编号-byte[8] */
+	private String tccbh;
+	/** 11、路段编码-byte[12] */
+	private String ldbh;
+	/** 12、上下行状态-byte[1] */
+	private int sxxzt;
+	/** 13、速度-byte[1] */
+	private int speed;
+	/** 14、初始异常状态-byte[1] */
+	private int csyczt;
+	/** 15、结束异常状态-byte[1] */
+	private int jsyczt;
+	/** 16、车辆位置经度（纠偏后）-byte[4] */
+	private double lon;
+	/** 17、车辆位置维度（纠偏后）-byte[4] */
+	private double lat;
+	/** 18、方向-byte[2] */
+	private int fx;
+	/** 19、发送时间-byte[4] */
+	private Date fssj;
+	/** 20、离下站距离-byte[2] */
+	private int lxzjl;
+	/** 21、本站留车人数-byte[2] */
+	private int bzlcrs;
+	/** 22、车辆位置经度（未纠偏）-byte[4] */
+	private double lon_old;
+	/** 23、车辆位置经度（未纠偏）-byte[4] */
+	private double lat_old;
+	/** 24、城建X坐标 */
+	private double x;
+	/** 25、城建Y坐标 */
+	private double y;
+	
+	public String getMtd() {
+		return mtd;
+	}
+	
+	public void setMtd(String mtd) {
+		this.mtd = mtd;
+	}
+
+	public String getDriver() {
+		return driver;
+	}
+
+	public void setDriver(String driver) {
+		this.driver = driver;
+	}
+
+	public int getBczt() {
+		return bczt;
+	}
+
+	public void setBczt(int bczt) {
+		this.bczt = bczt;
+	}
+
+	public int getXlzt() {
+		return xlzt;
+	}
+
+	public void setXlzt(int xlzt) {
+		this.xlzt = xlzt;
+	}
+
+	public int getXldm() {
+		return xldm;
+	}
+
+	public void setXldm(int xldm) {
+		this.xldm = xldm;
+	}
+
+	public int getYyzt() {
+		return yyzt;
+	}
+
+	public void setYyzt(int yyzt) {
+		this.yyzt = yyzt;
+	}
+
+	public int getJczzt() {
+		return jczzt;
+	}
+
+	public void setJczzt(int jczzt) {
+		this.jczzt = jczzt;
+	}
+
+	public String getZdbh() {
+		return zdbh;
+	}
+
+	public void setZdbh(String zdbh) {
+		this.zdbh = zdbh;
+	}
+
+	public int getJctcczt() {
+		return jctcczt;
+	}
+
+	public void setJctcczt(int jctcczt) {
+		this.jctcczt = jctcczt;
+	}
+
+	public String getTccbh() {
+		return tccbh;
+	}
+
+	public void setTccbh(String tccbh) {
+		this.tccbh = tccbh;
+	}
+
+	public String getLdbh() {
+		return ldbh;
+	}
+
+	public void setLdbh(String ldbh) {
+		this.ldbh = ldbh;
+	}
+
+	public int getSxxzt() {
+		return sxxzt;
+	}
+
+	public void setSxxzt(int sxxzt) {
+		this.sxxzt = sxxzt;
+	}
+
+	public int getSpeed() {
+		return speed;
+	}
+
+	public void setSpeed(int speed) {
+		this.speed = speed;
+	}
+
+	public int getCsyczt() {
+		return csyczt;
+	}
+
+	public void setCsyczt(int csyczt) {
+		this.csyczt = csyczt;
+	}
+
+	public int getJsyczt() {
+		return jsyczt;
+	}
+
+	public void setJsyczt(int jsyczt) {
+		this.jsyczt = jsyczt;
+	}
+
+	public double getLon() {
+		return lon;
+	}
+
+	public void setLon(double lon) {
+		this.lon = lon;
+	}
+
+	public double getLat() {
+		return lat;
+	}
+
+	public void setLat(double lat) {
+		this.lat = lat;
+	}
+
+	public int getFx() {
+		return fx;
+	}
+
+	public void setFx(int fx) {
+		this.fx = fx;
+	}
+
+	public Date getFssj() {
+		return fssj;
+	}
+
+	public void setFssj(Date fssj) {
+		this.fssj = fssj;
+	}
+
+	public int getLxzjl() {
+		return lxzjl;
+	}
+
+	public void setLxzjl(int lxzjl) {
+		this.lxzjl = lxzjl;
+	}
+
+	public int getBzlcrs() {
+		return bzlcrs;
+	}
+
+	public void setBzlcrs(int bzlcrs) {
+		this.bzlcrs = bzlcrs;
+	}
+
+	public double getLon_old() {
+		return lon_old;
+	}
+
+	public void setLon_old(double lon_old) {
+		this.lon_old = lon_old;
+	}
+
+	public double getLat_old() {
+		return lat_old;
+	}
+
+	public void setLat_old(double lat_old) {
+		this.lat_old = lat_old;
+	}
+
+	public double getX() {
+		return x;
+	}
+
+	public void setX(double x) {
+		this.x = x;
+	}
+
+	public double getY() {
+		return y;
+	}
+
+	public void setY(double y) {
+		this.y = y;
+	}
+	
+	public byte[] write() {
+		return null;
+	}
+
+	@Override
+	public void read(byte[] bytes) {
+		// TODO Auto-generated method stub
+		int idx = 0;
+		ByteBuffer buf = ByteBuffer.wrap(bytes);
+		mtd = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
+		driver = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
+		bczt = buf.get(idx); idx++;
+		xlzt = buf.get(idx); idx++;
+		xldm = Integer.parseInt(ConvertUtil.ascii2string(bytes, idx, 6).trim()); idx += 6;
+		yyzt = buf.get(idx); idx++;
+		jczzt = buf.get(idx); idx++;
+		zdbh = ConvertUtil.ascii2string(bytes, idx, 8).trim(); idx += 8;
+		jctcczt = buf.get(idx); idx++;
+		tccbh = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
+		ldbh = ConvertUtil.ascii2string(bytes, idx, 12).trim(); idx += 12;
+		sxxzt = buf.get(idx); idx++;
+		speed = buf.get(idx)*10; idx++;
+		csyczt = buf.get(idx); idx++;
+		jsyczt = buf.get(idx); idx++;
+		byte flagx = buf.get(idx); idx++;
+		if (flagx == 0) x = ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
+		else x = -ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
+		idx += 3;
+		byte flagy = buf.get(idx); idx++;
+		if (flagy == 0) y = ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
+		else y = -ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
+		idx += 3;
+		fx = buf.getShort(idx)*(short)10; idx += 2;
+		fssj = new Date(ConvertUtil.bytes2int(bytes, idx, 4) * 1000L); idx += 4;
+		lxzjl = buf.getShort(idx); idx += 2;
+		bzlcrs = buf.getShort(idx); idx += 2;
+		lon = ConvertUtil.bytes2int(bytes, idx, 4); idx += 4;
+		lat = ConvertUtil.bytes2int(bytes, idx, 4); idx += 4;
+	}
+
+	@Override
+	public String getDeviceId() {
+		// TODO Auto-generated method stub
+		return mtd;
+	}
+
+	@Override
+	public long getTimestamp() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+}
-package com.bsth.data.match;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-import com.bsth.data.LineConfigData;
-import com.bsth.data.arrival.ArrivalComparator;
-import com.bsth.data.arrival.ArrivalData_GPS;
-import com.bsth.data.arrival.ArrivalEntity;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.ScheduleComparator;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.service.directive.DirectiveService;
-import com.bsth.websocket.handler.SendUtils;
-import com.google.common.collect.ArrayListMultimap;
-
-/**
- * 
- * @ClassName: Arrival2Schedule 
- * @Description: TODO(到离站数据 和 计划班次进行匹配  注意线程安全！！！！) 
- * @author PanZhao 
- * @date 2016年8月28日 上午1:13:02 
- *
- */
-@Component
-public class Arrival2Schedule implements ApplicationContextAware {
-	
-	private static DayOfSchedule dayOfSchedule;
-	private static SendUtils sendUtils;
-	private static DirectiveService directiveService;
-	private static LineConfigData lineConfigData;
-	private final static int ONE_MINUTE = 1000 * 60;
-	//定一个4小时的范围，基本能对正常班次进行容错。主要防止早上停车场GPS飘导致完成晚上的进场班次
-	private final static int FOUR_HOURS = 1000 * 60 * 60 * 4;
-	
-	private static Logger logger = LoggerFactory.getLogger(Arrival2Schedule.class);
-	
-	private static ArrayListMultimap<String, ExpectArrivalEnd> expectMap = ArrayListMultimap.create();
-	
-	/**
-	 * 
-	 * @Title: start 
-	 * @Description: TODO(开始) 
-	 * @param @param cars    需要匹配的车辆集合
-	 */
-	public static void start(Set<String> cars){
-		
-		for(String car : cars){
-			new SchMatchThread(car).start();
-		}
-	}
-	
-	public static class SchMatchThread extends Thread{
-		String nbbm;
-		LineConfig conf;
-		
-		public SchMatchThread(String nbbm){
-			this.nbbm = nbbm;
-		}
-		
-		//排序器
-		private ScheduleComparator.FCSJ schComparator = new ScheduleComparator.FCSJ();
-		private ArrivalComparator arrComparator = new ArrivalComparator();
-		private MatchResultComparator mrComparator = new MatchResultComparator();
-
-		private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
-
-		@Override
-		public void run() {
-			//班次列表
-			List<ScheduleRealInfo> schList = dayOfSchedule.findByNbbm(nbbm);
-			//进出起终点数据
-			List<ArrivalEntity> arrList = ArrivalData_GPS.findByNbbm(nbbm);
-			
-			if(schList.size() == 0 || arrList.size() == 0)
-				return;
-			
-			conf = lineConfigData.get(schList.get(0).getXlBm());
-			//排序
-			Collections.sort(schList, schComparator);
-			Collections.sort(arrList, arrComparator);
-			//过滤班次
-			schList = matchFilter(schList);
-			
-			//检查并修正首班出场终点信号，可能会出现走向异常
-			correctFirstSignal(schList, arrList);
-			
-			
-			//用实际来匹配计划
-			for(ArrivalEntity arr : arrList){
-				match(arr, schList);
-			}
-		}
-		
-		private void match(ArrivalEntity arr, List<ScheduleRealInfo> schList) {
-			
-			if(arr.getInOut() == 1)
-				matchOut(arr, schList);
-			else if(arr.getInOut() == 0)
-				matchIn(arr, schList);
-		}
-		
-		private List<ScheduleRealInfo> matchFilter(List<ScheduleRealInfo> schList) {
-			List<ScheduleRealInfo> list = new ArrayList<>();
-			for(ScheduleRealInfo sch : schList){
-				//烂班不匹配
-				if(sch.isDestroy())
-					continue;
-				
-				//线路配置出站既出场，并且没有里程的不匹配
-				if(conf.getOutConfig()==2 && sch.getBcsj() == null && sch.getJhlc() == null)
-					continue;
-				
-				list.add(sch);
-			}
-			return list;
-		}
-		
-		private void matchOut(ArrivalEntity arr, List<ScheduleRealInfo> schList){
-			if(arr.getFlag() == -1)
-				return;
-			
-			List<MatchResult> mrs = new ArrayList<>();
-			ScheduleRealInfo sch;
-			MatchResult mr;
-			for(int i = 0; i < schList.size(); i ++){
-				sch = schList.get(i);
-				if(!arr.isTcc() && arr.getUpDown() != Integer.parseInt(sch.getXlDir()))
-					continue;
-				
-				if(!arr.getStopNo().equals(sch.getQdzCode()))
-					continue;
-				
-				//班次有实发时间
-				if(sch.getFcsjActualTime() != null){
-					//实际发车已经被引用
-					if(Math.abs(arr.getTs() - sch.getFcsjActualTime()) < ONE_MINUTE)
-						return;
-					else
-						continue;
-				}
-				//添加一个匹配结果
-				mr = new MatchResult();
-				mr.sch = sch;
-				mr.ts = arr.getTs();
-				mr.diff = arr.getTs() - sch.getFcsjT();
-				mr.success = dayOfSchedule.validStartTime(sch, arr.getTs());
-				
-				if(Math.abs(mr.diff) < FOUR_HOURS && mr.success)
-					mrs.add(mr);
-			}
-			
-			if(mrs.size() > 0){
-				//排序后的第一个 就是最合适的匹配
-				Collections.sort(mrs, mrComparator);
-				mr = mrs.get(0);
-				
-				//漂移判定
-				if(driftCheck(mr, arr)){
-					carOut(mr);
-				}
-			}
-		}
-		
-		private void matchIn(ArrivalEntity inArr, List<ScheduleRealInfo> schList){
-			
-			List<MatchResult> mrs = new ArrayList<>();
-			ScheduleRealInfo sch;
-			MatchResult mr;
-			for(int i = 0; i < schList.size(); i ++){
-				sch = schList.get(i);
-				if(!inArr.isTcc() && inArr.getUpDown() != Integer.parseInt(sch.getXlDir()))
-					continue;
-				
-				if(!inArr.getStopNo().equals(sch.getZdzCode()))
-					continue;
-				
-				//班次有实达时间
-				if(sch.getZdsjActualTime() != null){
-					//实际到达已经被引用
-					if(Math.abs(inArr.getTs() - sch.getZdsjActualTime()) < ONE_MINUTE)
-						return;
-					else
-						continue;
-				}
-				
-				//添加一个匹配结果
-				mr = new MatchResult();
-				mr.sch = sch;
-				mr.ts = inArr.getTs();
-				//班次没有里程和运送时间的
-				if(sch.getZdsj() == null){
-					if(i < schList.size()-1)
-						mr.diff = inArr.getTs() - schList.get(i + 1).getDfsjT();
-					else
-						mr.diff = inArr.getTs() - sch.getDfsjT();
-				}
-				else
-					mr.diff = inArr.getTs() - sch.getZdsjT();
-				mr.success = dayOfSchedule.validEndTime(sch, inArr.getTs());
-				if(Math.abs(mr.diff) < FOUR_HOURS && mr.success)
-					mrs.add(mr);
-			}
-			
-			if(mrs.size() > 0){
-				//排序后的第一个 就是最合适的匹配
-				Collections.sort(mrs, mrComparator);
-				mr = mrs.get(0);
-				carInStop(mr);
-			}
-		}
-		
-		/**
-		 * 
-		 * @Title: carOut 
-		 * @Description: TODO(车辆发出) 
-		 */
-		public void carOut(MatchResult mr){
-			ScheduleRealInfo sch = mr.sch;
-			
-			if(!isExpectOut(mr))
-				return;
-			//设置发车时间
-			sch.setFcsjActualAll(mr.ts);
-			//通知客户端
-			sendUtils.sendFcsj(sch);
-			//持久化
-			dayOfSchedule.save(sch);
-			//车辆当前执行班次
-			dayOfSchedule.addExecPlan(sch);
-			
-			//期望车辆到达的终点
-			if(sch.getZdsj() != null)
-				expectMap.put(nbbm, ExpectArrivalEnd.getEndInstance(sch, mr.ts));
-		}
-		
-		/**
-		 * 
-		 * @Title: isExpectOut 
-		 * @Description: TODO(是否是一个期望的出站匹配结果) 
-		 */
-		private boolean isExpectOut(MatchResult mr){
-			ScheduleRealInfo sch = mr.sch;
-			String nbbm = sch.getClZbh();
-			if(expectMap.containsKey(nbbm)){
-				List<ExpectArrivalEnd> eads = expectMap.get(nbbm);
-				for(ExpectArrivalEnd ead : eads){
-					if(sch.getQdzCode().equals(ead.getEndStation())
-							|| mr.ts > ead.getEndTime()){
-						expectMap.removeAll(nbbm);
-						return true;
-					}
-				}
-				return false;
-			}
-			return true;
-		}
-		
-		/**
-		 * 
-		 * @Title: carInStop 
-		 * @Description: TODO(车辆进入终点站) 
-		 */
-		public void carInStop(MatchResult mr){
-			ScheduleRealInfo sch = mr.sch;
-			String nbbm=sch.getClZbh();
-			if(!isExpectIn(mr))
-				return;
-			
-			//如果是进停车场，并且实达时间差值大于 30 分钟，并且之前还有未完成班次。
-			if(sch.getBcType().equals("in") && Math.abs(mr.diff) > (1000 * 60 * 30)){
-				int prve_nen = dayOfSchedule.prveNotExecNum(sch);
-				if(prve_nen > 0)
-					return;
-			}
-			
-			sch.setZdsjActualAll(mr.ts);
-			int doneSum = dayOfSchedule.doneSum(nbbm);
-			ScheduleRealInfo next = dayOfSchedule.next(sch);
-			if(null != next){
-				next.setQdzArrDateSJ(sch.getZdsjActual());
-				//下发调度指令
-				directiveService.send60Dispatch(next, doneSum, "到站@系统");
-				
-				//完成“起点既停车场”的进场班次
-				if(next.getBcType().equals("in") && next.getJhlc() == null)
-					next.setFcsjActualAll(mr.ts);
-				
-				//套跑  -下发线路切换指令
-				if(!next.getXlBm().equals(sch.getXlBm()))
-					directiveService.lineChange(nbbm, next.getXlBm(), "套跑@系统");
-			}
-			else//下发文本指令（已结束运营）
-				directiveService.send60Phrase(nbbm, "到达终点 " + sch.getZdzName() + "，已完成当日所有排班。", "系统");
-			//通知客户端
-			sendUtils.sendZdsj(sch, next, doneSum);
-			//持久化
-			dayOfSchedule.save(sch);
-			logger.info(sch.getClZbh() + "移除正在执行班次，" + sch.getFcsj());
-			//移除车辆正在执行班次索引
-			dayOfSchedule.removeExecPlan(nbbm);
-		}
-		
-		/**
-		 * 
-		 * @Title: isExpectOut 
-		 * @Description: TODO(是否是一个期望的进站匹配结果) 
-		 */
-		private boolean isExpectIn(MatchResult mr){
-			ScheduleRealInfo sch = mr.sch;
-			String nbbm = sch.getClZbh();
-			if(expectMap.containsKey(nbbm)){
-				List<ExpectArrivalEnd> eads = expectMap.get(nbbm);
-				for(ExpectArrivalEnd ead : eads){
-					if(sch.getZdzCode().equals(ead.getEndStation())
-							|| mr.ts > ead.getEndTime()){
-						expectMap.removeAll(nbbm);
-						return true;
-					}
-				}
-				return false;
-			}
-			return true;
-		}
-		
-		/**
-		 * 
-		 * @Title: correctFirstSignal 
-		 * @Description: TODO(检查并纠正首班出场到离站) 
-		 */
-		private final static long TEN_MINUTES = 1000 * 60 * 10;
-		private void correctFirstSignal(List<ScheduleRealInfo> schList, List<ArrivalEntity> arrList) {
-			ScheduleRealInfo sch = schList.get(0);
-			ArrivalEntity arr = arrList.get(0);
-			
-			//有里程的出场班次才需要纠正
-			if(arr.isCorrect() || !sch.getBcType().equals("out") || sch.getJhlc() == null || sch.getBcsj() == null)
-				return;
-			
-			//如果首个进出站信号是出场
-			if(arr.isOutTcc() && arrList.size() >= 2)
-				arr = arrList.get(1);
-			else
-				return;
-			
-			//出场任务 “进终点” 信号才需要纠正
-			if(arr.getInOut() != 0)
-				return;
-			
-			//在计划终点之前到达，或者之后10分钟内到达
-			if(arr.getTs() < sch.getZdsjT()
-					|| arr.getTs() - sch.getZdsjT() < TEN_MINUTES){
-				
-				int upDown = Integer.parseInt(sch.getXlDir());
-				//走向不一致，相信班次的走向。纠正进站信号
-				if(arr.getUpDown() != upDown
-						&& arr.getStopName().equals(sch.getZdzName())){
-					
-					
-					String old = arr.toString();
-					arr.setUpDown(upDown);
-					arr.setStopNo(sch.getZdzCode());
-					arr.setCorrect(true);
-					arr.setCorrectText(old + " | " + arr.toString());
-					
-					logger.info("被纠正的信号：" + arr.getCorrectText());
-				}
-			}
-		}
-		
-		/**
-		 * 
-		 * @Title: driftCheck 
-		 * @Description: TODO(漂移判定) 
-		 */
-		public boolean driftCheck(MatchResult mr, ArrivalEntity arr){
-			try{
-				//上行发车，和到达时间比较一下。起点一般不会立即发出
-				if(mr.sch.getXlDir().equals("0") 
-						&& null != mr.sch.getQdzArrDateSJ()){
-
-
-					long dt = fmtyyyyMMddHHmm.parseMillis(mr.sch.getRealExecDate() + mr.sch.getQdzArrDateSJ());
-					
-					//停站时间少于 计划的3分之1，标记为漂移信号
-					if((mr.ts - dt < (mr.sch.getDfsjT() - dt) / 3)){
-						arr.setCorrect(true);
-						arr.setCorrectText("停站时间太短，标记为信号漂移");
-						arr.setFlag(-1);
-						
-						logger.info("漂移判定：" + arr);
-						return false;
-					}
-				}
-			}catch(Exception e){
-				logger.error("", e);
-			}
-			return true;
-		}
-	}
-	
-	@Override
-	public void setApplicationContext(ApplicationContext arg0) throws BeansException {
-		sendUtils = arg0.getBean(SendUtils.class);
-		dayOfSchedule = arg0.getBean(DayOfSchedule.class);
-		directiveService = arg0.getBean(DirectiveService.class);
-		lineConfigData = arg0.getBean(LineConfigData.class);
-	}
-	
-	/**
-	 * 
-	 * @Title: removeExpect 
-	 * @Description: TODO(清除预期站点) 
-	 * @param @param nbbm   
-	 */
-	public void removeExpect(String nbbm){
-		expectMap.removeAll(nbbm);
-	}
-	
-	public static void addExpect(String nbbm, ExpectArrivalEnd eae){
-		expectMap.put(nbbm, eae);
-	}
-}
-package com.bsth.data.match;
-
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-
-/**
- * 
- * @ClassName: ExpectArrivalEnd 
- * @Description: TODO(期望车辆在某个时间段到达某个终点或 发出某个起点........) 
- * @author PanZhao 
- * @date 2016年11月2日 下午8:04:43 
- *
- */
-public class ExpectArrivalEnd {
-	
-	private String nbbm;
-	
-	private String endStation;
-	
-	private Long endTime;
-	
-	public static ExpectArrivalEnd getEndInstance(ScheduleRealInfo sch, long t){
-		ExpectArrivalEnd ead = new ExpectArrivalEnd();
-		ead.setNbbm(sch.getClZbh());
-		ead.setEndStation(sch.getZdzCode());
-		if(sch.getBcType().equals("out"))
-			ead.setEndTime(sch.getZdsjT());
-		else{
-			ead.setEndTime(sch.getZdsjT() - (sch.getDfsjT() - t));
-		}
-		return ead;
-	}
-	
-
-	public String getNbbm() {
-		return nbbm;
-	}
-
-	public void setNbbm(String nbbm) {
-		this.nbbm = nbbm;
-	}
-
-	public String getEndStation() {
-		return endStation;
-	}
-
-	public void setEndStation(String endStation) {
-		this.endStation = endStation;
-	}
-
-	public Long getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(Long endTime) {
-		this.endTime = endTime;
-	}
-}
-package com.bsth.data.match;
-
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-
-/**
- * 
- * @ClassName: MatchResult 
- * @Description: TODO(实际和计划匹配结果) 
- * @author PanZhao 
- * @date 2016年8月10日 下午3:55:48 
- *
- */
-public class MatchResult {
-
-	/** 班次 */
-	public ScheduleRealInfo sch;
-	
-	/** 时间差 */
-	public long diff;
-	
-	/** 0 进 1 出 */
-	public  int inOut;
-	
-	public long ts;
-	
-	/** 交配成功 */
-	public boolean success;
-}
-package com.bsth.data.match;
-
-import java.util.Comparator;
-
-public class MatchResultComparator implements Comparator<MatchResult>{
-
-	@Override
-	public int compare(MatchResult o1, MatchResult o2) {
-		return (int) (Math.abs(o1.diff) - Math.abs(o2.diff));
-	}
-}
@@ -1023,4 +1023,8 @@ public class DayOfSchedule implements CommandLineRunner {
         Collections.sort(list, schFCSJComparator);
         return next(list, sch);
     }
+
+    public ArrayListMultimap<String, ScheduleRealInfo> getLpScheduleMap(){
+        return lpScheduleMap;
+    }
 }
 \ No newline at end of file
 package com.bsth.entity.forecast;
  
  
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
+import com.bsth.data.forecast.entity.ArrivalEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  
-import com.bsth.data.arrival.ArrivalEntity;
+import javax.persistence.*;
  
 /**
  * 
@@ -200,6 +200,10 @@ public class ScheduleRealInfo {
 	/** 是否有补发GPS信号 */
 	private boolean reissue;
  
+	/** 发车屏 发车顺序号，不持久化，会动态变化 */
+	@Transient
+	private int fcpSn;
+
 	public boolean isDfAuto() {
 		return dfAuto;
 	}
@@ -912,4 +916,12 @@ public class ScheduleRealInfo {
 	public void setLate2(boolean late2) {
 		this.late2 = late2;
 	}
+
+	public int getFcpSn() {
+		return fcpSn;
+	}
+
+	public void setFcpSn(int fcpSn) {
+		this.fcpSn = fcpSn;
+	}
 }
@@ -38,4 +38,7 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	List<Line> findLine(String line);
  
 	public Line findByLineCode(String string);
+	
+	@Query(value = "  SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
+	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
 }
@@ -15,8 +15,6 @@ import com.bsth.repository.BaseRepository;
  
 @Repository
 public interface CdlRepository extends BaseRepository<Cdl, Integer>{
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_cdl ",nativeQuery=true)
 	List<Cdl> obtainCdl();
 }
@@ -20,8 +20,6 @@ public interface CwjyRepository extends BaseRepository&lt;Cwjy, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="SELECT a.gsdm as gsdm,a.nbbm as nbbm,b.jsy as jsy,b.jzl as jzl ,b.stationid as stationid,"
 			+ "b.nylx as nylx,b.yj as yj,b.bz as bz,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
    " left  join ( select * from bsth_c_ylxxb b where to_days(b.yyrq)=to_days(?1) and jylx=1) b " +
@@ -13,8 +13,6 @@ import com.bsth.repository.BaseRepository;
  
 @Repository
 public interface CylRepository extends BaseRepository<Cyl, Integer>{
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_cyl where nbbm like %?1% and gsdm like %?2%",nativeQuery=true)
 	List<Cyl> obtainCyl(String nbbm,String gsdm);
 }
@@ -18,8 +18,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="SELECT a.*  FROM bsth_c_dlb a   where to_days(?1)-to_days(a.rq)=1"
 			+ " and jcsx=(select max(b.jcsx)  from  bsth_c_dlb b where a.nbbm=b.nbbm and "
 			+ " to_days(?1)-to_days(b.rq)=1 )  and ssgsdm like %?2%  and fgsdm like %?3% and "
@@ -30,8 +28,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% and nbbm like %?5% order by ?6 asc",nativeQuery=true)
@@ -53,8 +49,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	 * @param xlbm
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="select nbbm,count(nbbm) from bsth_c_dlb where to_days(?1)=to_days(rq) and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
@@ -62,8 +56,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 			+ " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
 	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
  
-	@Transactional
-	@Modifying
 	@Query(value="select nbbm,sum(cdl*100) as cdl ,sum(zlc*100) as zlc from bsth_c_dlb where to_days(?1)=to_days(rq) and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
@@ -81,8 +73,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 			+ " and s.nbbm in ?5 ")
 	List<Object[]> sumDlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
  
-	@Transactional
-	@Modifying
 	@Query(value="select ifnull(cdl,0),ifnull(hd,0),ifnull(sh,0) from bsth_c_dlb "
 			+ " where to_days(?1)=to_days(rq) "
 			+ " and ssgsdm like %?2% "
@@ -92,8 +82,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	List<Object[]> sumDlb2(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
  
  
-	@Transactional
-    @Modifying
 	@Query(value="UPDATE bsth_c_dlb SET " +
 				" czcd= ?2,"+
 				" jzcd = ?3, " +
@@ -22,24 +22,16 @@ public interface JdlRepository extends BaseRepository&lt;Jdl, Integer&gt;{
     			 "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'))", nativeQuery=true)
 	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate);
  
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4%",nativeQuery=true)
 	List<Jdl> query(String gsbm, String fgsbm, String rq, String nbbm);
  
  
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_jdl where rq = ?",nativeQuery=true)
 	List<Jdl> JdlList( String rq);
  
-	@Transactional
-	@Modifying
 	@Query(value="SELECT jdl FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm = ?4 and jdz = ?5",nativeQuery=true)
 	List<Double> queryBySame(String gsbm, String fgsbm, String rq, String nbbm, String jdz);
  
-	@Transactional
-	@Modifying
 	@Query(value="UPDATE bsth_c_jdl set jdl = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5 and jdz = ?6",nativeQuery=true)
 	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm, String jdz);
  
@@ -19,8 +19,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="SELECT a.*  FROM bsth_c_ylb a   where to_days(?1)-to_days(a.rq)=1"
 			+ " and jcsx=(select max(b.jcsx)  from  bsth_c_ylb b where a.nbbm=b.nbbm and "
 			+ " to_days(?1)-to_days(b.rq)=1 ) and ssgsdm like %?2%  and fgsdm like %?3% and "
@@ -32,8 +30,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * 获取当天日期前的最大的日期中最大进出顺序的数据
 	 * 
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="select y.* from (select max(d.id) as id ,d.nbbm from ("
 			+ " select b.rq,b.nbbm,max(b.jcsx) as jcsx from ("
 			+ " select max(t.rq) as rq ,t.nbbm   from bsth_c_ylb t "
@@ -55,21 +51,15 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% and nbbm like %?5% order by ?6 asc ",nativeQuery=true)
 	List<Ylb> obtainYl(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,String px);
  
  
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 ",nativeQuery=true)
 	List<Ylb> queryListYlb(String rq,String nbbm,String jgh);
  
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4 order by ?5 asc",nativeQuery=true)
 	List<Ylb> checkYlb(String rq,String nbbm,String jgh,String xlbm,String px);
 	/**
@@ -77,8 +67,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="select ifnull(jzl,0),ifnull(zlc,0),ifnull(sh,0) from bsth_c_ylb where  nbbm=?1 and rq=?2 and xlbm like %?3% and ssgsdm like %?4% and fgsdm like %?5%",nativeQuery=true)
 	List<Object[]> sumLcYl(String nbbm,Date rq,String xlbm,String fgsbm,String gsbm);
  
@@ -89,8 +77,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param xlbm
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="select nbbm,count(nbbm) from bsth_c_ylb where to_days(?1)=to_days(rq) and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
@@ -124,8 +110,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " and s.nbbm in ?5 ")
 	List<Object[]> sumYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
  
-	@Transactional
-	@Modifying
 	@Query(value="select ifnull(jzl,0),ifnull(yh,0),ifnull(sh,0) from bsth_c_ylb "
 			+ " where to_days(?1)=to_days(rq) "
 			+ " and ssgsdm like %?2% "
@@ -17,23 +17,15 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nylx=?2 and gsdm like %?3%",nativeQuery=true)
 	List<Ylxxb> obtainYlxx(String rq,int nylx,String gsdm);
  
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and ssgs=?2",nativeQuery=true)
 	List<Ylxxb> checkYlxx(String rq,String gs);
  
-	@Transactional
-	@Modifying
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nbbm =?2 and jylx=1",nativeQuery=true)
 	List<Ylxxb> obtainYlxx2(String rq,String nbbm);
  
-	@Transactional
-	@Modifying
 	@Query(value="select * from bsth_c_ylxxb s where s.nbbm = ?1 and "
 			+ "to_days(s.yyrq) = to_days(?2)",nativeQuery=true)
 	List<Ylxxb> queryListYlxxb(String clZbh,String date);
 package com.bsth.service.forecast;
  
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.transaction.Transactional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.forecast.dto.CreateSampleParam;
 import com.bsth.data.BasicData;
-import com.bsth.data.arrival.ArrivalEntity;
-import com.bsth.data.arrival.DataLoader;
+import com.bsth.data.forecast.ArrivalDataLoader;
+import com.bsth.data.forecast.entity.ArrivalEntity;
 import com.bsth.entity.forecast.Sample;
 import com.bsth.repository.forecast.SampleRepository;
 import com.bsth.service.forecast.util.CreateByArrivalData;
 import com.bsth.service.impl.BaseServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.text.SimpleDateFormat;
+import java.util.*;
  
 @Service
 public class SampleServiceImpl extends BaseServiceImpl<Sample, Long> implements SampleService{
@@ -80,7 +72,7 @@ public class SampleServiceImpl extends BaseServiceImpl&lt;Sample, Long&gt; implements 
 			sampleRepository.deleteByLineAndUpdown(param.getLineCode(), param.getUpdown());
  
 			//查询到离站数据
-			DataLoader loader = new DataLoader();
+			ArrivalDataLoader loader = new ArrivalDataLoader();
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  
 			long st = sdf.parse(param.getStartDate()).getTime()
 package com.bsth.service.forecast.util;
  
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
 import com.bsth.controller.forecast.dto.CreateSampleParam;
 import com.bsth.controller.forecast.dto.CreateSampleParam.TimeRange;
-import com.bsth.data.arrival.ArrivalComparator;
-import com.bsth.data.arrival.ArrivalEntity;
+import com.bsth.data.forecast.ArrivalComparator;
+import com.bsth.data.forecast.entity.ArrivalEntity;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.forecast.Sample;
 import com.bsth.repository.StationRouteRepository;
 import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
  
 /**
  * 
@@ -35,7 +35,7 @@ public interface FormsService {
  
 	public List<Operationservice> operationservice(Map<String, Object> map);
  
-	public List<Turnoutrate> turnoutrate(Map<String, Object> map);
+	public List<Map<String, Object>> turnoutrate(Map<String, Object> map);
  
 	public List<Executionrate> executionrate(Map<String, Object> map);
  
@@ -9,14 +9,17 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
  
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
  
+import com.bsth.entity.Line;
 import com.bsth.entity.mcy_forms.Linepasswengerflow;
 import com.bsth.entity.mcy_forms.Operationservice;
 import com.bsth.entity.mcy_forms.Shifday;
@@ -27,6 +30,8 @@ import com.bsth.entity.mcy_forms.Vehicleloading;
 import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.repository.LineRepository;
 import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.data.BasicData;
@@ -60,6 +65,10 @@ public class FormsServiceImpl implements FormsService {
  
 	@Autowired
 	YlbRepository ylbRepository; 
+	
+	@Autowired
+	LineRepository lineRepository;
+	
  
 	// 行车路单日报表
 	@Override
@@ -734,11 +743,13 @@ public class FormsServiceImpl implements FormsService {
  
 	// 营运线路出车率统计表
 	@Override
-	public List<Turnoutrate> turnoutrate(Map<String, Object> map) {
+	public List<Map<String, Object>> turnoutrate(Map<String, Object> map) {
  
-		List<Turnoutrate> resList = new ArrayList<Turnoutrate>();
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
+		NumberFormat numberFormat = NumberFormat.getInstance();
+		numberFormat.setMaximumFractionDigits(2);
 		Date d = null;
 		Date d1 = null;
 		try {
@@ -750,68 +761,134 @@ public class FormsServiceImpl implements FormsService {
 		}
 		String rq2 = sdf1.format(d);
 		String rq3 = sdf1.format(d1);
+		String company = map.get("gsdmTurn").toString();
+		String subCompany = map.get("fgsdmTurn").toString();
+		String line = map.get("line").toString();
+		String startDate = map.get("startDate").toString();
+		String endDate = map.get("endDate").toString();
  
 		rq = rq2 + "-" + rq3;
  
-		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,b.warrant_car,a.bc_type from "
-				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
-				+ " from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+ map.get("startDate").toString() + "'  "
-				+ " and '" + map.get("endDate").toString() + "'  and xl_bm='"+ map.get("line").toString() + "' "
-				+ " AND gs_bm is not null "
-				+ " AND bc_type NOT IN ('in', 'out')"
-				+ " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
-				+ " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"
-//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
-				+ " ) a left JOIN ("
-				+ " SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car   "
-				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real "
-				+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "'  and '"
-				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get("line").toString()
-				+ "' AND gs_bm is not null "
-				+ " AND bc_type NOT IN ('in', 'out')"
-//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
-				+ " ) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
-				+ " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
-		List<Turnoutrate> list = jdbcTemplate.query(sql, new RowMapper<Turnoutrate>() {
+		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, startDate, endDate, company, subCompany);
+		List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line);
+		
+		String sql = "select * from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
+				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+startDate+"' and '"+endDate+"' ";
+		if(line.trim().length() != 0){
+			sql += "and xl_bm = '"+line+"' ";
+		}
+		List<SchedulePlanInfo> planList = jdbcTemplate.query(sql, new RowMapper<SchedulePlanInfo>() {
  
 			@Override
-			public Turnoutrate mapRow(ResultSet arg0, int arg1) throws SQLException {
-				Turnoutrate tu = new Turnoutrate();
-				NumberFormat numberFormat = NumberFormat.getInstance();
-				numberFormat.setMaximumFractionDigits(2);
-				int scl = arg0.getString("scl")!=null&&arg0.getString("scl").trim().length()!=0?Integer.parseInt(arg0.getString("scl")):0;
-				int jcl = arg0.getString("jcl")!=null&&arg0.getString("jcl").trim().length()!=0?Integer.parseInt(arg0.getString("jcl")):0;
-				int sbc = arg0.getString("sbc")!=null&&arg0.getString("sbc").trim().length()!=0?Integer.parseInt(arg0.getString("sbc")):0;
-				int jbc = arg0.getString("jbc")!=null&&arg0.getString("jbc").trim().length()!=0?Integer.parseInt(arg0.getString("jbc")):0;
-				String result1 = numberFormat.format((float) scl / (float) jcl * 100);
-				String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
-				tu.setRq(rq);
-				if(arg0.getString("gs_name") == null || arg0.getString("gs_name").trim().length() == 0)
-					return tu;
-				tu.setGs(arg0.getString("gs_name").toString());
-				tu.setZhgs(arg0.getString("fgs_name").toString());
-//				tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");
-				tu.setXl(arg0.getString("jxl")!=null&&arg0.getString("jxl").trim().length()!=0?arg0.getString("jxl"):"0");
-				tu.setXlmc(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
-				tu.setCchjh("" + jcl);
-				tu.setCchsj("" + scl);
-				tu.setCchqz(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
-				tu.setChl(result1 + "%");// 出车率
-				tu.setBcjh("" + jbc);
-				tu.setBcsj("" + sbc);
-				tu.setBbzxl(result2 + "%");// 班次执行率
-				tu.setSm(arg0.getString("gs_name").toString());
-				tu.setGsgs(arg0.getString("gslsbm").toString());
-				tu.setFgsgs(arg0.getString("fgsbm").toString());
-				return tu;
+			public SchedulePlanInfo mapRow(ResultSet arg0, int arg1) throws SQLException {
+				SchedulePlanInfo schedule = new SchedulePlanInfo();
+				schedule.setGsName(arg0.getString("gs_name"));
+				schedule.setFgsName(arg0.getString("fgs_name"));
+				schedule.setClZbh(arg0.getString("cl_zbh"));
+				schedule.setFcsj(arg0.getString("fcsj"));
+				schedule.setBcType(arg0.getString("bc_type"));
+				schedule.setXlBm(arg0.getString("xl_bm"));
+				schedule.setXlName(arg0.getString("xl_name"));
+				schedule.setScheduleDate(arg0.getDate("schedule_date"));
+				return schedule;
 			}
  
 		});
  
-		for(Turnoutrate t : list){
-			if(t.getGs() != null && t.getGs().trim().length() != 0)
-				resList.add(t);
+		
+		for(Line line1 : lineList){
+			if(line.trim().length() == 0 || line1.getLineCode().equals(line)){
+				Map<String, Object> m = new HashMap<String, Object>();
+				m.put("rq", rq);
+				m.put("line", line1.getName());
+				m.put("xlBm", line1.getLineCode());
+				m.put("qz", line1.getWarrantCar()!=null?line1.getWarrantCar():0);
+				m.put("sm", "");
+				resList.add(m);
+			}
+		}
+		for(Map<String, Object> m : resList){
+			String xlBm = m.get("xlBm").toString();
+			List<ScheduleRealInfo> reals = new ArrayList<ScheduleRealInfo>();
+			List<SchedulePlanInfo> plans = new ArrayList<SchedulePlanInfo>();
+			for(ScheduleRealInfo schedule : list){
+				if(schedule.getXlBm().equals(xlBm)){
+					reals.add(schedule);
+				}
+			}
+			for(SchedulePlanInfo schedule : planList){
+				if(schedule.getXlBm().equals(xlBm)){
+					plans.add(schedule);
+				}
+			}
+			Set<String> jhcc = new HashSet<String>();
+			Set<String> sjcc = new HashSet<String>();
+			for(SchedulePlanInfo schedule : plans){
+				if(!m.containsKey("gsName") && schedule.getGsName()!=null && schedule.getGsName().trim().length()!=0){
+					m.put("gsName", schedule.getGsName());
+				}
+				if(!m.containsKey("fgsName") && schedule.getFgsName()!=null && schedule.getFgsName().trim().length()!=0){
+					m.put("fgsName", schedule.getFgsName());
+				}
+				jhcc.add(schedule.getClZbh() + sdf.format(schedule.getScheduleDate()));
+			}
+			for(ScheduleRealInfo schedule : reals){
+				if(!m.containsKey("gsName") && schedule.getGsName()!=null && schedule.getGsName().trim().length()!=0){
+					m.put("gsName", schedule.getGsName());
+				}
+				if(!m.containsKey("fgsName") && schedule.getFgsName()!=null && schedule.getFgsName().trim().length()!=0){
+					m.put("fgsName", schedule.getFgsName());
+				}
+				sjcc.add(schedule.getClZbh() + sdf.format(schedule.getScheduleDate()));
+			}
+			m.put("jhcc", jhcc.size());
+			m.put("sjcc", sjcc.size());
+			if(jhcc.size() != 0  && sjcc.size() != 0){
+				m.put("ccl", numberFormat.format(((float)sjcc.size() / jhcc.size())*100)+"%");
+			}else{
+				m.put("ccl", "--");
+			}
+			int jhbc = culateMileageService.culateJhbc(reals, "");
+			int sjbc = culateMileageService.culateSjbc(reals, "");
+			m.put("jhbc", jhbc);
+			m.put("sjbc", sjbc);
+			if(jhbc != 0 && sjbc != 0){
+				m.put("zxl", numberFormat.format(((float)sjbc / jhbc)*100)+"%");
+			}else{
+				m.put("zxl", "--");
+			}
+		}
+		Map<String, Object> tempMap = new HashMap<String, Object>();
+		int jhcc = 0;
+		int sjcc = 0;
+		int jhbc = 0;
+		int sjbc = 0;
+		int qz = 0;
+		for(Map<String, Object> m : resList){
+			jhcc += Integer.valueOf(m.get("jhcc").toString());
+			sjcc += Integer.valueOf(m.get("sjcc").toString());
+			jhbc += Integer.valueOf(m.get("jhbc").toString());
+			sjbc += Integer.valueOf(m.get("sjbc").toString());
+			qz += Integer.valueOf(m.get("qz").toString());
+		}
+		tempMap.put("rq", "分类汇总");
+		tempMap.put("line", "共" + resList.size() + "条线路");
+		tempMap.put("jhcc", jhcc);
+		tempMap.put("sjcc", sjcc);
+		tempMap.put("jhbc", jhbc);
+		tempMap.put("sjbc", sjbc);
+		tempMap.put("qz", qz);
+		if(jhcc != 0 && sjcc != 0){
+			tempMap.put("ccl", numberFormat.format(((float)sjcc / jhcc)*100)+"%");
+		}else{
+			tempMap.put("ccl", "--");
+		}
+		if(jhbc != 0 && sjbc != 0){
+			tempMap.put("zxl", numberFormat.format(((float)sjbc / jhbc)*100)+"%");
+		}else{
+			tempMap.put("zxl", "--");
 		}
+		resList.add(tempMap);
  
 		return resList;
 	}
@@ -2,7 +2,7 @@ package com.bsth.service.gps;
  
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
-import com.bsth.data.arrival.ArrivalEntity;
+import com.bsth.data.forecast.entity.ArrivalEntity;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
@@ -2,7 +2,7 @@ package com.bsth.service.gps.entity;
  
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.bsth.data.arrival.ArrivalEntity;
+import com.bsth.data.forecast.entity.ArrivalEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.GeometryFactory;
@@ -52,6 +52,7 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.drools.compiler.lang.dsl.DSLMapParser.statement_return;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
@@ -812,6 +813,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
       //计算里程和班次数，并放入Map里
         Map<String, Object>  map = this.MapById(scheduleRealInfos.get(0).getId());
+
+        map.put("jhlc",Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
+        map.put("remMileage",culateMieageService.culateLbgl(lists));
+        map.put("addMileage", culateMieageService.culateLjgl(lists));
+        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
+        map.put("yygl", yygl);
+        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
+        map.put("ksgl",ksgl);
+        map.put("realMileage", Arith.add(yygl ,ksgl));
+        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("cjbc", culateMieageService.culateLbbc(lists));
+        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
+        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
+        map.put("sjbc", sjbc);
 //      map=new HashMap<String,Object>();
         Map<String, Object> maps;
         for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
@@ -842,19 +857,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
  
  
-        map.put("jhlc",Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
-        map.put("remMileage",culateMieageService.culateLbgl(lists));
-        map.put("addMileage", culateMieageService.culateLjgl(lists));
-        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
-        map.put("yygl", yygl);
-        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
-        map.put("ksgl",ksgl);
-        map.put("realMileage", Arith.add(yygl ,ksgl));
-        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
-        map.put("cjbc", culateMieageService.culateLbbc(lists));
-        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
-        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
-        map.put("sjbc", sjbc);
  
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  
@@ -4141,7 +4143,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return new ArrayList<Map<String, Object>>();
     }
  
-    public  List<ScheduleRealInfo> exportWaybill_pl(List<ScheduleRealInfo> listpl,String date,String jName, String clZbh,String lpName) {
+    public  void exportWaybill_pl(List<ScheduleRealInfo> listpl,String date,String jName, String clZbh,String lpName) {
         ReportUtils ee = new ReportUtils();
         ReportRelatedUtils rru = new ReportRelatedUtils();
         List<Iterator<?>> list = new ArrayList<Iterator<?>>();
@@ -4159,6 +4161,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
         Map<String, Object>  map = this.MapById(scheduleRealInfos.get(0).getId());
+        //计算里程和班次数，并放入Map里
+        map.put("jhlc", Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
+        map.put("remMileage",culateMieageService.culateLbgl(lists));
+        map.put("addMileage", culateMieageService.culateLjgl(lists));
+        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
+        map.put("yygl", yygl);
+        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
+        map.put("ksgl",ksgl);
+        map.put("realMileage", Arith.add(yygl ,ksgl));
+        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("cjbc", culateMieageService.culateLbbc(lists));
+        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
+        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
+        map.put("sjbc", sjbc);
+
         Map<String, Object> maps;
         for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
                 maps = new HashMap<String, Object>();
@@ -4187,27 +4204,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
         }
  
-        //计算里程和班次数，并放入Map里
-        map.put("jhlc", Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
-        map.put("remMileage",culateMieageService.culateLbgl(lists));
-        map.put("addMileage", culateMieageService.culateLjgl(lists));
-        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
-        map.put("yygl", yygl);
-        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
-        map.put("ksgl",ksgl);
-        map.put("realMileage", Arith.add(yygl ,ksgl));
-        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
-        map.put("cjbc", culateMieageService.culateLbbc(lists));
-        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
-        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
-        map.put("sjbc", sjbc);
-
+      
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  
         list.add(listMap.iterator());
         ee.excelReplace(list, new Object[]{map}, path + "mould/waybill_minhang.xls",
                 path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
-        return scheduleRealInfos;
+//        return scheduleRealInfos;
     }
  
     @Override
@@ -6,11 +6,11 @@ spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
-spring.jpa.show-sql= false
+spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password=
+spring.datasource.password= root
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root
@@ -29,7 +29,7 @@ spring.datasource.validation-query=select 1
 ##
 #222.66.0.204:5555
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://180.168.57.114:7474/transport_server/rtgps/
+http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
 #http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
 http.send.directive = http://192.168.168.201:9090/transport_server/message/
 \ No newline at end of file
@@ -92,20 +92,20 @@
 						<tbody id="tbody">
  
 						</tbody>
-						<tr>
-							<td colspan="1">分类汇总</td>
-							<td><span id="total_gs">&nbsp;</span></td>
-							<td><span id="total_zhgs">&nbsp;</span></td>
-							<td><span id="total_xlts">&nbsp;</span></td>
-							<td><span id="total_jh">&nbsp;</span></td>
-							<td><span id="total_sj">&nbsp;</span></td>
-							<td><span id="total_qz">&nbsp;</span></td>
-							<td><span id="total_ccl">&nbsp;</span></td>
-							<td><span id="total_bcjh">&nbsp;</span></td>
-							<td><span id="total_bcsj">&nbsp;</span></td>
-							<td><span id="total_bczxl">&nbsp;</span></td>
-							<td><span id="total_sm">&nbsp;</span></td>
-						</tr>
+<!-- 						<tr> -->
+<!-- 							<td colspan="1">分类汇总</td> -->
+<!-- 							<td><span id="total_gs">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_zhgs">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_xlts">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_jh">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_sj">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_qz">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_ccl">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_bcjh">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_bcsj">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_bczxl">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_sm">&nbsp;</span></td> -->
+<!-- 						</tr> -->
 					</table>
 				</div>
 			</div>
@@ -197,53 +197,53 @@
 		$("#query").on("click",function(){
  
 		  line = $("#line").val();
-		  startDate1=$("#startDate").val();
-	   	  endDate1=$("#endDate").val();
+		  startDate=$("#startDate").val();
+		  endDate=$("#endDate").val();
 	   	  gsdmTurn=$("#gsdmTurn").val();
 	   	  fgsdmTurn=$("#fgsdmTurn").val();
-			 if(startDate1!=''&&endDate1!=''){
+			 if(startDate!=''&&endDate!=''){
 				$post('/mcy_forms/turnoutrate',
-					{ gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
+					{ gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:startDate,endDate:endDate,type:'query'},function(result){
 // 						var result=[];
 					 // 把数据填充到模版中
 						var tbodyHtml = template('turnoutrate',{list:result});
 						// 把渲染好的模版html文本追加到表格中
 						$('#tbody').html(tbodyHtml);
-					  line = $("#line").val();
-					  startDate = $("#startDate").val();
-					   endDate = $("#endDate").val();
-					    $("#sDate").text(startDate);
-				        $("#eDate").text(endDate);
+						line = $("#line").val();
+						startDate = $("#startDate").val();
+						endDate = $("#endDate").val();
+						$("#sDate").text(startDate);
+						$("#eDate").text(endDate);
  
-				        var total_xlts = 0,total_jh = 0;
-				        var total_sj = 0,total_qz = 0,total_ccl = 0,total_bcjh = 0;
-				        var total_bcjh = 0,total_bcsj = 0,total_bczxl = 0;
-				   		var total_gs=0; 
-				        var total_zhgs=0;
-				        $.each(result, function(i, obj) {
-					    	total_gs +=Number(obj.gsgs);
-					    	total_zhgs +=Number(obj.fgsgs);
-					    	total_xlts += Number(obj.xl);
-					    	total_jh = Number(obj.cchjh)+Number(total_jh);
-					    	total_sj = Number(obj.cchsj)+Number(total_sj);
-					    	total_qz = Number(obj.cchqz)+Number(total_qz);
+// 				        var total_xlts = 0,total_jh = 0;
+// 				        var total_sj = 0,total_qz = 0,total_ccl = 0,total_bcjh = 0;
+// 				        var total_bcjh = 0,total_bcsj = 0,total_bczxl = 0;
+// 				   		var total_gs=0; 
+// 				        var total_zhgs=0;
+// 				        $.each(result, function(i, obj) {
+// 					    	total_gs +=Number(obj.gsgs);
+// 					    	total_zhgs +=Number(obj.fgsgs);
+// 					    	total_xlts += Number(obj.xl);
+// 					    	total_jh = Number(obj.cchjh)+Number(total_jh);
+// 					    	total_sj = Number(obj.cchsj)+Number(total_sj);
+// 					    	total_qz = Number(obj.cchqz)+Number(total_qz);
  
-					    	total_ccl =(Number(total_sj)/Number(total_jh))*100;
-					    	total_bcjh = Number(obj.bcjh)+Number(total_bcjh);
-					    	total_bcsj = Number(obj.bcsj)+Number(total_bcsj);
-					    	total_bczxl = (Number(total_bcsj)/Number(total_bcjh))*100;
+// 					    	total_ccl =(Number(total_sj)/Number(total_jh))*100;
+// 					    	total_bcjh = Number(obj.bcjh)+Number(total_bcjh);
+// 					    	total_bcsj = Number(obj.bcsj)+Number(total_bcsj);
+// 					    	total_bczxl = (Number(total_bcsj)/Number(total_bcjh))*100;
  
-		                });
-		                $("#total_gs").text(total_gs);
-		                $("#total_zhgs").text(total_zhgs);
-		                $("#total_xlts").text(total_xlts);
-		                $("#total_jh").text(total_jh);
-		                $("#total_sj").text(total_sj);
-		                $("#total_qz").text(total_qz);
-		                $("#total_ccl").text(total_ccl.toFixed(2)+'%');
-		                $("#total_bcjh").text(total_bcjh);
-		                $("#total_bcsj").text(total_bcsj);
-		                $("#total_bczxl").text(total_bczxl.toFixed(2)+'%');
+// 		                });
+// 		                $("#total_gs").text(total_gs);
+// 		                $("#total_zhgs").text(total_zhgs);
+// 		                $("#total_xlts").text(total_xlts);
+// 		                $("#total_jh").text(total_jh);
+// 		                $("#total_sj").text(total_sj);
+// 		                $("#total_qz").text(total_qz);
+// 		                $("#total_ccl").text(total_ccl.toFixed(2)+'%');
+// 		                $("#total_bcjh").text(total_bcjh);
+// 		                $("#total_bcsj").text(total_bcsj);
+// 		                $("#total_bczxl").text(total_bczxl.toFixed(2)+'%');
  
 				        var temp = {};
 				        var today_account = 0;
@@ -278,18 +278,23 @@
 <script type="text/html" id="turnoutrate">
 	{{each list as obj i}}
 		<tr>
-			<td>{{obj.rq}}</td>
-			<td>{{obj.gs}}</td>
-			<td>{{obj.zhgs}}</td>
-			<td>{{obj.xl}}</td>
-			<td>{{obj.cchjh}}</td>
-			<td>{{obj.cchsj}}</td>
-			<td>{{obj.cchqz}}</td>
-			<td>{{obj.chl}}</td>
-			<td>{{obj.bcjh}}</td>
-			<td>{{obj.bcsj}}</td>
-			<td>{{obj.bbzxl}}</td>
-			<td>{{obj.gs}}</td>
+			{{if obj.rq == '分类汇总'}}
+				<td colspan='3'>{{obj.rq}}</td>
+			{{/if}}
+			{{if obj.rq != '分类汇总'}}
+				<td>{{obj.rq}}</td>
+				<td>{{obj.gsName}}</td>
+				<td>{{obj.fgsName}}</td>
+			{{/if}}
+			<td>{{obj.line}}</td>
+			<td>{{obj.jhcc}}</td>
+			<td>{{obj.sjcc}}</td>
+			<td>{{obj.qz}}</td>
+			<td>{{obj.ccl}}</td>
+			<td>{{obj.jhbc}}</td>
+			<td>{{obj.sjbc}}</td>
+			<td>{{obj.zxl}}</td>
+			<td>{{obj.sm}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -209,7 +209,7 @@
  
         </td>
         <td>
-            {{obj.jsy}}
+            {{obj.jsy}}/{{obj.name}}
         </td>
         <td>
  
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-05-04',
-        text: '<h5>修复了一个问题，该问题导致在应急停靠时间设置为0的时候，待发时间不会自动调整。</h5>'
+        date: '2017-05-07',
+        text: '<h5>修复了一个问题，该问题导致在某些特定情况下，报出的发车时间比实际的要晚1~3分钟。</h5>'
     };
  
     var storage = window.localStorage
-/** 时钟 */
-var gb_minute_timer = (function () {
-
-
-    var getServerTime = function (cb) {
-        function oncallback(jqXHR) {
-            var time = jqXHR && jqXHR.getResponseHeader("Date");
-            if (time)
-                callback(new Date(time))
-        }
-
-        if ("function" == typeof callback)
-            $.ajax({
-                url: "/real_control_v2/assets/imgs/time.gif",
-                type: "HEAD"
-            }).done(function (data, textStatus, jqXHR) {
-                oncallback(jqXHR)
-            }).fail(function (jqXHR, textStatus, errorThrown) {
-                oncallback(jqXHR)
-            })
-    };
-
-
-    setTimeout(function () {
-        getServerTime(function () {
-            console.log('cb,,', cb);
-        });
-    }, 5000);
-
+/** 时钟 */
+var gb_minute_timer = (function () {
+
+
+    var getServerTime = function (cb) {
+        function oncallback(jqXHR) {
+            var time = jqXHR && jqXHR.getResponseHeader("Date");
+            if (time)
+                callback(new Date(time))
+        }
+
+        if ("function" == typeof callback)
+            $.ajax({
+                url: "/real_control_v2/assets/imgs/time.gif",
+                type: "HEAD"
+            }).done(function (data, textStatus, jqXHR) {
+                oncallback(jqXHR)
+            }).fail(function (jqXHR, textStatus, errorThrown) {
+                oncallback(jqXHR)
+            })
+    };
+
+
+    setTimeout(function () {
+        getServerTime(function () {
+            console.log('cb,,', cb);
+        });
+    }, 5000);
+
 })();
 \ No newline at end of file