Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents fde4f69e e65e5e3b
Showing 51 changed files with 2674 additions and 257 deletions
pom.xml
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/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.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
src/main/java/com/bsth/data/gpsdata/client/pd/codec/MessageDecoder.java
src/main/java/com/bsth/data/gpsdata/client/pd/codec/MessageEncoder.java
src/main/java/com/bsth/data/gpsdata/client/pd/codec/PdMessageCodecFactory.java
@@ -264,6 +264,12 @@
 			<artifactId>ojdbc</artifactId>
 			<version>14</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.apache.mina</groupId>
+			<artifactId>mina-core</artifactId>
+			<version>2.0.13</version>
+		</dependency>
 	</dependencies>
  
 	<dependencyManagement>
@@ -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);
 	}
@@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 public class GpsEntity {
  
 	/** 公司代码 */
-	private Integer companyCode;
+	private Short companyCode;
  
 	/** 线路编码 */
 	private String lineId;
@@ -47,23 +47,20 @@ public class GpsEntity {
 	private Float speed;
  
 	/** 方向（角度） */
-	private Float direction;
+	private float direction;
  
 	/** 营运状态（ 0 营运 ，1 非营运， -1 无效） */
 	private Integer state;
  
 	/** 上下行（0 上行 ， 1 下行 ， -1 无效） */
-	private Integer upDown;
+	private Byte upDown;
  
 	/** 车辆内部编码 */
 	private String nbbm;
  
 	/** 预计到达终点时间 */
 	private Float expectStopTime;
-	
-	/** 设备是否在线
-	private boolean online;
-	 */
+
 	/** 当前执行班次ID */
 	private Long schId;
  
@@ -91,14 +88,6 @@ public class GpsEntity {
 	/** gps是否有效 设备端发送的状态 */
 	private int valid;
  
-	public Integer getCompanyCode() {
-		return companyCode;
-	}
-
-	public void setCompanyCode(Integer companyCode) {
-		this.companyCode = companyCode;
-	}
-
 	public String getDeviceId() {
 		return deviceId;
 	}
@@ -147,21 +136,6 @@ public class GpsEntity {
 		this.timestamp = timestamp;
 	}
  
-	public Float getSpeed() {
-		return speed;
-	}
-
-	public void setSpeed(Float speed) {
-		this.speed = speed;
-	}
-
-	public Float getDirection() {
-		return direction;
-	}
-
-	public void setDirection(Float direction) {
-		this.direction = direction;
-	}
  
 	public Integer getState() {
 		return state;
@@ -171,14 +145,6 @@ public class GpsEntity {
 		this.state = state;
 	}
  
-	public Integer getUpDown() {
-		return upDown;
-	}
-
-	public void setUpDown(Integer upDown) {
-		this.upDown = upDown;
-	}
-
 	public String getNbbm() {
 		return nbbm;
 	}
@@ -291,4 +257,39 @@ public class GpsEntity {
 	public void setValid(int valid) {
 		this.valid = valid;
 	}
+
+
+
+	public short getCompanyCode() {
+		return companyCode;
+	}
+
+	public void setCompanyCode(short companyCode) {
+		this.companyCode = companyCode;
+	}
+
+	public Byte getUpDown() {
+		return upDown;
+	}
+
+	public void setUpDown(Byte upDown) {
+		this.upDown = upDown;
+	}
+
+
+	public float getDirection() {
+		return direction;
+	}
+
+	public void setDirection(float direction) {
+		this.direction = direction;
+	}
+
+	public Float getSpeed() {
+		return speed;
+	}
+
+	public void setSpeed(Float speed) {
+		this.speed = speed;
+	}
 }
@@ -2,6 +2,7 @@ package com.bsth.data.gpsdata;
  
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
+import com.bsth.data.gpsdata.client.ClientApp;
 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
 import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
 import com.bsth.data.schedule.DayOfSchedule;
@@ -52,13 +53,18 @@ public class GpsRealData implements CommandLineRunner {
         lineCode2Devices = TreeMultimap.create();
     }
  
+    @Autowired
+    ClientApp clientApp;
     @Override
     public void run(String... arg0) throws Exception {
         logger.info("gpsDataLoader,20,3");
-        //定时从网关获取GPS数据
+        //定时从网关http形式获取GPS数据 --- 已弃用，现socket客户端接入数据
         //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 3, TimeUnit.SECONDS);
         //定时扫描掉离线
         //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
+
+        //gps 客户端
+        //clientApp.init();
     }
  
  
@@ -285,7 +285,7 @@ public class GeoCacheData {
      * @param stationCode
      * @return
      */
-    public static boolean isEndStation(String lineId, Integer upDown, String stationCode) {
+    public static boolean isEndStation(String lineId, Byte upDown, String stationCode) {
         StationRoute station = routeCodeMap.get(lineId + "_" + upDown + "_" + stationCode);
         return station != null && station.getMark().equals("E");
     }
@@ -4,12 +4,15 @@ import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.arrival.handlers.*;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
+import com.google.common.collect.ArrayListMultimap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -43,10 +46,22 @@ public class GpsRealAnalyse {
     static ExecutorService threadPool = Executors.newFixedThreadPool(50);
  
     public void analyse(List<GpsEntity> list) {
-        CountDownLatch count = new CountDownLatch(list.size());
+        //如果正在恢复数据
+        if (GpsDataRecovery.run)
+            return;
+        logger.info("analyse gps size: " + list.size());
+        //按车辆分组gps
+        ArrayListMultimap multimap = ArrayListMultimap.create();
+        for(GpsEntity gps : list){
+            multimap.put(gps.getNbbm(), gps);
+        }
+
+        Set<String> ks = multimap.keySet();
+        CountDownLatch count = new CountDownLatch(ks.size());
  
-        for(GpsEntity gps : list)
-            threadPool.execute(new SignalHandleThread(gps, count));
+        for(String nbbm : ks){
+            threadPool.execute(new SignalHandleThread(multimap.get(nbbm), count));
+        }
  
         try {
             //等待子线程结束
@@ -62,11 +77,11 @@ public class GpsRealAnalyse {
  
     public class SignalHandleThread implements Runnable {
  
-        GpsEntity gps;
+        List<GpsEntity> list;
         CountDownLatch count;
  
-        SignalHandleThread(GpsEntity gps, CountDownLatch count) {
-            this.gps = gps;
+        SignalHandleThread(List<GpsEntity> gpsList, CountDownLatch count) {
+            this.list = gpsList;
             this.count = count;
         }
  
@@ -74,31 +89,33 @@ public class GpsRealAnalyse {
         public void run() {
  
             try {
-                //是否有任务
-                boolean task;
-                CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());
-                //掉线处理
-                offlineSignalHandle.handle(gps, prevs);
-                //状态处理
-                task = correctSignalHandle.handle(gps, prevs);
-                //场，站内外判断
-                stationInsideHandle.handle(gps, prevs);
-                //异常判定（越界/超速）
-                abnormalStateHandle.handle(gps, prevs);
-
-                if(!task)
-                    return; //无任务的，到这里就结束
-
-                //反向处理
-                reverseSignalHandle.handle(gps, prevs);
-                //进出站动作处理
-                inOutStationSignalHandle.handle(gps, prevs);
-                GeoCacheData.putGps(gps);
-
+                for(GpsEntity gps : list){
+                    //是否有任务
+                    boolean task;
+                    CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());
+                    //掉线处理
+                    offlineSignalHandle.handle(gps, prevs);
+                    //状态处理
+                    task = correctSignalHandle.handle(gps, prevs);
+                    //场，站内外判断
+                    stationInsideHandle.handle(gps, prevs);
+                    //异常判定（越界/超速）
+                    abnormalStateHandle.handle(gps, prevs);
+
+                    if(!task)
+                        return; //无任务的，到这里就结束
+
+                    //反向处理
+                    reverseSignalHandle.handle(gps, prevs);
+                    //进出站动作处理
+                    inOutStationSignalHandle.handle(gps, prevs);
+                    GeoCacheData.putGps(gps);
+                }
             } catch (Exception e) {
                 logger.error("", e);
             } finally {
-                count.countDown();
+                if(count != null)
+                    count.countDown();
             }
         }
     }
@@ -75,7 +75,7 @@ public abstract class SignalHandle {
     Logger logger = LoggerFactory.getLogger(this.getClass());
     private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
     protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
-        int updown = Integer.parseInt(sch.getXlDir());
+        byte updown = Byte.parseByte(sch.getXlDir());
         //gps 切换走向
         gps.setUpDown(updown);
  
@@ -41,7 +41,7 @@ public class CorrectSignalHandle extends SignalHandle {
         else
             sch = (ScheduleRealInfo) task;
  
-        int updown = Integer.parseInt(sch.getXlDir());
+        byte updown = Byte.parseByte(sch.getXlDir());
         //走向
         if(gps.getUpDown() != updown){
             gps.setUpDown(updown);
+package com.bsth.data.gpsdata.client;
+
+import com.bsth.data.gpsdata.client.pd.codec.PdMessageCodecFactory;
+import com.bsth.data.gpsdata.client.pd.handler.PdClientHandler;
+import com.bsth.data.gpsdata.client.pd.protocol.Pd_31_0;
+import com.bsth.data.gpsdata.client.pf.codec.PfMessageCodecFactory;
+import com.bsth.data.gpsdata.client.pf.handler.PfClientHandler;
+import com.bsth.util.ConfigUtil;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.IoSessionConfig;
+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.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.
+ */
+@Component
+public class ClientApp {
+
+    private static NioSocketConnector pdDataConnector;
+    private static NioSocketConnector pfDataConnector;
+    private static ExecutorService exec;
+
+    @Autowired
+    private PdClientHandler pdClient;
+    @Autowired
+    private PfClientHandler pfClient;
+    @Autowired
+    GpsBeforeBuffer gpsBeforeBuffer;
+
+    public static boolean dconnect(String device) {
+        boolean flag = false;
+        try {
+            ConnectFuture con = pdDataConnector.connect(new InetSocketAddress(ConfigUtil.get("gps.server.pd"), Integer.parseInt(ConfigUtil.get("gps.port.pd"))));
+            con.awaitUninterruptibly();
+            IoSession session = con.getSession();
+            session.setAttribute("deviceId", device);
+            com.bsth.data.gpsdata.client.pd.protocol.PdMessage msg = new com.bsth.data.gpsdata.client.pd.protocol.PdMessage();
+            Pd_31_0 body = new Pd_31_0();
+            body.setFunCode((short)0x15);
+            body.setLineId(0);
+            body.setDeviceId(device);
+            msg.setMessageBody(body);
+            msg.setVersion((short)1);
+            msg.setSerialNo((short)1);
+            msg.setCommandType((short)0x31);
+            byte[] bytes = msg.write();
+            WriteFuture write = session.write(bytes);
+            write.awaitUninterruptibly();
+            flag = true;
+            //SessionManager.getInstance().register(device, session);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return flag;
+    }
+
+    public static boolean fconnect(String device) {
+        boolean flag = false;
+        try {
+            ConnectFuture con = pfDataConnector.connect(new InetSocketAddress(ConfigUtil.get("gps.server.pf"),  Integer.parseInt(ConfigUtil.get("gps.port.pf"))));
+            con.awaitUninterruptibly();
+            IoSession session = con.getSession();
+            session.setAttribute("deviceId", device);
+            flag = true;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return flag;
+    }
+
+    public void init() {
+        exec = Executors.newFixedThreadPool(4);
+        //sexec.scheduleAtFixedRate(new SessionChecker(), 1, 1, TimeUnit.MINUTES);
+        /*******************************浦东********************************/
+        pdDataConnector = new NioSocketConnector();
+
+        LoggingFilter log = new LoggingFilter();
+        log.setMessageReceivedLogLevel(LogLevel.DEBUG);
+        pdDataConnector.getFilterChain().addLast("logger", log);
+
+        pdDataConnector.getFilterChain().addLast("codec",
+                new ProtocolCodecFilter(new PdMessageCodecFactory()));
+
+        IoSessionConfig config = pdDataConnector.getSessionConfig();
+
+        config.setReadBufferSize(4096);
+        config.setWriteTimeout(10000);
+        config.setWriterIdleTime(60000);
+
+        config.setIdleTime(IdleStatus.BOTH_IDLE, 60);
+
+        pdDataConnector.setHandler(pdClient);
+
+        dconnect(ConfigUtil.get("forward.device.name"));
+        /*******************************浦东转发********************************/
+        pfDataConnector = new NioSocketConnector();
+
+        LoggingFilter log1 = new LoggingFilter();
+        log1.setMessageReceivedLogLevel(LogLevel.DEBUG);
+        pfDataConnector.getFilterChain().addLast("logger", log1);
+
+        pfDataConnector.getFilterChain().addLast("codec",
+                new ProtocolCodecFilter(new PfMessageCodecFactory()));
+
+        IoSessionConfig config1 = pfDataConnector.getSessionConfig();
+
+        config1.setReadBufferSize(4096);
+        config1.setWriteTimeout(10000);
+        config1.setWriterIdleTime(60000);
+
+        config1.setIdleTime(IdleStatus.BOTH_IDLE, 60);
+
+        pfDataConnector.setHandler(pfClient);
+        fconnect(ConfigUtil.get("forward.device.name"));
+
+
+        gpsBeforeBuffer.init();
+    }
+}
+package com.bsth.data.gpsdata.client;
+
+import com.bsth.Application;
+import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
+import com.bsth.data.gpsdata.client.pd.protocol.BasicInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 从 socket client 到 .. 的缓冲
+ * Created by panzhao on 2017/5/4.
+ */
+@Component
+public class GpsBeforeBuffer {
+
+    static LinkedList<GpsEntity> linkedList = new LinkedList<>();
+
+    @Autowired
+    GpsHandleThread gpsHandleThread;
+
+    public void put(BasicInfo basicInfo){
+        //放弃补发数据
+        byte cacheData = getCacheState(basicInfo.getServiceState());
+        if(cacheData == 1)
+            return;
+        GpsEntity gps = new GpsEntity();
+
+        gps.setDeviceId(basicInfo.getDeviceId());
+        gps.setTimestamp(basicInfo.getTimestamp());
+        gps.setLat(basicInfo.getLat());
+        gps.setLon(basicInfo.getLon());
+        gps.setDirection((float)basicInfo.getDirection() / 10);
+        gps.setValid(basicInfo.getGpsValid());
+        gps.setCompanyCode(basicInfo.getCompanyCode());
+        gps.setStopNo(basicInfo.getStopNo());
+        gps.setUpDown(basicInfo.getUpOrDown());
+        gps.setSpeed((float)basicInfo.getSpeedGps() / 10);
+        gps.setLineId(String.valueOf(basicInfo.getLineId()));
+        gps.setState((int) getService(basicInfo.getServiceState()));
+        //没有设备号
+        if (StringUtils.isBlank(gps.getDeviceId()))
+            return;
+
+        String nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
+        if (StringUtils.isBlank(nbbm))
+            gps.setIncomplete(true);
+        else
+            gps.setNbbm(nbbm);
+
+        linkedList.addLast(gps);
+    }
+
+    public byte getCacheState(long serviceState) {
+        return (byte)(((serviceState & 0x00100000) == 0x00100000) ? 1 : 0);
+    }
+
+    public void init(){
+        Application.mainServices.scheduleWithFixedDelay(gpsHandleThread, 20, 2, TimeUnit.SECONDS);
+    }
+
+    @Component
+    public static class GpsHandleThread extends Thread{
+
+        List<GpsEntity> list;
+
+        @Autowired
+        GpsRealAnalyse gpsRealAnalyse;
+
+        @Override
+        public void run() {
+            list = new ArrayList<>(100);
+
+            GpsEntity gps;
+            for(int i = 0; i < 2000; i ++){
+                gps = linkedList.poll();
+                if(gps == null)
+                    break;
+                list.add(gps);
+            }
+
+            gpsRealAnalyse.analyse(list);
+        }
+    }
+
+    /**
+     * 获取运营状态
+     *
+     * @return -1无效 0运营 1未运营
+     */
+    public static byte getService(long serviceState) {
+        if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000)
+            return -1;
+        return (byte) (((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
+    }
+}
+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 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 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.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.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.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.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.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_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 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.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.protocol;
+
+
+import com.bsth.data.gpsdata.client.msg.IMessageBody;
+
+public class PfFactory {
+
+	public static IMessageBody create(int commandType, byte[] data) {
+		String pkgName = PfFactory.class.getPackage().getName();
+		IMessageBody body = null;
+		try {
+			Class<?> cls = Class.forName(pkgName + ".Pf_" + Integer.toHexString(commandType).toUpperCase() + "_0");
+			body = (IMessageBody)cls.newInstance();
+			body.read(data);
+		} catch (ClassNotFoundException e) {
+			// TODO Auto-generated catch block
+			//e.printStackTrace();
+		} catch (InstantiationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return body;
+	}
+}
+package com.bsth.data.gpsdata.client.pf.protocol;
+
+import com.bsth.data.gpsdata.client.msg.IMessage;
+import com.bsth.data.gpsdata.client.msg.IMessageBody;
+
+import java.util.Arrays;
+
+public class PfMessage implements IMessage {
+	
+	private short version;
+	private short serialNo;
+	private short commandType;
+	private IMessageBody messageBody;
+	private byte checkSum;
+	
+	public short getVersion() {
+		return version;
+	}
+
+	public void setVersion(short version) {
+		this.version = version;
+	}
+
+	public short getSerialNo() {
+		return serialNo;
+	}
+
+	public void setSerialNo(short serialNo) {
+		this.serialNo = serialNo;
+	}
+
+	public short getCommandType() {
+		return commandType;
+	}
+
+	public void setCommandType(short commandType) {
+		this.commandType = commandType;
+	}
+
+	public IMessageBody getMessageBody() {
+		return messageBody;
+	}
+
+	public void setMessageBody(IMessageBody messageBody) {
+		this.messageBody = messageBody;
+	}
+
+	public byte getCheckSum() {
+		return checkSum;
+	}
+
+	public void setCheckSum(byte checkSum) {
+		this.checkSum = checkSum;
+	}
+
+	public void read(byte[] data) {
+		int idx = 0, len = data.length;
+		//version = (short)(data[idx] & 0xff); idx++;
+		//serialNo = (short)(data[idx] & 0xff); idx++;
+		commandType = (short)(data[idx] & 0xff); idx++;
+		byte[] temp = Arrays.copyOfRange(data, idx, len - 1);
+		checkSum = data[len - 1];
+		if (0xff == (checkSum & 0xff)) {
+			try {
+				messageBody = PfFactory.create(commandType, temp);
+			} catch (Exception e) {
+				
+			}
+		}
+	}
+	
+	public byte[] write() {
+		return null;
+	}
+	
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		//sb.append("报文版本号：").append(version)
+		//.append("报文序列号：").append(serialNo)
+		sb.append("报文命令字：0x").append(Integer.toHexString(commandType))
+		.append("报文主体：(").append(messageBody).append(")")
+		.append("报文校验和：").append(checkSum);
+		
+		return sb.toString();
+	}
+}
+package com.bsth.data.gpsdata.client.pf.protocol;
+
+import com.bsth.data.gpsdata.client.msg.IMessageBody;
+import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
+
+import java.nio.ByteBuffer;
+import java.util.Date;
+
+
+public class Pf_1_0 implements IMessageBody {
+
+	/** 1、车载终端识别码-byte[8] */
+	private String mtd;
+	/** 2、司机工号-byte[8] */
+	private String driver;
+	/** 3、包车状态-byte[1] */
+	private int bczt;
+	/** 4、线路状态-byte[1] */
+	private int xlzt;
+	/** 5、线路代码-byte[6] */
+	private int xldm;
+	/** 6、营运状态-byte[1] */
+	private int yyzt;
+	/** 7、进出站状态-byte[1] */
+	private int jczzt;
+	/** 8、站点编号-byte[8] */
+	private String zdbh;
+	/** 9、进出停车场状态（0：厂内，1：厂外，2：未知）-byte[1] */
+	private int jctcczt;
+	/** 10、停车场编号-byte[8] */
+	private String tccbh;
+	/** 11、路段编码-byte[12] */
+	private String ldbh;
+	/** 12、上下行状态-byte[1] */
+	private int sxxzt;
+	/** 13、速度-byte[1] */
+	private int speed;
+	/** 14、初始异常状态-byte[1] */
+	private int csyczt;
+	/** 15、结束异常状态-byte[1] */
+	private int jsyczt;
+	/** 16、车辆位置经度（纠偏后）-byte[4] */
+	private double lon;
+	/** 17、车辆位置维度（纠偏后）-byte[4] */
+	private double lat;
+	/** 18、方向-byte[2] */
+	private int fx;
+	/** 19、发送时间-byte[4] */
+	private Date fssj;
+	/** 20、离下站距离-byte[2] */
+	private int lxzjl;
+	/** 21、本站留车人数-byte[2] */
+	private int bzlcrs;
+	/** 22、车辆位置经度（未纠偏）-byte[4] */
+	private double lon_old;
+	/** 23、车辆位置经度（未纠偏）-byte[4] */
+	private double lat_old;
+	/** 24、城建X坐标 */
+	private double x;
+	/** 25、城建Y坐标 */
+	private double y;
+	
+	public String getMtd() {
+		return mtd;
+	}
+	
+	public void setMtd(String mtd) {
+		this.mtd = mtd;
+	}
+
+	public String getDriver() {
+		return driver;
+	}
+
+	public void setDriver(String driver) {
+		this.driver = driver;
+	}
+
+	public int getBczt() {
+		return bczt;
+	}
+
+	public void setBczt(int bczt) {
+		this.bczt = bczt;
+	}
+
+	public int getXlzt() {
+		return xlzt;
+	}
+
+	public void setXlzt(int xlzt) {
+		this.xlzt = xlzt;
+	}
+
+	public int getXldm() {
+		return xldm;
+	}
+
+	public void setXldm(int xldm) {
+		this.xldm = xldm;
+	}
+
+	public int getYyzt() {
+		return yyzt;
+	}
+
+	public void setYyzt(int yyzt) {
+		this.yyzt = yyzt;
+	}
+
+	public int getJczzt() {
+		return jczzt;
+	}
+
+	public void setJczzt(int jczzt) {
+		this.jczzt = jczzt;
+	}
+
+	public String getZdbh() {
+		return zdbh;
+	}
+
+	public void setZdbh(String zdbh) {
+		this.zdbh = zdbh;
+	}
+
+	public int getJctcczt() {
+		return jctcczt;
+	}
+
+	public void setJctcczt(int jctcczt) {
+		this.jctcczt = jctcczt;
+	}
+
+	public String getTccbh() {
+		return tccbh;
+	}
+
+	public void setTccbh(String tccbh) {
+		this.tccbh = tccbh;
+	}
+
+	public String getLdbh() {
+		return ldbh;
+	}
+
+	public void setLdbh(String ldbh) {
+		this.ldbh = ldbh;
+	}
+
+	public int getSxxzt() {
+		return sxxzt;
+	}
+
+	public void setSxxzt(int sxxzt) {
+		this.sxxzt = sxxzt;
+	}
+
+	public int getSpeed() {
+		return speed;
+	}
+
+	public void setSpeed(int speed) {
+		this.speed = speed;
+	}
+
+	public int getCsyczt() {
+		return csyczt;
+	}
+
+	public void setCsyczt(int csyczt) {
+		this.csyczt = csyczt;
+	}
+
+	public int getJsyczt() {
+		return jsyczt;
+	}
+
+	public void setJsyczt(int jsyczt) {
+		this.jsyczt = jsyczt;
+	}
+
+	public double getLon() {
+		return lon;
+	}
+
+	public void setLon(double lon) {
+		this.lon = lon;
+	}
+
+	public double getLat() {
+		return lat;
+	}
+
+	public void setLat(double lat) {
+		this.lat = lat;
+	}
+
+	public int getFx() {
+		return fx;
+	}
+
+	public void setFx(int fx) {
+		this.fx = fx;
+	}
+
+	public Date getFssj() {
+		return fssj;
+	}
+
+	public void setFssj(Date fssj) {
+		this.fssj = fssj;
+	}
+
+	public int getLxzjl() {
+		return lxzjl;
+	}
+
+	public void setLxzjl(int lxzjl) {
+		this.lxzjl = lxzjl;
+	}
+
+	public int getBzlcrs() {
+		return bzlcrs;
+	}
+
+	public void setBzlcrs(int bzlcrs) {
+		this.bzlcrs = bzlcrs;
+	}
+
+	public double getLon_old() {
+		return lon_old;
+	}
+
+	public void setLon_old(double lon_old) {
+		this.lon_old = lon_old;
+	}
+
+	public double getLat_old() {
+		return lat_old;
+	}
+
+	public void setLat_old(double lat_old) {
+		this.lat_old = lat_old;
+	}
+
+	public double getX() {
+		return x;
+	}
+
+	public void setX(double x) {
+		this.x = x;
+	}
+
+	public double getY() {
+		return y;
+	}
+
+	public void setY(double y) {
+		this.y = y;
+	}
+	
+	public byte[] write() {
+		return null;
+	}
+
+	@Override
+	public void read(byte[] bytes) {
+		// TODO Auto-generated method stub
+		int idx = 0;
+		ByteBuffer buf = ByteBuffer.wrap(bytes);
+		mtd = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
+		driver = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
+		bczt = buf.get(idx); idx++;
+		xlzt = buf.get(idx); idx++;
+		xldm = Integer.parseInt(ConvertUtil.ascii2string(bytes, idx, 6).trim()); idx += 6;
+		yyzt = buf.get(idx); idx++;
+		jczzt = buf.get(idx); idx++;
+		zdbh = ConvertUtil.ascii2string(bytes, idx, 8).trim(); idx += 8;
+		jctcczt = buf.get(idx); idx++;
+		tccbh = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
+		ldbh = ConvertUtil.ascii2string(bytes, idx, 12).trim(); idx += 12;
+		sxxzt = buf.get(idx); idx++;
+		speed = buf.get(idx)*10; idx++;
+		csyczt = buf.get(idx); idx++;
+		jsyczt = buf.get(idx); idx++;
+		byte flagx = buf.get(idx); idx++;
+		if (flagx == 0) x = ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
+		else x = -ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
+		idx += 3;
+		byte flagy = buf.get(idx); idx++;
+		if (flagy == 0) y = ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
+		else y = -ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
+		idx += 3;
+		fx = buf.getShort(idx)*(short)10; idx += 2;
+		fssj = new Date(ConvertUtil.bytes2int(bytes, idx, 4) * 1000L); idx += 4;
+		lxzjl = buf.getShort(idx); idx += 2;
+		bzlcrs = buf.getShort(idx); idx += 2;
+		lon = ConvertUtil.bytes2int(bytes, idx, 4); idx += 4;
+		lat = ConvertUtil.bytes2int(bytes, idx, 4); idx += 4;
+	}
+
+	@Override
+	public String getDeviceId() {
+		// TODO Auto-generated method stub
+		return mtd;
+	}
+
+	@Override
+	public long getTimestamp() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+}
@@ -98,7 +98,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                         gps.setLon(rs.getFloat("LON"));
                         gps.setLineId(rs.getString("LINE_ID"));
                         gps.setTimestamp(rs.getLong("TS"));
-                        gps.setUpDown(getUpOrDown(rs.getLong("SERVICE_STATE")));
+                        gps.setUpDown((byte) getUpOrDown(rs.getLong("SERVICE_STATE")));
                         return gps;
                     }
                 });
@@ -144,8 +144,6 @@ public class DayOfSchedule implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
         basicDataLoader.loadAllData();
-        //从数据库恢复排班
-        //dataRecovery();
  
         //翻班线程
 //        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
@@ -123,7 +123,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
             //进的是班次起点（名称一样即可）
             gps.setStationName(BasicData.stationCode2NameMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo()));
             if(gps.getStationName().equals(sch.getQdzName())
-                    && sch.getLateMinute() > 0){
+                    /*&& sch.getLateMinute() > 0*/){
                 //自动调整待发 到达时间 + 停靠时间
                 long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
                 sch.setDfsjAll(dt);
@@ -38,4 +38,7 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	List<Line> findLine(String line);
  
 	public Line findByLineCode(String string);
+	
+	@Query(value = "  SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
+	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
 }
@@ -251,7 +251,8 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 			return null;
 		}
 		// 根据当前GPS确定 上下行和营运状态
-		Integer upDown = null, state = null;
+		Byte upDown = null;
+		Integer state = null;
 		if (null == sch) {
 			GpsEntity gpsData = gpsRealDataBuffer.get(deviceId);
 			if (null == gpsData) {
@@ -273,7 +274,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 				state = gpsData.getState();
 			}
 		} else {
-			upDown = Integer.parseInt(sch.getXlDir());
+			upDown = Byte.parseByte(sch.getXlDir());
 			state = 0;
 		}
  
@@ -35,7 +35,7 @@ public interface FormsService {
  
 	public List<Operationservice> operationservice(Map<String, Object> map);
  
-	public List<Turnoutrate> turnoutrate(Map<String, Object> map);
+	public List<Map<String, Object>> turnoutrate(Map<String, Object> map);
  
 	public List<Executionrate> executionrate(Map<String, Object> map);
  
@@ -9,14 +9,17 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
  
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
  
+import com.bsth.entity.Line;
 import com.bsth.entity.mcy_forms.Linepasswengerflow;
 import com.bsth.entity.mcy_forms.Operationservice;
 import com.bsth.entity.mcy_forms.Shifday;
@@ -27,6 +30,8 @@ import com.bsth.entity.mcy_forms.Vehicleloading;
 import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.repository.LineRepository;
 import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.data.BasicData;
@@ -60,6 +65,10 @@ public class FormsServiceImpl implements FormsService {
  
 	@Autowired
 	YlbRepository ylbRepository; 
+	
+	@Autowired
+	LineRepository lineRepository;
+	
  
 	// 行车路单日报表
 	@Override
@@ -734,11 +743,13 @@ public class FormsServiceImpl implements FormsService {
  
 	// 营运线路出车率统计表
 	@Override
-	public List<Turnoutrate> turnoutrate(Map<String, Object> map) {
+	public List<Map<String, Object>> turnoutrate(Map<String, Object> map) {
  
-		List<Turnoutrate> resList = new ArrayList<Turnoutrate>();
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
+		NumberFormat numberFormat = NumberFormat.getInstance();
+		numberFormat.setMaximumFractionDigits(2);
 		Date d = null;
 		Date d1 = null;
 		try {
@@ -750,68 +761,134 @@ public class FormsServiceImpl implements FormsService {
 		}
 		String rq2 = sdf1.format(d);
 		String rq3 = sdf1.format(d1);
+		String company = map.get("gsdmTurn").toString();
+		String subCompany = map.get("fgsdmTurn").toString();
+		String line = map.get("line").toString();
+		String startDate = map.get("startDate").toString();
+		String endDate = map.get("endDate").toString();
  
 		rq = rq2 + "-" + rq3;
  
-		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,b.warrant_car,a.bc_type from "
-				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
-				+ " from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+ map.get("startDate").toString() + "'  "
-				+ " and '" + map.get("endDate").toString() + "'  and xl_bm='"+ map.get("line").toString() + "' "
-				+ " AND gs_bm is not null "
-				+ " AND bc_type NOT IN ('in', 'out')"
-				+ " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
-				+ " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"
-//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
-				+ " ) a left JOIN ("
-				+ " SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car   "
-				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real "
-				+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "'  and '"
-				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get("line").toString()
-				+ "' AND gs_bm is not null "
-				+ " AND bc_type NOT IN ('in', 'out')"
-//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
-				+ " ) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
-				+ " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
-		List<Turnoutrate> list = jdbcTemplate.query(sql, new RowMapper<Turnoutrate>() {
+		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, startDate, endDate, company, subCompany);
+		List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line);
+		
+		String sql = "select * from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
+				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+startDate+"' and '"+endDate+"' ";
+		if(line.trim().length() != 0){
+			sql += "and xl_bm = '"+line+"' ";
+		}
+		List<SchedulePlanInfo> planList = jdbcTemplate.query(sql, new RowMapper<SchedulePlanInfo>() {
  
 			@Override
-			public Turnoutrate mapRow(ResultSet arg0, int arg1) throws SQLException {
-				Turnoutrate tu = new Turnoutrate();
-				NumberFormat numberFormat = NumberFormat.getInstance();
-				numberFormat.setMaximumFractionDigits(2);
-				int scl = arg0.getString("scl")!=null&&arg0.getString("scl").trim().length()!=0?Integer.parseInt(arg0.getString("scl")):0;
-				int jcl = arg0.getString("jcl")!=null&&arg0.getString("jcl").trim().length()!=0?Integer.parseInt(arg0.getString("jcl")):0;
-				int sbc = arg0.getString("sbc")!=null&&arg0.getString("sbc").trim().length()!=0?Integer.parseInt(arg0.getString("sbc")):0;
-				int jbc = arg0.getString("jbc")!=null&&arg0.getString("jbc").trim().length()!=0?Integer.parseInt(arg0.getString("jbc")):0;
-				String result1 = numberFormat.format((float) scl / (float) jcl * 100);
-				String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
-				tu.setRq(rq);
-				if(arg0.getString("gs_name") == null || arg0.getString("gs_name").trim().length() == 0)
-					return tu;
-				tu.setGs(arg0.getString("gs_name").toString());
-				tu.setZhgs(arg0.getString("fgs_name").toString());
-//				tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");
-				tu.setXl(arg0.getString("jxl")!=null&&arg0.getString("jxl").trim().length()!=0?arg0.getString("jxl"):"0");
-				tu.setXlmc(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
-				tu.setCchjh("" + jcl);
-				tu.setCchsj("" + scl);
-				tu.setCchqz(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
-				tu.setChl(result1 + "%");// 出车率
-				tu.setBcjh("" + jbc);
-				tu.setBcsj("" + sbc);
-				tu.setBbzxl(result2 + "%");// 班次执行率
-				tu.setSm(arg0.getString("gs_name").toString());
-				tu.setGsgs(arg0.getString("gslsbm").toString());
-				tu.setFgsgs(arg0.getString("fgsbm").toString());
-				return tu;
+			public SchedulePlanInfo mapRow(ResultSet arg0, int arg1) throws SQLException {
+				SchedulePlanInfo schedule = new SchedulePlanInfo();
+				schedule.setGsName(arg0.getString("gs_name"));
+				schedule.setFgsName(arg0.getString("fgs_name"));
+				schedule.setClZbh(arg0.getString("cl_zbh"));
+				schedule.setFcsj(arg0.getString("fcsj"));
+				schedule.setBcType(arg0.getString("bc_type"));
+				schedule.setXlBm(arg0.getString("xl_bm"));
+				schedule.setXlName(arg0.getString("xl_name"));
+				schedule.setScheduleDate(arg0.getDate("schedule_date"));
+				return schedule;
 			}
  
 		});
  
-		for(Turnoutrate t : list){
-			if(t.getGs() != null && t.getGs().trim().length() != 0)
-				resList.add(t);
+		
+		for(Line line1 : lineList){
+			if(line.trim().length() == 0 || line1.getLineCode().equals(line)){
+				Map<String, Object> m = new HashMap<String, Object>();
+				m.put("rq", rq);
+				m.put("line", line1.getName());
+				m.put("xlBm", line1.getLineCode());
+				m.put("qz", line1.getWarrantCar()!=null?line1.getWarrantCar():0);
+				m.put("sm", "");
+				resList.add(m);
+			}
+		}
+		for(Map<String, Object> m : resList){
+			String xlBm = m.get("xlBm").toString();
+			List<ScheduleRealInfo> reals = new ArrayList<ScheduleRealInfo>();
+			List<SchedulePlanInfo> plans = new ArrayList<SchedulePlanInfo>();
+			for(ScheduleRealInfo schedule : list){
+				if(schedule.getXlBm().equals(xlBm)){
+					reals.add(schedule);
+				}
+			}
+			for(SchedulePlanInfo schedule : planList){
+				if(schedule.getXlBm().equals(xlBm)){
+					plans.add(schedule);
+				}
+			}
+			Set<String> jhcc = new HashSet<String>();
+			Set<String> sjcc = new HashSet<String>();
+			for(SchedulePlanInfo schedule : plans){
+				if(!m.containsKey("gsName") && schedule.getGsName()!=null && schedule.getGsName().trim().length()!=0){
+					m.put("gsName", schedule.getGsName());
+				}
+				if(!m.containsKey("fgsName") && schedule.getFgsName()!=null && schedule.getFgsName().trim().length()!=0){
+					m.put("fgsName", schedule.getFgsName());
+				}
+				jhcc.add(schedule.getClZbh() + sdf.format(schedule.getScheduleDate()));
+			}
+			for(ScheduleRealInfo schedule : reals){
+				if(!m.containsKey("gsName") && schedule.getGsName()!=null && schedule.getGsName().trim().length()!=0){
+					m.put("gsName", schedule.getGsName());
+				}
+				if(!m.containsKey("fgsName") && schedule.getFgsName()!=null && schedule.getFgsName().trim().length()!=0){
+					m.put("fgsName", schedule.getFgsName());
+				}
+				sjcc.add(schedule.getClZbh() + sdf.format(schedule.getScheduleDate()));
+			}
+			m.put("jhcc", jhcc.size());
+			m.put("sjcc", sjcc.size());
+			if(jhcc.size() != 0  && sjcc.size() != 0){
+				m.put("ccl", numberFormat.format(((float)sjcc.size() / jhcc.size())*100)+"%");
+			}else{
+				m.put("ccl", "--");
+			}
+			int jhbc = culateMileageService.culateJhbc(reals, "");
+			int sjbc = culateMileageService.culateSjbc(reals, "");
+			m.put("jhbc", jhbc);
+			m.put("sjbc", sjbc);
+			if(jhbc != 0 && sjbc != 0){
+				m.put("zxl", numberFormat.format(((float)sjbc / jhbc)*100)+"%");
+			}else{
+				m.put("zxl", "--");
+			}
+		}
+		Map<String, Object> tempMap = new HashMap<String, Object>();
+		int jhcc = 0;
+		int sjcc = 0;
+		int jhbc = 0;
+		int sjbc = 0;
+		int qz = 0;
+		for(Map<String, Object> m : resList){
+			jhcc += Integer.valueOf(m.get("jhcc").toString());
+			sjcc += Integer.valueOf(m.get("sjcc").toString());
+			jhbc += Integer.valueOf(m.get("jhbc").toString());
+			sjbc += Integer.valueOf(m.get("sjbc").toString());
+			qz += Integer.valueOf(m.get("qz").toString());
+		}
+		tempMap.put("rq", "分类汇总");
+		tempMap.put("line", "共" + resList.size() + "条线路");
+		tempMap.put("jhcc", jhcc);
+		tempMap.put("sjcc", sjcc);
+		tempMap.put("jhbc", jhbc);
+		tempMap.put("sjbc", sjbc);
+		tempMap.put("qz", qz);
+		if(jhcc != 0 && sjcc != 0){
+			tempMap.put("ccl", numberFormat.format(((float)sjcc / jhcc)*100)+"%");
+		}else{
+			tempMap.put("ccl", "--");
+		}
+		if(jhbc != 0 && sjbc != 0){
+			tempMap.put("zxl", numberFormat.format(((float)sjbc / jhbc)*100)+"%");
+		}else{
+			tempMap.put("zxl", "--");
 		}
+		resList.add(tempMap);
  
 		return resList;
 	}
@@ -408,6 +408,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     t.setsName(sName);//补上售票员名称
                 }
             }
+            else{
+                t.setsGh("");
+                t.setsName("");
+            }
  
             //公司 和 分公司名称
             t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
@@ -498,6 +502,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     t.setsName(sName);//补上售票员名称
                 }
             }
+            else{
+                t.setsGh("");
+                t.setsName("");
+            }
  
             //公司 和 分公司名称
             t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
@@ -177,6 +177,10 @@
 			level="INFO" additivity="false">
 		<appender-ref ref="GPS_COUNT" />
 	</logger>
+	<logger name="com.bsth.data.gpsdata.arrival.GpsRealAnalyse"
+			level="INFO" additivity="false">
+		<appender-ref ref="GPS_COUNT" />
+	</logger>
     <!--<logger name="org.hibernate.SQL" level="TRACE">-->
         <!--<appender-ref ref="STDOUT" />-->
     <!--</logger>-->
@@ -92,20 +92,20 @@
 						<tbody id="tbody">
  
 						</tbody>
-						<tr>
-							<td colspan="1">分类汇总</td>
-							<td><span id="total_gs">&nbsp;</span></td>
-							<td><span id="total_zhgs">&nbsp;</span></td>
-							<td><span id="total_xlts">&nbsp;</span></td>
-							<td><span id="total_jh">&nbsp;</span></td>
-							<td><span id="total_sj">&nbsp;</span></td>
-							<td><span id="total_qz">&nbsp;</span></td>
-							<td><span id="total_ccl">&nbsp;</span></td>
-							<td><span id="total_bcjh">&nbsp;</span></td>
-							<td><span id="total_bcsj">&nbsp;</span></td>
-							<td><span id="total_bczxl">&nbsp;</span></td>
-							<td><span id="total_sm">&nbsp;</span></td>
-						</tr>
+<!-- 						<tr> -->
+<!-- 							<td colspan="1">分类汇总</td> -->
+<!-- 							<td><span id="total_gs">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_zhgs">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_xlts">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_jh">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_sj">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_qz">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_ccl">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_bcjh">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_bcsj">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_bczxl">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_sm">&nbsp;</span></td> -->
+<!-- 						</tr> -->
 					</table>
 				</div>
 			</div>
@@ -197,53 +197,53 @@
 		$("#query").on("click",function(){
  
 		  line = $("#line").val();
-		  startDate1=$("#startDate").val();
-	   	  endDate1=$("#endDate").val();
+		  startDate=$("#startDate").val();
+		  endDate=$("#endDate").val();
 	   	  gsdmTurn=$("#gsdmTurn").val();
 	   	  fgsdmTurn=$("#fgsdmTurn").val();
-			 if(startDate1!=''&&endDate1!=''){
+			 if(startDate!=''&&endDate!=''){
 				$post('/mcy_forms/turnoutrate',
-					{ gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
+					{ gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:startDate,endDate:endDate,type:'query'},function(result){
 // 						var result=[];
 					 // 把数据填充到模版中
 						var tbodyHtml = template('turnoutrate',{list:result});
 						// 把渲染好的模版html文本追加到表格中
 						$('#tbody').html(tbodyHtml);
-					  line = $("#line").val();
-					  startDate = $("#startDate").val();
-					   endDate = $("#endDate").val();
-					    $("#sDate").text(startDate);
-				        $("#eDate").text(endDate);
+						line = $("#line").val();
+						startDate = $("#startDate").val();
+						endDate = $("#endDate").val();
+						$("#sDate").text(startDate);
+						$("#eDate").text(endDate);
  
-				        var total_xlts = 0,total_jh = 0;
-				        var total_sj = 0,total_qz = 0,total_ccl = 0,total_bcjh = 0;
-				        var total_bcjh = 0,total_bcsj = 0,total_bczxl = 0;
-				   		var total_gs=0; 
-				        var total_zhgs=0;
-				        $.each(result, function(i, obj) {
-					    	total_gs +=Number(obj.gsgs);
-					    	total_zhgs +=Number(obj.fgsgs);
-					    	total_xlts += Number(obj.xl);
-					    	total_jh = Number(obj.cchjh)+Number(total_jh);
-					    	total_sj = Number(obj.cchsj)+Number(total_sj);
-					    	total_qz = Number(obj.cchqz)+Number(total_qz);
+// 				        var total_xlts = 0,total_jh = 0;
+// 				        var total_sj = 0,total_qz = 0,total_ccl = 0,total_bcjh = 0;
+// 				        var total_bcjh = 0,total_bcsj = 0,total_bczxl = 0;
+// 				   		var total_gs=0; 
+// 				        var total_zhgs=0;
+// 				        $.each(result, function(i, obj) {
+// 					    	total_gs +=Number(obj.gsgs);
+// 					    	total_zhgs +=Number(obj.fgsgs);
+// 					    	total_xlts += Number(obj.xl);
+// 					    	total_jh = Number(obj.cchjh)+Number(total_jh);
+// 					    	total_sj = Number(obj.cchsj)+Number(total_sj);
+// 					    	total_qz = Number(obj.cchqz)+Number(total_qz);
  
-					    	total_ccl =(Number(total_sj)/Number(total_jh))*100;
-					    	total_bcjh = Number(obj.bcjh)+Number(total_bcjh);
-					    	total_bcsj = Number(obj.bcsj)+Number(total_bcsj);
-					    	total_bczxl = (Number(total_bcsj)/Number(total_bcjh))*100;
+// 					    	total_ccl =(Number(total_sj)/Number(total_jh))*100;
+// 					    	total_bcjh = Number(obj.bcjh)+Number(total_bcjh);
+// 					    	total_bcsj = Number(obj.bcsj)+Number(total_bcsj);
+// 					    	total_bczxl = (Number(total_bcsj)/Number(total_bcjh))*100;
  
-		                });
-		                $("#total_gs").text(total_gs);
-		                $("#total_zhgs").text(total_zhgs);
-		                $("#total_xlts").text(total_xlts);
-		                $("#total_jh").text(total_jh);
-		                $("#total_sj").text(total_sj);
-		                $("#total_qz").text(total_qz);
-		                $("#total_ccl").text(total_ccl.toFixed(2)+'%');
-		                $("#total_bcjh").text(total_bcjh);
-		                $("#total_bcsj").text(total_bcsj);
-		                $("#total_bczxl").text(total_bczxl.toFixed(2)+'%');
+// 		                });
+// 		                $("#total_gs").text(total_gs);
+// 		                $("#total_zhgs").text(total_zhgs);
+// 		                $("#total_xlts").text(total_xlts);
+// 		                $("#total_jh").text(total_jh);
+// 		                $("#total_sj").text(total_sj);
+// 		                $("#total_qz").text(total_qz);
+// 		                $("#total_ccl").text(total_ccl.toFixed(2)+'%');
+// 		                $("#total_bcjh").text(total_bcjh);
+// 		                $("#total_bcsj").text(total_bcsj);
+// 		                $("#total_bczxl").text(total_bczxl.toFixed(2)+'%');
  
 				        var temp = {};
 				        var today_account = 0;
@@ -278,18 +278,23 @@
 <script type="text/html" id="turnoutrate">
 	{{each list as obj i}}
 		<tr>
-			<td>{{obj.rq}}</td>
-			<td>{{obj.gs}}</td>
-			<td>{{obj.zhgs}}</td>
-			<td>{{obj.xl}}</td>
-			<td>{{obj.cchjh}}</td>
-			<td>{{obj.cchsj}}</td>
-			<td>{{obj.cchqz}}</td>
-			<td>{{obj.chl}}</td>
-			<td>{{obj.bcjh}}</td>
-			<td>{{obj.bcsj}}</td>
-			<td>{{obj.bbzxl}}</td>
-			<td>{{obj.gs}}</td>
+			{{if obj.rq == '分类汇总'}}
+				<td colspan='3'>{{obj.rq}}</td>
+			{{/if}}
+			{{if obj.rq != '分类汇总'}}
+				<td>{{obj.rq}}</td>
+				<td>{{obj.gsName}}</td>
+				<td>{{obj.fgsName}}</td>
+			{{/if}}
+			<td>{{obj.line}}</td>
+			<td>{{obj.jhcc}}</td>
+			<td>{{obj.sjcc}}</td>
+			<td>{{obj.qz}}</td>
+			<td>{{obj.ccl}}</td>
+			<td>{{obj.jhbc}}</td>
+			<td>{{obj.sjbc}}</td>
+			<td>{{obj.zxl}}</td>
+			<td>{{obj.sm}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-05-03',
-        text: '<h5>修复了在临加/子任务里临加路牌后再临加班次出现的异常情况。</h5>'
+        date: '2017-05-04',
+        text: '<h5>修复了一个问题，该问题导致在应急停靠时间设置为0的时候，待发时间不会自动调整。</h5>'
     };
  
     var storage = window.localStorage
+/** 时钟 */
+var gb_minute_timer = (function () {
+
+
+    var getServerTime = function (cb) {
+        function oncallback(jqXHR) {
+            var time = jqXHR && jqXHR.getResponseHeader("Date");
+            if (time)
+                callback(new Date(time))
+        }
+
+        if ("function" == typeof callback)
+            $.ajax({
+                url: "/real_control_v2/assets/imgs/time.gif",
+                type: "HEAD"
+            }).done(function (data, textStatus, jqXHR) {
+                oncallback(jqXHR)
+            }).fail(function (jqXHR, textStatus, errorThrown) {
+                oncallback(jqXHR)
+            })
+    };
+
+
+    setTimeout(function () {
+        getServerTime(function () {
+            console.log('cb,,', cb);
+        });
+    }, 5000);
+
+})();
 \ No newline at end of file
@@ -183,6 +183,8 @@
 <script src="/real_control_v2/js/websocket/sch_websocket.js" merge="custom_js"></script>
 <!-- tts -->
 <script src="/real_control_v2/js/utils/tts.js" merge="custom_js"></script>
+<!-- minute_timer.js -->
+<script src="/real_control_v2/js/minute_timer.js" merge="custom_js"></script>
  
 <!-- echart -->
 <script src="/real_control_v2/assets/echarts-3/echarts.js" merge="plugins"></script>