合并浦东分支 0124

潘钊
2 parents 5a34d353 7c74f45f
Showing 82 changed files with 2726 additions and 428 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/BusIntervalController.java
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/controller/SectionController.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/geo_data/GeoDataController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/oil/YlxxbController.java
src/main/java/com/bsth/controller/realcontrol/ChildTaskPlanController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/controller/realcontrol/summary/TempSchSituationController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/directive/DirectivesPstThread.java
 package com.bsth;
 import com.bsth.data.BasicData;
-import com.bsth.data.LineVersionsData;
 import com.bsth.data.ThreadMonotor;
 import com.bsth.data.car_out_info.UpdateDBThread;
 import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.forecast.SampleTimeDataLoader;
 import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import com.bsth.data.gpsdata_v2.thread.OfflineMonitorThread;
+import com.bsth.data.line_version.thread.FixedEnableVerionsThread;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
+import com.bsth.data.safe_driv.SafeDrivDataLoadThread;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.auto_exec.AutoExecScanThread;
 import com.bsth.data.schedule.edit_logs.SeiPstThread;
@@ -72,8 +73,14 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     OfflineMonitorThread offlineMonitorThread;
+    //@Autowired
+    //LineVersionsData lineVersionsData;
+
+    @Autowired
+    FixedEnableVerionsThread fixedEnableVerionsThread;
+
     @Autowired
-    LineVersionsData lineVersionsData;
+    SafeDrivDataLoadThread safeDrivDataLoadThread;
     private static long timeDiff;
     private static long timeDiffTraffic;
@@ -131,11 +138,18 @@ public class XDApplication implements CommandLineRunner {
         //sexec.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
         //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
+
+        //安全驾驶
+        //sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 40, 30, TimeUnit.SECONDS);
+
+        //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 20, 60 * 2 , TimeUnit.SECONDS);
     }
     public void prodInit(){
         log.info("prodInit...");
         ScheduledExecutorService sexec = Application.mainServices;
+        //安全驾驶
+        sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
@@ -167,6 +181,9 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //线路版本更新
-        sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
+
+        //线路版本更新
+        sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
     }
 }
@@ -38,6 +38,7 @@ public class Constants {
 	public static final String SESSION_USERNAME = "sessionUserName";
 	public static final String COMPANY_AUTHORITYS = "cmyAuths";
+	public static final String STATION_AND_SECTION_COUNT = "/station/updateStationAndSectionCode";
 	/**
 	 * 解除调度指令和班次的外键约束
@@ -52,5 +52,10 @@ public class BusIntervalController {
 	public List<Map<String,Object>> correctStatis(@RequestParam Map<String, Object> map){
 		return busIntervalService.correctStatis(map);
 	}
-	
+
+	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
+	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
+		return busIntervalService.exportWaybillMore(map);
+	}
+
 }
 package com.bsth.controller;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-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.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.LineVersions;
 import com.bsth.service.LineService;
 import com.bsth.service.LineVersionsService;
 import com.bsth.util.GetUIDAndCode;
+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 java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 
@@ -123,4 +122,14 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 	Line findByID(@RequestParam(defaultValue = "id") Integer id){
 		return service.findById(id);
 	}
+
+	/**
+	 * 删除线路
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value ="/remove" , method = RequestMethod.POST)
+	public Map<String, Object> remove(Integer id){
+		return service.remove(id);
+	}
 }
@@ -135,7 +135,16 @@ public class SectionController extends BaseController&lt;Section, Integer&gt; {
 	@RequestMapping(value="getSectionCode" , method = RequestMethod.GET)
 	public long getSectionCode() {
 		return GetUIDAndCode.getSectionId();
-		
+	}
+
+	/**
+	 * @Description :TODO(把路段截取位双路名路段)
+	 *
+	 * @return int <sectionCode路段编码>
+	 */
+	@RequestMapping(value="doubleName" , method = RequestMethod.GET)
+	public Map<String, Object> doubleName(@RequestParam Map<String, Object> map) {
+		return service.doubleName(map);
 	}
 }
@@ -148,14 +148,28 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 		return service.stationCacheUpdate(map);
 	}
 	/**
+	 * @Description :TODO(更新内部编码)
+	 * @param stationCount,sectionCount 更新数
+	 */
+	@RequestMapping(value="updateStationAndSectionCode" , method = RequestMethod.GET)
+	public int updateStationAndSectionCode(@RequestParam Integer stationCount, Integer sectionCount) {
+		for(int i = 0; i <  stationCount; i++) {
+			GetUIDAndCode.getStationId();
+		}
+		for(int i = 0; i <  sectionCount; i++) {
+			GetUIDAndCode.getSectionId();
+		}
+		return 1;
+	}
+	/**
 	 * @Description :TODO(查询站点编码)
-	 * 
+	 *
 	 * @return int <stationCode站点编码>
 	 */
 	@RequestMapping(value="getStationCode" , method = RequestMethod.GET)
 	public long getStationCode() {
 		return GetUIDAndCode.getStationId();
-		
+
 	}
 	/**
 	 * @Description :TODO(查询站点编码)
 package com.bsth.controller;
+import com.bsth.entity.Station;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.StationRouteCache;
 import com.bsth.repository.StationRouteCacheRepository;
@@ -110,12 +111,20 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	}
 	/**
-	 * @Description :TODO(查询缓存站点的上一个缓存站点)
+	 * @Description :TODO(查询线路某方向下的站点序号与类型)
 	 */
 	@RequestMapping(value = "/findCacheUpStationRouteCode" , method = RequestMethod.GET)
 	public List<Map<String, Object>> findCacheUpStationRouteCode(@RequestParam Map<String, Object> map) {
 		return service.findCacheUpStationRouteCode(map);
 	}
+
+	/**
+	 * @Description :TODO(查询站点的下一个缓存站点)
+	 */
+	@RequestMapping(value = "/findDownStationRoute" , method = RequestMethod.GET)
+	public List<Map<String, Object>> findDownStationRoute(@RequestParam Map<String, Object> map) {
+		return service.findDownStationRoute(map);
+	}
 	/**
 	 * @Description :TODO(查询线路某方向下所有站点的中心百度坐标)
-package com.bsth.controller.geo_data;
-
-import com.bsth.entity.geo_data.GeoStation;
-import com.bsth.service.geo_data.GeoDataService;
-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 java.util.Map;
-
-/**
- * Created by panzhao on 2017/12/7.
- */
-@RestController
-@RequestMapping("/_geo_data")
-public class GeoDataController {
-
-    @Autowired
-    GeoDataService geoDataService;
-
-    @RequestMapping("findGeoStations")
-    public Map<String, Object> findGeoStations(@RequestParam String lineCode){
-        return geoDataService.findGeoStations(lineCode);
-    }
-
-
-    @RequestMapping("findGeoRoad")
-    public Map<String, Object> findGeoRoad(@RequestParam String lineCode){
-        return geoDataService.findGeoRoad(lineCode);
-    }
-
-    @RequestMapping(value = "updateBufferInfo",method = RequestMethod.POST)
-    public Map<String, Object> updateBufferInfo(GeoStation station){
-        return geoDataService.updateBufferInfo(station);
-    }
-
-    @RequestMapping(value = "updateStationName",method = RequestMethod.POST)
-    public Map<String, Object> updateStationName(@RequestParam Map<String, Object> map){
-        return geoDataService.updateStationName(map);
-    }
+package com.bsth.controller.geo_data;
+
+import com.bsth.entity.geo_data.GeoRoad;
+import com.bsth.entity.geo_data.GeoStation;
+import com.bsth.service.geo_data.GeoDataService;
+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 java.util.Map;
+
+/**
+ * Created by panzhao on 2017/12/7.
+ */
+@RestController
+@RequestMapping("/_geo_data")
+public class GeoDataController {
+
+    @Autowired
+    GeoDataService geoDataService;
+
+    @RequestMapping("findGeoStations")
+    public Map<String, Object> findGeoStations(@RequestParam String lineCode, Integer version){
+        return geoDataService.findGeoStations(lineCode, version);
+    }
+
+
+    @RequestMapping("findGeoRoad")
+    public Map<String, Object> findGeoRoad(@RequestParam String lineCode,Integer version){
+        return geoDataService.findGeoRoad(lineCode, version);
+    }
+
+    @RequestMapping(value = "updateBufferInfo",method = RequestMethod.POST)
+    public Map<String, Object> updateBufferInfo(GeoStation station){
+        return geoDataService.updateBufferInfo(station);
+    }
+
+    @RequestMapping(value = "updateStationName",method = RequestMethod.POST)
+    public Map<String, Object> updateStationName(@RequestParam Map<String, Object> map){
+        return geoDataService.updateStationName(map);
+    }
+
+    @RequestMapping(value = "addNewStationRoute",method = RequestMethod.POST)
+    public Map<String, Object> addNewStationRoute(@RequestParam String lineCode,@RequestParam int versions,@RequestParam int upDown
+            ,@RequestParam String stationName,@RequestParam Float lat,@RequestParam Float lng,@RequestParam int prevRouteId){
+        return geoDataService.addNewStationRoute(lineCode, upDown, versions, stationName, lat, lng, prevRouteId);
+    }
+
+    @RequestMapping(value = "addNewRoadRoute",method = RequestMethod.POST)
+    public Map<String, Object> addNewRoadRoute(@RequestParam String lineCode,@RequestParam int versions,@RequestParam int upDown
+            ,@RequestParam String sectionName,@RequestParam String crosesRoad,@RequestParam String coords,@RequestParam int prevRouteId){
+        return geoDataService.addNewRoadRoute(lineCode, upDown, versions, sectionName, crosesRoad, coords, prevRouteId);
+    }
+
+    @RequestMapping(value = "destroyStation",method = RequestMethod.POST)
+    public Map<String, Object> destroyStation(GeoStation station){
+        return geoDataService.destroyStation(station);
+    }
+
+    @RequestMapping(value = "updateRoadInfo",method = RequestMethod.POST)
+    public Map<String, Object> updateRoadInfo(GeoRoad road){
+        return geoDataService.updateRoadInfo(road);
+    }
+
+    @RequestMapping(value = "destroyRoad",method = RequestMethod.POST)
+    public Map<String, Object> destroyRoad(GeoRoad road){
+        return geoDataService.destroyRoad(road);
+    }
+
+    @RequestMapping("findVersionInfo")
+    public Map<String, Object> findVersionInfo(@RequestParam String lineCode){
+        return geoDataService.findVersionInfo(lineCode);
+    }
+
+    @RequestMapping(value = "addNewLineVersion",method = RequestMethod.POST)
+    public Map<String, Object> addNewLineVersion(@RequestParam Map<String, Object> map){
+        return geoDataService.addNewLineVersion(map);
+    }
+
+    @RequestMapping(value = "deleteLineVersion",method = RequestMethod.POST)
+    public Map<String, Object> deleteLineVersion(@RequestParam String lineCode,@RequestParam int version){
+        return geoDataService.deleteLineVersion(lineCode, version);
+    }
+
+    @RequestMapping("findFutureVersion")
+    public Map<String, Object> findFutureVersion(@RequestParam String lineCode){
+        return  geoDataService.findFutureVersion(lineCode);
+    }
+
+    @RequestMapping(value = "addEnableInfo",method = RequestMethod.POST)
+    public Map<String, Object> addEnableInfo(@RequestParam String lineCode,@RequestParam int versions, @RequestParam String startDate){
+        return geoDataService.addEnableInfo(lineCode, versions, startDate);
+    }
 }
 \ No newline at end of file
@@ -3,6 +3,8 @@ package com.bsth.controller.gps;
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.GpsOverspeed;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.service.gps.GpsService;
 import com.bsth.service.gps.entity.GpsSpeed;
 import com.google.common.base.Splitter;
@@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +28,9 @@ public class GpsController {
     @Autowired
     GpsService gpsService;
+    @Autowired
+    OverspeedProcess overspeedProcess;
+
     @RequestMapping(value = "/real/all")
     public Map<String, Object> search(@RequestParam Map<String, Object> map,
                                       @RequestParam(defaultValue = "0") int page,
@@ -42,8 +48,17 @@ public class GpsController {
     }
     @RequestMapping(value = "/real/line")
-    public List<GpsEntity> findByLineCodes(@RequestParam String lineCodes) {
-        return gpsRealData.get(Splitter.on(",").splitToList(lineCodes));
+    public Map<String, Object> findByLineCodes(@RequestParam String lineCodes) {
+        Map<String, Object> rs = new HashMap();
+        List<String> lineArray = Splitter.on(",").splitToList(lineCodes);
+        //实时gps
+        List<GpsEntity> gpsList = gpsRealData.get(lineArray);
+
+        //超速信息
+        List<GpsOverspeed> overspeedList = overspeedProcess.findByLines(lineArray);
+        rs.put("gpsList", gpsList);
+        rs.put("overspeedList", overspeedList);
+        return rs;
     }
     @RequestMapping(value = "/allDevices")
@@ -197,5 +212,15 @@ public class GpsController {
 		map.put("pageData","10");
 		return gpsService.Pagequery(map);
 	}
+
+    /**
+     * 获取线路下所有车辆，包括实时设备 和 计划排班
+     * @param lineCode
+     * @return
+     */
+    @RequestMapping(value = "/allCarsByLine",method = RequestMethod.GET)
+	public Map<String, Object> allCarsByLine(String lineCode){
+        return gpsService.allCarsByLine(lineCode);
+    }
 }
@@ -229,6 +229,12 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		return list;
 	}
+	@RequestMapping(value = "/checkDate",method = RequestMethod.GET)
+	public String checkDate(@RequestParam Map<String, Object> map){
+		String list=ylbService.checkDate(map);
+		return list;
+	}
+	
 	@RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
 	public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){
 		Map<String, Object> list=ylbService.sumYlb(map);
@@ -65,4 +65,16 @@ public class YlxxbController extends BaseController&lt;Ylxxb, Integer&gt;{
 		return list;
 	}
+	@RequestMapping(value="/saveYlxxb",method = RequestMethod.POST)
+	public Map<String, Object> savejzl(@RequestParam Map<String, Object> map){
+		Map<String, Object> maps=new HashMap<>();
+		try {
+			maps = service.saveYlxxb(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return maps;
+	}
+	
 }
@@ -27,4 +27,9 @@ public class ChildTaskPlanController extends BaseController&lt;ChildTaskPlan, Long&gt;
     public Map<String, Object> delHistory(@PathVariable("id") Long id){
         return childTaskPlanService.delHistory(id);
     }
+
+    @RequestMapping(value = "update", method = RequestMethod.POST)
+    public Map<String, Object> update(ChildTaskPlan childTask){
+        return childTaskPlanService.update(childTask);
+    }
 }
@@ -483,6 +483,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> MapById(@RequestParam("id") Long id){
 		return scheduleRealInfoService.MapById(id);
 	}
+	
+	@RequestMapping(value="/MapByIdQp",method = RequestMethod.GET)
+	public Map<String, Object> MapByIdQp(@RequestParam("id") Long id){
+		return scheduleRealInfoService.MapByIdQp(id);
+	}
 	/**
 	 * @Title: scheduleDaily
@@ -63,7 +63,9 @@ public class ServiceDataInterface {
             map = new HashMap<>();
             map.put("clZbh", sch.getClZbh());
             map.put("jGh", sch.getjGh());
+            map.put("jName", sch.getjGh());
             map.put("sGh", sch.getsGh());
+            map.put("sName", sch.getsGh());
             map.put("lpName", sch.getLpName());
             map.put("xlBm", sch.getXlBm());
             map.put("xlName", sch.getXlName());
+package com.bsth.controller.realcontrol.summary;
+
+import com.bsth.controller.BaseController;
+import com.bsth.data.summary.entity.TempSchSituation;
+import com.bsth.data.summary.service.TempSchSituationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@RestController
+@RequestMapping("/summary/temp_sch")
+public class TempSchSituationController extends BaseController<TempSchSituation, Long> {
+
+    @Autowired
+    TempSchSituationService tempSchSituationService;
+
+    @RequestMapping("excel")
+    public void excel(@RequestParam Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
+        tempSchSituationService.excel(map, request, response);
+    }
+}
@@ -209,6 +209,12 @@ public class ReportController {
 		return service.historyMessageCount(line, date, code);
 	}
+	@RequestMapping(value = "/historyMessageList", method = RequestMethod.GET)
+	public List<Object[]> historyMessageList(@RequestParam String line, @RequestParam String date,
+			@RequestParam String code,@RequestParam String type) {
+		return service.historyMessageList(line, date, code, type);
+	}
+	
 	@RequestMapping(value = "/tbodyTime1", method = RequestMethod.GET)
 	public Map<String, Object> tbodyTime1(@RequestParam String line,@RequestParam String ttinfo) {
 		return service.tbodyTime1(line, ttinfo);
@@ -2,16 +2,14 @@ package com.bsth.controller.schedule.core;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
-import com.bsth.entity.LineVersions;
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.service.LineVersionsService;
 import com.bsth.service.schedule.TTInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
-import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * Created by xu on 16/12/20.
@@ -21,47 +19,33 @@ import java.util.*;
 public class TTInfoController extends BController<TTInfo, Long> {
     @Autowired
     private TTInfoService ttInfoService;
-    @Autowired
-    private LineVersionsService lineVersionsService;
     @RequestMapping(value = "/stationroute/{lineid}", method = RequestMethod.GET)
     public Map<String, Object> getLineStationRouteVersions(@PathVariable(value = "lineid") Integer lineid) {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            List<LineVersions> lineVersionses = lineVersionsService.findByLineCode(lineid);
-            Collections.sort(lineVersionses, new Comparator<LineVersions>() {
-                @Override
-                public int compare(LineVersions o1, LineVersions o2) {
-                    if (o1.getVersions() > o2.getVersions()) {
-                        return -1;
-                    } else if (o1.getVersions() < o2.getVersions()) {
-                        return 1;
-                    } else {
-                        return 0;
-                    }
-                }
-            });
-
-            // 取最近2条记录
-            List<Map<String, Object>> mapList = new ArrayList<>();
-            for (LineVersions lv: lineVersionses) {
-                String vname = lv.getName();
-                String rq = lv.getStartDate() == null ? "未知启用日期" : new DateTime(lv.getStartDate()).toString("YYYY年MM月dd日");
-                String sdesc = lv.getStatus() == 0 ? "历史" : (lv.getStatus() == 1 ? "当前" : "待更新");
-
-                Map<String, Object> value = new HashMap<>();
-                value.put("desc", vname + "-" + rq + "-" + sdesc);
-                value.put("version", lv.getVersions());
-
-                mapList.add(value);
-
-                if (mapList.size() == 2) {
-                    break;
-                }
-            }
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", ttInfoService.getLineStationRouteVersions(lineid));
+
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/versiondesc/{lineid}/{version}")
+    public Map<String, Object> getLineVersionDesc(
+            @PathVariable(value = "lineid") Integer lineid,
+            @PathVariable(value = "version") Integer version) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            Map<String, String> desc = new HashMap<>();
+            desc.put("desc", ttInfoService.getLineVersionDesc(lineid, version));
             rtn.put("status", ResponseCode.SUCCESS);
-            rtn.put("data", mapList);
+            rtn.put("data", desc);
         } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
@@ -69,7 +53,23 @@ public class TTInfoController extends BController&lt;TTInfo, Long&gt; {
         }
         return rtn;
+    }
+
+    @RequestMapping(value = "/versiondesc2/{lineid}/{status}")
+    public Map<String, Object> getLineVersionDesc2(
+            @PathVariable(value = "lineid") Integer lineid,
+            @PathVariable(value = "status") Integer status) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", ttInfoService.getLineVersions(lineid, status));
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
     }
     @RequestMapping(value = "/validate_name", method = RequestMethod.GET)
@@ -5,9 +5,13 @@ import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
+import com.bsth.service.schedule.datatools.TTinfoDetailDynamicData;
+import com.bsth.service.schedule.utils.DataToolsFile;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,30 +36,18 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
      * @param sheetname sheet名字
      * @param lineid 线路id
      * @param linename 线路名称
+     * @param lineversion 线路版本
      * @return
      */
     @RequestMapping(value = "/validate/sheet", method = RequestMethod.POST)
     public Map<String, Object> validate_sheet(
-            String filename, String sheetname, Integer lineid, String linename,
-            Integer zdlytype, Integer zdlyversion) {
+            String filename, String sheetname, Integer lineid, String linename, Integer lineversion) {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            if (zdlytype == null) {
-                throw new Exception("请选择路由版本类型");
-            } else {
-                if (zdlytype == 1) {
-                    ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, null);
-                } else if (zdlytype == 2) {
-                    if (zdlyversion == null || zdlyversion == -1) {
-                        throw new Exception("请选择具体版本");
-                    } else {
-                        ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, zdlyversion);
-                    }
-                } else {
-                    throw new Exception("未知路由版本类型");
-                }
+            if (lineversion == null) {
+                throw new Exception("线路版本未知");
             }
-
+            ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, lineversion);
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
@@ -108,10 +100,10 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
     }
     @RequestMapping(value = "/zd_tcc", method = RequestMethod.GET)
-    public Map<String, Object> getZdAndTccInfo(Integer lineid, Integer xldir) {
+    public Map<String, Object> getZdAndTccInfo(Integer lineid, Integer xldir, Integer lineversion) {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            List<Map<String, Object>> list = ttInfoDetailService.findZdAndTcc(lineid, xldir);
+            List<Map<String, Object>> list = ttInfoDetailService.findZdAndTcc(lineid, xldir, lineversion);
             rtn.put("status", ResponseCode.SUCCESS);
             rtn.put("data", list);
         } catch (Exception exp) {
@@ -132,4 +124,32 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
     public Map<String, Object> skbDetailMxSave(@RequestParam Map<String, Object> entities){
     	return ttInfoDetailService.skbDetailMxSave(entities);
     }
+
+
+    @RequestMapping(value = "/exportDTDFile", method = RequestMethod.POST)
+    public void exportFile(
+            @RequestBody TTinfoDetailDynamicData.DTInfos dtInfos,
+            HttpServletResponse response) throws Exception {
+        DataToolsFile dataToolsFile = ttInfoDetailService.exportDynamicTTinfo(dtInfos);
+        // 流输出导出文件
+        response.setHeader("content-type", "application/octet-stream");
+        response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName());
+        response.setContentType("application/octet-stream");
+
+        OutputStream os = response.getOutputStream();
+        BufferedOutputStream bos = new BufferedOutputStream(os);
+
+        InputStream is = new FileInputStream(dataToolsFile.getFile());
+        BufferedInputStream bis = new BufferedInputStream(is);
+
+        int length = 0;
+        byte[] temp = new byte[1 * 1024 * 10];
+        while ((length = bis.read(temp)) != -1) {
+            bos.write(temp, 0, length);
+        }
+        bos.flush();
+        bis.close();
+        bos.close();
+        is.close();
+    }
 }
 package com.bsth.data.car_out_info;
 import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.entity.StationRoute;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -43,7 +45,7 @@ public class CarOutInfoHandler {
         bcTypeMap.put("ldks", "两点间空驶");
     }
-    private static ScheduleComparator.DFSJ schDFSJComparator = new ScheduleComparator.DFSJ();
+    private static ScheduleComparator.DFSJ2 schDFSJComparator = new ScheduleComparator.DFSJ2();
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -166,6 +168,11 @@ public class CarOutInfoHandler {
      * @param list
      * @return
      */
+    private static String[] fls = new String[]{"in","out","ldks","venting","major"};
+    private static List<String> clearTypes;
+    static {
+        clearTypes = Arrays.asList(fls);
+    }
     private ScheduleRealInfo[] nexts(List<ScheduleRealInfo> list) {
         ScheduleRealInfo[] array = new ScheduleRealInfo[3];
         Collections.sort(list, schDFSJComparator);
@@ -181,11 +188,16 @@ public class CarOutInfoHandler {
                 continue;
             //进场、出场、2点间空驶
-            if (sch.getBcType().equals("in")
-                    || sch.getBcType().equals("out")
-                    || sch.getBcType().equals("ldks"))
+            if (clearTypes.contains(sch.getBcType()))
                 continue;
+            //区间
+            if (sch.getBcType().equals("region")){
+                //是否起点发出
+                if(!isStartOut(sch))
+                    continue;
+            }
+
             //有实发实达时间的
             if (StringUtils.isNotEmpty(sch.getFcsjActual())
                     || StringUtils.isNotEmpty(sch.getZdsjActual()))
@@ -199,4 +211,30 @@ public class CarOutInfoHandler {
         }
         return array;
     }
+
+    private static StationRouteComp sComp = new StationRouteComp();
+    private boolean isStartOut(ScheduleRealInfo sch) {
+        try{
+            List<StationRoute> list = GeoCacheData.getStationRoute(sch.getXlBm(), Integer.parseInt(sch.getXlDir()));
+
+            if(null == list && list.size() == 0)
+                return false;
+            //排序
+            Collections.sort(list, sComp);
+
+            if(sch.getQdzName().equals(list.get(0).getName()))
+                return true;
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        return false;
+    }
+
+    private static class StationRouteComp implements Comparator<StationRoute> {
+
+        @Override
+        public int compare(StationRoute s1, StationRoute s2) {
+            return s1.getRouteSort() - s2.getRouteSort();
+        }
+    }
 }
@@ -7,6 +7,8 @@ import com.bsth.entity.directive.Directive;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D60Repository;
 import com.bsth.repository.directive.D64Repository;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +34,8 @@ public class DirectivesPstThread extends Thread {
     @Autowired
     DayOfSchedule dayOfSchedule;
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+
     @Override
     public void run() {
@@ -52,6 +56,8 @@ public class DirectivesPstThread extends Thread {
                             continue;
                         }
                     }
+                    //日期
+                    d60.setRq(fmtyyyyMMdd.print(d60.getTimestamp()));
                     d60Repository.save(d60);
                 }
 package com.bsth.data.gpsdata_v2;
+import com.alibaba.fastjson.JSON;
 import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.handlers.*;
@@ -11,7 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 /**
  * 实时信号数据处理
@@ -38,7 +41,7 @@ public class DataHandleProcess {
     static Logger logger = LoggerFactory.getLogger(DataHandleProcess.class);
-    final static int POOL_SIZE = 25;
+    final static int POOL_SIZE = 20;
     static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
     public static CountDownLatch count;
@@ -73,38 +76,16 @@ public class DataHandleProcess {
             logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
             count = new CountDownLatch(ks.size());
-            List<Future> fRs = new ArrayList<>(ks.size());
+            logger.info(JSON.toJSONString(ks));
             for (Integer index : ks) {
-                fRs.add(threadPool.submit(new SignalHandleThread(dataListMap.get(index), count)));
+                //logger.info("execute index: " + index);
+                threadPool.execute(new SignalHandleThread(dataListMap.get(index), count));
             }
-            //按线路分组gps
-            /*ArrayListMultimap multimap = ArrayListMultimap.create();
-            for (GpsEntity gps : list) {
-                multimap.put(gps.getLineId(), gps);
-            }
-
-            Set<String> ks = multimap.keySet();
-
-            logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
-            count = new CountDownLatch(ks.size());
-
-            for (String lineCode : ks) {
-                threadPool.execute(new SignalHandleThread(multimap.get(lineCode), count));
-            }*/
             //等待子线程结束
             count.await();
-            for (Future f : fRs) {
-                try {
-                    f.get();
-                } catch (InterruptedException e) {
-                } catch (ExecutionException e) {
-                    logger.error(e.getCause().getMessage());
-                }
-            }
-
             //加入实时gps对照
             for (GpsEntity gps : list)
                 gpsRealData.put(gps);
@@ -129,36 +110,45 @@ public class DataHandleProcess {
         @Override
         public void run() {
-            //try {
-            Collections.sort(list, comp);
-            for (GpsEntity gps : list) {
-                try {
-                    if(StringUtils.isEmpty(gps.getNbbm()))
-                        continue;
-                    if (Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
-                        continue;
-
-                    gpsStateProcess.process(gps);//状态处理
-                    stationInsideProcess.process(gps);//场站内外判定
-                    reverseRouteProcess.process(gps);//反向路由处理
-                    abnormalStateProcess.process(gps);//超速越界
-
-                    inStationProcess.process(gps);//进站
-                    outStationProcess.process(gps);//出站
-
-                    GpsCacheData.putGps(gps);//历史gps缓存
-                } catch (Exception e) {
-                    logger.error("", e);
+            try {
+                Collections.sort(list, comp);
+                //logger.info("sort end --" + Thread.currentThread().getName() + " -list size: " + list.size());
+
+                GpsEntity gps;
+                for(int i = 0,len = list.size(); i< len ;i ++){
+                    gps = list.get(i);
+
+                    //logger.info("run |--" + Thread.currentThread().getName() + " -i: " + i);
+                    try {
+                        if (StringUtils.isEmpty(gps.getNbbm()))
+                            continue;
+                        if (Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
+                            continue;
+
+                        gpsStateProcess.process(gps);//状态处理
+                        stationInsideProcess.process(gps);//场站内外判定
+                        reverseRouteProcess.process(gps);//反向路由处理
+                        abnormalStateProcess.process(gps);//超速越界
+
+                        inStationProcess.process(gps);//进站
+                        outStationProcess.process(gps);//出站
+
+
+                        //logger.info("put start --" + Thread.currentThread().getName() + " -i: " + i);
+                        GpsCacheData.putGps(gps);//历史gps缓存
+                        //logger.info("put end --" + Thread.currentThread().getName() + " -i: " + i);
+                    } catch (Throwable e) {
+                        logger.error("", e);
+                    }
                 }
-            }
-            logger.info(Thread.currentThread().getName() + " -countDown : " + count.getCount());
-            count.countDown();
-            /*} finally {
+                //logger.info("for end --" + Thread.currentThread().getName() + " -list size: " + list.size());
+
+            } finally {
                 if (count != null)
                     count.countDown();
-                logger.info(Thread.currentThread().getName() + " -countDown : " + count.getCount());
-            }*/
+                //logger.info(Thread.currentThread().getName() + " -countDown : " + count.getCount());
+            }
         }
     }
@@ -123,7 +123,13 @@ public class GpsRealData {
      * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
      */
     public List<GpsEntity> getByLine(String lineCode) {
-        NavigableSet<String> set = lineCode2Devices.get(lineCode);
+        NavigableSet<String> set = lineCode2Devices.get(lineCode);//实际车载
+        Set<String> nbbmSet = dayOfSchedule.findCarByLineCode(lineCode);//计划用车
+
+        Map<String, String> nbbm2deviceMap = BasicData.deviceId2NbbmMap.inverse();
+        for(String nbbm : nbbmSet){
+            set.add(nbbm2deviceMap.get(nbbm));
+        }
         List<GpsEntity> rs = new ArrayList<>();
         GpsEntity gps;
@@ -135,14 +141,28 @@ public class GpsRealData {
                 continue;
             sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
-            if (null != sch)
+            if (null != sch){
                 gps.setSchId(sch.getId());
+                if(!sch.getXlBm().equals(lineCode)){
+                    //车辆在其他线路营运
+                    gps.setRemark("执行 " + sch.getXlName() + " " + sch.getDfsj() + " 班次");
+                    gps.setPlanCode(sch.getXlBm());
+                }
+                else
+                    gps.setRemark(null);
+            }else
+                gps.setRemark(null);
+
             rs.add(gps);
         }
         return rs;
     }
+    public static Set<String> findDevices(String lineCode){
+        return lineCode2Devices.get(lineCode);
+    }
+
     public List<GpsEntity> get(List<String> pArray) {
         List<GpsEntity> list = new ArrayList<>();
@@ -139,7 +139,7 @@ public class GeoCacheData {
     private void loadTccMapData(){
         //加载停车场数据
-        String sql = "select PARK_CODE, ST_AsText(G_PARK_POINT) as G_PARK_POINT from bsth_c_car_park where park_code is not null and b_park_point is not null";
+        String sql = "select PARK_CODE, ST_AsText(G_PARK_POINT) as G_PARK_POINT from bsth_c_car_park where park_code is not null and b_park_point is not null and destroy=0";
         List<Map<String, Object>> tccList = jdbcTemplate.queryForList(sql);
         Map<String, Polygon> tccTempMap = new HashMap<>();
@@ -9,6 +9,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 /**
  * gps 数据缓存
@@ -17,10 +19,10 @@ import java.util.*;
 public class GpsCacheData {
     /**
-     * 每辆车缓存最后300条gps
+     * 每辆车缓存最后200条gps
      */
-    private static final int CACHE_SIZE = 300;
-    private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
+    private static final int CACHE_SIZE = 200;
+    private static ConcurrentMap<String, CircleQueue<GpsEntity>> gpsCacheMap = new ConcurrentHashMap<>();
     /**
      * 车辆执行班次的详细 进出站数据
@@ -100,6 +100,9 @@ public class GpsEntity implements Cloneable{
 	 */
 	private int source = -1;
+	private String remark;
+	private String planCode;
+
 	public Object clone() {
 		try {
 			return super.clone();
@@ -360,4 +363,20 @@ public class GpsEntity implements Cloneable{
 	public void setPremiseCode(String premiseCode) {
 		this.premiseCode = premiseCode;
 	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getPlanCode() {
+		return planCode;
+	}
+
+	public void setPlanCode(String planCode) {
+		this.planCode = planCode;
+	}
 }
@@ -3,8 +3,10 @@ package com.bsth.data.gpsdata_v2.handlers;
 import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.gpsdata_v2.entity.CtLineString;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.data.gpsdata_v2.utils.GeoUtils;
 import com.bsth.util.Geo.Point;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.List;
@@ -17,19 +19,18 @@ import java.util.List;
 public class AbnormalStateProcess {
     /**
-     * 默认限速
-     */
-    private static final double DEFAULT_SPEED_LIMIT = 60;
-    /**
      * 越界阈值
      */
     private static final double OUT_BOUNDS_THRESHOLD = 100;
+    @Autowired
+    OverspeedProcess overspeedProcess;
+
     public void process(GpsEntity gps) {
         if (isOffline(gps))
             return;
-        if (overspeed(gps))
+        if (overspeedProcess.process(gps))
             return;
         if (outOfBounds((gps)))
@@ -41,14 +42,14 @@ public class AbnormalStateProcess {
     }
-    /**
+/*    *//**
      * 是否超速
      *
      * @param gps
      * @return
-     */
+
     private boolean overspeed(GpsEntity gps) {
-        double maxSpeed = DEFAULT_SPEED_LIMIT;
+        *//*double maxSpeed = DEFAULT_SPEED_LIMIT;
         if (GeoCacheData.speedLimit(gps.getLineId()) != null)
             maxSpeed = GeoCacheData.speedLimit(gps.getLineId());
@@ -56,8 +57,9 @@ public class AbnormalStateProcess {
             gps.setAbnormalStatus("overspeed");
             return true;
         }
-        return false;
-    }
+        return false;*//*
+        return overspeedProcess.process(gps);
+    }*/
     /**
@@ -159,7 +159,7 @@ public class InStationProcess {
         logger.info("车辆：" + nbbm + " 班次：" + sch.getDfsj() + "到终点， 时间：" + sch.getZdsjActual());
         //清除车辆误点调整监听
-        LateAdjustHandle.remove(nbbm);
+        LateAdjustHandle.remove(sch);
         //将gps转换成下一个班次走向的站内信号（应对只有一个站内信号 即 发出时）
         transformUpDown(gps, next);
@@ -113,7 +113,7 @@ public class OutStationProcess {
             dayOfSchedule.save(sch);
             //清理应发未发标记
-            LateAdjustHandle.remove(sch.getClZbh());
+            LateAdjustHandle.remove(sch);
             //发车的时候，同步一下状态
             if (!gps.isService() && !dayOfSchedule.emptyService(sch))
+package com.bsth.data.gpsdata_v2.handlers.overspeed;
+
+/**
+ * gps 超速信息
+ * Created by panzhao on 2018/1/9.
+ */
+public class GpsOverspeed {
+
+    private String device;
+
+    private String nbbm;
+
+    private String lineCode;
+
+    /**
+     * 开始超速时间 HH:mm
+     */
+    private String sts;
+
+    private long st;
+
+    /**
+     * 结束超速时间 HH:mm
+     */
+    private String ets;
+
+    /**
+     * 最新速度值
+     */
+    private float speed;
+
+    /**
+     * 0：结束超速， 1：离线
+     */
+    private int eType;
+
+    public String getDevice() {
+        return device;
+    }
+
+    public void setDevice(String device) {
+        this.device = device;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getSts() {
+        return sts;
+    }
+
+    public void setSts(String sts) {
+        this.sts = sts;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public String getEts() {
+        return ets;
+    }
+
+    public void setEts(String ets) {
+        this.ets = ets;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    public int geteType() {
+        return eType;
+    }
+
+    public void seteType(int eType) {
+        this.eType = eType;
+    }
+}
+package com.bsth.data.gpsdata_v2.handlers.overspeed;
+
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.google.common.collect.ArrayListMultimap;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+/**
+ * 超速处理
+ * Created by panzhao on 2018/1/9.
+ */
+@Component
+public class OverspeedProcess {
+
+
+    private static final double DEFAULT_SPEED_LIMIT = 60;
+
+    private static final double INVALID_SPEED_LIMIT = 110;
+
+    private static final int CONT_SPEED_SIZE = 6;
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+    private static GpsOverspeedComp comp = new GpsOverspeedComp();
+    /**
+     * 按线路分组的超速信息
+     */
+    private static ArrayListMultimap<String, GpsOverspeed> multimap;
+
+    /**
+     * 设备号 --> 当前超速
+     */
+    private static Map<String, GpsOverspeed> realOverspeedMap;
+
+    /**
+     * 设备号 --> 连续超速次数
+     */
+    private static Map<String, Integer> contSpeedMap;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    static{
+        multimap = ArrayListMultimap.create();
+        contSpeedMap = new HashMap();
+        realOverspeedMap = new HashMap();
+    }
+
+    public static void clear(){
+        multimap = null;
+        multimap = ArrayListMultimap.create();
+
+        contSpeedMap = null;
+        contSpeedMap = new HashMap();
+
+        realOverspeedMap = null;
+        realOverspeedMap = new HashMap();
+    }
+
+    public boolean process(GpsEntity gps){
+        if(gps.getSpeed() >= INVALID_SPEED_LIMIT){
+            return false;//无效的速度
+        }
+
+        Double maxSpeed = GeoCacheData.speedLimit(gps.getLineId());
+        if(null == maxSpeed)
+            maxSpeed = DEFAULT_SPEED_LIMIT;
+
+        if(gps.getSpeed() > maxSpeed){
+            overspeed(gps, maxSpeed);
+        }
+        else if(realOverspeedMap.containsKey(gps.getDeviceId())){
+            String device = gps.getDeviceId();
+            //结束超速
+            GpsOverspeed sp = realOverspeedMap.get(device);
+            sp.setEts(fmtHHmm.print(gps.getTimestamp()));
+
+            realOverspeedMap.remove(device);
+            contSpeedMap.put(device, 0);
+        }
+        return false;
+    }
+
+    private void overspeed(GpsEntity gps, Double maxSpeed) {
+        String device = gps.getDeviceId();
+        Integer cont = contSpeedMap.get(device);
+
+        if(null == cont)
+            cont = 1;
+
+        cont++;
+
+        if(gps.getSpeed() - maxSpeed > (maxSpeed * 0.1))
+            cont++;
+
+        if(cont >= CONT_SPEED_SIZE){
+            if(realOverspeedMap.containsKey(device)){
+                //正在超速，更新速度
+                realOverspeedMap.get(device).setSpeed(gps.getSpeed());
+            }
+            else{
+                logger.info("开始超速..." + gps.getNbbm());
+                GpsOverspeed sp = new GpsOverspeed();
+                sp.setLineCode(gps.getLineId());
+                sp.setDevice(device);
+                sp.setSpeed(gps.getSpeed());
+                sp.setNbbm(gps.getNbbm());
+                sp.setSts(fmtHHmm.print(gps.getTimestamp()));
+                sp.setSt(gps.getTimestamp());
+
+                realOverspeedMap.put(device, sp);
+                multimap.put(sp.getLineCode(), sp);
+            }
+            //标记gps超速
+            gps.setAbnormalStatus("overspeed");
+        }
+
+        contSpeedMap.put(device, cont);
+    }
+
+    /**
+     * 设备掉线
+     * @param device
+     */
+    public void offline(String device){
+        if(realOverspeedMap.containsKey(device)){
+            //结束超速
+            GpsOverspeed sp = realOverspeedMap.get(device);
+            sp.setEts(fmtHHmm.print(System.currentTimeMillis()));
+            sp.seteType(1);
+
+            realOverspeedMap.remove(device);
+            contSpeedMap.put(device, 0);
+        }
+    }
+
+
+    public List<GpsOverspeed> findByLines(List<String> lineArray){
+        List<GpsOverspeed> rs = new ArrayList<>();
+
+        for(String code : lineArray){
+            rs.addAll(multimap.get(code));
+        }
+
+        //按发送时间排序
+        Collections.sort(rs, comp);
+        if(rs.size() > 50)
+            rs = rs.subList(0, 50);
+
+        return rs;
+    }
+
+
+    public static class GpsOverspeedComp implements Comparator<GpsOverspeed>{
+
+        @Override
+        public int compare(GpsOverspeed o1, GpsOverspeed o2) {
+            return (int) (o2.getSt() - o1.getSt());
+        }
+    }
+}
@@ -51,8 +51,8 @@ public class GatewayHttpLoader implements ApplicationContextAware{
         httpClient = HttpClients.createDefault();
         get = new HttpGet(url);
         requestConfig = RequestConfig.custom()
-                .setConnectTimeout(1500).setConnectionRequestTimeout(1000)
-                .setSocketTimeout(1500).build();
+                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
+                .setSocketTimeout(2500).build();
         get.setConfig(requestConfig);
     }
@@ -44,8 +44,8 @@ public class SocketClientLoader {
         httpClient = HttpClients.createDefault();
         get = new HttpGet(url);
         requestConfig = RequestConfig.custom()
-                .setConnectTimeout(1500).setConnectionRequestTimeout(1000)
-                .setSocketTimeout(1500).build();
+                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
+                .setSocketTimeout(2500).build();
         get.setConfig(requestConfig);
     }
@@ -2,6 +2,7 @@ package com.bsth.data.gpsdata_v2.thread;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.websocket.handler.SendUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,6 +29,9 @@ public class OfflineMonitorThread extends Thread{
     @Autowired
     SendUtils sendUtils;
+    @Autowired
+    OverspeedProcess overspeedProcess;
+
     //无任务时 离线阈值
     //private final static int OFFLINE_TIME = 1000 * 60 * 10;
@@ -47,6 +51,8 @@ public class OfflineMonitorThread extends Thread{
                 if (t - gps.getTimestamp() > LOSE_TIME){
                     gps.offline();
+                    //结束超速
+                    overspeedProcess.offline(gps.getDeviceId());
                     //通知页面有设备掉线
                     sendUtils.deviceOffline(gps);
                 }
+package com.bsth.data.line_version;
+
+import com.bsth.data.line_version.dto.EvSectionRoute;
+import com.bsth.data.line_version.dto.EvStationRoute;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 启用线路路由版本
+ * Created by panzhao on 2017/12/28.
+ */
+@Component
+public class EnableRouteVersionHandler {
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public void enable(String lineCode, int version){
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+
+        try{
+            enableStation(lineCode, version);
+            enableRoad(lineCode, version);
+
+            //将当前版本变为历史版本
+            String sql = "update bsth_c_line_versions set status=0, end_date=SYSDATE(),update_date=SYSDATE() where line_code=" + lineCode + " and status=1";
+            jdbcTemplate.update(sql);
+            //将待更新版本变为启用版本
+            sql = "update bsth_c_line_versions set status=1,update_date=SYSDATE() where line_code=" + lineCode + " and  versions="+version;
+            jdbcTemplate.update(sql);
+
+            tran.commit(status);
+        }catch (Exception e){
+            tran.rollback(status);
+            logger.error("", e);
+        }
+    }
+
+    public void sync(String lineCode, int version){
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+
+        try{
+            enableStation(lineCode, version);
+            enableRoad(lineCode, version);
+
+            tran.commit(status);
+        }catch (Exception e){
+            tran.rollback(status);
+            logger.error("", e);
+        }
+    }
+
+    /**
+     * 启用新版本站点
+     * @param lineCode
+     * @param version
+     */
+    public void enableStation(String lineCode, int version){
+        //删除当前站点路由表数据
+        String sql = "delete from bsth_c_stationroute where line_code=" + lineCode;
+        jdbcTemplate.update(sql);
+
+        //将新版本数据插入当前表
+        sql = "select * from bsth_c_ls_stationroute where line_code=" + lineCode + " and versions=" + version;
+        List<EvStationRoute> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(EvStationRoute.class));
+
+        List<BeanPropertySqlParameterSource> sourceList = new ArrayList<>();
+        for(EvStationRoute s : list){
+            sourceList.add(new BeanPropertySqlParameterSource(s));
+        }
+
+        sql = "insert into bsth_c_stationroute(id,line,station,station_name,station_route_code,line_code,station_code,station_mark,out_station_nmber,directions,distances,to_time,first_time,end_time,descriptions,destroy,versions,create_date,update_date) " +
+                " values(:id,:line,:station,:stationName,:stationRouteCode,:lineCode,:stationCode,:stationMark,:outStationNmber,:directions,:distances,:toTime,:firstTime,:endTime,:descriptions,:destroy,:versions,SYSDATE(),SYSDATE())";
+        BeanPropertySqlParameterSource[] beanSources  =  sourceList.toArray(new BeanPropertySqlParameterSource[sourceList.size()]);
+        namedParameterJdbcTemplate.batchUpdate(sql, beanSources);
+    }
+
+    /**
+     * 启用新版本路段
+     * @param lineCode
+     * @param version
+     */
+    public void enableRoad(String lineCode, int version){
+        //删除当前路段路由表数据
+        String sql = "delete from bsth_c_sectionroute where line_code=" + lineCode;
+        jdbcTemplate.update(sql);
+
+        //将新版本数据插入当前表
+        sql = "select * from bsth_c_ls_sectionroute where line_code=" + lineCode + " and versions=" + version;
+        List<EvSectionRoute> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(EvSectionRoute.class));
+
+        List<BeanPropertySqlParameterSource> sourceList = new ArrayList<>();
+        for(EvSectionRoute s : list){
+            sourceList.add(new BeanPropertySqlParameterSource(s));
+        }
+
+        sql = "insert into bsth_c_sectionroute(id,line_code,section_code,sectionroute_code,directions,line,section,descriptions,create_by,create_date,update_by,update_date,versions,destroy,is_roade_speed) " +
+                " values(:id,:lineCode,:sectionCode,:sectionrouteCode,:directions,:line,:section,:descriptions,:createBy,SYSDATE(),:updateBy,SYSDATE(),:versions,:destroy,:isRoadeSpeed)";
+        BeanPropertySqlParameterSource[] beanSources  =  sourceList.toArray(new BeanPropertySqlParameterSource[sourceList.size()]);
+        namedParameterJdbcTemplate.batchUpdate(sql, beanSources);
+    }
+}
+package com.bsth.data.line_version.dto;
+
+import java.util.Date;
+
+/**
+ * Created by panzhao on 2017/12/28.
+ */
+public class EvSectionRoute {
+
+
+    private Integer id;
+
+    // 路段路由序号
+    private Integer sectionrouteCode;
+
+    // 线路编号
+    private String lineCode;
+
+    // 路段编号
+    private String sectionCode;
+
+    // 路段路由方向
+    private Integer directions;
+
+    // 版本号
+    private Integer versions;
+
+    // 是否撤销
+    private Integer destroy;
+
+    /** 是否有路段限速数据  <0：分段；1：未分段>*/
+    private Integer isRoadeSpeed;
+
+    // 描述
+    private String descriptions;
+
+    // 创建人
+    private Integer createBy;
+
+    // 修改人
+    private Integer updateBy;
+
+    // 创建日期
+    private Date createDate;
+
+    // 修改日期
+    private Date updateDate;
+
+    // 路段信息
+    private Integer section;
+
+    // 线路信息
+    private Integer line;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getSectionrouteCode() {
+        return sectionrouteCode;
+    }
+
+    public void setSectionrouteCode(Integer sectionrouteCode) {
+        this.sectionrouteCode = sectionrouteCode;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getSectionCode() {
+        return sectionCode;
+    }
+
+    public void setSectionCode(String sectionCode) {
+        this.sectionCode = sectionCode;
+    }
+
+    public Integer getDirections() {
+        return directions;
+    }
+
+    public void setDirections(Integer directions) {
+        this.directions = directions;
+    }
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+
+    public Integer getDestroy() {
+        return destroy;
+    }
+
+    public void setDestroy(Integer destroy) {
+        this.destroy = destroy;
+    }
+
+    public Integer getIsRoadeSpeed() {
+        return isRoadeSpeed;
+    }
+
+    public void setIsRoadeSpeed(Integer isRoadeSpeed) {
+        this.isRoadeSpeed = isRoadeSpeed;
+    }
+
+    public String getDescriptions() {
+        return descriptions;
+    }
+
+    public void setDescriptions(String descriptions) {
+        this.descriptions = descriptions;
+    }
+
+    public Integer getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Integer createBy) {
+        this.createBy = createBy;
+    }
+
+    public Integer getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Integer updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Integer getSection() {
+        return section;
+    }
+
+    public void setSection(Integer section) {
+        this.section = section;
+    }
+
+    public Integer getLine() {
+        return line;
+    }
+
+    public void setLine(Integer line) {
+        this.line = line;
+    }
+}
+package com.bsth.data.line_version.dto;
+
+import java.util.Date;
+
+/**
+ * Created by panzhao on 2017/12/28.
+ */
+public class EvStationRoute {
+    private Integer id;
+
+    // 站点路由序号
+    private Integer stationRouteCode;
+
+    // 站点编码
+    private String stationCode;
+
+    // 站点名称
+    private String stationName;
+
+    // 线路编码
+    private String lineCode;
+
+    /**
+     * 站点类型
+     *
+     * ------ B：起点站
+     *
+     * ------ Z：中途站
+     *
+     * ------ E：终点站
+     *
+     * ------ T：停车场
+     *
+     */
+    private String stationMark;
+
+    // 站点路由出站序号
+    private Integer outStationNmber;
+
+    // 站点路由到站距离
+    private Double distances;
+
+    // 站点路由到站时间
+    private Double toTime;
+
+    // 首班时间
+    private String firstTime;
+
+    // 末班时间
+    private String endTime;
+
+    // 站点路由方向
+    private Integer directions;
+
+    // 版本号
+    private Integer versions;
+
+    // 是否撤销
+    private Integer destroy;
+
+    // 描述
+    private String descriptions;
+
+    // 创建人
+    private Integer createBy;
+
+    // 修改人
+    private Integer updateBy;
+
+    // 创建日期
+    private Date createDate;
+
+    // 修改日期
+    private Date updateDate;
+
+    // 站点信息
+    private Integer station;
+
+    // 线路信息
+    private Integer line;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getStationRouteCode() {
+        return stationRouteCode;
+    }
+
+    public void setStationRouteCode(Integer stationRouteCode) {
+        this.stationRouteCode = stationRouteCode;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getStationMark() {
+        return stationMark;
+    }
+
+    public void setStationMark(String stationMark) {
+        this.stationMark = stationMark;
+    }
+
+    public Integer getOutStationNmber() {
+        return outStationNmber;
+    }
+
+    public void setOutStationNmber(Integer outStationNmber) {
+        this.outStationNmber = outStationNmber;
+    }
+
+    public Double getDistances() {
+        return distances;
+    }
+
+    public void setDistances(Double distances) {
+        this.distances = distances;
+    }
+
+    public Double getToTime() {
+        return toTime;
+    }
+
+    public void setToTime(Double toTime) {
+        this.toTime = toTime;
+    }
+
+    public String getFirstTime() {
+        return firstTime;
+    }
+
+    public void setFirstTime(String firstTime) {
+        this.firstTime = firstTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getDirections() {
+        return directions;
+    }
+
+    public void setDirections(Integer directions) {
+        this.directions = directions;
+    }
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+
+    public Integer getDestroy() {
+        return destroy;
+    }
+
+    public void setDestroy(Integer destroy) {
+        this.destroy = destroy;
+    }
+
+    public String getDescriptions() {
+        return descriptions;
+    }
+
+    public void setDescriptions(String descriptions) {
+        this.descriptions = descriptions;
+    }
+
+    public Integer getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Integer createBy) {
+        this.createBy = createBy;
+    }
+
+    public Integer getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Integer updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Integer getStation() {
+        return station;
+    }
+
+    public void setStation(Integer station) {
+        this.station = station;
+    }
+
+    public Integer getLine() {
+        return line;
+    }
+
+    public void setLine(Integer line) {
+        this.line = line;
+    }
+}
+package com.bsth.data.line_version.thread;
+
+import com.bsth.data.line_version.EnableRouteVersionHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/12/28.
+ */
+@Component
+public class FixedEnableVerionsThread extends Thread {
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    EnableRouteVersionHandler enableRouteVersionHandler;
+
+    @Override
+    public void run() {
+        try {
+
+            String sql = "select * from bsth_c_line_versions where status=2 and start_date<=SYSDATE()";
+
+            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
+            if (list.size() > 0) {
+                String lineCode;
+                int version;
+
+                for (Map<String, Object> map : list) {
+                    lineCode = map.get("line_code").toString();
+                    version = Integer.parseInt(map.get("versions").toString());
+
+                    enableRouteVersionHandler.enable(lineCode, version);
+                }
+            }
+
+
+            //自动同步当前启用版本
+            long t = System.currentTimeMillis();
+            List<String> syncs = jdbcTemplate.queryForList("SELECT CONCAT(line_code,'_',versions) FROM bsth_c_line_versions WHERE STATUS = 1 AND CONCAT(line_code, '_', versions) IN (SELECT CONCAT(line_code, '_', version) FROM logger_route_synchro where t < " + t + ")", String.class);
+
+            String[] ks;
+            for (String keys : syncs) {
+                ks = keys.split("_");
+
+                enableRouteVersionHandler.sync(ks[0], Integer.parseInt(ks[1]));
+
+                logger.info("同步线路 " + ks[0] + " 版本：" + ks[1]);
+            }
+
+            jdbcTemplate.update("delete from logger_route_synchro where t < " + t);
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+}
@@ -20,9 +20,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 /**
@@ -55,10 +53,16 @@ public class PilotReport {
     private static ConcurrentHashMap<Integer, D80> d80Maps;
+    /**
+     * 设备 ——> 最后一条请求出场记录
+     */
+    public static ConcurrentHashMap<String, D80> qqccMap;
+
     Logger logger = LoggerFactory.getLogger(PilotReport.class);
     static {
         d80Maps = new ConcurrentHashMap<>();
+        qqccMap = new ConcurrentHashMap<>();
     }
     public void report(D80 d80) {
@@ -81,6 +85,7 @@ public class PilotReport {
             switch (d80.getData().getRequestCode()) {
                 //出场请求
                 case 0xA3:
+                    qqccMap.put(d80.getDeviceId(), d80);
                     ScheduleRealInfo outSch = dayOfSchedule.searchNearByBcType(nbbm, "out");
                     //如果有对应出场班次
                     if (outSch != null && StringUtils.isEmpty(outSch.getFcsjActual())) {
@@ -241,6 +246,7 @@ public class PilotReport {
         List<D80> rems = findByLine(lineCode);
         for (D80 d80 : rems) {
             d80Maps.remove(d80.getId());
+            qqccMap.remove(d80.getDeviceId());
         }
         rems.clear();
@@ -21,7 +21,7 @@ import java.util.List;
 @Component
 public class SafeDrivDataLoadThread extends Thread{
-    private final static String url = "http://118.178.187.115/bsth-safedriving/Crlcxb/realtimeInterface.do";
+    private final static String url = "http://180.166.5.82:9005/bsth-safedriving/Crlcxb/realtimeInterface.do";
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -15,6 +15,7 @@ import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.HashMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -55,6 +56,9 @@ public class DayOfSchedule {
     // 按车辆分组的班次数据
     private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
+    //按线路分组计划用车
+    private static HashMultimap<String, String> lineNbbmsMap;
+
     //按路牌分组的班次数据 线路编码_路牌名称 ——> 班次list
     private static ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap;
@@ -199,6 +203,8 @@ public class DayOfSchedule {
                 reCalcExecPlan(nbbm);
             }
+            //分组计划用车
+            reCalcLineNbbms();
             // 页面 翻班通知
             //sendUtils.shiftSchedule(lineCode);
         } catch (Exception e) {
@@ -543,15 +549,15 @@ public class DayOfSchedule {
      * @Description: TODO(线路下运营的车辆)
      */
     public Set<String> findCarByLineCode(String lineCode) {
-        Set<String> rs = new HashSet<>();
+        /*Set<String> rs = new HashSet<>();
         Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
         for (ScheduleRealInfo sch : schs) {
             if (sch.getXlBm().equals(lineCode))
                 rs.add(sch.getClZbh());
         }
-
-        return rs;
+*/
+        return lineNbbmsMap.get(lineCode);
     }
     public List<ScheduleRealInfo> findByNbbm(String nbbm) {
@@ -908,6 +914,8 @@ public class DayOfSchedule {
         //重新计算车辆当前执行班次
         reCalcExecPlan(newClZbh);
         reCalcExecPlan(sch.getClZbh());
+        //重新分组计划用车
+        reCalcLineNbbms();
         return ups;
     }
@@ -970,7 +978,6 @@ public class DayOfSchedule {
                 //删除班次数据
                 removeRealSch(lineCode, rq);
-                //删除相关班次修正记录
             }
             rs.put("status", ResponseCode.SUCCESS);
@@ -1083,6 +1090,20 @@ public class DayOfSchedule {
         return id2SchedulMap.size();
     }
+    /**
+     * 重新计算线路计划用车
+     */
+    public void reCalcLineNbbms(){
+        HashMultimap<String, String> multimap = HashMultimap.create();
+
+        Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+        for (ScheduleRealInfo sch : schs) {
+            multimap.put(sch.getXlBm(), sch.getClZbh());
+        }
+
+        lineNbbmsMap = multimap;
+    }
+
     public String sizeString(){
         return id2SchedulMap.size() + "/" + nbbmScheduleMap.size();
     }
 package com.bsth.data.schedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -23,6 +25,7 @@ public class ScheduleComparator {
 		}
 	}*/
+
 	static Map<String, Integer> bcTypeOrderMap = new HashMap<>();
 	static{
@@ -50,10 +53,44 @@ public class ScheduleComparator {
 	public static class DFSJ  implements Comparator<ScheduleRealInfo>{
+        static Logger logger = LoggerFactory.getLogger(DFSJ.class);
+
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
-			return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+            try{
+
+                if(!s1.getXlBm().equals(s2.getXlBm()) || !s1.getLpName().equals(s2.getLpName())){
+                    int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
+                    return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+                }
+                else{
+                    /**
+                     * 按时刻表发车顺序号
+                     */
+                    Integer fc1 = s1.getFcno();
+                    Integer fc2 = s2.getFcno();
+                    if(null != fc1 && null != fc2){
+                        return fc1.intValue()==fc2.intValue()?0:fc1.intValue()-fc2.intValue();
+                    }
+                    else{
+                        int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
+                        return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+                    }
+                }
+            }catch (Exception e){
+                logger.error("排序异常", e);
+                return s1.getDfsjT() - s2.getDfsjT() > 0?1:-1;
+            }
 		}
 	}
+
+    public static class DFSJ2  implements Comparator<ScheduleRealInfo>{
+
+
+        @Override
+        public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
+            int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
+            return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+        }
+    }
 }
@@ -117,7 +117,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
         }
     }
-    public static void remove(String nbbm){
+/*    public static void remove(String nbbm){
         if(lateSchMap.containsKey(nbbm)){
             ScheduleRealInfo sch = lateSchMap.get(nbbm);
             sch.setLate2(false);
@@ -127,7 +127,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
             lateSchMap.remove(nbbm);
             logger.info("移除误点调整 nbbm -" + nbbm);
         }
-    }
+    }*/
     /**
      * 车辆到站
@@ -35,7 +35,7 @@ public class ScheduleLateThread extends Thread{
 	Logger logger = LoggerFactory.getLogger(this.getClass());
-	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.DFSJ();
+	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.DFSJ2();
 	@Override
 	public void run() {
 package com.bsth.data.schedule.thread;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.service.oil.DlbService;
 import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.service.oil.YlbService;
@@ -38,6 +39,8 @@ public class CalcOilThread extends Thread{
             logger.info("计算班次准点率结束！");
             //清除安全驾驶数据 先临时蹭这个线程
             SafeDrivCenter.clear();
+            //清除超速缓存数据
+            OverspeedProcess.clear();
         } catch(Exception e){
             logger.error("计算路单里程加注量失败",e);
         }
@@ -152,7 +152,7 @@ public class SchedulePstThread extends Thread {
                     ps.setBoolean(40, sch.isOnline());
                     ps.setString(41, sch.getAdjustExps());
                     ps.setBoolean(42, sch.isReissue());
-                    ps.setDouble(43, sch.getJhlcOrig());
+                    ps.setDouble(43, sch.getJhlcOrig()==null?0:sch.getJhlcOrig());
                     ps.setInt(44, sch.getSiginCompate());
                     ps.setInt(45, sch.getDriftStatus());
                     ps.setBoolean(46, sch.isCcService());
@@ -74,14 +74,6 @@ public class ScheduleRefreshThread extends Thread{
 						//重载排班数据
 						dayOfSchedule.reloadSch(lineCode, currSchDate, false);
 						logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
-
-
-						//校验一下数据库和缓存的数据
-						/*int dbCount = dayOfSchedule.dbCount(lineCode, currSchDate);
-						logger.info(lineCode + " 数据库数量：" + dbCount);
-						if(dbCount != dayOfSchedule.findByLineCode(lineCode).size()){
-							logger.error("异常异常异常，，数据库和缓存数量不一致，" + lineCode);
-						}*/
 					}
 				}catch (Exception e){
 					logger.error("班次更新失败！！ -" + lineCode, e);
+package com.bsth.data.summary.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 临加情况
+ * Created by panzhao on 2017/10/31.
+ */
+@Entity
+@Table(name = "z_calc_temp_detail")
+public class TempSchSituation {
+
+    @Id
+    private Long id;
+
+    private String rq;
+
+    private String gsBm;
+
+    private String fgsBm;
+
+    private String lineCode;
+
+    private String lineName;
+
+    private String nbbm;
+
+    private String jGh;
+
+    private String sGh;
+
+    private int size;
+
+    private Double mileage;
+
+    private Long t;
+
+    private String remark;
+
+    private String idsStr;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getjGh() {
+        return jGh;
+    }
+
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
+    }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public Double getMileage() {
+        return mileage;
+    }
+
+    public void setMileage(Double mileage) {
+        this.mileage = mileage;
+    }
+
+    public Long getT() {
+        return t;
+    }
+
+    public void setT(Long t) {
+        this.t = t;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getIdsStr() {
+        return idsStr;
+    }
+
+    public void setIdsStr(String idsStr) {
+        this.idsStr = idsStr;
+    }
+
+    public String getGsBm() {
+        return gsBm;
+    }
+
+    public void setGsBm(String gsBm) {
+        this.gsBm = gsBm;
+    }
+
+    public String getFgsBm() {
+        return fgsBm;
+    }
+
+    public void setFgsBm(String fgsBm) {
+        this.fgsBm = fgsBm;
+    }
+}
 \ No newline at end of file
+package com.bsth.data.summary.repository;
+
+import com.bsth.data.summary.entity.TempSchSituation;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@Repository
+public interface TempSchSituationRepository extends BaseRepository<TempSchSituation, Long> {
+}
+package com.bsth.data.summary.service;
+
+import com.bsth.data.summary.entity.TempSchSituation;
+import com.bsth.service.BaseService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+public interface TempSchSituationService extends BaseService<TempSchSituation, Long> {
+    void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response);
+}
 \ No newline at end of file
@@ -118,7 +118,7 @@ public class DestroySituationServiceImpl extends BaseServiceImpl&lt;DestroySituatio
                 row.createCell(9).setCellValue(dys.getRemark());
             }
-            String name = list.get(0).getLineName();
+            String name = "";//list.get(0).getLineName();
             wb.setSheetName(0, name + "烂班明细");
             //response 输出
             String filename = name + map.get("rq_ge") + "至" + map.get("rq_le") + "烂班明细情况.xls";
+package com.bsth.data.summary.service.impl;
+
+import com.bsth.data.summary.entity.TempSchSituation;
+import com.bsth.data.summary.service.TempSchSituationService;
+import com.bsth.data.utils.CustomStringUtils;
+import com.bsth.service.impl.BaseServiceImpl;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@Service
+public class TempSchSituationServiceImpl extends BaseServiceImpl<TempSchSituation, Long> implements TempSchSituationService {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public Iterable<TempSchSituation> list(Map<String, Object> map) {
+        List<TempSchSituation> list = (List<TempSchSituation>) super.list(map);
+
+        //排序
+        Collections.sort(list, new Comparator<TempSchSituation>() {
+            @Override
+            public int compare(TempSchSituation o1, TempSchSituation o2) {
+                int i = o1.getRq().compareTo(o2.getRq());
+                if (i != 0)
+                    return i;
+
+                i = o1.getLineName().compareTo(o2.getLineName());
+                if (i != 0)
+                    return i;
+
+                i = (int) (o1.getT() - o2.getT());
+                return i;
+            }
+        });
+        return list;
+    }
+
+    @Override
+    public void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
+        try {
+            map.put("rq_le", CustomStringUtils.maxEndTime(map.get("rq_ge").toString()
+                    , map.get("rq_le").toString(), 62));
+
+            List<TempSchSituation> list = (List<TempSchSituation>) super.list(map);
+
+            if (list.size() == 0) {
+                response.setHeader("Content-type", "text/html;charset=UTF-8");
+                response.getWriter().print("<span style='color:red;font-size:24px;'>根据查询条件没有搜索到数据，别导了！</span>");
+                return;
+            }
+
+            //排序
+            Collections.sort(list, new Comparator<TempSchSituation>() {
+                @Override
+                public int compare(TempSchSituation o1, TempSchSituation o2) {
+                    int i = o1.getRq().compareTo(o2.getRq());
+                    if (i != 0)
+                        return i;
+
+                    i = o1.getLineName().compareTo(o2.getLineName());
+                    if (i != 0)
+                        return i;
+
+                    i = (int) (o1.getT() - o2.getT());
+                    return i;
+                }
+            });
+
+            //输出excel
+            String basePath = Thread.currentThread().getContextClassLoader().getResource("").getPath();
+            String filePath = basePath + "/static/pages/summary/excel/临加明细情况.xls";
+            POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filePath));
+            HSSFWorkbook wb = new HSSFWorkbook(fs);
+
+            //写入数据
+            Sheet sheet = wb.getSheetAt(0);
+            Row row;
+            TempSchSituation tss;
+            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+            for (int i = 0; i < list.size(); i++) {
+                tss = list.get(i);
+                row = sheet.createRow(i + 1);
+                row.createCell(0).setCellValue(tss.getRq());
+                row.createCell(1).setCellValue(tss.getLineName());
+                row.createCell(2).setCellValue(tss.getNbbm());
+                row.createCell(3).setCellValue(tss.getjGh());
+                row.createCell(4).setCellValue(tss.getsGh());
+                row.createCell(5).setCellValue(tss.getSize());
+                row.createCell(6).setCellValue(tss.getMileage());
+                row.createCell(7).setCellValue(sdf.format(new Date(tss.getT())));
+                row.createCell(8).setCellValue(tss.getRemark());
+            }
+
+            String name = "";//list.get(0).getLineName();
+            wb.setSheetName(0, name + "临加明细");
+            //response 输出
+            String filename = name + map.get("rq_ge") + "至" + map.get("rq_le") + "临加明细情况.xls";
+            response.setContentType("application/x-msdownload");
+            response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
+
+            OutputStream os = response.getOutputStream();
+            wb.write(os);
+            os.flush();
+            os.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+}
 \ No newline at end of file
+package com.bsth.email;
+
+import javax.mail.Authenticator;
+import javax.mail.PasswordAuthentication;
+
+/**
+ * 服务器邮箱登录验证
+ */
+public class MailAuthenticator extends Authenticator{
+	/**
+	 * 用户名（登录邮箱）
+	 */
+	private String username;
+	/**
+	 * 密码
+	 */
+	private String password;
+
+	/**
+	 * 初始化邮箱和密码
+	 * 
+	 * @param username
+	 *            邮箱
+	 * @param password
+	 *            密码
+	 */
+	public MailAuthenticator(String username, String password) {
+		this.username = username;
+		this.password = password;
+	}
+
+	String getPassword() {
+		return password;
+	}
+
+	@Override
+	protected PasswordAuthentication getPasswordAuthentication() {
+		return new PasswordAuthentication(username, password);
+	}
+
+	String getUsername() {
+		return username;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+}
+package com.bsth.email;
+
+import com.bsth.email.entity.EmailBean;
+import com.bsth.util.Tools;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class SendEmailController {
+
+	/*
+	 * recipients
+	 * 收件人集合
+	 * mail
+	 * 邮件
+	 */
+	public int sendMail(List<String> recipients,EmailBean mail){
+		Tools t = new Tools("mailbox.properties");
+		SimpleMailSender sms = new SimpleMailSender(t.getValue("username"),t.getValue("password"));
+		 try {
+	            for (String recipient : recipients) {
+	            	sms.send(recipient, mail.getSubject(),mail.getContent());
+	            }
+	        } catch (Exception e) {
+	            e.printStackTrace();
+	            return -1;
+	        }
+		return 1;
+	}
+	
+	/*
+	 * recipient
+	 * 收件人
+	 * mail
+	 * 邮件
+	 */
+	public int sendMail(String recipient,EmailBean mail){
+		Tools t = new Tools("mailbox.properties");
+		SimpleMailSender sms = new SimpleMailSender(t.getValue("username"),t.getValue("password"));
+		 try {
+			 	sms.send(recipient, mail.getSubject(),mail.getContent());
+	        } catch (Exception e) {
+	            e.printStackTrace();
+	            return -1;
+	        }
+		return 1;
+	}
+}
+package com.bsth.email;
+
+import com.bsth.email.entity.EmailBean;
+
+import java.util.List;
+import java.util.Properties;
+ 
+import javax.activation.CommandMap;
+import javax.activation.MailcapCommandMap;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMessage.RecipientType;
+
+
+public class SimpleMailSender {
+	/**
+     * 发送邮件的props文件
+     */
+    private final transient Properties props = System.getProperties();
+    /**
+     * 邮件服务器登录验证
+     */
+    private transient MailAuthenticator authenticator;
+ 
+    /**
+     * 邮箱session
+     */
+    private transient Session session;
+ 
+    /**
+     * 初始化邮件发送器
+     * 
+     * @param smtpHostName
+     *                SMTP邮件服务器地址
+     * @param username
+     *                发送邮件的用户名(地址)
+     * @param password
+     *                发送邮件的密码
+     */
+    public SimpleMailSender(final String smtpHostName, final String username,
+        final String password) {
+    init(username, password, smtpHostName);
+    }
+ 
+    /**
+     * 初始化邮件发送器
+     * 
+     * @param username
+     *                发送邮件的用户名(地址)，并以此解析SMTP服务器地址
+     * @param password
+     *                发送邮件的密码
+     */
+    public SimpleMailSender(final String username, final String password) {
+    //通过邮箱地址解析出smtp服务器，对大多数邮箱都管用
+    final String smtpHostName = "smtp." + username.split("@")[1];
+    init(username, password, smtpHostName);
+ 
+    }
+ 
+    /**
+     * 初始化
+     * 
+     * @param username
+     *                发送邮件的用户名(地址)
+     * @param password
+     *                密码
+     * @param smtpHostName
+     *                SMTP主机地址
+     */
+    private void init(String username, String password, String smtpHostName) {
+    // 初始化props
+    props.put("mail.smtp.auth", "true");
+    props.put("mail.smtp.host", smtpHostName);
+    // 验证
+    authenticator = new MailAuthenticator(username, password);
+    // 创建session
+    session = Session.getInstance(props, authenticator);
+    }
+ 
+    /**
+     * 发送邮件
+     * 
+     * @param recipient
+     *                收件人邮箱地址
+     * @param subject
+     *                邮件主题
+     * @param content
+     *                邮件内容
+     * @throws AddressException
+     * @throws MessagingException
+     */
+    public void send(String recipient, String subject, Object content)
+        throws AddressException, MessagingException {
+    // 创建mime类型邮件
+    final MimeMessage message = new MimeMessage(session);
+    // 设置发信人
+    message.setFrom(new InternetAddress(authenticator.getUsername()));
+    // 设置收件人
+    message.setRecipient(RecipientType.TO, new InternetAddress(recipient));
+    // 设置主题
+    message.setSubject(subject);
+    // 设置邮件内容
+    message.setContent(content.toString(), "text/html;charset=utf-8");
+    
+    MailcapCommandMap mc = (MailcapCommandMap) CommandMap.getDefaultCommandMap();
+    mc.addMailcap("text/html;; x-java-content-handler=com.sun.mail.handlers.text_html");
+    mc.addMailcap("text/xml;; x-java-content-handler=com.sun.mail.handlers.text_xml");
+    mc.addMailcap("text/plain;; x-java-content-handler=com.sun.mail.handlers.text_plain");
+    mc.addMailcap("multipart/*;; x-java-content-handler=com.sun.mail.handlers.multipart_mixed");
+    mc.addMailcap("message/rfc822;; x-java-content-handler=com.sun.mail.handlers.message_rfc822");
+    CommandMap.setDefaultCommandMap(mc);
+    // 发送
+    Transport.send(message);
+    }
+ 
+    /**
+     * 群发邮件
+     * 
+     * @param recipients
+     *                收件人们
+     * @param subject
+     *                主题
+     * @param content
+     *                内容
+     * @throws AddressException
+     * @throws MessagingException
+     */
+    public void send(List<String> recipients, String subject, Object content)
+        throws AddressException, MessagingException {
+    // 创建mime类型邮件
+    final MimeMessage message = new MimeMessage(session);
+    // 设置发信人
+    message.setFrom(new InternetAddress(authenticator.getUsername()));
+    // 设置收件人们
+    final int num = recipients.size();
+    InternetAddress[] addresses = new InternetAddress[num];
+    for (int i = 0; i < num; i++) {
+        addresses[i] = new InternetAddress(recipients.get(i));
+    }
+    message.setRecipients(RecipientType.TO, addresses);
+    // 设置主题
+    message.setSubject(subject);
+    // 设置邮件内容
+    message.setContent(content.toString(), "text/html;charset=utf-8");
+    // 发送
+    Transport.send(message);
+    }
+ 
+    /**
+     * 发送邮件
+     * 
+     * @param recipient
+     *                收件人邮箱地址
+     * @param mail
+     *                邮件对象
+     * @throws AddressException
+     * @throws MessagingException
+     */
+    public void send(String recipient, EmailBean mail)
+        throws AddressException, MessagingException {
+    send(recipient, mail.getSubject(), mail.getContent());
+    }
+ 
+    /**
+     * 群发邮件
+     * 
+     * @param recipients
+     *                收件人们
+     * @param mail
+     *                邮件对象
+     * @throws AddressException
+     * @throws MessagingException
+     */
+    public void send(List<String> recipients, EmailBean mail)
+        throws AddressException, MessagingException {
+    send(recipients, mail.getSubject(), mail.getContent());
+    }
+}
+package com.bsth.email.entity;
+
+/**
+ * Created by zlz on 2017-12-29.
+ */
+public class EmailBean {
+    private String subject;// 邮件标题
+    private String content;//邮件内容
+    public String getSubject() {
+        return subject;
+    }
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+    public String getContent() {
+        return content;
+    }
+    public void setContent(String content) {
+        this.content = content;
+    }
+}
@@ -160,6 +160,11 @@ public class Line implements Serializable {
 	/** 是否在使用 <1:是;0:否> bit length(50) */
 	private Integer inUse;
+
+	/**
+	 * 逻辑删除标记 为 1：标识已删除
+	 */
+	private Integer remove;
 	public Integer getSpacGrade() {
 		return spacGrade;
@@ -492,6 +497,13 @@ public class Line implements Serializable {
 	public void setSfyy(Integer sfyy) {
 		this.sfyy = sfyy;
 	}
-    
-    
+
+
+	public Integer getRemove() {
+		return remove;
+	}
+
+	public void setRemove(Integer remove) {
+		this.remove = remove;
+	}
 }
+package com.bsth.entity;
+
+public class LonLatName {
+    public String first_name;
+    public String second_name;
+    public String way_name;
+    public String location;
+
+    public String getFirst_name() {
+        return first_name;
+    }
+
+    public void setFirst_name(String first_name) {
+        this.first_name = first_name;
+    }
+
+    public String getSecond_name() {
+        return second_name;
+    }
+
+    public void setSecond_name(String second_name) {
+        this.second_name = second_name;
+    }
+
+    public String getWay_name() {
+        return way_name;
+    }
+
+    public void setWay_name(String way_name) {
+        this.way_name = way_name;
+    }
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+}
@@ -28,6 +28,8 @@ public class Directive {
 	 * 时间戳
 	 */
 	protected Long timestamp;
+
+	private String rq;
 	/**
 	 * 时间 HH:mm
@@ -113,4 +115,12 @@ public class Directive {
 	public void setSender(String sender) {
 		this.sender = sender;
 	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
 }
+package com.bsth.entity.geo_data;
+
+import java.util.Date;
+
+/**
+ * 线路版本信息
+ * Created by panzhao on 2017/12/18.
+ */
+public class GeoLineVersionInfo {
+    /** ID 主键(唯一标识符) int length(11) */
+    private Integer id;
+
+    /** 线路版本名字 varchar length(50)
+     * 	给排版人员选版本使用
+     *  */
+    private String name;
+
+    /** 线路ID  int length(11) */
+    private Integer line;
+
+    /** 线路编码 varchar length(50) */
+    private String lineCode;
+
+    /** 版本号  int length(11)  */
+    private int versions;
+
+    /** 启用日期 timestamp  */
+    private Date startDate;
+
+    /** 终止日期 timestamp  */
+    private Date endDate;
+
+    /** 创建日期 timestamp  */
+    private Date createDate;
+
+    /** 修改日期 timestamp */
+    private Date updateDate;
+
+    /** 备注 varchar length(50) */
+    private String remark;
+
+    /** 版本状态 int length(11)
+     *  0（历史版本），1（当前版本），2（待更新版本）
+     */
+    private int status;
+
+    /**
+     * 是否发布 int length(1)
+     * 0（没有），1（发布）
+     */
+    private int isupdate;
+
+    private String lineName;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getVersions() {
+        return versions;
+    }
+
+    public void setVersions(int versions) {
+        this.versions = versions;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public int getIsupdate() {
+        return isupdate;
+    }
+
+    public void setIsupdate(int isupdate) {
+        this.isupdate = isupdate;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Integer getLine() {
+        return line;
+    }
+
+    public void setLine(Integer line) {
+        this.line = line;
+    }
+}
-package com.bsth.entity.geo_data;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import java.util.List;
-
-/**
- * Created by panzhao on 2017/12/7.
- */
-public class GeoStation {
-
-    private int id;
-
-    private String stationName;
-
-    private String stationRouteCode;
-
-    private String lineCode;
-
-    private Integer directions;
-
-    private String stationCode;
-
-    private String stationMark;
-
-    private Integer version;
-
-    private Float gLonx;
-
-    private Float gLaty;
-
-    @JsonIgnore
-    private String gPolygonGrid;
-
-    private List<String> bdCoords;
-
-    private Integer radius;
-
-    private String shapesType;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getStationName() {
-        return stationName;
-    }
-
-    public void setStationName(String stationName) {
-        this.stationName = stationName;
-    }
-
-    public String getStationRouteCode() {
-        return stationRouteCode;
-    }
-
-    public void setStationRouteCode(String stationRouteCode) {
-        this.stationRouteCode = stationRouteCode;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public Integer getDirections() {
-        return directions;
-    }
-
-    public void setDirections(Integer directions) {
-        this.directions = directions;
-    }
-
-    public String getStationCode() {
-        return stationCode;
-    }
-
-    public void setStationCode(String stationCode) {
-        this.stationCode = stationCode;
-    }
-
-    public String getStationMark() {
-        return stationMark;
-    }
-
-    public void setStationMark(String stationMark) {
-        this.stationMark = stationMark;
-    }
-
-    public Integer getVersion() {
-        return version;
-    }
-
-    public void setVersion(Integer version) {
-        this.version = version;
-    }
-
-    public Float getgLonx() {
-        return gLonx;
-    }
-
-    public void setgLonx(Float gLonx) {
-        this.gLonx = gLonx;
-    }
-
-    public Float getgLaty() {
-        return gLaty;
-    }
-
-    public void setgLaty(Float gLaty) {
-        this.gLaty = gLaty;
-    }
-
-    public String getgPolygonGrid() {
-        return gPolygonGrid;
-    }
-
-    public void setgPolygonGrid(String gPolygonGrid) {
-        this.gPolygonGrid = gPolygonGrid;
-    }
-
-    public Integer getRadius() {
-        return radius;
-    }
-
-    public void setRadius(Integer radius) {
-        this.radius = radius;
-    }
-
-    public String getShapesType() {
-        return shapesType;
-    }
-
-    public void setShapesType(String shapesType) {
-        this.shapesType = shapesType;
-    }
-
-    public List<String> getBdCoords() {
-        return bdCoords;
-    }
-
-    public void setBdCoords(List<String> bdCoords) {
-        this.bdCoords = bdCoords;
-    }
+package com.bsth.entity.geo_data;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/12/7.
+ */
+public class GeoStation {
+
+    private int id;
+
+    private String stationName;
+
+    private String stationRouteCode;
+
+    private String lineCode;
+
+    private Integer directions;
+
+    private String stationCode;
+
+    private String stationMark;
+
+    private Integer versions;
+
+    private Float gLonx;
+
+    private Float gLaty;
+
+    @JsonIgnore
+    private String gPolygonGrid;
+
+    private List<String> bdCoords;
+
+    private Integer radius;
+
+    private String shapesType;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getStationRouteCode() {
+        return stationRouteCode;
+    }
+
+    public void setStationRouteCode(String stationRouteCode) {
+        this.stationRouteCode = stationRouteCode;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Integer getDirections() {
+        return directions;
+    }
+
+    public void setDirections(Integer directions) {
+        this.directions = directions;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
+    public String getStationMark() {
+        return stationMark;
+    }
+
+    public void setStationMark(String stationMark) {
+        this.stationMark = stationMark;
+    }
+
+    public Float getgLonx() {
+        return gLonx;
+    }
+
+    public void setgLonx(Float gLonx) {
+        this.gLonx = gLonx;
+    }
+
+    public Float getgLaty() {
+        return gLaty;
+    }
+
+    public void setgLaty(Float gLaty) {
+        this.gLaty = gLaty;
+    }
+
+    public String getgPolygonGrid() {
+        return gPolygonGrid;
+    }
+
+    public void setgPolygonGrid(String gPolygonGrid) {
+        this.gPolygonGrid = gPolygonGrid;
+    }
+
+    public Integer getRadius() {
+        return radius;
+    }
+
+    public void setRadius(Integer radius) {
+        this.radius = radius;
+    }
+
+    public String getShapesType() {
+        return shapesType;
+    }
+
+    public void setShapesType(String shapesType) {
+        this.shapesType = shapesType;
+    }
+
+    public List<String> getBdCoords() {
+        return bdCoords;
+    }
+
+    public void setBdCoords(List<String> bdCoords) {
+        this.bdCoords = bdCoords;
+    }
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
 }
 \ No newline at end of file
@@ -58,6 +58,8 @@ public class Dlb {
 	private int nylx;
 	//进场顺序（根据最先出场和最后进场来关联车辆的存电量）
 	private int jcsx;
+	
+	private String jname;
 	@Transient
 	private String name;
 	@Transient
@@ -73,7 +75,8 @@ public class Dlb {
 	private String fgsname;
-	private String lp="";
+	
+	private String lp;
 	public Integer getId() {
 		return id;
@@ -391,6 +394,14 @@ public class Dlb {
 	public void setLp(String lp) {
 		this.lp = lp;
 	}
+
+	public String getJname() {
+		return jname;
+	}
+
+	public void setJname(String jname) {
+		this.jname = jname;
+	}
@@ -26,6 +26,7 @@ public class Ylb {
 	private String fgsdm;
 	private String nbbm;
 	private String jsy;
+	private String jname;
 	private Double czlc=0.0;
 	private Double jzlc=0.0;
 	private Double czyl=0.0;
@@ -56,7 +57,7 @@ public class Ylb {
 	//进场顺序（根据最先出场和最后进场来关联车辆的存油量）
 	private int jcsx;
-	private String lp="";
+	private String lp;
 	@Transient
 	private String bglyh;
@@ -339,6 +340,14 @@ public class Ylb {
 	public void setLp(String lp) {
 		this.lp = lp;
 	}
+
+	public String getJname() {
+		return jname;
+	}
+
+	public void setJname(String jname) {
+		this.jname = jname;
+	}
 }
@@ -67,6 +67,10 @@ public class TTInfo extends BEntity {
     /** 最近备份日期 */
     private Date lastBackUpDate;
+    /** 线路版本（bsth_c_line_versions表对应字段） */
+    @Column(nullable = false)
+    private int lineVersion;
+
     public TTInfo() {}
     public TTInfo(Object id, Object xlid, Object name, Object nds, Object sds) {
         if (id != null) {
@@ -109,7 +113,9 @@ public class TTInfo extends BEntity {
                 .setUpdateUser(getUpdateBy() == null ? 0 : getUpdateBy().getId())
                 .setUpdateUserName(getUpdateBy() == null ? "" : getUpdateBy().getUserName())
                 .setCreateDate(getCreateDate() == null ? 0l : getCreateDate().getTime())
-                .setUpdateDate(getUpdateDate() == null ? 0l : getUpdateDate().getTime());
+                .setUpdateDate(getUpdateDate() == null ? 0l : getUpdateDate().getTime())
+                .setLineVersion(lineVersion)
+                ;
     }
@@ -216,4 +222,12 @@ public class TTInfo extends BEntity {
     public void setLastBackUpDate(Date lastBackUpDate) {
         this.lastBackUpDate = lastBackUpDate;
     }
+
+    public int getLineVersion() {
+        return lineVersion;
+    }
+
+    public void setLineVersion(int lineVersion) {
+        this.lineVersion = lineVersion;
+    }
 }
@@ -36,6 +36,10 @@ public class TTInfoBackup {
     @Lob
     private byte[] backUpInfo;
+    /** 线路版本（bsth_c_line_versions表对应字段） */
+    @Column(nullable = false)
+    private int lineVersion;
+
     public Long getId() {
         return id;
     }
@@ -91,4 +95,12 @@ public class TTInfoBackup {
     public void setBackUpInfo(byte[] backUpInfo) {
         this.backUpInfo = backUpInfo;
     }
+
+    public int getLineVersion() {
+        return lineVersion;
+    }
+
+    public void setLineVersion(int lineVersion) {
+        this.lineVersion = lineVersion;
+    }
 }
@@ -100,6 +100,10 @@ public class TTInfoDetail extends BEntity {
     /** 备注 */
     private String remark;
+    /** 线路版本（bsth_c_line_versions表对应字段） */
+    @Column(nullable = false)
+    private int lineVersion;
+
     /**
      * 输出proto生成的builder
      * @return
@@ -126,6 +130,7 @@ public class TTInfoDetail extends BEntity {
                 .setIsFB(isFB == null ? false : isFB)
                 .setIsTS(isTS == null ? false : isTS)
                 .setRemark(remark == null ? "" : remark)
+                .setLineVersion(lineVersion)
                 ;
     }
@@ -320,4 +325,12 @@ public class TTInfoDetail extends BEntity {
     public void setIsTS(Boolean isTS) {
         this.isTS = isTS;
     }
+
+    public int getLineVersion() {
+        return lineVersion;
+    }
+
+    public void setLineVersion(int lineVersion) {
+        this.lineVersion = lineVersion;
+    }
 }
@@ -17,7 +17,7 @@ public abstract class BaseFilter implements Filter {
 	 * 白名单
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT };
 	@Override
 	public void destroy() {
 package com.bsth.repository;
 import com.bsth.entity.CarDevice;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 /**
@@ -8,4 +13,6 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface CarDeviceRepository extends BaseRepository<CarDevice, Long> {
+	@Query(value="select s from CarDevice s where s.oldDeviceNo=?1 and s.qyrq>=?2 ")
+	List<CarDevice> findCarDevice(String device,Date date );
 }
@@ -15,4 +15,7 @@ public interface CarsRepository extends BaseRepository&lt;Cars, Integer&gt;{
 	@Query(value="select s from Cars s")
 	List<Cars> findCars();
+	
+	@Query(value="select s from Cars s where s.insideCode=?1")
+	List<Cars> findCarsByCode(String insideCode);
 }
@@ -172,9 +172,13 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	void isRoadSpeedUpd(Integer isR,Integer line,Integer directions);
 	@Modifying
-	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+10) where line = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
+	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+100) where line = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
 	public void sectionUpdSectionRouteCode(Integer line,Integer dir,Integer routeCod);
-	
+
+	@Modifying
+	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+100) where line_code = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
+	public void sectionUpdSectionRouteCode(String lineCode,Integer dir,int routeCod);
+
 	@Modifying
 	@Query(value="UPDATE bsth_c_sectionroute set destroy = 1 where id = ?1", nativeQuery=true)
 	public void sectionRouteIsDestroyUpdBatch(Integer id);
@@ -102,8 +102,79 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 				"select  MAX(station_route_code) as stationRouteCode   from bsth_c_stationroute r  WHERE  " +
 					"r.line=?1 and r.directions =?2 and station_route_code< ?3 and r.destroy = 0  ) and t.line=?1 and t.directions = ?2 AND t.destroy = 0", nativeQuery=true)
 	List<Object[]> findUpStationRouteCode(Integer lineId,Integer direction,Integer stationRouteCode);
-	
-	
+
+	/**
+	 * @Description :TODO(查询下个站点)
+	 *
+	 * @param map <lineId:线路ID； direction：方向；stationRouteCode：站点编码>
+	 *
+	 * @return List<Map<String, Object>>
+	 */
+	@Query(value = "SELECT a.stationRouteLine," +
+			" a.stationRouteStation," +
+			" a.stationRouteCode," +
+			" a.stationRouteLIneCode," +
+			" a.stationRouteStationMark," +
+			" a.stationOutStationNmber," +
+			" a.stationRoutedirections," +
+			" a.stationRouteDistances," +
+			" a.stationRouteToTime," +
+			" a.staitonRouteFirstTime," +
+			" a.stationRouteEndTime," +
+			" a.stationRouteDescriptions," +
+			" a.stationRouteDestroy," +
+			" a.stationRouteVersions," +
+			" a.stationRouteCreateBy," +
+			" a.stationRouteCreateDate," +
+			" a.stationRouteUpdateBy," +
+			" a.stationRouteUpdateDate," +
+			" b.id AS stationId," +
+			" b.station_cod AS stationCode," +
+			" a.stationRouteName," +
+			" b.road_coding AS stationRoadCoding," +
+			" b.db_type AS stationDbType," +
+			" b.b_jwpoints AS stationJwpoints," +
+			" b.g_lonx AS stationGlonx," +
+			" b.g_laty AS stationGlaty," +
+			" b.x AS stationX," +
+			" b.y AS stationY," +
+			" ST_AsText(b.b_polygon_grid) as stationBPolyonGrid," +
+			" ST_AsText(b.g_polygon_grid) AS stationGPloyonGrid, " +
+			" b.destroy AS stationDestroy," +
+			" b.radius AS stationRadius," +
+			" b.shapes_type AS stationShapesType," +
+			" b.versions AS stationVersions," +
+			" b.descriptions AS sttationDescriptions," +
+			" b.create_by AS stationCreateBy," +
+			" b.create_date AS stationCreateDate," +
+			" b.update_by AS stationUpdateBy," +
+			" b.update_date AS stationUpdateDate," +
+			" a.stationRouteId,b.station_name as zdmc "+
+			" FROM ( SELECT s.id AS stationRouteId," +
+			" s.line AS stationRouteLine," +
+			" s.station as stationRouteStation," +
+			" s.station_name AS stationRouteName," +
+			" s.station_route_code as stationRouteCode," +
+			" s.line_code AS stationRouteLIneCode," +
+			" s.station_mark AS stationRouteStationMark," +
+			" s.out_station_nmber AS stationOutStationNmber," +
+			" s.directions AS stationRoutedirections," +
+			" s.distances AS stationRouteDistances," +
+			" s.to_time AS stationRouteToTime," +
+			" s.first_time AS staitonRouteFirstTime," +
+			" s.end_time AS stationRouteEndTime," +
+			" s.descriptions AS stationRouteDescriptions," +
+			" s.destroy AS stationRouteDestroy," +
+			" s.versions AS stationRouteVersions," +
+			" s.create_by AS stationRouteCreateBy," +
+			" s.create_date AS stationRouteCreateDate," +
+			" s.update_by AS stationRouteUpdateBy," +
+			" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.station_route_code =(" +
+			"select  MIN(station_route_code) as stationRouteCode   from bsth_c_stationroute r  WHERE  " +
+			"r.line=?1 and r.directions =?2 and station_route_code > ?3 and r.destroy = 0  ) and s.line=?1 and s.directions = ?2 AND s.destroy = 0) a " +
+			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
+	List<Object[]> findDownStationRoute(Integer id,Integer direction,Integer stationRouteCode);
+
 	/**
 	 * @Description :TODO(站点中心点坐标查询)
 	 * 
@@ -95,4 +95,8 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
 	List<Dlb> queryListDlb(String rq,String nbbm,String jgh,String xlbm);
+
+	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and xlbm=?2",nativeQuery=true)
+	List<Dlb> queryDlbByRqXlbm(String rq, String xlbm);
+	
 }
@@ -49,13 +49,13 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select * from bsth_c_ylb where to_days(?1) -to_days(rq) <30 "
 			+ " and rq< ?1 and ssgsdm like %?2%"
 			+ " and fgsdm like %?3% and xlbm like %?4% and nbbm like %?5% "
-			+ " order by nbbm , rq desc,jcsx desc",nativeQuery=true)
+			+ " order by nbbm , rq desc,jcsx desc,lp desc",nativeQuery=true)
 	List<Ylb> listByRqJcsx(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
 	@Query(value="select * from bsth_c_ylb where rq>=?1 "
 			+ " and rq<= ?2 and ssgsdm =?3"
 			+ " and fgsdm =?4 and xlbm like %?5%  "
-			+ " order by nbbm , rq desc,jcsx desc",nativeQuery=true)
+			+ " order by nbbm , rq desc,jcsx desc,lp desc",nativeQuery=true)
 	List<Ylb> listByMonthJcsx(String rq,String rq2,String gsbm,String fgsbm,String xlbm);
 	/**
@@ -81,6 +81,9 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
 	List<Ylb> queryListYlb(String rq,String nbbm,String jgh,String xlbm);
+
+	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and xlbm=?2",nativeQuery=true)
+	List<Ylb> queryYlbByRqXlbm(String rq,String xlbm);
 	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4 order by ?5 asc",nativeQuery=true)
 	List<Ylb> checkYlb(String rq,String nbbm,String jgh,String xlbm,String px);
@@ -58,6 +58,12 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 			+ " lp_name,xl_name,cl_zbh",nativeQuery=true)
 	List<Object[]> historyMessageCount(String line,String date,String code);
+	@Query(value="SELECT r.xl_name,r.cl_zbh,d.sender,d.timestamp,d.txt_content "
+			+ " FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d "
+			+ " ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
+			+ " r.schedule_date_str = ?2 and r.cl_zbh =?3 ",nativeQuery=true)
+	List<Object[]> historyMessageList(String line,String date,String code);
+	
 	@Query(value = "select max(id) from ScheduleRealInfo")
 	Long getMaxId();
@@ -187,10 +193,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> scheduleByDateAndLineYbb(String line,String date,String date2);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate ) from ScheduleRealInfo s where s.xlBm like %?1% and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName ORDER BY clZbh,realExecDate,fcsj")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate,s.jName as jName ) from ScheduleRealInfo s where s.xlBm like %?1% and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName,jName ORDER BY clZbh,realExecDate,fcsj")
 	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String nbbm);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate ) from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName ORDER BY clZbh,realExecDate,fcsj")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate,s.jName as jName ) from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName,jName ORDER BY clZbh,realExecDate,fcsj")
 	List<Map<String,Object>> yesterdayDataList_eq(String line,String date,String gsbm,String fgsbm,String nbbm);
 	@Query(value="select s from ScheduleRealInfo s where s.scheduleDateStr = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
@@ -11,7 +11,9 @@ import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import javax.persistence.Tuple;
 import java.util.List;
+import java.util.Map;
 /**
  * Created by xu on 16/5/12.
@@ -31,4 +33,19 @@ public interface TTInfoRepository extends BaseRepository&lt;TTInfo, Long&gt; {
     @Query("select t from TTInfo t where t.xl = ?1 and t.isCancel = false")
     List<TTInfo> findInCanceledByXl(Line xl);
+
+    @Query(value = "select new map(lv.name as name, lv.startDate as sd, " +
+            "lv.status as status, lv.versions as version) " +
+            "from LineVersions lv where lv.line.id = ?1 ")
+    List<Map<String, Object>> findLineVersionDescs(Integer lineId);
+
+    @Query(value = "select new map(lv.name as name, lv.startDate as sd, " +
+            "lv.status as status, lv.versions as version) " +
+            "from LineVersions lv where lv.line.id = ?1 and lv.versions = ?2 ")
+    List<Map<String, Object>> findLineVersionDescs2(Integer lineId, Integer version);
+
+    @Query(value = "select new map(lv.name as name, lv.versions as version) " +
+            "from LineVersions lv where lv.line.id = ?1 and lv.status = ?2 ")
+    List<Map<String, Object>> findLineVersionDescs3(Integer lineId, Integer status);
+
 }
@@ -36,7 +36,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     public void configure(WebSecurity web) throws Exception {
         // 白名单
         web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
-                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL);
+                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT);
     }
     @Override
@@ -33,7 +33,7 @@ public class LoginInterceptor implements Filter {
 	 * 相比于 BaseFilter，此处对线调GPS请求进行了拦截验证
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT };
 	@Override
@@ -19,4 +19,6 @@ public interface BusIntervalService {
 	List<Map<String, Object>> lbStatuAnaly(Map<String, Object> map);
 	List<Map<String, Object>> correctStatis(Map<String, Object> map);
+
+	Map<String, Object> exportWaybillMore(Map<String, Object> map);
 }
 package com.bsth.service;
-import java.util.Map;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
 import com.bsth.entity.Line;
+import java.util.Map;
+
 /**
  * 
  * @Interface: LineService(线路service业务层实现接口)
@@ -38,4 +35,6 @@ public interface LineService extends BaseService&lt;Line, Integer&gt; {
 	String lineCodeVerification(String lineCode);
 	Map<String, Object> update(Line l);
+
+    Map<String,Object> remove(Integer id);
 }
@@ -37,4 +37,6 @@ public interface SectionService extends BaseService&lt;Section, Integer&gt; {
 	Map<String, Object> sectionCacheUpdate(Map<String, Object> map);
 	Map<String, Object> sectionCutSaveLineLS(Map<String, Object> map);
+
+    Map<String,Object> doubleName(Map<String, Object> map);
 }
@@ -72,9 +72,18 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	  * @return List<Map<String, Object>> 
 	  */
 	 List<Map<String, Object>> findUpStationRouteCode(Map<String, Object> map);
-	 
+
 	 List<Map<String, Object>> findCacheUpStationRouteCode(Map<String, Object> map);
-	 
+
+	/**
+	 * @Description :TODO(查询下一个站点)
+	 *
+	 * @param map <站点路由id; direction：方向；stationRouteCode：站点编码>
+	 *
+	 * @return List<Map<String, Object>>
+	 */
+	List<Map<String, Object>> findDownStationRoute(Map<String, Object> map);
+
 	 /**
 	  * @Description :TODO(查询线路某方向下所有站点的中心百度坐标)
 	  * 
@@ -658,7 +658,7 @@ public class FormsServiceImpl implements FormsService {
 			List<Singledata> list_=new ArrayList<Singledata>();
 			if(tjtype.equals("jsy")){
 				//油统计
-				String sql="select r.j_gh, r.xl_bm,r.cl_zbh"
+				String sql="select r.j_gh, r.xl_bm,r.cl_zbh,r.j_name"
 						+ " from bsth_c_s_sp_info_real r where "
 						+ " r.schedule_date_str = '"+startDate+"'";
 				if(xlbm.equals("")){
@@ -667,13 +667,14 @@ public class FormsServiceImpl implements FormsService {
 				}else{
 					sql += " and r.xl_bm = '"+xlbm+"'";
 				}
-			       sql += " group  by  r.j_gh,r.xl_bm,r.cl_zbh order by r.xl_bm,r.cl_zbh";
+			       sql += " group  by  r.j_gh,r.xl_bm,r.cl_zbh,r.j_name order by r.xl_bm,r.cl_zbh";
 			    list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 					@Override
 					public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
 						Singledata sin = new Singledata();
 						sin.setxL(arg0.getString("xl_bm"));
 						sin.setJsy(arg0.getString("j_gh"));
+						sin.setjName(arg0.getString("j_name"));
 						sin.setClzbh(arg0.getString("cl_zbh"));
 						return sin;
 					}
@@ -794,7 +795,7 @@ public class FormsServiceImpl implements FormsService {
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 					sin.setXlmc(BasicData.lineCode2NameMap.get(line));
 					sin.setrQ(startDate);
-					sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+//					sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
 					sin.setSgh("");
 					sin.setsName("");
 					sin.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
@@ -868,7 +869,7 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
-					sin.setxL(BasicData.lineCode2NameMap.get(line));
+					sin.setXlmc(BasicData.lineCode2NameMap.get(line));
 					sin.setClzbh(clzbh);
 					sin.setJsy("");
 					sin.setjName("");
@@ -876,8 +877,9 @@ public class FormsServiceImpl implements FormsService {
 					sin.setHyl("");
 					sin.setJzl("");
 					sin.setUnyyyl("");
+					list_.add(sin);
 				}
-				Collections.sort(list,new SingledataByXlbm());
+				Collections.sort(list_,new SingledataByXlbm());
 			}
 			return list_;
 		}
@@ -1380,7 +1382,11 @@ public class FormsServiceImpl implements FormsService {
 						sin.setClzbh(clzbh);
 						sin.setJsy(jsy);
 						sin.setrQ(startDate);
-						sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+						if(newList.size()>0){
+							sin.setjName(newList.get(0).getjName());
+						}else{
+							sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+						}
 						sin.setSgh("");
 						sin.setsName("");
 						sin.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
@@ -1458,7 +1464,11 @@ public class FormsServiceImpl implements FormsService {
 						sin.setClzbh(clzbh);
 						sin.setJsy(jsy);
 						sin.setrQ(startDate);
-						sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+						if(newList.size()>0){
+							sin.setjName(newList.get(0).getjName());
+						}else{
+							sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+						}
 						sin.setSgh("");
 						sin.setsName("");
 						sin.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
@@ -1539,7 +1549,7 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
-					sin.setxL(BasicData.lineCode2NameMap.get(line));
+					sin.setXlmc(BasicData.lineCode2NameMap.get(line));
 					sin.setClzbh(clzbh);
 					sin.setJsy("");
 					sin.setjName("");
@@ -1550,9 +1560,7 @@ public class FormsServiceImpl implements FormsService {
 				}
 				Collections.sort(list,new SingledataByXlbm());
 			}
-			
 			return list;
-			
 		}
 	// 运营服务阶段报表
-package com.bsth.service.geo_data;
-
-import com.bsth.entity.geo_data.GeoStation;
-
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/12/7.
- */
-public interface GeoDataService {
-
-
-    Map<String, Object> findGeoStations(String lineCode);
-
-
-    Map<String, Object> findGeoRoad(String lineCode);
-
-    Map<String, Object> updateBufferInfo(GeoStation station);
-
-    Map<String, Object> updateStationName(Map<String, Object> map);
-}
+package com.bsth.service.geo_data;
+
+import com.bsth.entity.geo_data.GeoRoad;
+import com.bsth.entity.geo_data.GeoStation;
+
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/12/7.
+ */
+public interface GeoDataService {
+
+
+    Map<String, Object> findGeoStations(String lineCode, Integer version);
+
+
+    Map<String, Object> findGeoRoad(String lineCode,Integer version);
+
+    Map<String, Object> updateBufferInfo(GeoStation station);
+
+    Map<String, Object> updateStationName(Map<String, Object> map);
+
+    Map<String,Object> addNewStationRoute(String lineCode, int upDown,int versions, String stationName, Float lat, Float lng, int prevRouteId);
+
+    Map<String,Object> destroyStation(GeoStation station);
+
+    Map<String,Object> updateRoadInfo(GeoRoad road);
+
+    Map<String,Object> destroyRoad(GeoRoad road);
+
+    Map<String,Object> addNewRoadRoute(String lineCode, int upDown, int versions, String sectionName,String crosesRoad, String coords, int prevRouteId);
+
+    Map<String,Object> findVersionInfo(String lineCode);
+
+    Map<String,Object> addNewLineVersion(Map<String, Object> map);
+
+    Map<String,Object> deleteLineVersion(String lineCode, int version);
+
+    Map<String,Object> findFutureVersion(String lineCode);
+
+    Map<String,Object> addEnableInfo(String lineCode, int version, String enableTime);
+}