Merge branch 'minhang' of

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

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 57014855 04e27efb
Showing 24 changed files with 905 additions and 35 deletions
.gitignore
pom.xml
src/main/java/com/bsth/Application.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/controller/sys/IntervalController.java
src/main/java/com/bsth/data/Station2ParkBuffer.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/excep/Speeding.java
src/main/java/com/bsth/entity/schedule/TTInfo.java
src/main/java/com/bsth/entity/schedule/TTInfoBackup.java
src/main/java/com/bsth/entity/schedule/TTInfoDetail.java
src/main/java/com/bsth/entity/sys/Interval.java
src/main/java/com/bsth/repository/schedule/TTInfoBackupRepository.java
src/main/java/com/bsth/repository/sys/IntervalRepository.java
src/main/java/com/bsth/service/excep/impl/SpeedingServiceImpl.java
src/main/java/com/bsth/service/gps/GpsService.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/gps/entity/GpsSpeed.java
@@ -10,7 +10,8 @@ test_coverage/
 .DS_Store
 *.iml
 tmp
+E:/
 # git忽略空文件夹，按照惯例，空文件夹下放置.gitkeep文件避免文件夹被忽略不上传。
-!.gitkeep
-/target/
+!.gitkeep
+/target/
@@ -292,6 +292,13 @@
 			<artifactId>mina-core</artifactId>
 			<version>2.0.13</version>
 		</dependency>
+
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+
 	</dependencies>
 	<dependencyManagement>
@@ -10,6 +10,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -3,12 +3,18 @@ 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.*;
 import javax.servlet.http.HttpServletResponse;
+
+import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -179,4 +185,22 @@ public class GpsController {
                                        @RequestParam(defaultValue = "DESC") String direction){
         return gpsService.safeDrivList(map , page, size, order, direction);
     }
+    
+    @RequestMapping(value = "/findPosition", method = RequestMethod.GET)
+    public List<GpsSpeed> findPosition(@RequestParam String vehicle,@RequestParam String startdate,@RequestParam String enddate) throws ParseException {
+    	String deviceid = BasicData.deviceId2NbbmMap.inverse().get(vehicle);
+    	List<GpsSpeed> listGpsSpeed = new ArrayList<GpsSpeed>();
+    	listGpsSpeed = gpsService.findPosition(deviceid,startdate,enddate);
+    	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
+package com.bsth.controller.sys;
+
+import java.util.Map;
+
+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 com.alibaba.fastjson.JSON;
+import com.bsth.entity.sys.Interval;
+import com.bsth.service.sys.IntervalService;
+
+@RestController
+@RequestMapping("interval")
+public class IntervalController {
+	
+	@Autowired
+	IntervalService intervalService;
+	
+	@RequestMapping(value = "/save", method = RequestMethod.POST)
+	public Map<String, Object> save(@RequestParam String array){
+		return intervalService.saveList(JSON.parseArray(array, Interval.class));
+	}
+}
@@ -2,6 +2,7 @@ package com.bsth.data;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.realcontrol.StationToPark;
 import com.bsth.repository.realcontrol.StationToParkRepository;
 import com.bsth.util.Arith;
@@ -28,14 +29,13 @@ public class Station2ParkBuffer implements CommandLineRunner {
     private static ArrayListMultimap listMultimap;
-    private static Set<StationToPark> pstBuff;
+    private static Set<StationToPark> pstBuff = new HashSet<>();
     static Logger log = LoggerFactory.getLogger(Station2ParkBuffer.class);
     @Override
     public void run(String... strings) throws Exception {
         listMultimap = ArrayListMultimap.create();
-        pstBuff = new HashSet<>();
         Iterator<StationToPark> iterator = stationToParkRepository.findAll().iterator();
         StationToPark stp;
         while (iterator.hasNext()) {
@@ -102,6 +102,47 @@ public class Station2ParkBuffer implements CommandLineRunner {
         }
     }
+    public static void put(ScheduleRealInfo sch){
+        try{
+            String type = sch.getBcType();
+            String lineCode = sch.getXlBm(), sName, eName;
+
+            if (type.equals("in")) {
+                sName = sch.getQdzName();
+                eName = sch.getZdzName();
+            } else if (type.equals("out")) {
+                eName = sch.getQdzName();
+                sName = sch.getZdzName();
+            } else
+                return;
+
+            long dt = sch.getZdsjT() - sch.getDfsjT();
+            Float time = Float.parseFloat(String.valueOf(Arith.div(Arith.div(dt, 1000), 60)));
+            Float mileage = Float.parseFloat(sch.getJhlc().toString());
+
+            StationToPark stp = get(lineCode, sName, eName);
+            if (stp == null) {
+                stp = new StationToPark();
+                stp.setLineCode(lineCode);
+                stp.setStationName(sName);
+                stp.setParkName(eName);
+                listMultimap.put(lineCode, stp);
+            }
+
+            if (type.equals("in")) {
+                stp.setTime1(time);
+                stp.setMileage1(mileage);
+            } else {
+                stp.setTime2(time);
+                stp.setMileage2(mileage);
+            }
+
+            pstBuff.add(stp);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
     public static Float calcMinute(ChildTaskPlan ctask) {
         long t = 0;
@@ -189,7 +189,7 @@ public class PilotReport {
     }
     public boolean isEmpty(Double v) {
-        return v == null || v.equals(0);
+        return v == null || v.equals(0.0);
     }
     public void defaultReply(String nbbm, short requestCode, boolean agree) {
@@ -944,8 +944,11 @@ public class DayOfSchedule {
         ScheduleRealInfo sch = schAttrCalculator.calcCurrentExecSch(list);
         carExecutePlanMap.put(nbbm, sch);
-        if(sch==null)
+        if(sch==null){
+            logger.info("车辆" + nbbm + "无可执行任务，切换至非营运状态");
+            DirectivePushQueue.put6003(nbbm, 1, Integer.parseInt(sch.getXlDir()), null, "系统");
             return;
+        }
         try {
             GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
             if(gps != null && gps.isOnline()){
@@ -52,6 +52,33 @@ public class Speeding {
 	private Float lat;
 	/**
+	 * 超速结束时的经度
+	 */
+	private Float endlon;
+	
+	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;
+	}
+
+	/**
+	 * 超速结束时的纬度
+	 */
+	private Float endlat;
+	
+	
+	/**
 	 * 速度
 	 */
 	private Float speed;
 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.entity.sys;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+
+@Entity
+@Table(name = "bsth_c_interval")
+public class Interval {
+	
+	@Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+	
+	/** 大间隔等级 */
+	private String level;
+	/** 高峰*/
+	private Integer peak;
+	public Integer getPeak() {
+		return peak;
+	}
+
+	public void setPeak(Integer peak) {
+		this.peak = peak;
+	}
+
+	public Integer getTrough() {
+		return trough;
+	}
+
+	public void setTrough(Integer trough) {
+		this.trough = trough;
+	}
+
+	
+	public Integer getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(Integer createBy) {
+		this.createBy = createBy;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public Integer getUpdateBy() {
+		return updateBy;
+	}
+
+	public void setUpdateBy(Integer updateBy) {
+		this.updateBy = updateBy;
+	}
+
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+
+	/** 低谷 */
+	private Integer trough;
+	
+	@Column(name = "create_by")
+	private Integer createBy;
+	
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+	
+	@Column(name = "update_by")
+	private Integer updateBy;
+	
+	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	private Date updateDate;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getLevel() {
+		return level;
+	}
+
+	public void setLevel(String level) {
+		this.level = level;
+	}
+	
+}
+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> {
+}
+package com.bsth.repository.sys;
+
+
+import org.springframework.stereotype.Repository;
+import com.bsth.entity.sys.Interval;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface IntervalRepository extends BaseRepository<Interval, Integer> {
+
+}
@@ -9,21 +9,22 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 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;
 import com.bsth.util.PageObject;
+import com.bsth.util.TransGPS;
+import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
 import com.github.abel533.echarts.Option;
 import com.google.gson.Gson;
@@ -83,7 +84,6 @@ public class SpeedingServiceImpl implements SpeedingService {
 		}
-		
 		/*sql +=" order by id limit ?,?";*/
@@ -104,17 +104,23 @@ public class SpeedingServiceImpl implements SpeedingService {
 	}
 	static List<Speeding> resultSet2Set(ResultSet rs) throws SQLException{
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		List<Speeding> list=new ArrayList<Speeding>();
 		Speeding speeding;
+		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));
 			speeding=new Speeding();
 			speeding.setId(Integer.valueOf(rs.getObject("id").toString()));
-			speeding.setLat(Float.valueOf(rs.getObject("lat").toString()));
+			speeding.setLon((float)location.getLng());
+			speeding.setLat((float)location.getLat());
 			speeding.setLine(Integer.valueOf(rs.getObject("line").toString()));
 			//run 时注解
 			speeding.setLineName(BasicData.lineCode2NameMap.get(speeding.getLine().toString()));
-			speeding.setLon(Float.valueOf(rs.getObject("lon").toString()));
 			speeding.setSpeed(Float.valueOf(rs.getObject("speed").toString()));
 			speeding.setTimestamp((Long.valueOf(rs.getObject("timestamp").toString())));
 			speeding.setTimestampDate(sdf.format(new Date(speeding.getTimestamp())));
@@ -127,14 +133,12 @@ public class SpeedingServiceImpl implements SpeedingService {
 	@Override
 	public PageObject<Speeding> Pagequery(Map<String, Object> map) {
-		String sql="select count(*) record  from bsth_c_speeding where 1=1 ";
+/*		String sql="select count(*) record  from bsth_c_speeding 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 like'%"+line.toString().trim()+"%'";
@@ -186,31 +190,61 @@ public class SpeedingServiceImpl implements SpeedingService {
 			e.printStackTrace();
 		}finally {
 			DBUtils_MS.close(rs, ps, conn);
-		}
+		}*/
+		//时间转换
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		List<Speeding> list=findAll(map);
 		List<Speeding> listResult = new ArrayList<Speeding>();
 		int curPage;//页码  
 		int pageData;//每页的记录条数
 		int start;//起始数据下标
 		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())));//设置结束时间
-					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(); 
+			while(speedIt.hasNext()){
+				Speeding speeding = speedIt.next(); 
+			    if(speeding.getEndtimestamp()-speeding.getTimestamp()<=1000){  
+			    	speedIt.remove();  
+			    }  
+			}
 			totalData = listResult.size();//总记录条数。
 			if(map.get("curPage") == null || map.get("curPage").equals("0")){
 package com.bsth.service.gps;
+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;
+
+import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
@@ -38,4 +43,9 @@ public interface GpsService {
 	void abnormalExcel(String nbbm, long st, long et, HttpServletResponse resp);
 	void arrivalExcel(String nbbm, long st, long et, HttpServletResponse resp);
+
+	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,7 +46,10 @@ 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;
 import java.util.*;
 @Service
@@ -804,7 +809,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));
     }
@@ -981,4 +986,235 @@ public class GpsServiceImpl implements GpsService {
         }
         return true;
     }
+
+	@Override
+	public List<GpsSpeed> findPosition(String deviceid, String startdate,
+			String enddate) throws ParseException{
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    	Calendar c = Calendar.getInstance();
+    	Date date = sdf.parse(startdate);	
+    	c.setTime(date);
+    	int daysYear = c.get(Calendar.DAY_OF_YEAR);//获取当前是今年的第几天。
+    	
+    	long startTime = sdf.parse(startdate).getTime();
+    	long endTime = sdf.parse(enddate).getTime();
+    	
+        String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,speed_gps from bsth_c_gps_info where days_year=? and device_id=? and ts >= ? and ts <= ?" +
+        		"     ORDER BY TS ";
+        Connection conn = null;
+        PreparedStatement ps = null;
+        ResultSet rs = null;
+        List<GpsSpeed> listResult = new ArrayList<GpsSpeed>();
+        GpsSpeed gpsSpeed = null;
+        try {
+            conn = DBUtils_MS.getConnection();
+            ps = conn.prepareStatement(sql);
+            ps.setInt(1, daysYear);
+            ps.setString(2, deviceid);
+            ps.setLong(3,startTime);
+            ps.setLong(4,endTime);
+            rs = ps.executeQuery();
+            Float lon, lat;
+            Location location;
+            while (rs.next()) {
+            	gpsSpeed = new GpsSpeed();
+                // to 百度坐标
+                lon = rs.getFloat("LON");
+                lat = rs.getFloat("LAT");
+                location = TransGPS.LocationMake(lon, lat);
+                location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
+                gpsSpeed.setVehicle(rs.getString("device_id"));
+                gpsSpeed.setLon((float)location.getLng());
+                gpsSpeed.setLat((float)location.getLat());
+                gpsSpeed.setSpeed(rs.getFloat("speed_gps"));
+                gpsSpeed.setTimestamp(rs.getLong("TS"));
+                // 上下行
+                listResult.add(gpsSpeed);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            DBUtils_MS.close(rs, ps, conn);
+        }
+        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;
+	}
 }
@@ -10,6 +10,7 @@ import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.controller.realcontrol.dto.LpData;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
+import com.bsth.data.Station2ParkBuffer;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.SchAttrCalculator;
 import com.bsth.data.schedule.ScheduleComparator;
@@ -590,6 +591,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //重新计算车辆当前执行班次
             dayOfSchedule.reCalcExecPlan(t.getClZbh());
+            //记录站到场历时数据
+            Station2ParkBuffer.put(t);
             rs.put("ts", ts);
             rs.put("t", t);
@@ -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;
+
 }
@@ -157,7 +157,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                 } else {
                     Cell[] cells = sheet.getRow(0); // 获取第一行数据列
                     for (int i = 0; i < cells.length; i++) {
-                        String cell_con = cells[i].getContents();
+                        String cell_con = StringUtils.trimToEmpty(cells[i].getContents()); // trimToEmpty
                         if (StringUtils.isEmpty(cell_con)) {
                             throw new Exception(String.format("第1行，第%d列数据不能为空", i + 1));
@@ -199,7 +199,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                     Map<String, Integer> gbindexmap = new HashMap<>(); // 记录每个路牌在第几行
                     for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
                         Cell bcell = sheet.getRow(i)[0]; // 获取第1列
-                        String bcell_con = bcell.getContents();
+                        String bcell_con = StringUtils.trimToEmpty(bcell.getContents()); // trimToEmpty
                         if (StringUtils.isEmpty(bcell_con)) {
                             throw new Exception(String.format("第%d行，第1列路牌无数据", i + 1));
                         } else if (gbindexmap.get(bcell_con.trim()) != null) {
@@ -233,7 +233,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                     for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
                         Cell[] bcells = sheet.getRow(i);
                         for (int j = 1; j < bcells.length; j++) { // 从第2列开始
-                            String bcell_con = bcells[j].getContents();
+                            String bcell_con = StringUtils.trimToEmpty(bcells[j].getContents()); // trimToEmpty
                             if (StringUtils.isNotEmpty(bcell_con)) {
                                 Matcher m1 = p1.matcher(bcell_con.trim());
                                 Matcher m2 = p2.matcher(bcell_con.trim());
 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);
+        }
+
+
+    }
 }