Merge branch 'minhang' into pudong

潘钊
2 parents 43e285ed e0064270
Showing 36 changed files with 2352 additions and 2410 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 {
+        
+    }
+}