Merge branch 'minhang' into pudong

# Conflicts: # src/main/resources/ms-jdbc.properties

Merge branch 'minhang' into pudong
# Conflicts: # src/main/resources/ms-jdbc.properties
潘钊
2 parents 1146232f b6d02551
Showing 35 changed files with 1618 additions and 202 deletions
.gitignore
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoController.java
src/main/java/com/bsth/data/directive/DayOfDirectives.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/handlers/CorrectSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/OfflineSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/gpsdata/status_manager/GpsStatusManager.java
src/main/java/com/bsth/data/gpsdata/status_manager/gps_line_state/ChangeBean.java
src/main/java/com/bsth/data/gpsdata/status_manager/gps_line_state/LineStateHandle.java
src/main/java/com/bsth/data/gpsdata/status_manager/gps_service_state/ServiceStateHandle.java
src/main/java/com/bsth/data/gpsdata/status_manager/gps_service_state/StateBean.java
src/main/java/com/bsth/data/msg_queue/DirectivePushQueue.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/realcontrol/ScheduleType.java
@@ -10,7 +10,8 @@ test_coverage/
 .DS_Store
 *.iml
 tmp
+E:/
  
 # git忽略空文件夹，按照惯例，空文件夹下放置.gitkeep文件避免文件夹被忽略不上传。
-!.gitkeep
-/target/
+!.gitkeep
+/target/
@@ -31,7 +31,7 @@ public class DirectiveController {
  
 	@Autowired
 	DirectiveService directiveService;
-	
+
 	/**
 	 * 
 	 * @Title: send60 
@@ -106,7 +106,7 @@ public class DirectiveController {
 	@RequestMapping(value = "/upDownChange", method = RequestMethod.POST)
 	public int upDownChange(@RequestParam String nbbm, @RequestParam Integer upDown){
 		SysUser user = SecurityUtils.getCurrentUser();
-		return directiveService.upDownChange(nbbm, upDown, user.getUserName());
+		return directiveService.send60Operation(nbbm, 0, upDown, user.getUserName());
 	}
  
 	/**
@@ -120,7 +120,7 @@ public class DirectiveController {
 	@RequestMapping(value = "/stateChange", method = RequestMethod.POST)
 	public int stateChange(@RequestParam String nbbm, @RequestParam Integer upDown, @RequestParam Integer state){
 		SysUser user = SecurityUtils.getCurrentUser();
-		return directiveService.stateChange(nbbm, upDown, state, user.getUserName());
+		return directiveService.send60Operation(nbbm, state, upDown, user.getUserName());
 	}
  
 	/**
@@ -3,8 +3,10 @@ package com.bsth.controller.gps;
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.entity.excep.Speeding;
 import com.bsth.service.gps.GpsService;
 import com.bsth.service.gps.entity.GpsSpeed;
+import com.bsth.util.PageObject;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -192,4 +194,13 @@ public class GpsController {
     	return listGpsSpeed;
     }
  
+	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
+	public PageObject<GpsSpeed> pagequery(@RequestParam Map<String, Object> map){
+		PageObject<GpsSpeed> pageObject = null;
+		map.put("curPage", map.get("page").toString());
+		map.put("pageData","10");
+		pageObject=gpsService.Pagequery(map);
+		return pageObject;
+	}
+    
 }
@@ -6,10 +6,7 @@ import com.bsth.entity.schedule.TTInfo;
 import com.bsth.service.schedule.TTInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
  
 import java.util.HashMap;
 import java.util.Map;
@@ -87,4 +84,18 @@ public class TTInfoController extends BController&lt;TTInfo, Long&gt; {
         return rtn;
     }
  
+    @RequestMapping(value = "/backup/{ttinfo}", method = RequestMethod.GET)
+    public Map<String, Object> backup(@PathVariable(value = "ttinfo") Long ttInfoId) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 备份时刻表
+            this.ttInfoService.backUp(ttInfoId);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
 }
 \ No newline at end of file
@@ -166,7 +166,8 @@ public class DayOfDirectives {
 			if(null != d60Map.remove(d60.getMsgId()))
 				c60 ++;
 		}
-		logger.info("清除60数据 ，" + c60);
+		if(c60 > 0)
+			logger.info("清除60数据 ，" + c60);
  
 		//找到该设备的64数据
 		Collection<D64> d64s = d64Map.values();
@@ -184,8 +185,9 @@ public class DayOfDirectives {
 			if(null != d64Map.remove(d64.getKey()))
 				c64 ++;
 		}
-		
-		logger.info("清除64数据 ，" + c64);
+
+		if(c64 > 0)
+			logger.info("清除64数据 ，" + c64);
 	}
  
 	public Collection<D60> all60(){
@@ -40,9 +40,12 @@ public class GpsEntity {
 	/** 纬度 */
 	private Float lat;
  
-	/** 发送时间戳 */
+	/** GPS发送时间戳 */
 	private Long timestamp;
  
+	/** 网关收到时间 */
+	private Long serverTimestamp;
+
 	/** 速度 */
 	private Float speed;
  
@@ -318,17 +321,33 @@ public class GpsEntity {
  
 		long t = System.currentTimeMillis();
  
-		if((t - this.getTimestamp()) > 1000 * 60){
+		if((t - this.getServerTimestamp()) > 1000 * 60 * 2){
 			return false;
 		}
  
-		if((this.getTimestamp() - t) > 1000 * 60 * 3){
+		if((this.getServerTimestamp() - t) > 1000 * 60 * 3){
 			return false;
 		}
 		return true;
 	}
  
+	/**
+	 * 是否营运
+	 * @return
+	 */
+	public boolean isService(){
+		return state!=null && state==0;
+	}
+
 	public boolean isOffline(){
 		return this.getAbnormalStatus() != null && this.getAbnormalStatus().equals("offline");
 	}
+
+	public Long getServerTimestamp() {
+		return serverTimestamp;
+	}
+
+	public void setServerTimestamp(Long serverTimestamp) {
+		this.serverTimestamp = serverTimestamp;
+	}
 }
@@ -110,6 +110,14 @@ public class GpsRealData {
         return rs;
     }
  
+    public GpsEntity getByNbbm(String nbbm){
+        String device = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+        if(StringUtils.isNotBlank(device))
+            return get(device);
+        else
+            return null;
+    }
+
     /**
      * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
      */
@@ -3,8 +3,8 @@ package com.bsth.data.gpsdata.arrival.handlers;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.SignalHandle;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.status_manager.GpsStatusManager;
 import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
 import org.slf4j.Logger;
@@ -24,28 +24,45 @@ public class CorrectSignalHandle extends SignalHandle {
     @Autowired
     DirectiveService directiveService;
  
+    @Autowired
+    GpsStatusManager gpsStatusManager;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
  
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        Object task = dayOfSchedule.executeCurr(gps.getNbbm());
+        ScheduleRealInfo task = dayOfSchedule.executeCurr(gps.getNbbm());
         if(task == null)
             return false;
-        ScheduleRealInfo sch;
+        //ScheduleRealInfo sch;
  
         //子任务
-        if(task.getClass().isAssignableFrom(ChildTaskPlan.class)){
+        /*if(task.getClass().isAssignableFrom(ChildTaskPlan.class)){
             ChildTaskPlan childTask = (ChildTaskPlan) task;
             sch = childTask.getSchedule();
         }
         else
-            sch = (ScheduleRealInfo) task;
+            sch = (ScheduleRealInfo) task;*/
  
-        byte updown = Byte.parseByte(sch.getXlDir());
+        byte updown = Byte.parseByte(task.getXlDir());
         //走向
         if(gps.getUpDown() != updown){
             gps.setUpDown(updown);
-            gps.setState(0);
+            //gps.setState(0);
+        }
+
+        //（转发的数据不管）
+        if(gps.getSource() != 0){
+            //gps=非营运 && 班次=非空驶 ;切换到营运状态
+            if(!gps.isService() &&
+                    !dayOfSchedule.emptyService(task)){
+                gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, null);
+            }
+
+            //需要切换线路
+            if(!task.getXlBm().equals(gps.getLineId())){
+                gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), null);
+            }
         }
  
         return true;
@@ -6,6 +6,7 @@ import com.bsth.data.gpsdata.arrival.SignalHandle;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
 import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
+import com.bsth.data.gpsdata.status_manager.GpsStatusManager;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
@@ -46,6 +47,9 @@ public class InOutStationSignalHandle extends SignalHandle{
     @Autowired
     SignalSchPlanMatcher signalSchPlanMatcher;
  
+    @Autowired
+    GpsStatusManager gpsStatusManager;
+
     private final static int MAX_BEFORE_TIME = 1000 * 60 * 120;
  
     //最大的班次时间差，防止异常的GPS时间打乱数据
@@ -57,10 +61,11 @@ public class InOutStationSignalHandle extends SignalHandle{
         if(isGpsOffline(gps))
             return false;
  
-        //从异常状态恢复的第一个信号
+        /*//从异常状态恢复的第一个信号*/
         if(abnormalRecovery(gps, prevs)){
             //回溯一下之前的轨迹
-            scheduleSignalState.signalRetrospect(gps);
+            //scheduleSignalState.signalRetrospect(gps);
+            return false;
         }
  
         if(isNotEmpty(prevs)){
@@ -154,10 +159,9 @@ public class InOutStationSignalHandle extends SignalHandle{
             //清理应发未发标记
             LateAdjustHandle.remove(sch);
  
-            if(sch.getBcType().equals("out")){
-                //出场时，切换成营运状态
-                DirectivePushQueue.put6003(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
-                //directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
+            if(!gps.isService()){
+                //切换成营运状态
+                gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 0, "发车@系统");
             }
             //出站既出场
             outStationAndOutPark(sch);
@@ -232,11 +236,13 @@ public class InOutStationSignalHandle extends SignalHandle{
                 sendUtils.refreshSch(schPrev);
                 dayOfSchedule.save(schPrev);
  
-                if(schPrev.getBcType().equals("out")){
+                /*if(schPrev.getBcType().equals("out")){
                     //出场时，切换成营运状态
-                    DirectivePushQueue.put6003(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
+                    String deviceId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
+                    gpsStatusManager.changeServiceState(deviceId, schPrev.getXlDir(), 0, "出场@系统");
+                    //DirectivePushQueue.put6003(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), "出场@系统");
                     //directiveService.send60Operation(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
-                }
+                }*/
             }
         }
     }
@@ -265,6 +271,15 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(Math.abs(diff) > MAX_NORMAL_DIFF)
                 return;
  
+            //环线或内外圈 ，飘出去再回来
+            if(sch.getQdzCode().equals(sch.getZdzCode())
+                    && StringUtils.isNotEmpty(sch.getFcsjActual())
+                    && gps.getTimestamp() - sch.getFcsjActualTime() < 1000 * 60 * 3){
+                sch.clearFcsjActual();
+                sendUtils.refreshSch(sch);
+                return;
+            }
+
             //实达时间不覆盖
             if(StringUtils.isNotEmpty(sch.getZdsjActual()))
                 return;
@@ -304,26 +319,23 @@ public class InOutStationSignalHandle extends SignalHandle{
                 transformUpdown(gps, next);
                 //下发调度指令
                 DirectivePushQueue.put6002(next, doneSum, "到站@系统");
-                //directiveService.send60Dispatch(next, doneSum, "到站@系统");
  
                 //套跑  -下发线路切换指令
                 if(!next.getXlBm().equals(sch.getXlBm())){
-                    DirectivePushQueue.put64(next.getClZbh(), next.getXlBm(), "套跑@系统");
-                    //directiveService.lineChange(next.getClZbh(), next.getXlBm(), "套跑@系统");
+                    gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
                 }
             }
             else if(sch.getBcType().equals("in")){
-                //终班进场，切换成非营运状态
-                DirectivePushQueue.put6003(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
-                //directiveService.send60Operation(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
+                //进场，切换成非营运状态
+                gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, "进场@系统");
             }
         }
         else {
-            if(sch.getFcsjActual() == null){
+            /*if(sch.getFcsjActual() == null){
                 //有进站，但班次没有实发，向前追溯一下信号
                 scheduleSignalState.signalRetrospect(gps, sch);
             }
-
+*/
             //如果当前班次是出场，并且进的是下一个班次的终点
             if(sch.getBcType().equals("out")){
                 ScheduleRealInfo next = dayOfSchedule.next(sch);
@@ -397,6 +409,9 @@ public class InOutStationSignalHandle extends SignalHandle{
             next = dayOfSchedule.next(next);
             if(next != null)
                 dayOfSchedule.addExecPlan(next);
+
+            //进场，切换成非营运状态
+            gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, "进场@系统");
         }
     }
  
@@ -23,7 +23,7 @@ public class OfflineSignalHandle extends SignalHandle{
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
         //掉线信号不管
         if(isGpsOffline(gps)){
-            gps.setSignalState("drift");
+            gps.setSignalState("gps-offline");
             gps.setAbnormalStatus("gps-offline");
             return true;
         }
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
  
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=" + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=194";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
  
         List<GpsEntity> list =
+package com.bsth.data.gpsdata.status_manager;
+
+import com.bsth.Application;
+import com.bsth.data.gpsdata.status_manager.gps_line_state.LineStateHandle;
+import com.bsth.data.gpsdata.status_manager.gps_service_state.ServiceStateHandle;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * GPS 状态管理
+ * Created by panzhao on 2017/7/13.
+ */
+@Component
+public class GpsStatusManager  implements CommandLineRunner {
+
+    @Autowired
+    StatusCheckThread checkThread;
+
+    @Autowired
+    LineStateHandle lineStateHandle;
+
+    @Autowired
+    ServiceStateHandle serviceStateHandle;
+
+    /**
+     * 切换线路
+     * @param nbbm
+     * @param lineCode
+     * @param sender
+     */
+    public void changeLine(String nbbm, String lineCode, String sender){
+        lineStateHandle.changeLine(nbbm, lineCode, sender);
+    }
+
+    /**
+     * 切换营运状态
+     * @param nbbm
+     * @param state 0 营运， 1：非营运
+     * @param sender
+     */
+    public void changeServiceState(String nbbm, String upDown,int state, String sender){
+        changeServiceState(nbbm, Integer.parseInt(upDown), state, sender);
+    }
+
+    /**
+     * 切换营运状态
+     * @param nbbm
+     * @param state 0 营运， 1：非营运
+     * @param sender
+     */
+    public void changeServiceState(String nbbm, int upDown,int state, String sender){
+        serviceStateHandle.changeState(nbbm, upDown, state, sender);
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(checkThread, 120, 120, TimeUnit.SECONDS);
+    }
+
+    @Component
+    public static class StatusCheckThread extends Thread{
+
+        @Autowired
+        LineStateHandle lineStateHandle;
+
+        @Autowired
+        ServiceStateHandle serviceStateHandle;
+
+        @Override
+        public void run() {
+            /** 检查线路切换结果 */
+            lineStateHandle.checkResultAll();
+            /** 检查营运状态切换结果 */
+            serviceStateHandle.checkResultAll();
+        }
+    }
+}
+package com.bsth.data.gpsdata.status_manager.gps_line_state;
+
+/**
+ * Created by panzhao on 2017/7/13.
+ */
+public class ChangeBean {
+
+    /**
+     * 车辆自编号
+     */
+    private String nbbm;
+
+    /**
+     * 要切换到的线路
+     */
+    private String lineCode;
+
+    /**
+     * 指令发送次数
+     */
+    private int sendCount;
+
+    /**
+     * 上次指令时间
+     */
+    private long st;
+
+    /**发送人 */
+    private String sender;
+
+    public static ChangeBean getInstance(String nbbm, String lineCode, String sender){
+        ChangeBean cb = new ChangeBean();
+        cb.setNbbm(nbbm);
+        cb.setLineCode(lineCode);
+        cb.setSendCount(0);
+        cb.setSender(sender);
+        return cb;
+    }
+
+    public void countPlus(){
+        sendCount ++;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getSendCount() {
+        return sendCount;
+    }
+
+    public void setSendCount(int sendCount) {
+        this.sendCount = sendCount;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public String getSender() {
+        return sender;
+    }
+
+    public void setSender(String sender) {
+        this.sender = sender;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+}
+package com.bsth.data.gpsdata.status_manager.gps_line_state;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.msg_queue.DirectivePushQueue;
+import com.bsth.service.directive.DirectiveService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 设备线路状态处理
+ * Created by panzhao on 2017/7/13.
+ */
+@Component
+public class LineStateHandle {
+
+    private static ConcurrentHashMap<String, ChangeBean> map;
+
+    @Autowired
+    DirectiveService directiveService;
+    @Autowired
+    GpsRealData gpsRealData;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    /** 重发次数 */
+    private final static int MAX_SEND_COUNT=3;
+    /** 重发间隔 */
+    private final static int SEND_SPACE=1000 * 60 * 5;
+    /** 最大有效时间 */
+    private final static int MAX_AVAIL_TIME=1000 * 60 * 60 * 2;
+
+    static{
+        map = new ConcurrentHashMap();
+    }
+
+    public void changeLine(String nbbm, String lineCode, String sender){
+        ChangeBean cb = map.get(nbbm);
+        if(cb != null && cb.getLineCode().equals(lineCode)){
+            return;
+        }
+
+        cb = ChangeBean.getInstance(nbbm, lineCode, sender);
+        map.put(nbbm, cb);
+
+        changeLine(cb);
+    }
+
+    private void changeLine(ChangeBean cb){
+        cb.setSt(System.currentTimeMillis());
+        cb.countPlus();
+        DirectivePushQueue.put64(cb.getNbbm(), cb.getLineCode(), cb.getSender());
+    }
+
+
+    public void checkResultAll(){
+        Collection<ChangeBean> cbs = map.values();
+        for(ChangeBean cb : cbs){
+            checkResult(cb);
+        }
+    }
+
+    private void checkResult(ChangeBean cb){
+        try{
+            GpsEntity gps = gpsRealData.getByNbbm(cb.getNbbm());
+            if(gps == null)
+                return;
+
+            if(cb.getLineCode().equals(gps.getLineId())){
+                map.remove(cb.getNbbm());
+                logger.info("线路切换成功，" + cb.getNbbm() + "、" + cb.getLineCode());
+            }
+            else{
+                reSend(cb);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+
+    private void reSend(ChangeBean cb){
+        if(cb.getSendCount() >= MAX_SEND_COUNT){
+            map.remove(cb.getNbbm());
+            logger.info("超过重发次数，" + cb.getNbbm() + "、" + cb.getLineCode());
+            return;
+        }
+
+        long diff = System.currentTimeMillis() - cb.getSt();
+        if(diff >= MAX_AVAIL_TIME){
+            map.remove(cb.getNbbm());
+            logger.info("超过有效时间，" + cb.getNbbm() + "、" + cb.getLineCode() + "、" + cb.getSt());
+            return;
+        }
+
+        if(diff >= SEND_SPACE){
+            cb.setSender("补发@系统");
+            changeLine(cb);
+            logger.info("重发线路切换指令，" + cb.getNbbm() + "、" + cb.getLineCode());
+            return;
+        }
+    }
+}
+package com.bsth.data.gpsdata.status_manager.gps_service_state;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.msg_queue.DirectivePushQueue;
+import com.bsth.service.directive.DirectiveService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 设备营运状态处理
+ * Created by panzhao on 2017/7/13.
+ */
+@Component
+public class ServiceStateHandle {
+
+    private static ConcurrentHashMap<String, StateBean> map;
+
+    @Autowired
+    DirectiveService directiveService;
+    @Autowired
+    GpsRealData gpsRealData;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    /** 重发次数 */
+    private final static int MAX_SEND_COUNT=3;
+    /** 重发间隔 */
+    private final static int SEND_SPACE=1000 * 60 * 4;
+    /** 最大有效时间 */
+    private final static int MAX_AVAIL_TIME=1000 * 60 * 60;
+
+    static{
+        map = new ConcurrentHashMap();
+    }
+
+    public void changeState(String nbbm, int upDown ,int state, String sender){
+        if(map.containsKey(nbbm)){
+            return;
+        }
+        StateBean sb = StateBean.getInstance(nbbm, upDown, state, sender);
+        map.put(nbbm, sb);
+        changeState(sb);
+    }
+
+    private void changeState(StateBean sb){
+        sb.setSt(System.currentTimeMillis());
+        sb.countPlus();
+        DirectivePushQueue.put6003(sb.getNbbm(), sb.getState(), sb.getUpDown(), sb.getSender());
+    }
+
+    public void checkResultAll(){
+        Collection<StateBean> sbs = map.values();
+        for(StateBean sb : sbs){
+            checkResult(sb);
+        }
+    }
+
+    private void checkResult(StateBean sb){
+        try{
+            GpsEntity gps = gpsRealData.getByNbbm(sb.getNbbm());
+            if(gps == null)
+                return;
+
+            if(gps.getState().equals(sb.getState())){
+                map.remove(sb.getNbbm());
+                logger.info("营运状态切换成功，" + sb.getNbbm() + "、" + sb.getState());
+            }
+            else
+                reSend(sb);
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+
+    private void reSend(StateBean sb){
+        if(sb.getSendCount() >= MAX_SEND_COUNT){
+            map.remove(sb.getNbbm());
+            logger.info("超过重发次数，" + sb.getNbbm() + "、" + sb.getState());
+            return;
+        }
+
+        long diff = System.currentTimeMillis() - sb.getSt();
+        if(diff >= MAX_AVAIL_TIME){
+            map.remove(sb.getNbbm());
+            logger.info("营运状态切换超过有效时间，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getSt());
+            return;
+        }
+
+        if(diff >= SEND_SPACE){
+            sb.setSender("补发@系统");
+            changeState(sb);
+            logger.info("重发营运状态切换指令，" + sb.getNbbm() + "、" + sb.getState());
+            return;
+        }
+    }
+}
+package com.bsth.data.gpsdata.status_manager.gps_service_state;
+
+/**
+ * Created by panzhao on 2017/7/13.
+ */
+public class StateBean {
+
+    /**
+     * 车辆自编号
+     */
+    private String nbbm;
+
+    /**
+     * 要切换到营运状态
+     */
+    private int state;
+
+    /**
+     * 要切换到的上下行
+     */
+    private int upDown;
+
+    /**
+     * 指令发送次数
+     */
+    private int sendCount;
+
+    /**
+     * 上次指令时间
+     */
+    private long st;
+
+    /**发送人 */
+    private String sender;
+
+    public static StateBean getInstance(String nbbm, int upDown, int state, String sender){
+        StateBean sb = new StateBean();
+        sb.setNbbm(nbbm);
+        sb.setState(state);
+        sb.setSendCount(0);
+        sb.setSender(sender);
+        sb.setUpDown(upDown);
+        return sb;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public int getSendCount() {
+        return sendCount;
+    }
+
+    public void setSendCount(int sendCount) {
+        this.sendCount = sendCount;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public String getSender() {
+        return sender;
+    }
+
+    public void setSender(String sender) {
+        this.sender = sender;
+    }
+
+    public void countPlus(){
+        sendCount ++;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+}
@@ -39,12 +39,12 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
         linkedList.add(qd6002);
     }
  
-    public static void put6003(String nbbm, int state, int upDown, ScheduleRealInfo sch,  String sender){
+    public static void put6003(String nbbm, int state, int upDown, String sender){
         QueueData_Directive qd6003 = new QueueData_Directive();
         qd6003.setNbbm(nbbm);
         qd6003.setState(state);
         qd6003.setUpDown(upDown);
-        qd6003.setSch(sch);
+        //qd6003.setSch(sch);
         qd6003.setSender(sender);
  
         qd6003.setCode("60_03");
@@ -111,7 +111,7 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
                             log.info("directive 60_02 sch id: " + qd.getSch().getId());
                         }
                         else if(code.equals("60_03")){
-                            directiveService.send60Operation(qd.getNbbm(), qd.getState(), qd.getUpDown(), null, qd.getSender());
+                            directiveService.send60Operation(qd.getNbbm(), qd.getState(), qd.getUpDown(), qd.getSender());
                             log.info("directive 60_03 nbbm: " + qd.getNbbm());
                         }
                         else if(code.equals("64")){
@@ -2,7 +2,9 @@ package com.bsth.data.pilot80;
  
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.gpsdata.status_manager.GpsStatusManager;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.Line;
@@ -51,6 +53,9 @@ public class PilotReport {
     @Autowired
     DC0A4Repository dc0A4Repository;
  
+    @Autowired
+    GpsStatusManager gpsStatusManager;
+
     //private static ArrayListMultimap<String, D80> d80MultiMap;
  
     private static ConcurrentHashMap<Integer, D80> d80Maps;
@@ -80,14 +85,26 @@ public class PilotReport {
                     ScheduleRealInfo outSch = dayOfSchedule.searchNearByBcType(nbbm, "out");
                     //如果有对应出场班次
                     if (outSch != null) {
-                        //没有计划里程的出场班次，出场既是首发站，发送下一班次的营运指令
+                        //没有计划里程的出场班次，出场既是首发站，发送下一班次的调度指令
                         if (outSch.getJhlc() == null)
                             outSch = dayOfSchedule.next(outSch);
  
                         //下发调度指令
+                        String deviceId = d80.getDeviceId();
                         DirectivePushQueue.put6002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
+
                         //下发线路切换指令
                         DirectivePushQueue.put64(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
+
+                        try {
+                            GpsEntity gps = gpsRealData.get(deviceId);
+                            if(gps != null && !gps.isService()){
+                                //切换到营运状态
+                                gpsStatusManager.changeServiceState(nbbm, outSch.getXlDir() ,0, "请出@系统");
+                            }
+                        }catch (Exception e){
+                            logger.error("请出切换营运状态异常", e);
+                        }
                     }
                     break;
             }
@@ -4,12 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
-import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
-import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
-import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -181,7 +178,7 @@ public class DayOfSchedule {
  
  
             Set<String> lps = searchAllLP(list);
-            for(String lp : lps){
+            for (String lp : lps) {
                 //计算“起点站应到”时间
                 schAttrCalculator.calcQdzTimePlan(lpScheduleMap.get(lineCode + "_" + lp));
             }
@@ -201,14 +198,14 @@ public class DayOfSchedule {
         return 0;
     }
  
-    public int reloadSch(String lineCode){
+    public int reloadSch(String lineCode) {
         return reloadSch(lineCode, calcSchDate(lineCode), true);
     }
  
     /**
      * @Title: searchAllCars
      * @Description: TODO(搜索班次集合中的车辆)
-    */
+     */
     private Set<String> searchAllCars(List<ScheduleRealInfo> list) {
         Set<String> cars = new HashSet<>();
         for (ScheduleRealInfo sch : list)
@@ -277,12 +274,12 @@ public class DayOfSchedule {
         //清理路牌对照
         List<String> lprms = new ArrayList<>();
         Set<String> lps = lpScheduleMap.keySet();
-        for(String lp : lps){
-            if(lp.indexOf(lineCode + "_") != -1)
+        for (String lp : lps) {
+            if (lp.indexOf(lineCode + "_") != -1)
                 lprms.add(lp);
         }
  
-        for(String lp : lprms)
+        for (String lp : lprms)
             lpScheduleMap.removeAll(lp);
  
         logger.info(lineCode + "排班清理 " + count);
@@ -336,10 +333,10 @@ public class DayOfSchedule {
                 if (StringUtils.isEmpty(sch.getFcsj()))
                     sch.setFcsj("00:00");
  
-                if(sch.getFcsj().equals("24:00"))
+                if (sch.getFcsj().equals("24:00"))
                     sch.setFcsj("23:59");
  
-                if(sch.getFcsj().substring(0, 2).equals("24")){
+                if (sch.getFcsj().substring(0, 2).equals("24")) {
                     sch.setFcsj("00" + sch.getFcsj().substring(2));
                 }
  
@@ -364,13 +361,13 @@ public class DayOfSchedule {
                 }
  
                 //售票员为空设置为""字符串
-                if(StringUtils.isEmpty(sch.getsGh())){
+                if (StringUtils.isEmpty(sch.getsGh())) {
                     sch.setsGh("");
                     sch.setsName("");
                 }
                 sch.setJhlcOrig(sch.getJhlc());
                 //保留备注
-                if(StringUtils.isNotEmpty(sch.getRemark()))
+                if (StringUtils.isNotEmpty(sch.getRemark()))
                     sch.setRemarks(sch.getRemark());
             }
         } catch (Exception e) {
@@ -440,7 +437,7 @@ public class DayOfSchedule {
  
         Collection<ScheduleRealInfo> schs = id2SchedulMap.values();
         for (ScheduleRealInfo sch : schs) {
-            if(lineList.contains(sch.getXlBm())){
+            if (lineList.contains(sch.getXlBm())) {
                 mMap.put(sch.getXlBm(), sch);
             }
         }
@@ -497,12 +494,13 @@ public class DayOfSchedule {
  
     /**
      * 下一个相同走向的班次
+     *
      * @param sch
      * @return
      */
-    public ScheduleRealInfo nextSame(final ScheduleRealInfo sch){
+    public ScheduleRealInfo nextSame(final ScheduleRealInfo sch) {
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-        Collection<ScheduleRealInfo> subList = Collections2.filter(list, new Predicate<ScheduleRealInfo>(){
+        Collection<ScheduleRealInfo> subList = Collections2.filter(list, new Predicate<ScheduleRealInfo>() {
  
             @Override
             public boolean apply(ScheduleRealInfo item) {
@@ -544,11 +542,12 @@ public class DayOfSchedule {
  
     /**
      * 下一个班次
+     *
      * @param list 班次集合
-     * @param sch 当前班次
+     * @param sch  当前班次
      * @return
      */
-    private ScheduleRealInfo next(Collection<ScheduleRealInfo> list , ScheduleRealInfo sch){
+    private ScheduleRealInfo next(Collection<ScheduleRealInfo> list, ScheduleRealInfo sch) {
         int outConfig = -1;
         LineConfig config = lineConfigData.get(sch.getXlBm());
         if (config != null)
@@ -583,11 +582,12 @@ public class DayOfSchedule {
  
     /**
      * 下一个班次
+     *
      * @param list 班次集合
-     * @param sch 当前班次
+     * @param sch  当前班次
      * @return
      */
-    private ScheduleRealInfo next2(Collection<ScheduleRealInfo> list , ScheduleRealInfo sch){
+    private ScheduleRealInfo next2(Collection<ScheduleRealInfo> list, ScheduleRealInfo sch) {
         int outConfig = -1;
         LineConfig config = lineConfigData.get(sch.getXlBm());
         if (config != null)
@@ -639,13 +639,14 @@ public class DayOfSchedule {
  
     /**
      * 是否是首班出场
+     *
      * @param sch
      * @return
      */
-    public boolean isFirstOut(ScheduleRealInfo sch){
+    public boolean isFirstOut(ScheduleRealInfo sch) {
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
         try {
-            if(list.get(0) == sch && sch.getBcType().equals("out"))
+            if (list.get(0) == sch && sch.getBcType().equals("out"))
                 return true;
         } catch (IndexOutOfBoundsException e) {
             logger.error("小小的数组越界，无伤大雅！");
@@ -671,7 +672,7 @@ public class DayOfSchedule {
             save(sch);
     }
  
-    public void addLPMapp(ScheduleRealInfo sch){
+    public void addLPMapp(ScheduleRealInfo sch) {
         lpScheduleMap.put(sch.getXlBm() + "_" + sch.getLpName(), sch);
     }
  
@@ -685,7 +686,7 @@ public class DayOfSchedule {
         lpScheduleMap.remove(sch.getXlBm() + "_" + sch.getLpName(), sch);
  
         //如果正在执行该班次
-        if(carExecutePlanMap.get(sch.getClZbh()) == sch){
+        if (carExecutePlanMap.get(sch.getClZbh()) == sch) {
             //重新计算车辆当前执行班次
             reCalcExecPlan(sch.getClZbh());
         }
@@ -823,12 +824,12 @@ public class DayOfSchedule {
         Collections.sort(list, schFCSJComparator);
  
         boolean flag = false;
-        for(ScheduleRealInfo temp : list){
+        for (ScheduleRealInfo temp : list) {
  
-            if(flag && temp.getBcType().equals(bcType))
+            if (flag && temp.getBcType().equals(bcType))
                 return temp;
  
-            if(temp == sch){
+            if (temp == sch) {
                 flag = true;
             }
         }
@@ -837,21 +838,22 @@ public class DayOfSchedule {
  
     /**
      * 搜索离当前时间最近的一个指定类型的班次
+     *
      * @param nbbm
      * @param bcType
      * @return
      */
-    public ScheduleRealInfo searchNearByBcType(String nbbm, String bcType){
+    public ScheduleRealInfo searchNearByBcType(String nbbm, String bcType) {
         List<ScheduleRealInfo> list = findByBcType(nbbm, bcType);
         Collections.sort(list, schFCSJComparator);
  
         long t = System.currentTimeMillis();
-        int distance=-1, diff;
+        int distance = -1, diff;
  
         ScheduleRealInfo sch = null;
-        for(ScheduleRealInfo temp : list){
+        for (ScheduleRealInfo temp : list) {
             diff = (int) Math.abs(temp.getDfsjT() - t);
-            if(diff < distance || distance == -1){
+            if (diff < distance || distance == -1) {
                 sch = temp;
                 distance = diff;
             }
@@ -878,7 +880,7 @@ public class DayOfSchedule {
     }
  
     public void addExecPlan(ScheduleRealInfo sch) {
-        if(sch != null)
+        if (sch != null)
             carExecutePlanMap.put(sch.getClZbh(), sch);
         else
             carExecutePlanMap.remove(sch.getClZbh());
@@ -915,7 +917,7 @@ public class DayOfSchedule {
         nbbmScheduleMap.remove(sch.getClZbh(), sch);
  
         sch.setClZbh(newClZbh);
-        if(!nbbmScheduleMap.containsEntry(newClZbh, sch)){
+        if (!nbbmScheduleMap.containsEntry(newClZbh, sch)) {
             nbbmScheduleMap.put(newClZbh, sch);
         }
  
@@ -929,52 +931,90 @@ public class DayOfSchedule {
         return ups;
     }
  
-    public void removeNbbm2SchMapp(ScheduleRealInfo sch, String nbbm){
+    public void removeNbbm2SchMapp(ScheduleRealInfo sch, String nbbm) {
         nbbmScheduleMap.remove(nbbm, sch);
     }
  
-    public void addNbbm2SchMapp(ScheduleRealInfo sch, String nbbm){
+    public void addNbbm2SchMapp(ScheduleRealInfo sch, String nbbm) {
         nbbmScheduleMap.put(nbbm, sch);
     }
  
-    public void reCalcExecPlan(String nbbm){
+    public void reCalcExecPlan(String nbbm) {
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
         Collections.sort(list, schFCSJComparator);
  
         ScheduleRealInfo sch = schAttrCalculator.calcCurrentExecSch(list);
         carExecutePlanMap.put(nbbm, sch);
  
-        if(sch==null){
-            logger.info("车辆" + nbbm + "无可执行任务，切换至非营运状态");
-            DirectivePushQueue.put6003(nbbm, 1, Integer.parseInt(sch.getXlDir()), null, "系统");
-            return;
-        }
-        try {
+
+ /*       try{
             GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
-            if(gps != null && gps.isOnline()){
-                if(StringUtils.isNotEmpty(gps.getLineId()) && !gps.getLineId().equals(sch.getXlBm())){
-                    //下发线路切换指令
-                    DirectivePushQueue.put64(nbbm, sch.getXlBm(), "系统");
-                    logger.info("车辆" + nbbm + "切换至" + sch.getXlBm() + " -原" + gps.getLineId() + " --重新计算当前执行班次！");
+            if (gps == null || !gps.isOnline())
+                return;//设备不在线
+
+            *//*if(sch == null && gps.isService())
+                DirectivePushQueue.put6003(nbbm, 1, 0, null, "系统");//无任务*//*
+
+            //String bcType = sch.getBcType();
+            *//*if(bcType.equals("normal")
+                    || bcType.equals("region")
+                    || bcType.equals("major")){
+                //全程、区间、放站，切换到营运状态
+                if(!gps.isService()){
+                    DirectivePushQueue.put6003(nbbm, 0, Integer.parseInt(sch.getXlDir()), sch, "系统");
                 }
             }
+            else if(gps.isService()){
+                DirectivePushQueue.put6003(nbbm, 1, 0, null, "系统");//空驶任务
+            }*//*
         }catch (Exception e){
             logger.error("", e);
         }
+        *//*try {
+            //切换设备状态
+            GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
+            if (gps == null || !gps.isOnline())
+                return;
+            if (sch == null) {
+                logger.info("车辆" + nbbm + "无可执行任务，切换至非营运状态");
+                DirectivePushQueue.put6003(nbbm, 1, 0, null, "系统");
+                return;
+            }
+
+            if (StringUtils.isNotEmpty(gps.getLineId()) && !gps.getLineId().equals(sch.getXlBm())) {
+                //下发线路切换指令
+                DirectivePushQueue.put64(nbbm, sch.getXlBm(), "系统");
+                logger.info("车辆" + nbbm + "切换至" + sch.getXlBm() + " -原" + gps.getLineId() + " --重新计算当前执行班次！");
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        }*/
+    }
+
+    /**
+     * 空驶任务？
+     * 出场、进场、直放、两点间空驶
+     * @param sch
+     * @return
+     */
+    public static boolean emptyService(ScheduleRealInfo sch){
+        String type = sch.getBcType();
+        return type.equals("out") || type.equals("in") || type.equals("venting") || type.equals("ldks");
     }
  
     /**
      * 是否在执行首班出场
+     *
      * @param nbbm
      * @return
-     */
-    public boolean isExecFirstOut(String nbbm, long time){
+
+    public boolean isExecFirstOut(String nbbm, long time) {
         try {
             List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
             ScheduleRealInfo second = list.get(2),
                     first = executeCurr(nbbm);
  
-            if(first.getBcType().equals("out")
+            if (first.getBcType().equals("out")
                     && first.getDfsjT() < second.getDfsjT()
                     && doneSum(nbbm) == 0 && second.getDfsjT() > time)
                 return true;
@@ -983,13 +1023,15 @@ public class DayOfSchedule {
         }
  
         return false;
-    }
+    }*/
  
  
     @Autowired
     JdbcTemplate jdbcTemplate;
+
     /**
      * 删除实际排班
+     *
      * @param lineCode
      * @return
      */
@@ -998,16 +1040,16 @@ public class DayOfSchedule {
  
         try {
             String rq = currSchDateMap.get(lineCode);
-            if(StringUtils.isNotEmpty(rq)){
+            if (StringUtils.isNotEmpty(rq)) {
                 List<ScheduleRealInfo> all = findByLineCode(lineCode);
                 //解除gps 和班次之间的关联
                 List<ScheduleRealInfo> unions = calcUnion(all, carExecutePlanMap.values());
-                for(ScheduleRealInfo sch : unions){
+                for (ScheduleRealInfo sch : unions) {
                     removeExecPlan(sch.getClZbh());
                 }
                 //解除调度指令和班次的外键约束
                 StringBuilder inStr = new StringBuilder("(");
-                for(ScheduleRealInfo sch : all){
+                for (ScheduleRealInfo sch : all) {
                     inStr.append(sch.getId() + ",");
                 }
                 inStr.deleteCharAt(inStr.length() - 1).append(")");
@@ -1019,10 +1061,10 @@ public class DayOfSchedule {
  
             }
             rs.put("status", ResponseCode.SUCCESS);
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
-            if(e instanceof DataIntegrityViolationException)
+            if (e instanceof DataIntegrityViolationException)
                 rs.put("msg", "失败，违反数据约束！！");
             else
                 rs.put("msg", e.getMessage());
@@ -1042,7 +1084,7 @@ public class DayOfSchedule {
         List<ScheduleRealInfo> rs = new ArrayList<>();
  
         for (ScheduleRealInfo sch : c1) {
-            if(c2.contains(sch)){
+            if (c2.contains(sch)) {
                 rs.add(sch);
             }
         }
@@ -1051,16 +1093,18 @@ public class DayOfSchedule {
  
     /**
      * 覆盖一辆车的所有班次
+     *
      * @param nbbm
      * @param sets
      */
-    public void replaceByNbbm(String nbbm, Collection<ScheduleRealInfo> sets){
+    public void replaceByNbbm(String nbbm, Collection<ScheduleRealInfo> sets) {
         nbbmScheduleMap.removeAll(nbbm);
         nbbmScheduleMap.putAll(nbbm, sets);
     }
  
     /**
      * 获取该班次所在路牌的下一个班次
+     *
      * @param sch
      * @return
      */
@@ -1072,6 +1116,7 @@ public class DayOfSchedule {
  
     /**
      * 获取该班次所在路牌的下一个班次，不考虑场既是站
+     *
      * @param sch
      * @return
      */
@@ -1081,7 +1126,7 @@ public class DayOfSchedule {
         return next2(list, sch);
     }
  
-    public ArrayListMultimap<String, ScheduleRealInfo> getLpScheduleMap(){
+    public ArrayListMultimap<String, ScheduleRealInfo> getLpScheduleMap() {
         return lpScheduleMap;
     }
 }
 \ No newline at end of file
-package com.bsth.entity.realcontrol;
-
-/**
- * 班次类型
- * Created by panzhao on 2016/12/23.
- */
-public enum ScheduleType {
-
-    normal, //正常班次
-    out,    //出场
-    in,     //进场
-    region, //区间
-    venting,//直放
-    major   //放站
-}
 package com.bsth.entity.schedule;
  
 import com.bsth.entity.Line;
+import com.bsth.service.schedule.utils.TimeTableProto;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  
 import javax.persistence.*;
@@ -63,6 +64,9 @@ public class TTInfo extends BEntity {
     /** 特殊有效日期（格式：2001-01-01，多个用逗号隔开） */
     private String special_days;
  
+    /** 最近备份日期 */
+    private Date lastBackUpDate;
+
     public TTInfo() {}
     public TTInfo(Object id, Object xlid, Object name, Object nds, Object sds) {
         if (id != null) {
@@ -83,6 +87,32 @@ public class TTInfo extends BEntity {
         }
     }
  
+    /**
+     * 输出proto生成的builder
+     * @return
+     */
+    public TimeTableProto.TTInfo.Builder toProtoBuilder() {
+        // 注意部份空值处理，必须覆默认值，否则报nullexceptio
+        return TimeTableProto.TTInfo.newBuilder()
+                .setId(id)
+                .setName(name)
+                .setXl(xl.getId())
+                .setXlName(xl.getName())
+                .setXlDir(xlDir)
+                .setQyrq(qyrq.getTime())
+                .setIsEnableDisTemplate(isEnableDisTemplate)
+                .setIsCancel(isCancel)
+                .setRuleDays(rule_days)
+                .setSpecialDays(special_days)
+                .setCreateUser(getCreateBy() == null ? 0 : getCreateBy().getId())
+                .setCreateUserName(getCreateBy() == null ? "" : getCreateBy().getUserName())
+                .setUpdateUser(getUpdateBy() == null ? 0 : getUpdateBy().getId())
+                .setUpdateUserName(getUpdateBy() == null ? "" : getUpdateBy().getUserName())
+                .setCreateDate(getCreateDate() == null ? 0l : getCreateDate().getTime())
+                .setUpdateDate(getUpdateDate() == null ? 0l : getUpdateDate().getTime());
+
+    }
+
     public Long getId() {
         return id;
     }
@@ -178,4 +208,12 @@ public class TTInfo extends BEntity {
     public void setIsCancel(Boolean isCancel) {
         this.isCancel = isCancel;
     }
+
+    public Date getLastBackUpDate() {
+        return lastBackUpDate;
+    }
+
+    public void setLastBackUpDate(Date lastBackUpDate) {
+        this.lastBackUpDate = lastBackUpDate;
+    }
 }
+package com.bsth.entity.schedule;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 时刻表信息备份。
+ * --不做关联信息，保存相应的关联id
+ */
+@Entity
+@Table(name="bsth_c_s_ttinfo_bak")
+public class TTInfoBackup {
+
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 关联 bsth_c_line 主键，不做mapping */
+    @Column(nullable = false)
+    private Integer xl;
+    /** 线路名称 */
+    @Column(nullable = false)
+    private String xlName;
+
+    /** 关联 bsth_c_s_ttinfo 主键，不做mapping */
+    @Column(nullable = false)
+    private Long ttInfo;
+    /** 关联的时刻表名字 */
+    private String ttInfoName;
+
+    /** 备份日期 */
+    @Column(nullable = false)
+    private Date backUpDate;
+    /** 备份的二进制内容（google protobuf格式） */
+    @Lob
+    private byte[] backUpInfo;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getXl() {
+        return xl;
+    }
+
+    public void setXl(Integer xl) {
+        this.xl = xl;
+    }
+
+    public String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
+
+    public Long getTtInfo() {
+        return ttInfo;
+    }
+
+    public void setTtInfo(Long ttInfo) {
+        this.ttInfo = ttInfo;
+    }
+
+    public String getTtInfoName() {
+        return ttInfoName;
+    }
+
+    public void setTtInfoName(String ttInfoName) {
+        this.ttInfoName = ttInfoName;
+    }
+
+    public Date getBackUpDate() {
+        return backUpDate;
+    }
+
+    public void setBackUpDate(Date backUpDate) {
+        this.backUpDate = backUpDate;
+    }
+
+    public byte[] getBackUpInfo() {
+        return backUpInfo;
+    }
+
+    public void setBackUpInfo(byte[] backUpInfo) {
+        this.backUpInfo = backUpInfo;
+    }
+}
@@ -3,6 +3,7 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.CarPark;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
+import com.bsth.service.schedule.utils.TimeTableProto;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  
 import javax.persistence.*;
@@ -99,6 +100,35 @@ public class TTInfoDetail extends BEntity {
     /** 备注 */
     private String remark;
  
+    /**
+     * 输出proto生成的builder
+     * @return
+     */
+    public TimeTableProto.TTInfoDetail.Builder toProtoBuilder() {
+        // 注意部份空值处理，必须覆默认值，否则报nullexception
+        return TimeTableProto.TTInfoDetail.newBuilder()
+                .setId(id)
+                .setXl(xl.getId())
+                .setXlName(xl.getName())
+                .setLp(lp.getId())
+                .setLpName(lp.getLpName())
+                .setFcno(fcno)
+                .setXlDir(xlDir)
+                .setQdzCode(qdzCode)
+                .setQdzName(qdzName)
+                .setZdzCode(zdzCode)
+                .setZdzName(zdzName)
+                .setFcsj(fcsj)
+                .setBcs(bcs)
+                .setJhlc(jhlc)
+                .setBcsj(bcsj)
+                .setBcType(bcType)
+                .setIsFB(isFB == null ? false : isFB)
+                .setIsTS(isTS == null ? false : isTS)
+                .setRemark(remark == null ? "" : remark)
+                ;
+    }
+
     public Long getId() {
         return id;
     }
+package com.bsth.repository.schedule;
+
+import com.bsth.entity.schedule.TTInfoBackup;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by xu on 17/7/13.
+ */
+@Repository
+public interface TTInfoBackupRepository extends BaseRepository<TTInfoBackup, Long> {
+}
@@ -44,7 +44,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	int send60Dispatch(Long id, String sender);
  
 	//60营运指令
-	int send60Operation(String nbbm, int state, int upDown, ScheduleRealInfo sch, String sender);
+	int send60Operation(String nbbm, int state, int upDown, String sender);
  
 	/**
 	 * 
@@ -66,7 +66,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	 * @param @param upDonw 上下行 0 上行  1 下行
 	 * @throws
 	 */
-	int upDownChange(String nbbm, Integer upDown, String sender);
+	//int upDownChange(String nbbm, Integer upDown, String sender);
  
 	/**
 	 * 
@@ -94,7 +94,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
  
     int refreshLineFile(String deviceId);
  
-    int stateChange(String nbbm, Integer upDown, Integer state, String userName);
+    //int stateChange(String nbbm, Integer upDown, Integer state, String userName);
  
     Map<String,Object> deviceCofigList(Map<String, String> map, int page, int size);
 }
@@ -188,7 +188,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     }
  
     @Override
-    public int send60Operation(String nbbm, int state, int upDown, ScheduleRealInfo sch, String sender) {
+    public int send60Operation(String nbbm, int state, int upDown, String sender) {
         logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
  
         String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
@@ -204,9 +204,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
         // 添加到缓存，等待入库
         d60.setHttpCode(code);
-        if (null != sch)
+        /*if (null != sch){
             d60.setSch(sch);
-
+            d60.setLineCode(sch.getXlBm());
+        }*/
  
         if (code == 0) {
             dayOfDirectives.put60(d60, true);
@@ -294,10 +295,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state, lineCode);
     }
  
-    @Override
+/*    @Override
     public int upDownChange(String nbbm, Integer upDown, String sender) {
-        return send60Operation(nbbm, 0, upDown, null, sender);
-    }
+        return send60Operation(nbbm, 0, upDown, sender);
+    }*/
  
  
     @Override
@@ -540,10 +541,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
     }
  
-    @Override
+/*    @Override
     public int stateChange(String nbbm, Integer upDown, Integer state, String userName) {
-        return send60Operation(nbbm, state, upDown, null, userName);
-    }
+        return send60Operation(nbbm, state, upDown, userName);
+    }*/
  
     @Override
     public Map<String, Object> deviceCofigList(Map<String, String> map, int page, int size) {
@@ -14,13 +14,11 @@ import java.util.List;
 import java.util.Map;
  
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
  
 import com.bsth.data.BasicData;
 import com.bsth.entity.excep.Speeding;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.excep.SpeedingService;
 import com.bsth.util.EchartConver;
 import com.bsth.util.PageHelper;
@@ -42,7 +40,7 @@ public class SpeedingServiceImpl implements SpeedingService {
 		ResultSet rs = null;
 		int page=Integer.parseInt(map.get("page").toString());
 		List<Speeding> list=new ArrayList<Speeding>();
-		String sql="select * from bsth_c_speeding where speed > 60 ";
+		String sql="select * from bsth_c_speeding where 1=1 ";
 		Object line=map.get("line");
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
@@ -204,22 +202,40 @@ public class SpeedingServiceImpl implements SpeedingService {
 		int totalPage;//总页数
 		int totalData = 0;
 		if(list.size()>1){
-			Speeding speedingNow;//下标为i的车
-			Speeding speedingLast;//下标为i-1的车
+			Speeding speedingNow;//下标为i的车辆行驶记录
+			Speeding speedingLast;//下标为i-1的车辆行驶记录
+			Speeding spped = null;//整合后的车辆行驶记录
 			String strNow;
 			String strLast;
+			boolean Flag = false;//判断是否有连续超速记录,默认没有
 			for(int i = 1;i<list.size();i++){
 				speedingNow = list.get(i);
 				speedingLast = list.get(i-1);
-				strNow = speedingNow.getVehicle()+speedingNow.getLine()+speedingNow.getUpDown();//同一车辆同一线路同一方向
+				strNow = speedingNow.getVehicle()+speedingNow.getLine()+speedingNow.getUpDown();
 				strLast = speedingLast.getVehicle()+speedingLast.getLine()+speedingLast.getUpDown();
-				//同一车辆同一线路同一方向并且该记录的超速的开始时间减去上一条超速记录的结束时间小于等于10s，证明该车超速。//PS:祛除数据库中的重复发送数据
-				if(strNow.equals(strLast) && Math.abs(speedingNow.getTimestamp()-speedingLast.getTimestamp())<=10*1000 && (speedingNow.getTimestamp()-speedingLast.getTimestamp()!=0)){
-					speedingLast.setEndtimestamp(speedingNow.getTimestamp());//设置结束时间时间戳
-					speedingLast.setEndtimestampDate(sdf.format(new Date(speedingNow.getTimestamp())));//设置结束时间
-					speedingLast.setEndlon(speedingNow.getLon());//设置结束时的经度
-					speedingLast.setEndlat(speedingNow.getLat());//设置结束时的纬度
-					listResult.add(speedingLast);
+				if(speedingNow.getSpeed()>60 && speedingLast.getSpeed()>60 && strNow.equals(strLast)){//如果两条连续的记录都是超速且属于同一辆车。
+					if(Flag==false){//
+						spped = new Speeding();
+						spped.setId(speedingLast.getId());//设置连续超速记录Id
+						spped.setLine(speedingLast.getLine());//设置连续超速记录线路
+						spped.setLineName(speedingLast.getLineName());//设置连续超速记录线路名称
+						spped.setVehicle(speedingLast.getVehicle());//设置连续超速记录的车辆编号
+						spped.setUpDown(speedingLast.getUpDown());//设置上下行
+						spped.setLon(speedingLast.getLon());//设置开始时经度
+						spped.setLat(speedingLast.getLat());//设置开始时纬度
+						spped.setTimestamp(speedingLast.getTimestamp());//设置连续超速记录的开始时间
+						spped.setTimestampDate(speedingLast.getTimestampDate());//设置连续超速记录的开始时间戳
+					}
+					spped.setEndtimestamp(speedingNow.getTimestamp());//设置结束时间戳
+					spped.setEndtimestampDate(sdf.format(new Date(speedingNow.getTimestamp())));//设置结束时间
+					spped.setEndlon(speedingNow.getLon());//设置结束时的经度
+					spped.setEndlat(speedingNow.getLat());//设置结束时的纬度
+					Flag = true;
+				}else{
+					if(Flag){//如果上一条记录超速。
+						listResult.add(spped);
+						Flag = false;
+					}
 				}
 			}
 			Iterator<Speeding> speedIt = listResult.iterator(); 
@@ -1020,19 +1020,19 @@ public class FormsServiceImpl implements FormsService {
 			}
  
 		});
-		sql = "select name from bsth_c_line where sfyy = 0";
+		sql = "select line_code from bsth_c_line where sfyy = 0";
 		List<String> strList = new ArrayList<>();
 		strList = jdbcTemplate.query(sql,
 				new RowMapper<String>(){
 			@Override
 			public String mapRow(ResultSet rs, int rowNum) throws SQLException {
-				return rs.getString("name");
+				return rs.getString("line_code");
 			}
 		});
 		lineSet.addAll(strList);
  
 		for(Line line1 : lineList){
-			if(lineSet.contains(line1.getName())){
+			if(lineSet.contains(line1.getLineCode())){
 				continue;
 			}
 			if(line.trim().length() == 0 || line1.getLineCode().equals(line)){
@@ -4,6 +4,7 @@ import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.service.gps.entity.GpsOutbound_DTO;
 import com.bsth.service.gps.entity.GpsSpeed;
 import com.bsth.service.gps.entity.GpsSpeed_DTO;
+import com.bsth.util.PageObject;
  
 import javax.servlet.http.HttpServletResponse;
  
@@ -45,4 +46,6 @@ public interface GpsService {
  
 	List<GpsSpeed> findPosition(String deviceid, String startdate,
 			String enddate) throws ParseException;
+
+	PageObject<GpsSpeed> Pagequery(Map<String, Object> map);
 }
@@ -16,6 +16,8 @@ import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.gps.entity.*;
 import com.bsth.util.DateUtils;
+import com.bsth.util.PageHelper;
+import com.bsth.util.PageObject;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
@@ -44,6 +46,7 @@ import java.net.URLEncoder;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -152,6 +155,17 @@ public class GpsServiceImpl implements GpsService {
         return (byte) (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
     }
  
+    /**
+     * 获取运营状态
+     *
+     * @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);
+    }
+
     @Override
     public List<Map<String, Object>> history(String[] nbbmArray, Long st, Long et) {
         List<Map<String, Object>> list = new ArrayList<>();
@@ -239,10 +253,11 @@ public class GpsServiceImpl implements GpsService {
             rs = ps.executeQuery();
             Float lon, lat;
             Location bdLoc, gdLoc;
-            int upDown, inOutStop;
+            int inOutStop;
+            long serviceState;
             ArrivalEntity arrival;
             while (rs.next()) {
-                upDown = getUpOrDown(rs.getLong("SERVICE_STATE"));
+                serviceState = rs.getLong("SERVICE_STATE");
                 map = new HashMap<>();
  
                 lon = rs.getFloat("LON");
@@ -278,9 +293,9 @@ public class GpsServiceImpl implements GpsService {
                 }
  
                 map.put("nbbm", BasicData.deviceId2NbbmMap.get(rs.getString("DEVICE_ID")));
-                map.put("state", 0);
+                map.put("state", getService(serviceState));
                 // 上下行
-                map.put("upDown", upDown);
+                map.put("upDown", getUpOrDown(serviceState));
                 //路段编码
                 map.put("section_code", rs.getString("SECTION_CODE"));
                 list.add(map);
@@ -806,7 +821,7 @@ public class GpsServiceImpl implements GpsService {
     @Override
     public List<GpsSpeed_DTO> speeds(String nbbm, long st, long et) {
         String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-        String sql = "select vehicle, line, up_down, lon, lat, speed,timestamp from bsth_c_speeding where vehicle=? and timestamp>? and timestamp<?";
+        String sql = "select vehicle, line, up_down, lon, lat, speed,timestamp from bsth_c_GpsSpeed where vehicle=? and timestamp>? and timestamp<?";
  
         return GpsSpeed_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql, deviceId, st * 1000, et * 1000));
     }
@@ -1036,4 +1051,182 @@ public class GpsServiceImpl implements GpsService {
         return listResult;
  
 	}
+
+	@Override
+	public PageObject<GpsSpeed> Pagequery(Map<String, Object> map) {
+		
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		List<GpsSpeed> list=findAll(map);
+		List<GpsSpeed> listResult = new ArrayList<GpsSpeed>();
+		int curPage;//页码  
+		int pageData;//每页的记录条数
+		int start;//起始数据下标
+		int totalPage;//总页数
+		int totalData = 0;
+		if(list.size()>1){
+			GpsSpeed GpsSpeedNow;//下标为i的车辆行驶记录
+			GpsSpeed GpsSpeedLast;//下标为i-1的车辆行驶记录
+			GpsSpeed spped = null;//整合后的车辆行驶记录
+			String strNow;
+			String strLast;
+			boolean Flag = false;//判断是否有连续超速记录,默认没有
+			for(int i = 1;i<list.size();i++){
+				GpsSpeedNow = list.get(i);
+				GpsSpeedLast = list.get(i-1);
+				strNow = GpsSpeedNow.getVehicle()+GpsSpeedNow.getLine()+GpsSpeedNow.getUp_down();
+				strLast = GpsSpeedLast.getVehicle()+GpsSpeedLast.getLine()+GpsSpeedLast.getUp_down();
+				if(GpsSpeedNow.getSpeed()>60 && GpsSpeedLast.getSpeed()>60 && strNow.equals(strLast)){//如果两条连续的记录都是超速且属于同一辆车。
+					if(Flag==false){//
+						spped = new GpsSpeed();
+						spped.setLine(GpsSpeedLast.getLine());//设置连续超速记录线路
+						spped.setLineName(GpsSpeedLast.getLineName());//设置连续超速记录线路名称
+						spped.setVehicle(GpsSpeedLast.getVehicle());//设置连续超速记录的车辆编号
+						spped.setUp_down(GpsSpeedLast.getUp_down());//设置上下行
+						spped.setLon(GpsSpeedLast.getLon());//设置开始时经度
+						spped.setLat(GpsSpeedLast.getLat());//设置开始时纬度
+						spped.setTimestamp(GpsSpeedLast.getTimestamp());//设置连续超速记录的开始时间
+						spped.setTimestampDate(GpsSpeedLast.getTimestampDate());//设置连续超速记录的开始时间戳
+					}
+					spped.setEndtimestamp(GpsSpeedNow.getTimestamp());//设置结束时间戳
+					spped.setEndtimestampDate(sdf.format(new Date(GpsSpeedNow.getTimestamp())));//设置结束时间
+					spped.setEndlon(GpsSpeedNow.getLon());//设置结束时的经度
+					spped.setEndlat(GpsSpeedNow.getLat());//设置结束时的纬度
+					Flag = true;
+				}else{
+					if(Flag){//如果上一条记录超速。
+						listResult.add(spped);
+						Flag = false;
+					}
+				}
+			}
+			Iterator<GpsSpeed> speedIt = listResult.iterator(); 
+			while(speedIt.hasNext()){
+				GpsSpeed GpsSpeed = speedIt.next(); 
+			    if(GpsSpeed.getEndtimestamp()-GpsSpeed.getTimestamp()<=1000){  
+			    	speedIt.remove();  
+			    }  
+			}
+			
+			totalData = listResult.size();//总记录条数。
+			if(map.get("curPage") == null || map.get("curPage").equals("0")){
+				curPage = 0;
+			}else{
+				curPage = Integer.parseInt((String) map.get("curPage"));
+			}
+			pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
+			start = (curPage - 0) * pageData; //起始记录下标。
+			totalPage = totalData % pageData == 0 ? totalData / pageData : totalData / pageData +1;//总页数
+			if(curPage == totalPage-1){//如果当前页等于总页数。
+				listResult = listResult.subList(start, totalData);
+			}else{
+				listResult = listResult.subList(start, start+pageData);
+			}
+		}else{
+			curPage = 1;
+			pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
+			totalPage =1;
+		}
+		Map<String,Object> paramMap = new HashMap<String,Object>();
+		paramMap.put("totalPage", totalPage);
+		paramMap.put("curPage", curPage);
+		paramMap.put("pageData", pageData);
+		PageHelper pageHelper = new PageHelper(totalData, paramMap);
+		pageHelper.getMap();
+		PageObject<GpsSpeed> pageObject = pageHelper.getPageObject();
+		pageObject.setDataList(listResult);
+		return pageObject;
+	}
+	
+	static List<GpsSpeed> findAll(Map<String, Object> map) {
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		int page=Integer.parseInt(map.get("page").toString());
+		List<GpsSpeed> list=new ArrayList<GpsSpeed>();
+		String sql="select * from bsth_c_gps_info where 1=1 ";
+		Object line=map.get("line");
+		Object nbbm=map.get("nbbm");
+		Object updown=map.get("updown");
+		Object startDate=map.get("startDate");
+		Object endDate=map.get("endDate");
+		
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		if(line!=null){
+			sql +=" and line_id like'%"+line.toString().trim()+"%'";
+		}
+		
+		if(nbbm!=null){
+			 nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			 if(nbbm!=null)
+			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
+		}
+		
+		if(updown!=null){
+			sql +="and industry_code like '%"+updown.toString()+"%'";
+		}
+		if(startDate!=null){
+			if (startDate.toString().length()>0) {
+				try {
+					Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime();
+					sql += " and ts >="+t1;
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+			}
+			
+		}
+		if(endDate!=null){
+			if (endDate.toString().length()>0) {
+				try {
+					Long t2=sdf.parse(endDate.toString()+" 23:59:59").getTime();
+					sql += " and ts <="+t2;
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+			}
+			
+		}
+
+		try {
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			rs = ps.executeQuery();
+			list = resultSet2Set(rs);
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		
+		return list;
+	}
+	
+	static List<GpsSpeed> resultSet2Set(ResultSet rs) throws SQLException{
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		List<GpsSpeed> list=new ArrayList<GpsSpeed>();
+		GpsSpeed GpsSpeed;
+		Float lon, lat;
+		Location location;
+		while(rs.next()){
+			lon = rs.getFloat("lon");
+			lat = rs.getFloat("lat");
+            location = TransGPS.LocationMake(lon, lat);
+            location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
+			GpsSpeed=new GpsSpeed();
+			GpsSpeed.setLon((float)location.getLng());
+			GpsSpeed.setLat((float)location.getLat());
+			GpsSpeed.setLine(rs.getObject("line_id").toString());
+			//run 时注解
+			GpsSpeed.setLineName(BasicData.lineCode2NameMap.get(GpsSpeed.getLine().toString()));
+			GpsSpeed.setSpeed(Float.valueOf(rs.getObject("speed_gps").toString()));
+			GpsSpeed.setTimestamp((Long.valueOf(rs.getObject("ts").toString())));
+			GpsSpeed.setTimestampDate(sdf.format(new Date(GpsSpeed.getTimestamp())));
+			GpsSpeed.setUp_down(((Integer.valueOf(rs.getObject("service_state").toString())) & 0x10000000)==0?0:1);
+			GpsSpeed.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("device_id").toString()));
+			list.add(GpsSpeed);
+		}
+		return list;
+	}
+	
 }
+
 package com.bsth.service.gps.entity;
  
+import javax.persistence.Transient;
+
 /**
  * 超速异常 -ms数据库格式
  * Created by panzhao on 2017/4/7.
@@ -15,11 +17,59 @@ public class GpsSpeed {
     private float lon;
  
     private float lat;
+    
+    private String lineName;
+    
+	/**
+	 * 超速结束时的纬度
+	 */
+    @Transient
+	private Float endlat;
+	
+	/**
+	 * 超速结束时的经度
+	 */
+	@Transient
+	private Float endlon;
  
     private float speed;
-
+    
     private long timestamp;
-
+    
+    @Transient
+    private String timestampDate;
+    
+  public String getTimestampDate() {
+		return timestampDate;
+	}
+
+	public void setTimestampDate(String timestampDate) {
+		this.timestampDate = timestampDate;
+	}
+
+	public Long getEndtimestamp() {
+		return endtimestamp;
+	}
+
+	public void setEndtimestamp(Long endtimestamp) {
+		this.endtimestamp = endtimestamp;
+	}
+
+	public String getEndtimestampDate() {
+		return endtimestampDate;
+	}
+
+	public void setEndtimestampDate(String endtimestampDate) {
+		this.endtimestampDate = endtimestampDate;
+	}
+
+	//结束时间，单位：秒/s
+  	@Transient
+  	private Long endtimestamp;
+  	
+  	@Transient
+  	private String endtimestampDate;
+    
     public String getVehicle() {
         return vehicle;
     }
@@ -75,4 +125,28 @@ public class GpsSpeed {
     public void setTimestamp(long timestamp) {
         this.timestamp = timestamp;
     }
+
+	public Float getEndlon() {
+		return endlon;
+	}
+
+	public void setEndlon(Float endlon) {
+		this.endlon = endlon;
+	}
+
+	public Float getEndlat() {
+		return endlat;
+	}
+
+	public void setEndlat(Float endlat) {
+		this.endlat = endlat;
+	}
+
+	public String getLineName() {
+		return lineName;
+	}
+
+	public void setLineName(String lineName) {
+		this.lineName = lineName;
+	}
 }
@@ -738,6 +738,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		// TODO Auto-generated method stub
 		double ljjcc=0.0;
 		double ljyy=0.0;
+		double ljkfks=0.0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo t=lists.get(i);
 			if(t.isSflj()){
@@ -760,6 +761,24 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					}*/
 				}
  
+				if(t.getBcType().equals("ldks")){
+					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+					if(childTaskPlans.isEmpty()){
+						if(!t.isDestroy()){
+							ljkfks =Arith.add(ljkfks, t.getJhlc());
+						}
+						
+					}
+					/*else{
+						//临加进出场子任务 待统计
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						double zrwlc=0.0;
+						boolean fage=false;
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                }
+					}*/
+				}
 				if(!isInOut(t)){
 					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
 					if(childTaskPlans.isEmpty()){
@@ -774,6 +793,14 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		                    	 if(childTaskPlan.getMileageType().equals("service")){
 		                    		 ljyy =Arith.add(ljyy,childTaskPlan.getMileage());
 		                    	 }
+		                    	 if(childTaskPlan.getMileageType().equals("empty")){
+		                    		 if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
+		                    			 ljjcc =Arith.add(ljjcc, childTaskPlan.getMileage());
+		                    		 }
+		                    		 if(childTaskPlan.getType2().equals("1")){
+		                    			 ljkfks =Arith.add(ljkfks, childTaskPlan.getMileage());
+		                    		 }
+		                    	 }
 		                    }
 		                }
 					}
@@ -784,6 +811,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		Map<String, Double> map=new HashMap<String,Double>();
 		map.put("ljjcc", ljjcc);
 		map.put("ljyy", ljyy);
+		map.put("ljkfks", ljkfks);
 		return map;
 	}
  
@@ -858,20 +886,32 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		double zrwjcclc=0.0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo t=lists.get(i);
-			if(!isInOut(t)){
-				Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
-				if(!childTaskPlans.isEmpty()){
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-	                while (it.hasNext()) {
-	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
-		                    if (childTaskPlan.isDestroy()) {
-		                    	if(childTaskPlan.getReason().equals(item)){
-			                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
-		                    	}
-		                    } 
-	                    }
-	                }
+			if(!t.isSflj()){
+				if(!isInOut(t)){
+					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+					if(!childTaskPlans.isEmpty()){
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if(item.equals("空放")){
+		                    	if(childTaskPlan.getType2().equals("1")){
+				                    if (!childTaskPlan.isDestroy()) {
+				                    	if(childTaskPlan.getReason().equals(item)){
+					                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+				                    	}
+				                    } 
+			                    }
+		                    }else{
+			                    if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
+				                    if (!childTaskPlan.isDestroy()) {
+				                    	if(childTaskPlan.getReason().equals(item)){
+					                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+				                    	}
+				                    } 
+			                    }
+		                    }
+		                }
+					}
 				}
 			}
 		}
@@ -37,6 +37,10 @@ import java.util.*;
 @Service
 public class ReportServiceImpl implements ReportService{
  
+	private static long zgf1 = 6 * 60 + 31,
+			zgf2 = 8 * 60 + 30,
+			wgf1 = 16 * 60 + 1, 
+			wgf2 = 18 * 60;
  
 	private Logger logger = LoggerFactory.getLogger(this.getClass());
  
@@ -466,38 +470,35 @@ public class ReportServiceImpl implements ReportService{
 		System.out.println(609360/60);
 		System.out.println(609360%60);
 	}
-	@Override
+/*	@Override
 	public List<Map<String, Object>> tbodyTime3(String line, String ttinfo) {
 		// TODO Auto-generated method stub
 		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
  
  
  
-		String sqlZd=" select t.*,x.station_name as qdz_name from ("
-				+ " select qdz,count(lp) as cls,lx from ( select qdz,lp,  'zqc' as lx  "
-				+ " from bsth_c_s_ttinfo_detail  where "
-				+ " bc_type='normal' and ttinfo ='"+ttinfo+"'  "
-				+ " and fcsj>'06:31' and fcsj<'08:00'  group by  qdz,lp) t1"
-				+ " group by qdz "
+		String sqlZd="select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqc' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"' "
+				+ " and bc_type ='normal'"
+				+ " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
+				+ " group by cl_zbh,qdz_name) a group by a.qdz_name"
 				+ " union "
-				+ " select qdz,count(lp) as cls,lx from ( select qdz,lp,  'wqc' as lx  "
-				+ " from bsth_c_s_ttinfo_detail  where "
-				+ " bc_type='normal' and ttinfo ='"+ttinfo+"'   "
-				+ " and fcsj>'16:01' and fcsj<'18:00' group by qdz,lp) t2"
-				+ " group by qdz "
+				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqc' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+				+ " and bc_type ='normal' "
+				+ " and fcsj >'16:01' and fcsj<'18:00' group by cl_zbh,qdz_name "
+				+ " ) a group by a.qdz_name "
 				+ " union "
-				+ " select qdz,count(lp) as cls,lx from ( select qdz,lp,  'zqj' as lx  "
-				+ " from bsth_c_s_ttinfo_detail  where "
-				+ " bc_type='region' and ttinfo ='"+ttinfo+"'  "
-				+ " and fcsj>'06:31' and fcsj<'08:00'  group by  qdz,lp) t3"
-				+ " group by qdz "
+				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqj' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+				+ " and bc_type ='region' "
+				+ " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
+				+ " group by cl_zbh,qdz_name) a group by a.qdz_name"
 				+ " union "
-				+ " select qdz,count(lp) as cls,lx from ( select qdz,lp,  'wqj' as lx  "
-				+ " from bsth_c_s_ttinfo_detail  where "
-				+ " bc_type='region' and ttinfo ='"+ttinfo+"'   "
-				+ " and fcsj>'16:01' and fcsj<'18:00' group by qdz,lp) t4"
-				+ " group by qdz ) t left join bsth_c_station  x on t.qdz=x.id";
-		
+				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqj' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+				+ " and bc_type ='region' and fcsj >'16:01' and fcsj<'18:00'"
+				+ " group by cl_zbh,qdz_name) a group by a.qdz_name";
 		List<Map<String, Object>> lists= jdbcTemplate.query(sqlZd,
 				 new RowMapper<Map<String, Object>>(){
 			 @Override
@@ -556,6 +557,208 @@ public class ReportServiceImpl implements ReportService{
  
 		}
 		return list;
+	}*/
+	@Override
+	public List<Map<String, Object>> tbodyTime3(String line, String ttinfo) {
+		// TODO Auto-generated method stub
+		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
+		List<Map<String, Object>> list_s=new ArrayList<Map<String,Object>>();
+
+
+		/*String sqlZd="select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqc' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"' "
+				+ " and bc_type ='normal'"
+				+ " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
+				+ " group by cl_zbh,qdz_name) a group by a.qdz_name"
+				+ " union "
+				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqc' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+				+ " and bc_type ='normal' "
+				+ " and fcsj >'16:01' and fcsj<'18:00' group by cl_zbh,qdz_name "
+				+ " ) a group by a.qdz_name "
+				+ " union "
+				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqj' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+				+ " and bc_type ='region' "
+				+ " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
+				+ " group by cl_zbh,qdz_name) a group by a.qdz_name"
+				+ " union "
+				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqj' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+				+ " and bc_type ='region' and fcsj >'16:01' and fcsj<'18:00'"
+				+ " group by cl_zbh,qdz_name) a group by a.qdz_name";*/
+		
+		        String sqlCl="SELECT cl_zbh,qdz_name,bc_type,fcsj,bcsj FROM"
+		        		+ "  bsth_c_s_sp_info WHERE tt_info = '"+ttinfo+"' "
+		        		+ " AND bc_type = 'normal' order by qdz_name";
+		        
+        List<Map<String, Object>> listj= jdbcTemplate.query(sqlCl,
+				 new RowMapper<Map<String, Object>>(){
+			 @Override
+			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Map<String, Object> m=new HashMap<String,Object>();
+				 m.put("cl_zbh", rs.getString("cl_zbh"));
+				 m.put("qdz_name", rs.getString("qdz_name"));
+				 m.put("bcType", rs.getString("bc_type"));
+				 m.put("fcsj", rs.getString("fcsj"));
+				 m.put("bcsj", rs.getString("bcsj"));
+				 return m;
+			 }
+		});
+        
+        String sqlZd="select qdz_name ,bc_type from  bsth_c_s_sp_info WHERE tt_info = '"+ttinfo+"' "
+        		+ " AND (bc_type = 'normal' or bc_type='region') group by qdz_name ,bc_type "
+        		+ " order by qdz_name";
+		List<Map<String, Object>> lists= jdbcTemplate.query(sqlZd,
+				 new RowMapper<Map<String, Object>>(){
+			 @Override
+			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Map<String, Object> m=new HashMap<String,Object>();
+				 m.put("zdm", rs.getString("qdz_name"));
+				 m.put("bcType", rs.getString("bc_type"));
+				 return m;
+			 }
+		});
+		
+		for (int i = 0; i < lists.size(); i++) {
+			Map<String, Object> z=new HashMap<String,Object>();
+			Map<String, Object> w=new HashMap<String,Object>();
+			Map<String, Object> p=lists.get(i);
+			int zbcs=0;
+			int wbcs=0;
+			if(p.get("bcType").toString().equals("normal")){
+				for (int j = 0; j < listj.size(); j++) {
+					if(listj.get(j).get("qdz_name").toString().equals(p.get("zdm").toString()) && 
+							listj.get(j).get("bcType").toString().equals("normal")){
+						String time=listj.get(j).get("fcsj").toString();
+						long bcsj= Long.parseLong(listj.get(j).get("bcsj").toString());
+						String clZbh=listj.get(j).get("cl_zbh").toString();
+						String[] fcsjStr = time.split(":");
+						long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+						long ddsj=fcsj+bcsj;
+						if((fcsj>=zgf1 && fcsj<=zgf2) || (ddsj>=zgf1&&ddsj<=zgf2) 
+								|| (fcsj<zgf1&&ddsj>zgf2)){
+							if(p.get("z"+clZbh)==null){
+								zbcs++;
+								p.put("z"+clZbh, clZbh);
+							}
+						}
+						
+						if((fcsj>=wgf1 && fcsj<=wgf2) || (ddsj>=wgf1&&ddsj<=wgf2) 
+								|| (fcsj<wgf1&&ddsj>wgf2)){
+							if(p.get("w"+clZbh)==null){
+								wbcs++;
+								p.put("w"+clZbh, clZbh);
+							}
+						}
+					}
+					
+				}
+				if(zbcs>0){
+					 z.put("zdm", p.get("zdm"));
+					 z.put("cls", zbcs);
+					 z.put("lx", "zqc");
+					 list_s.add(z);
+				}
+				if(wbcs>0){
+					w.put("zdm", p.get("zdm"));
+					 w.put("cls", zbcs);
+					 w.put("lx", "wqc");
+					 list_s.add(w);
+				}
+				
+			}
+			
+			if(p.get("bcType").equals("region")){
+				for (int j = 0; j < listj.size(); j++) {
+					if(listj.get(j).get("qdz_name").toString().equals(p.get("zdm").toString()) && 
+							listj.get(j).get("bcType").toString().equals("region")){
+						String time=listj.get(j).get("fcsj").toString();
+						long bcsj= Long.parseLong(listj.get(j).get("bcsj").toString());
+						String clZbh=listj.get(j).get("cl_zbh").toString();
+						String[] fcsjStr = time.split(":");
+						long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+						long ddsj=fcsj+bcsj;
+						if((fcsj>=zgf1 && fcsj<=zgf2) || (ddsj>=zgf1&&ddsj<=zgf2) 
+								|| (fcsj<zgf1&&ddsj>zgf2)){
+							if(p.get("z"+clZbh)==null){
+								zbcs++;
+								p.put("z"+clZbh, clZbh);
+							}
+						}
+						
+						if((fcsj>=wgf1 && fcsj<=wgf2) || (ddsj>=wgf1&&ddsj<=wgf2) 
+								|| (fcsj<wgf1&&ddsj>wgf2)){
+							if(p.get("w"+clZbh)==null){
+								wbcs++;
+								p.put("w"+clZbh, clZbh);
+							}
+						}
+					}
+					
+				}
+				if(zbcs>0){
+					 z.put("zdm", p.get("zdm"));
+					 z.put("cls", zbcs);
+					 z.put("lx", "zqj");
+					 list_s.add(z);
+				}
+				if(wbcs>0){
+					 w.put("zdm", p.get("zdm"));
+					 w.put("cls", zbcs);
+					 w.put("lx", "wqj");
+					 list_s.add(w);
+				}
+			}
+			
+		}
+		int a=0;
+		int b=0;
+		int c=0;
+		int d=0;
+		for(int i=0;i<list_s.size();i++){
+			boolean fage=true;
+			Map<String, Object> newMap= new HashMap<String, Object>();
+			list.add(newMap);
+			Map<String, Object> maps=list_s.get(i);
+			if(maps.get("lx").equals("zqc")){
+				list.get(a).put("zqcZm", maps.get("zdm"));
+				list.get(a).put("zqcCls", maps.get("cls"));
+				a++;
+				fage=false;
+			}else if(maps.get("lx").equals("wqc")){
+				list.get(b).put("wqcZm", maps.get("zdm"));
+				list.get(b).put("wqcCls", maps.get("cls"));
+				b++;
+				fage=false;
+			}else if(maps.get("lx").equals("zqj")){
+				list.get(c).put("zqjZm", maps.get("zdm"));
+				list.get(c).put("zqjCls", maps.get("cls"));
+				c++;
+				fage=false;
+			}else if(maps.get("lx").equals("wqj")){
+				list.get(d).put("wqjZm", maps.get("zdm"));
+				list.get(d).put("wqjCls", maps.get("cls"));
+				d++;
+				fage=false;
+			}
+			if(fage){
+				break;
+			}
+		}
+		boolean status=true;
+		while (status) {
+			for (int i = 0; i < list.size(); i++) {
+				if(list.get(i).isEmpty()){
+					list.remove(i);
+					status=true;
+				}else{
+					status=false;
+				}
+			}
+			
+		}
+		return list;
 	}
  
 	@Override
@@ -1501,11 +1704,18 @@ public class ReportServiceImpl implements ReportService{
 		            Map<String, Object> m = new HashMap<String, Object>();
 		            m.put("date", date);
 		            m.put("date1", date2);
+		            String by=map.get("by").toString();
+		            String xls="";
+		            if(by.equals("sj")){
+		            	xls="countByLine.xls";
+		            }else{
+		            	xls="countByLines.xls";
+		            }
 		            ReportUtils ee = new ReportUtils();
 		            try {
 		                listI.add(lMap.iterator());
 		                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-		                ee.excelReplace(listI, new Object[]{m}, path + "mould/countByLine.xls",
+		                ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
 		                        path + "export/线路公里统计表.xls");
 		            } catch (Exception e) {
 		                // TODO: handle exception
@@ -1572,9 +1782,12 @@ public class ReportServiceImpl implements ReportService{
 					Map<String, Double> culateLjMile=culateService.culateLjMile(lists);
 					double ljyy=culateLjMile.get("ljyy");
 					double ljjcc=culateLjMile.get("ljjcc");
+					double ljkfks=culateLjMile.get("ljkfks");
 					map.put("ljyy", ljyy);
 					map.put("ljjcc", ljjcc);
-					double ljlc=Arith.add(ljyy, ljjcc);
+					map.put("ljkfks", ljkfks);
+					
+					double ljlc=Arith.add(Arith.add(ljyy, ljjcc),ljkfks);
  
 					double lbss=culateService.culateSsMile(list);//烂班少驶
 					map.put("lbss", lbss);
@@ -1594,18 +1807,18 @@ public class ReportServiceImpl implements ReportService{
 			        double zrwjcclc=culateService.culateZrwJccLc(list, "故障");
 			        double zrwjcclc1=culateService.culateZrwJccLc(list, "肇事");
 			        double zrwjcclc2=culateService.culateZrwJccLc(list, "纠纷");
+			        double zrwjcclcqt=culateService.culateZrwJccLc(list, "其他");
+			        map.put("jhwjcclc_z", Arith.add(jhwjcclc,zrwjcclcqt)); 
 			        map.put("zrwjcclc", zrwjcclc);
 			        map.put("zrwjcclc1", zrwjcclc1);
 			        map.put("zrwjcclc2", zrwjcclc2);
-			        double zrwjcc=Arith.add(Arith.add(zrwjcclc, zrwjcclc1), zrwjcclc2);
-			        double kfks=culateService.culateKfksLc(lists);
+			        map.put("zrwjcclcqt", zrwjcclcqt);
+			        double zrwjcc=Arith.add(Arith.add(Arith.add(zrwjcclc, zrwjcclc1), zrwjcclc2),zrwjcclcqt);
+			        double kfks=Arith.add(culateService.culateKfksLc(lists),culateService.culateZrwJccLc(list, "空放"));
 			        map.put("kfks", kfks);
 			        double zlc=Arith.add(Arith.add(Arith.add(zrwjcc, ljlc), 
 			        		Arith.add(zjcclc, zyylc)),kfks);
-			        
-			        
 			        map.put("zlc", zlc);
-			      
 		    	}
 		        return map;
 		    }
@@ -1830,10 +2043,22 @@ public class ReportServiceImpl implements ReportService{
 		            m.put("date", date);
 		            m.put("date1", date2);
 		            String xls="";
+		            String by=map.get("by").toString();
+		            
+		           
 		            if(zt.equals("zbh")){
-		            	xls="countByBus1.xls";
+		            	 if(by.equals("sj")){
+		            		 xls="countByBus1.xls";
+			             }else{
+			            	 xls="countByBus1s.xls";
+			             }
 		            }else{
-		            	xls="countByBus2.xls";
+		            	
+		            	 if(by.equals("sj")){
+		            		 xls="countByBus2.xls";
+			             }else{
+			            	 xls="countByBus2s.xls";
+			             }
 		            }
 		            ReportUtils ee = new ReportUtils();
 		            try {
@@ -1896,7 +2121,8 @@ public class ReportServiceImpl implements ReportService{
 				 String jGh= m.get("jGh")==null?"":m.get("jGh").toString();
 				 String sGh= m.get("sGh")==null?"":m.get("sGh").toString();
 				 double jhzlc = 0.0,jhlc= 0.0,jcclc= 0.0,zlc= 0.0,jhnlc= 0.0,jhwlc= 0.0,
-				 jhnjcclc= 0.0,jhwjcclc= 0.0,zrwjcclc= 0.0,lbss= 0.0,ssgl_lz= 0.0,
+				 jhnjcclc= 0.0,jhwjcclc= 0.0,jhwjcclc_z=0.0,zrwjcclc= 0.0,zrwjcclc1= 0.0,zrwjcclc2= 0.0,
+						 zrwjcclcqt=0.0,lbss= 0.0,ssgl_lz= 0.0,
 				 ssgl_dm= 0.0,ssgl_gz= 0.0,ssgl_jf= 0.0,ssgl_zs= 0.0,ssgl_qr= 0.0,ssgl_qc= 0.0,
 				 ssgl_kx= 0.0,ssgl_qh= 0.0,ssgl_yw= 0.0,ssgl_other= 0.0,ljyy=0.0,ljjcc=0.0,
 					kfks=0.0,yhl=0.0,jzl=0.0,hyl=0.0,dhl=0.0,cdl=0.0;
@@ -1915,7 +2141,11 @@ public class ReportServiceImpl implements ReportService{
 			        	 jhwlc=Arith.add(jhwlc, map.get("jhwlc"));
 			        	 jhnjcclc=Arith.add(jhnjcclc, map.get("jhnjcclc"));
 			        	 jhwjcclc=Arith.add(jhwjcclc, map.get("jhwjcclc"));
+			        	 jhwjcclc_z=Arith.add(jhwjcclc_z,  map.get("jhwjcclc_z"));
 			        	 zrwjcclc=Arith.add(zrwjcclc, map.get("zrwjcclc"));
+			        	 zrwjcclc1=Arith.add(zrwjcclc1, map.get("zrwjcclc1"));
+			        	 zrwjcclc2=Arith.add(zrwjcclc2, map.get("zrwjcclc2"));
+			        	 zrwjcclcqt=Arith.add(zrwjcclcqt, map.get("zrwjcclcqt"));
 			        	 lbss=Arith.add(lbss, map.get("lbss"));
 			        	 ssgl_lz=Arith.add(ssgl_lz, map.get("ssgl_lz"));
 			        	 ssgl_dm=Arith.add(ssgl_dm, map.get("ssgl_dm"));
@@ -1962,7 +2192,11 @@ public class ReportServiceImpl implements ReportService{
 	        	 newMap.put("jhwlc", jhwlc);
 	        	 newMap.put("jhnjcclc", jhnjcclc);
 	        	 newMap.put("jhwjcclc", jhwjcclc);
+	        	 newMap.put("jhwjcclc_z", jhwjcclc_z);
 	        	 newMap.put("zrwjcclc", zrwjcclc);
+	        	 newMap.put("zrwjcclc1", zrwjcclc1);
+	        	 newMap.put("zrwjcclc2", zrwjcclc2);
+	        	 newMap.put("zrwjcclcqt", zrwjcclcqt);
 	        	 newMap.put("lbss", lbss);
 	        	 newMap.put("ssgl_lz", ssgl_lz);
 	        	 newMap.put("ssgl_dm",ssgl_dm);
@@ -12,4 +12,6 @@ public interface TTInfoService extends BService&lt;TTInfo, Long&gt; {
     void validate_s_d(TTInfo ttInfo) throws ScheduleException;
     void toggleCancel(Long id) throws ScheduleException;
  
+    void backUp(Long ttInfoId) throws ScheduleException;
+
 }
 package com.bsth.service.schedule.impl;
  
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.entity.schedule.TTInfoBackup;
+import com.bsth.entity.schedule.TTInfoDetail;
+import com.bsth.repository.schedule.TTInfoBackupRepository;
+import com.bsth.repository.schedule.TTInfoDetailRepository;
+import com.bsth.repository.schedule.TTInfoRepository;
 import com.bsth.service.schedule.TTInfoService;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.TimeTableProto;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
  
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +31,15 @@ import java.util.Map;
  */
 @Service
 public class TTInfoServiceImpl extends BServiceImpl<TTInfo, Long> implements TTInfoService {
+    /** 日志记录器 */
+    private static final Logger LOG = LoggerFactory.getLogger(TTInfoServiceImpl.class);
+
+    @Autowired
+    private TTInfoRepository ttInfoRepository;
+    @Autowired
+    private TTInfoDetailRepository ttInfoDetailRepository;
+    @Autowired
+    private TTInfoBackupRepository ttInfoBackupRepository;
  
     @Override
     public void validate_name(TTInfo ttInfo) throws ScheduleException {
@@ -112,4 +135,60 @@ public class TTInfoServiceImpl extends BServiceImpl&lt;TTInfo, Long&gt; implements TTI
             ttInfo.setIsCancel(true);
         }
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
+    public void backUp(Long ttInfoId) throws ScheduleException {
+        LOG.info(">>>>>>开始备份时刻表<<<<<<");
+
+        try {
+            // 获取原始数据
+            TTInfo ttInfo = ttInfoRepository.findOne(ttInfoId);
+            List<TTInfoDetail> ttInfoDetails = ttInfoDetailRepository.findByTtinfoId(ttInfoId);
+
+            // protobuf序列化成二进制数据
+            TimeTableProto.TTInfo.Builder tb = ttInfo.toProtoBuilder();
+            for (TTInfoDetail ttInfoDetail : ttInfoDetails) {
+                tb.addBcInfo(ttInfoDetail.toProtoBuilder());
+            }
+            byte[] backupbytes = tb.build().toByteArray();
+            LOG.info("......时刻表={}", ttInfo.getName());
+            LOG.info("......时刻表protoBuf字节数={}", backupbytes.length);
+
+            // 更新备份日期
+            Date backupdate = new Date();
+            ttInfo.setLastBackUpDate(backupdate);
+
+            // 保存备份数据
+            TTInfoBackup ttInfoBackup = new TTInfoBackup();
+            ttInfoBackup.setXl(ttInfo.getXl().getId());
+            ttInfoBackup.setXlName(ttInfo.getXl().getName());
+            ttInfoBackup.setTtInfo(ttInfoId);
+            ttInfoBackup.setTtInfoName(ttInfo.getName());
+            ttInfoBackup.setBackUpDate(backupdate);
+            ttInfoBackup.setBackUpInfo(backupbytes);
+
+            ttInfoBackupRepository.save(ttInfoBackup);
+//        System.out.println(backupbytes.length);
+//        try {
+//
+//            TimeTableProto.TTInfo tt1 = TimeTableProto.TTInfo.parseFrom(backupbytes);
+//            System.out.println(tt1.getName());
+//            System.out.println(tt1.getBcInfoCount());
+//        } catch (Exception exp) {
+//            exp.printStackTrace();
+//        }
+
+            LOG.info(">>>>>>备份时刻表success<<<<<<");
+        } catch (Exception exp) {
+            StringWriter stringWriter = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(stringWriter);
+            exp.printStackTrace(printWriter);
+            LOG.info("......异常stack->{}", stringWriter.toString());
+            LOG.info(">>>>>>备份时刻表failed<<<<<<");
+            throw new ScheduleException(exp);
+        }
+
+
+    }
 }