Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents 7ae37be1 5ea684d3
Showing 41 changed files with 1903 additions and 662 deletions
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/directive/UpstreamEntrance.java
src/main/java/com/bsth/controller/excep/SpeedingController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/data/directive/DirectiveCreator.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/GeoUtils.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/gpsdata/thread/OfflineMonitorThread.java
src/main/java/com/bsth/data/msg_queue/DirectivePushQueue.java
src/main/java/com/bsth/data/msg_queue/WebSocketPushQueue.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
@@ -173,15 +173,10 @@ public class DirectiveController {
 	}
 	@RequestMapping(value = "/c0a4", method = RequestMethod.POST)
-	public int c0a4(@RequestParam String nbbm){
+	public Map<String, Object> c0a4(@RequestParam String nbbm){
 		return directiveService.sendC0A4(nbbm);
 	}
-//	@RequestMapping(value = "/c0a3", method = RequestMethod.POST)
-//	public int c0a3(@RequestParam DC0_A4 c0a4){
-//		return directiveService.sendC0A3(c0a4);
-//	}
-	
 	@RequestMapping(value = "/c0a3", method = RequestMethod.POST)
 	public int c0a3(String json){
 		json = StringEscapeUtils.unescapeHtml4(json);
@@ -192,7 +187,18 @@ public class DirectiveController {
 	@RequestMapping(value = "/c0a5", method = RequestMethod.POST)
 	public int c0a5(String json){
 		json = StringEscapeUtils.unescapeHtml4(json);
-		//DC0_A3 c0a3 = JSON.toJavaObject(JSONObject.parseObject(json), DC0_A3.class);
 		return directiveService.sendC0A5(json);
 	}
+
+	/**
+	 * 设备参数查询
+	 * @return
+	 */
+	@RequestMapping(value = "/deviceCofigList", method = RequestMethod.GET)
+	public Map<String, Object> deviceCofigList(
+			@RequestParam Map<String, String> map,
+			@RequestParam(defaultValue = "0") int page,
+			@RequestParam(defaultValue = "10") int size){
+		return directiveService.deviceCofigList(map, page, size);
+	}
 }
 package com.bsth.controller.directive;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +60,8 @@ public class UpstreamEntrance {
 					case 0x26:
 						// 驾驶员上报
 						D80 d80 = JSON.toJavaObject(jsonParam, D80.class);
-						pilotReport.report(d80);
+						if(d80!=null && StringUtils.isNotEmpty(d80.getDeviceId()))
+							pilotReport.report(d80);
 						break;
 					case 0xA4:
@@ -67,9 +69,9 @@ public class UpstreamEntrance {
 						data.put("posPort", data.getString("posPort").trim());
 						data.put("posIpAddress", data.getString("posIpAddress").trim());
 						data.put("ipAddress", data.getString("ipAddress").trim());
-						
+
 						DC0_A4 c0a4 = JSON.toJavaObject(jsonParam, DC0_A4.class);
-						System.out.println(c0a4);
+						pilotReport.report(c0a4);
 						break;
 					}
@@ -31,10 +31,8 @@ public class SpeedingController extends BaseController&lt;SysUser, Integer&gt;{
 		map.put("pageData","10");
 		pageObject=speedingService.Pagequery(map);
 		return pageObject;
-		
 	}
-
 	@RequestMapping(value = "/getReport", method = RequestMethod.POST)
 	public Map<String, Object> getReport(@RequestParam Map<String, Object> map) {
 		Map<String, Object> modelMap = new HashMap<String, Object>();
@@ -8,6 +8,7 @@ import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
@@ -110,6 +111,57 @@ public class GpsController {
     }
     /**
+     * 历史GPS查询 ，第三版轨迹回放用
+     * @param nbbm
+     * @param st
+     * @param et
+     * @return
+     */
+    @RequestMapping(value = "/history_v3/{nbbm}")
+    public Map<String, Object> history_v3(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et){
+        return gpsService.history_v3(nbbm, st, et);
+    }
+
+    /**
+     * 轨迹导出
+     * @param nbbm
+     * @param st
+     * @param et
+     * @return
+     */
+    @RequestMapping(value = "/history_v3/excel/{nbbm}")
+    public void trailExcel(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et, HttpServletResponse resp){
+        gpsService.trailExcel(nbbm, st, et, resp);
+    }
+
+    /**
+     * 轨迹异常数据导出
+     * @param nbbm
+     * @param st
+     * @param et
+     * @return
+     */
+    @RequestMapping(value = "/history_v3/excel_abnormal/{nbbm}")
+    public void abnormalExcel(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et, HttpServletResponse resp){
+        gpsService.abnormalExcel(nbbm, st, et, resp);
+    }
+
+    /**
+     * 到离站数据导出
+     * @param nbbm
+     * @param st
+     * @param et
+     * @return
+     */
+    @RequestMapping(value = "/history_v3/excel_arrival/{nbbm}")
+    public void arrivalExcel(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et, HttpServletResponse resp){
+        gpsService.arrivalExcel(nbbm, st, et, resp);
+    }
+
+
+
+
+    /**
      * 安全驾驶数据 分页查询
      * @param map
      * @param page
@@ -5,12 +5,15 @@ import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.entity.Line;
+import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.BiMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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.*;
@@ -145,4 +148,36 @@ public class BasicDataController {
 		}
 		return listMultimap.asMap();
 	}
+
+	/**
+	 * 获取车辆信息
+	 * @return
+	 */
+	@RequestMapping("/ccInfo/lineArray")
+	public List<Map<String, String>> ccInfoByLine(@RequestParam String idx){
+		List<String> lines = Splitter.on(",").splitToList(idx);
+		List<Map<String, String>> rs = new ArrayList<>();
+		Map<String, String> map;
+
+		//ArrayListMultimap<String, String> listMultimap = ArrayListMultimap.create();
+		Set<String> ks = BasicData.nbbm2LineMap.keySet();
+		BiMap<String,String> nbbm2deviceMap = BasicData.deviceId2NbbmMap.inverse();
+
+		Line line;
+		for(String nbbm : ks){
+			line = BasicData.nbbm2LineMap.get(nbbm);
+			if(lines.contains(line.getLineCode())){
+				map = new HashMap<>();
+				map.put("nbbm", nbbm);
+				map.put("deviceId", nbbm2deviceMap.get(nbbm));
+				map.put("lineName", line.getName());
+				map.put("lineCode", line.getLineCode());
+				rs.add(map);
+			}
+				//listMultimap.put(line.getName(), nbbm);
+		}
+		//return listMultimap.asMap();
+
+		return rs;
+	}
 }
@@ -101,4 +101,14 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 		//System.out.println(map);
 		return lineConfigService.yjtkSet(map);
 	}
+
+	/**
+	 * 修改场既是站的  停车场 和 站点
+	 * @param map
+	 * @return
+	 */
+	@RequestMapping(value = "/parkAndStationSet", method = RequestMethod.POST)
+	public Map<String, Object> parkAndStationSet(@RequestParam Map<String, String> map){
+		return lineConfigService.parkAndStationSet(map);
+	}
 }
@@ -294,6 +294,21 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
 	}
+	/**
+	 * 路单公里统计 （闵行审计专用）
+	 * @param jGh
+	 * @param clZbh
+	 * @param lpName
+	 * @param date
+	 * @param line
+	 * @return
+	 */
+	@RequestMapping(value="/findKMBC_mh_2",method = RequestMethod.GET)
+	public Map<String,Object> findKMBC_mh_2(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBC_mh_2(jGh, clZbh,lpName,date,line);
+	}
+
 	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
 	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
 			,@RequestParam String date,@RequestParam String line){
@@ -337,6 +352,20 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
 	}
+	/**
+	 * @Title queryListWaybill
+	 * @Description 查询行车路单列表（闵行审计专用路单）
+	 * @param jName 驾驶员名字
+	 * @param clZbh 车辆自编号（内部编号）
+	 * @param lpName 路牌
+	 * @return
+	 */
+	@RequestMapping(value="/queryListWaybill_mh_2",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybill_mh_2(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybill2(jName, clZbh,lpName,date,line);
+	}
+
 	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
 													 @RequestParam String date,@RequestParam String line){
@@ -349,6 +378,12 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
 	}
+	@RequestMapping(value="/statisticsDaily_mh_2")
+	public List<Map<String,Object>> statisticsDaily_mh_2(@RequestParam String line, @RequestParam String date,
+													@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDaily_mh_2(line, date, xlName, type);
+	}
+
 	@RequestMapping(value="/statisticsDailyTj")
 	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
 		String gsdm="";
@@ -404,6 +439,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.realScheduleList(line,date);
 	}
+	@RequestMapping(value="/realScheduleList_mh_2")
+	public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList_mh_2(line,date);
+	}
+
 	@RequestMapping(value="/realScheduleListQp")
 	public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
 		return scheduleRealInfoService.realScheduleListQp(line,date);
@@ -69,11 +69,21 @@ public class anomalyCheckController {
         DirectivePushQueue.start();
     }
+    @RequestMapping(value = "/directiveQueueSize")
+    public void directiveQueueSize(){
+        DirectivePushQueue.size();
+    }
+
     @RequestMapping(value = "/webSocketPushQueue")
     public void webSocketPushQueue(){
         WebSocketPushQueue.start();
     }
+    @RequestMapping(value = "/webSocketQueueSize")
+    public void webSocketQueueSize(){
+        WebSocketPushQueue.size();
+    }
+
     @RequestMapping(value = "/setHttpFlag")
     public void setHttpFlag(@RequestParam int flag){
         if(flag != 0 && flag != -1)
@@ -261,4 +261,17 @@ public class ReportController {
 		return service.userList(map);
 	}
+	@RequestMapping(value="/countLineMileage")
+	public List<Map<String,Object>> countLineMileage(@RequestParam Map<String, Object> map){
+		
+		return service.countByList(map);
+	}
+	
+	@RequestMapping(value="/countBusMileage")
+	public List<Map<String,Object>> countBusMileage(@RequestParam Map<String, Object> map){
+		
+		return service.countByBusList(map);
+	}
+	
+	
 }
 package com.bsth.data.directive;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.alibaba.fastjson.JSON;
 import com.bsth.data.BasicData;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D60.D60Data;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.D64.D64Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 
@@ -81,7 +80,7 @@ public class DirectiveCreator {
 	}
-	public D60 createD60_02(String nbbm, String text, int upDown, int state, Date alarmTime){
+	public D60 createD60_01(String nbbm, String text, int upDown, int state, Date alarmTime){
 		SimpleDateFormat sdfMMddHHmm = new SimpleDateFormat("MMddHHmm");
 		Long timestamp = System.currentTimeMillis();
@@ -102,7 +101,7 @@ public class DirectiveCreator {
 		directive.setMsgId(msgId);
 		// 构造数据
 		data.setDeviceId(deviceId);
-		data.setDispatchInstruct((short) 0x02);
+		data.setDispatchInstruct((short) 0x01);
 		data.setTimestamp(timestamp);
 		data.setCompanyCode(company);
 		data.setMsgId(msgId);
@@ -307,4 +307,28 @@ public class GpsEntity {
 	public void setSource(int source) {
 		this.source = source;
 	}
+
+	public void offline(){
+		this.setAbnormalStatus("offline");
+	}
+
+	public boolean isOnline(){
+		if(isOffline())
+			return false;
+
+		long t = System.currentTimeMillis();
+
+		if((t - this.getTimestamp()) > 1000 * 60){
+			return false;
+		}
+
+		if((this.getTimestamp() - t) > 1000 * 60 * 3){
+			return false;
+		}
+		return true;
+	}
+
+	public boolean isOffline(){
+		return this.getAbnormalStatus() != null && this.getAbnormalStatus().equals("offline");
+	}
 }
@@ -36,6 +36,9 @@ public class GeoCacheData {
     //线路路段走向
     private static ArrayListMultimap<String, LineString> sectionCacheMap;
+    //路段编码和名称对照
+    private static Map<String, String> sectionCode2Name;
+
     //线路站点路由
     private static ArrayListMultimap<String, StationRoute> stationCacheMap;
@@ -44,6 +47,8 @@ public class GeoCacheData {
     //停车场
     public static Map<String, Polygon> tccMap;
+    //停车场
+    public static Map<String, com.bsth.util.Geo.Polygon> tccMap2;
     //线路限速信息
     private static Map<String, Double> speedLimitMap;
@@ -78,6 +83,10 @@ public class GeoCacheData {
         }
     }
+    public static Map<String, String> sectionCode2NameMap(){
+        return sectionCode2Name;
+    }
+
     public static StationRoute getRouteCode(GpsEntity gps) {
         return routeCodeMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo());
     }
@@ -135,7 +144,7 @@ public class GeoCacheData {
     }
     private void loadRoadsData() {
-        String sql = "select r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) as GSECTION_VECTOR, r.DIRECTIONS from bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section=s.id where r.destroy=0 and GSECTION_VECTOR is not null order by line_code,directions,sectionroute_code";
+        String sql = "select r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) as GSECTION_VECTOR, r.DIRECTIONS, s.CROSES_ROAD from bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section=s.id where r.destroy=0 and GSECTION_VECTOR is not null order by line_code,directions,sectionroute_code";
         List<Map<String, Object>> secList = jdbcTemplate.queryForList(sql);
         String polygonStr, key;
@@ -143,9 +152,22 @@ public class GeoCacheData {
         int i, len;
         ArrayListMultimap<String, LineString> sectionCacheTempMap = ArrayListMultimap.create();
+        Map<String, String> sectionCode2NameTemp = new HashMap<>();
+
         Coordinate[] cds;
         String[] temps1, temps2;
+        String name = null, code;
         for (Map<String, Object> tMap : secList) {
+            //编码和名称对照
+            if(tMap.get("CROSES_ROAD") != null && StringUtils.isNotEmpty(tMap.get("CROSES_ROAD").toString()))
+                name = tMap.get("CROSES_ROAD").toString();
+            else if(tMap.get("SECTION_NAME") != null && StringUtils.isNotEmpty(tMap.get("SECTION_NAME").toString()))
+                name = tMap.get("SECTION_NAME").toString();
+
+            code = tMap.get("SECTION_CODE").toString();
+            sectionCode2NameTemp.put(code, name);
+
+            //空间数据映射
             polygonStr = tMap.get("GSECTION_VECTOR").toString();
             key = tMap.get("LINE_CODE") + "_" + tMap.get("DIRECTIONS");
@@ -166,6 +188,8 @@ public class GeoCacheData {
         if(sectionCacheTempMap.size() > 0)
             sectionCacheMap = sectionCacheTempMap;
+        if(sectionCode2NameTemp.size() > 0)
+            sectionCode2Name = sectionCode2NameTemp;
     }
     private void loadTccMapData(){
@@ -185,8 +209,31 @@ public class GeoCacheData {
                 logger.error("停车场：" + tMap.get("PARK_CODE"), e);
             }
         }
-        if (tccTempMap.size() > 0)
+        if (tccTempMap.size() > 0){
             tccMap = tccTempMap;
+            tccMap2 = convertPolygonMap(tccMap);
+        }
+    }
+
+    private Map<String, com.bsth.util.Geo.Polygon> convertPolygonMap(Map<String, Polygon> tccMap) {
+        Map<String, com.bsth.util.Geo.Polygon> rsMap = new HashMap<>();
+        Set<String> ks = tccMap.keySet();
+        for(String k : ks){
+            rsMap.put(k, convertPolygon(tccMap.get(k)));
+        }
+        return rsMap;
+    }
+
+    public static com.bsth.util.Geo.Polygon convertPolygon(Polygon polygon) {
+        List<com.bsth.util.Geo.Point> ps = new ArrayList<>();
+        com.bsth.util.Geo.Point p;
+
+        Coordinate[] cs = polygon.getCoordinates();
+        for(int i = 0; i < cs.length;i ++){
+            p = new com.bsth.util.Geo.Point(cs[i].y, cs[i].x);
+            ps.add(p);
+        }
+        return new com.bsth.util.Geo.Polygon(ps);
     }
     private void loadStationRoutesData(){
@@ -96,9 +96,15 @@ public class InOutStationSignalHandle extends SignalHandle{
         }
         //从站内到另一个站内
-        if(prev.getInstation() > 0 && gps.getInstation() > 0
-                && !prev.getStopNo().equals(gps.getStopNo()))
+        if(prev.getInstation() == 1 && gps.getInstation() == 1
+                && !prev.getStopNo().equals(gps.getStopNo())
+                && !prev.getStation().getName().equals(gps.getStation().getName()))
             return true;
+
+        //从场内到站内
+        if(prev.getInstation() == 2 && gps.getInstation() == 1){
+            return true;
+        }
         return false;
     }
@@ -3,7 +3,10 @@ package com.bsth.data.gpsdata.arrival.utils;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
-import com.vividsolutions.jts.geom.*;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.Point;
 import java.util.List;
 import java.util.Map;
@@ -26,7 +29,7 @@ public class GeoUtils {
      */
     public static StationRoute gpsInStation(GpsEntity gps, List<StationRoute> srs) {
         Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
-        double min = -1, distance, distance2;
+        double min = -1, distance;
         StationRoute stationRoute = null;
         for (StationRoute sr : srs) {
@@ -43,7 +46,13 @@ public class GeoUtils {
                 }
             } else {
                 //多边形
-                if (sr.getPolygon().contains(point)) {
+                /*if (sr.getPolygon().contains(point)) {
+                    stationRoute = sr;
+                    break;
+                }*/
+                com.bsth.util.Geo.Polygon polygon2 = GeoCacheData.convertPolygon(sr.getPolygon());
+                com.bsth.util.Geo.Point point2 = new com.bsth.util.Geo.Point(gps.getLon(), gps.getLat());
+                if(com.bsth.util.Geo.GeoUtils.isPointInPolygon(point2, polygon2)){
                     stationRoute = sr;
                     break;
                 }
@@ -125,7 +134,6 @@ public class GeoUtils {
      * gps 是否在某个停车场内
      * @param gps
      * @return
-     */
     public static String gpsInCarpark(GpsEntity gps){
         Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
@@ -139,6 +147,25 @@ public class GeoUtils {
             }
         }
         return null;
+    }*/
+
+    /**
+     * gps 是否在某个停车场内
+     * @param gps
+     * @return
+     */
+    public static String gpsInCarpark(GpsEntity gps){
+        com.bsth.util.Geo.Point point = new com.bsth.util.Geo.Point(gps.getLon(), gps.getLat());
+        Map<String, com.bsth.util.Geo.Polygon> carparkMap = GeoCacheData.tccMap2;
+        com.bsth.util.Geo.Polygon polygon;
+        Set<String> codes = carparkMap.keySet();
+        for(String code : codes){
+            polygon = carparkMap.get(code);
+            if(com.bsth.util.Geo.GeoUtils.isPointInPolygon(point, polygon)){
+                return code;
+            }
+        }
+        return null;
     }
     /**
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=143";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=173";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -45,7 +45,7 @@ public class OfflineMonitorThread extends Thread{
                     continue;
                 if (t - gps.getTimestamp() > LOSE_TIME){
-                    gps.setAbnormalStatus("offline");
+                    gps.offline();
                     //通知页面有设备掉线
                     sendUtils.deviceOffline(gps);
@@ -10,7 +10,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
-import java.util.LinkedList;
+import java.util.concurrent.ConcurrentLinkedQueue;
 /**
  * 到网关的指令推送队列 （系统发送的队列， 用户手动发送的不走这里）
@@ -19,14 +19,14 @@ import java.util.LinkedList;
 @Component
 public class DirectivePushQueue implements CommandLineRunner, ApplicationContextAware {
-    static LinkedList<QueueData_Directive> linkedList;
+    static ConcurrentLinkedQueue<QueueData_Directive> linkedList;
     static DataPushThread thread;
     static DirectiveService directiveService;
     static long t;
     static final int IDLE_TIME = 1000 * 30;
     static {
-        linkedList = new LinkedList<>();
+        linkedList = new ConcurrentLinkedQueue<>();
     }
     public static void put6002(ScheduleRealInfo sch, int finish, String sender){
@@ -71,10 +71,15 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
         if(thread != null){
             thread.interrupt();
         }
+        linkedList.clear();
         thread = new DataPushThread();
         thread.start();
     }
+    public static int size(){
+        return linkedList.size();
+    }
+
     @Override
     public void run(String... strings) throws Exception {
         start();
@@ -96,7 +101,7 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
             String code;
             while (true) {
                 try {
-                    qd = linkedList.pollFirst();
+                    qd = linkedList.poll();
                     if (qd != null) {
                         sleepFlag = false;
                         code = qd.getCode();
@@ -124,13 +129,15 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
                     t = System.currentTimeMillis();
                 }
                 catch(InterruptedException e){
+                    log.error("", e);
                     break;
                 }
                 catch (Exception e) {
                     log.error("", e);
                 }
-
             }
+
+            log.warn("DirectivePushQueue is break...");
         }
     }
 }
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
-import java.util.LinkedList;
+import java.util.concurrent.ConcurrentLinkedQueue;
 /**
  * 线调web socket 推送队列
@@ -17,14 +17,14 @@ import java.util.LinkedList;
 @Component
 public class WebSocketPushQueue implements CommandLineRunner {
-    static LinkedList<QueueData> linkedList;
+    static ConcurrentLinkedQueue<QueueData> linkedList;
     static DataPushThread thread;
     static Logger log = LoggerFactory.getLogger(WebSocketPushQueue.class);
     static long t;
     static final int IDLE_TIME = 1000 * 30;
     static {
-        linkedList = new LinkedList();
+        linkedList = new ConcurrentLinkedQueue();
     }
     public static boolean isIdle() {
@@ -45,10 +45,15 @@ public class WebSocketPushQueue implements CommandLineRunner {
         if (thread != null) {
             thread.interrupt();
         }
+        linkedList.clear();
         thread = new DataPushThread();
         thread.start();
     }
+    public static int size(){
+        return linkedList.size();
+    }
+
     @Override
     public void run(String... strings) throws Exception {
         start();
@@ -66,7 +71,7 @@ public class WebSocketPushQueue implements CommandLineRunner {
             boolean sleepFlag = false;
             while (true) {
                 try {
-                    qd = linkedList.pollFirst();
+                    qd = linkedList.poll();
                     if (qd != null) {
                         sleepFlag = false;
                         session = qd.getSession();
@@ -84,11 +89,14 @@ public class WebSocketPushQueue implements CommandLineRunner {
                     }
                     t = System.currentTimeMillis();
                 } catch (InterruptedException e) {
+                    log.error("", e);
                     break;
                 } catch (Exception e) {
                     log.error("", e);
                 }
             }
+
+            log.warn("WebSocketPushQueue is break...");
         }
     }
 }
@@ -8,13 +8,16 @@ import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.Line;
 import com.bsth.entity.directive.D80;
+import com.bsth.entity.directive.DC0_A4;
 import com.bsth.entity.realcontrol.D80ReplyTemp;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D80Repository;
+import com.bsth.repository.directive.DC0A4Repository;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.collect.ArrayListMultimap;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +30,7 @@ import java.util.List;
 /**
  * 
  * @ClassName: PilotReport 
- * @Description: TODO(驾驶员上报) 
+ * @Description: TODO(设备80协议上报处理)
  * @author PanZhao
  * @date 2016年8月14日 下午11:37:51 
  *
@@ -37,31 +40,26 @@ public class PilotReport {
 	@Autowired
 	D80Repository d80Repository;
-	
 	@Autowired
 	DayOfSchedule dayOfSchedule;
-	
 	@Autowired
 	LineConfigData lineConfigData;
-	
 	@Autowired
 	DirectiveService directiveService;
-	
 	@Autowired
 	GpsRealData gpsRealData;
-	
 	@Autowired
 	SendUtils sendUtils;
-	
-	//private static ScheduleComparator.FCNO schComp;
-	
+
+	@Autowired
+	DC0A4Repository dc0A4Repository;
+
 	private static ArrayListMultimap<String, D80> d80MultiMap;
 	Logger logger = LoggerFactory.getLogger(PilotReport.class);
 	static{
 		d80MultiMap = ArrayListMultimap.create();
-		//schComp = new ScheduleComparator.FCNO();
 	}
 	public void report(D80 d80){
@@ -95,22 +93,31 @@ public class PilotReport {
 		case 0xA5:
 			//进场请求
-			ScheduleRealInfo inSch = dayOfSchedule.nextByBcType(nbbm, "in");
+			//ScheduleRealInfo inSch = dayOfSchedule.nextByBcType(nbbm, "in");
 			//如果有对应出场班次
-			if(inSch != null){
-				d80.setRemarks("计划进场时间：" + inSch.getDfsj());
+			//if(inSch != null){
+				/*d80.setRemarks("计划进场时间：" + inSch.getDfsj());
 				//当前GPS位置
 				GpsEntity gps = gpsRealData.get(d80.getDeviceId());
 				if(null != gps)
-					d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));
-			}else
-				d80.setRemarks("没有进场计划");
+					d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));*/
+			//}/*else
+			//	d80.setRemarks("没有进场计划");*/
 			break;
 		}
 		//推送到页面
 		sendUtils.send80ToPage(d80);
 	}
+
+	public void report(DC0_A4 c0a4){
+		String deviceId = c0a4.getData().getDeviceId();
+		if(StringUtils.isNotEmpty(deviceId))
+			c0a4.setId(deviceId);
+
+		//入库
+		dc0A4Repository.save(c0a4);
+	}
 	/**
 	 * 
@@ -121,7 +128,7 @@ public class PilotReport {
 		String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
 		Short reqCode = d80.getData().getRequestCode();
 		//默认短语回复
-		defaultReply(nbbm, reqCode, d80.getConfirmRs() == 0?true:false);
+		//defaultReply(nbbm, reqCode, d80.getConfirmRs() == 0?true:false);
 		switch (reqCode) {
 		case 0xA3:
@@ -181,7 +188,7 @@ public class PilotReport {
 				sch.setZdsjActualAll(d80.getTimestamp());
 				//没有里程的进场班次
-				if(sch.getBcsj() == null && sch.getJhlc() == null)
+				if(isEmpty(sch.getBcsj()) && isEmpty(sch.getJhlc()))
 					sch.setFcsjActualAll(d80.getTimestamp());
 				dayOfSchedule.save(sch);
@@ -190,6 +197,14 @@ public class PilotReport {
 			}
 		}
 	}
+
+	public boolean isEmpty(Integer v){
+		return v == null || v.equals(0);
+	}
+
+	public boolean isEmpty(Double v){
+		return v == null || v.equals(0);
+	}
 	public void defaultReply(String nbbm, short requestCode, boolean agree){
 		Line line = BasicData.nbbm2LineMap.get(nbbm);
@@ -4,9 +4,12 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
+import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -579,6 +582,37 @@ public class DayOfSchedule {
     }
     /**
+     * 下一个班次
+     * @param list 班次集合
+     * @param sch 当前班次
+     * @return
+     */
+    private ScheduleRealInfo next2(Collection<ScheduleRealInfo> list , ScheduleRealInfo sch){
+        int outConfig = -1;
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (config != null)
+            outConfig = config.getOutConfig();
+
+        boolean flag = false;
+        ScheduleRealInfo next = null;
+        for (ScheduleRealInfo temp : list) {
+            if (temp.getId() == sch.getId()) {
+                flag = true;
+                continue;
+            }
+            //忽略烂班
+            if (temp.isDestroy())
+                continue;
+
+            if (flag) {
+                next = temp;
+                break;
+            }
+        }
+        return next;
+    }
+
+    /**
      * 上一个班次
      *
      * @param sch
@@ -906,7 +940,22 @@ public class DayOfSchedule {
     public void reCalcExecPlan(String nbbm){
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
         Collections.sort(list, schFCSJComparator);
-        carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(list));
+
+        ScheduleRealInfo sch = schAttrCalculator.calcCurrentExecSch(list);
+        carExecutePlanMap.put(nbbm, sch);
+
+        try {
+            GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
+            if(gps != null && gps.isOnline()){
+                if(StringUtils.isNotEmpty(gps.getLineId()) && !gps.getLineId().equals(sch.getXlBm())){
+                    //下发线路切换指令
+                    DirectivePushQueue.put64(nbbm, sch.getXlBm(), "系统");
+                    logger.info("车辆" + nbbm + "切换至" + sch.getXlBm() + " -原" + gps.getLineId() + " --重新计算当前执行班次！");
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
     }
     /**
@@ -1016,6 +1065,17 @@ public class DayOfSchedule {
         return next(list, sch);
     }
+    /**
+     * 获取该班次所在路牌的下一个班次，不考虑场既是站
+     * @param sch
+     * @return
+     */
+    public ScheduleRealInfo nextByLp2(ScheduleRealInfo sch) {
+        List<ScheduleRealInfo> list = lpScheduleMap.get(sch.getXlBm() + "_" + sch.getLpName());
+        Collections.sort(list, schFCSJComparator);
+        return next2(list, sch);
+    }
+
     public ArrayListMultimap<String, ScheduleRealInfo> getLpScheduleMap(){
         return lpScheduleMap;
     }
@@ -49,25 +49,25 @@ public class SchAttrCalculator {
 			if (null == sch.getFcsjT())
 				calcFcsjTime(sch);
-			//計發時間
+			//计发時間
 			if(sch.getFcsj().compareTo(conf.getStartOpt()) < 0){
 				sch.setFcsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsj()) + DAY_TIME);
 			}
-			//待發時間
+			//待发時間
 			if(sch.getDfsj().compareTo(conf.getStartOpt()) < 0){
 				sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()) + DAY_TIME);
 			}
 			else
 				sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()));
-			//實發時間
+			//实发時間
 			if(StringUtils.isNotEmpty(sch.getFcsjActual()) &&
 					sch.getFcsjActual().compareTo(conf.getStartOpt()) < 0){
 				sch.setFcsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsjActual()) + DAY_TIME);
 			}
-			//實際終點時間
+			//实际终点時間
 			if(StringUtils.isNotEmpty(sch.getZdsjActual()) &&
 					sch.getZdsjActual().compareTo(conf.getStartOpt()) < 0){
 				sch.setZdsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getZdsjActual()) + DAY_TIME);
@@ -119,7 +119,7 @@ public class SchAttrCalculator {
 			if(prve.getZdzName().equals(curr.getQdzName())
 					|| prve.getZdzCode().equals(curr.getQdzCode())){
-				curr.setQdzArrDateJH(prve.getZdsj());
+				curr.setQdzArrDatejh(prve.getZdsj());
 				if(StringUtils.isNotEmpty(prve.getZdsjActual()))
 					curr.setQdzArrDatesj(prve.getZdsjActual());
 			}
@@ -147,16 +147,16 @@ public class SchAttrCalculator {
 			if(prve.getZdzName().equals(curr.getQdzName())
 					|| prve.getZdzCode().equals(curr.getQdzCode())){
-				if(curr.getQdzArrDateJH() != null && prve.getZdsj().equals(curr.getQdzArrDateJH())){
+				if(curr.getQdzArrDatejh() != null && prve.getZdsj().equals(curr.getQdzArrDatejh())){
 					prve = curr;
 					continue;
 				}
-				curr.setQdzArrDateJH(prve.getZdsj());
+				curr.setQdzArrDatejh(prve.getZdsj());
 				updateList.add(curr);
 			}
 			else{
-				curr.setQdzArrDateJH(null);
+				curr.setQdzArrDatejh(null);
 				updateList.add(curr);
 			}
 			prve = curr;
@@ -54,8 +54,9 @@ public class FormLogger {
             cc.setFgs(sch.getFgsBm());
             cc.setXl(sch.getXlBm());
             cc.setLp(sch.getLpName());
-            cc.setFssj(fmtHHmm.print(d.getTime()));
+            cc.setFssj(sch.getFcsj());
             cc.setXgsj(fmtHHmm.print(d.getTime()));
+            cc.setsId(sch.getId());
             if(user != null)
                 cc.setXgr(user.getUserName());
@@ -31,7 +31,7 @@ public class ScheduleLateThread extends Thread{
 	@Autowired
 	SendUtils sendUtils;
-	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.FCSJ();
+	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.DFSJ();
 	@Override
 	public void run() {
@@ -54,7 +54,7 @@ public class ScheduleLateThread extends Thread{
 					&& StringUtils.isEmpty(sch.getFcsjActual())){
 				//检查应发未到 当前班次无起点到达时间
-				if(StringUtils.isEmpty(sch.getQdzArrDateSJ())){
+				if(StringUtils.isEmpty(sch.getQdzArrDatesj())){
 					ScheduleRealInfo prev = dayOfSchedule.prev(sch);
 					//上一个班次也没有实际终点到达时间
 					if(prev != null && StringUtils.isEmpty(prev.getZdsjActual())){
@@ -13,13 +13,21 @@ import javax.persistence.*;
 @Entity
 @Table(name = "bsth_v_C0_A4")
 public class DC0_A4 extends Directive{
-	
+
+
 	@Id
-	@GeneratedValue
-	private Integer id;
+	private String id;
 	private DC0A4Data data;
-	
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
 	@Embeddable
 	public static class DC0A4Data {
 		/**
@@ -164,14 +172,6 @@ public class DC0_A4 extends Directive{
 		}
 	}
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
 	public DC0A4Data getData() {
 		return data;
 	}
@@ -74,6 +74,13 @@ public class Speeding {
 	@Transient
 	private String lpname;
+	//结束时间，单位：秒/s
+	@Transient
+	private Long endtimestamp;
+	
+	@Transient
+	private String endtimestampDate;
+	
 	/**
 	 * 	创建时间
 	 */
@@ -169,6 +176,14 @@ public class Speeding {
 		this.timestampDate = timestampDate;
 	}
+	public String getEndtimestampDate() {
+		return endtimestampDate;
+	}
+
+	public void setEndtimestampDate(String endtimestampDate) {
+		this.endtimestampDate = endtimestampDate;
+	}
+
 	public String getNbbm() {
 		return nbbm;
 	}
@@ -193,6 +208,12 @@ public class Speeding {
 		this.lpname = lpname;
 	}
+	public Long getEndtimestamp() {
+		return endtimestamp;
+	}
+	public void setEndtimestamp(Long endtimestamp) {
+		this.endtimestamp = endtimestamp;
+	}
 }
@@ -648,22 +648,6 @@ public class ScheduleRealInfo {
 		return ("schedule_" + this.id).hashCode();
 	}
-	public String getQdzArrDateJH() {
-		return qdzArrDatejh;
-	}
-
-	public void setQdzArrDateJH(String qdzArrDateJH) {
-		this.qdzArrDatejh = qdzArrDateJH;
-	}
-
-	public String getQdzArrDateSJ() {
-		return qdzArrDatesj;
-	}
-
-	public void setQdzArrDateSJ(String qdzArrDateSJ) {
-		this.qdzArrDatesj = qdzArrDateSJ;
-	}
-
 	public boolean isSflj() {
 		return sflj;
 	}
+package com.bsth.repository.directive;
+
+import com.bsth.entity.directive.DC0_A4;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * C0_A4 设备回复（设备参数）
+ * Created by panzhao on 2017/6/28.
+ */
+@Repository
+public interface DC0A4Repository extends BaseRepository<DC0_A4, String>{
+}
@@ -86,7 +86,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	D64 save64(D64 d64);
-	int sendC0A4(String nbbm);
+	Map<String, Object> sendC0A4(String nbbm);
 	int sendC0A3(DC0_A3 c0a4);
@@ -95,4 +95,6 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
     int refreshLineFile(String deviceId);
     int stateChange(String nbbm, Integer upDown, Integer state, String userName);
+
+    Map<String,Object> deviceCofigList(Map<String, String> map, int page, int size);
 }
@@ -18,6 +18,7 @@ import com.bsth.repository.directive.D60Repository;
 import com.bsth.repository.directive.D64Repository;
 import com.bsth.repository.directive.D80Repository;
 import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.directive.dto.DeviceConfigDto;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.websocket.handler.RealControlSocketHandler;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -29,6 +30,8 @@ import org.joda.time.format.DateTimeFormatter;
 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.stereotype.Service;
 import java.util.*;
@@ -36,486 +39,540 @@ import java.util.*;
 @Service
 public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implements DirectiveService {
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	D60Repository d60Repository;
-
-	@Autowired
-	GpsRealData gpsRealDataBuffer;
-
-	@Autowired
-	D64Repository d64Repository;
-
-	@Autowired
-	RealControlSocketHandler socketHandler;
-
-	@Autowired
-	D80Repository d80Repository;
-	
-	@Autowired
-	DayOfDirectives dayOfDirectives;
-	
-	@Autowired
-	PilotReport pilotReport;
-	
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-	
-	//static Long schDiff = 1000 * 60 * 60L;
-
-	private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm")
-				,fmtHHmm_CN = DateTimeFormat.forPattern("HH点mm分");
-
-	@Override
-	public int send60Phrase(String nbbm, String text, String sender) {
-		D60 d60 = null;
-		try {
-			d60 = create60Data(nbbm, text, (short) 0x00, null);
-		} catch (Exception e) {
-			logger.error("发送消息短语出现异常", e);
-			return -1;
-		}
-
-		if (null == d60)
-			return -1;
-
-		// 发送指令
-		int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
-		if(null != sender)
-			d60.setSender(sender);
-		d60.setHttpCode(code);
-
-		if (code == 0) {
-			// 添加到缓存
-			dayOfDirectives.put60(d60, true);
-		}
-		else{
-			d60.setErrorText("网关通讯失败, code: " + code);
-			d60Repository.save(d60);
-			dayOfDirectives.put60(d60, false);
-		}
-		return code;
-	}
-
-	@Override
-	public int send60Dispatch(ScheduleRealInfo sch, int finish, String sender) {
-		D60 d60 = null;
-		try {
-			if(sch.isDestroy()){
-				logger.warn("烂班不允许发送调度指令....");
-				return -1;
-			}
-			String text = "已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
-					+ sch.getQdzName() + "发往" + sch.getZdzName();
-
-			//下发0x02指令  调度指令(闹钟有效)
-			Long alarmTime = System.currentTimeMillis() + 1000 * 30;
-			d60 = new DirectiveCreator().createD60_02(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
-					, 0, new Date(alarmTime));
-		} catch (Exception e) {
-			logger.error("生成调度指令时出现异常", e);
-			return -1;
-		}
-		
-		if (null == d60)
-			return -1;
-		
-		d60.setSender(sender);
-		
-		JSONObject jObj = JSON.parseObject(JSON.toJSONString(d60));
-		
-		//进场或者出场班次时，附加lock 标识
-		if(null != sch.getBcType()
-				&& (sch.getBcType().equals("out") || sch.getBcType().equals("in"))){
-			
-			jObj.put("lock", 1);
-		}
-		
-		// 发送指令
-		int code = GatewayHttpUtils.postJson(jObj.toJSONString());
-
-		d60.setDispatch(true);
-		d60.setSch(sch);
-		d60.setHttpCode(code);
-
-		if (code == 0) {
-			sch.setDirectiveState(60);
-			// 添加到缓存，延迟入库
-			dayOfDirectives.put60(d60, true);
-			// 通知页面
-			sendD60ToPage(sch);
-		}
-		else{
-			d60.setErrorText("网关通讯失败, code: " + code);
-			dayOfDirectives.put60(d60, false);
-			d60Repository.save(d60);
-		}
-		return code;
-	}
-
-	/**
-	 * 
-	 * @Title: sendDirectiveState @Description: TODO(向页面推送班次指令状态) @throws
-	 */
-	@Override
-	public void sendD60ToPage(ScheduleRealInfo sch) {
-		Map<String, Object> map = new HashMap<>();
-		map.put("fn", "directive");
-		map.put("t", sch);
-		
-		ObjectMapper mapper = new ObjectMapper();
-		
-		try {
-			socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
-		} catch (JsonProcessingException e) {
-			logger.error("", e);
-		}
-	}
-
-	@Override
-	public int send60Dispatch(Long id, String sender) {
-		ScheduleRealInfo sch = dayOfSchedule.get(id);
-		// 车辆已完成班次
-		int finish = dayOfSchedule.doneSum(sch.getClZbh());
-		return send60Dispatch(sch, finish, sender);
-	}
-
-	@Override
-	public int send60Operation(String nbbm, int state, int upDown, ScheduleRealInfo sch, String sender) {
-		logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
-
-		String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
-		D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state);
-
-		if (null == d60)
-			return -1;
-		if(null != sender)
-			d60.setSender(sender);
-		else
-			d60.setSender("系统");
-		// 发送指令
-		int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
-		// 添加到缓存，等待入库
-		d60.setHttpCode(code);
-		if (null != sch)
-			d60.setSch(sch);
-
-
-		if (code == 0) {
-			dayOfDirectives.put60(d60, true);
-		}
-		else{
-			d60.setErrorText("网关通讯失败, code: " + code);
-			d60Repository.save(d60);
-			dayOfDirectives.put60(d60, false);
-		}
-		return code;
-	}
-
-	/**
-	 * 线路切换
-	 */
-	@Override
-	public int lineChange(String nbbm, String lineCode, String sender) {
-		return lineChangeByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm), lineCode, sender);
-	}
-
-
-	@Override
-	public int lineChangeByDeviceId(String deviceId, String lineCode, String sender){
-		DirectiveCreator crt = new DirectiveCreator();
-		Long t = System.currentTimeMillis();
-		//生成64数据包
-		D64 d64 = crt.create64(deviceId, lineCode, t);
-
-		if(null != sender)
-			d64.setSender(sender);
-		else
-			d64.setSender("系统");
-
-		//String deviceId = d64.getDeviceId();
-		int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64));
-		// 入库
-		d64.setHttpCode(code);
-		d64.getData().setTxtContent("切换线路[" + lineCode + "]");
-		dayOfDirectives.put64(d64);
-
-		// 通知设备刷新线路文件，忽略结果
-		if (code == 0)
-			GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
-		else
-			d64.setErrorText(" 网关通讯失败, code: " + code);
-
-		d64Repository.save(d64);
-		return code;
-	}
-
-	public D60 create60Data(String nbbm, String text, Short dispatchInstruct, ScheduleRealInfo sch) {
-
-		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-		if (null == deviceId) {
-			logger.error("没有设备号对照的车辆：" + nbbm);
-			return null;
-		}
-		// 根据当前GPS确定 上下行和营运状态
-		Byte upDown = null;
-		Integer state = null;
-		if (null == sch) {
-			GpsEntity gpsData = gpsRealDataBuffer.get(deviceId);
-			if (null == gpsData) {
-				/*
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    D60Repository d60Repository;
+
+    @Autowired
+    GpsRealData gpsRealDataBuffer;
+
+    @Autowired
+    D64Repository d64Repository;
+
+    @Autowired
+    RealControlSocketHandler socketHandler;
+
+    @Autowired
+    D80Repository d80Repository;
+
+    @Autowired
+    DayOfDirectives dayOfDirectives;
+
+    @Autowired
+    PilotReport pilotReport;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    //static Long schDiff = 1000 * 60 * 60L;
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm"), fmtHHmm_CN = DateTimeFormat.forPattern("HH点mm分");
+
+    @Override
+    public int send60Phrase(String nbbm, String text, String sender) {
+        D60 d60 = null;
+        try {
+            d60 = create60Data(nbbm, text, (short) 0x00, null);
+        } catch (Exception e) {
+            logger.error("发送消息短语出现异常", e);
+            return -1;
+        }
+
+        if (null == d60)
+            return -1;
+
+        // 发送指令
+        int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
+        if (null != sender)
+            d60.setSender(sender);
+        d60.setHttpCode(code);
+
+        if (code == 0) {
+            // 添加到缓存
+            dayOfDirectives.put60(d60, true);
+        } else {
+            d60.setErrorText("网关通讯失败, code: " + code);
+            d60Repository.save(d60);
+            dayOfDirectives.put60(d60, false);
+        }
+        return code;
+    }
+
+    @Override
+    public int send60Dispatch(ScheduleRealInfo sch, int finish, String sender) {
+        D60 d60 = null;
+        try {
+            if (sch.isDestroy()) {
+                logger.warn("烂班不允许发送调度指令....");
+                return -1;
+            }
+            String text = "已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
+                    + sch.getQdzName() + "发往" + sch.getZdzName();
+
+            //下发0x01指令  调度指令(闹钟有效)
+            long t = System.currentTimeMillis(), alarmTime;
+            alarmTime = sch.getDfsjT();
+            if (sch.getDfsjT() < t)
+                alarmTime = t + 1000 * 30;
+
+            d60 = new DirectiveCreator().createD60_01(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
+                    , 0, new Date(alarmTime));
+        } catch (Exception e) {
+            logger.error("生成调度指令时出现异常", e);
+            return -1;
+        }
+
+        if (null == d60)
+            return -1;
+
+        d60.setSender(sender);
+
+        JSONObject jObj = JSON.parseObject(JSON.toJSONString(d60));
+
+        //进场或者出场班次时，附加lock 标识
+        if (null != sch.getBcType()
+                && (sch.getBcType().equals("out") || sch.getBcType().equals("in"))) {
+
+            jObj.put("lock", 1);
+        }
+
+        // 发送指令
+        int code = GatewayHttpUtils.postJson(jObj.toJSONString());
+
+        d60.setDispatch(true);
+        d60.setSch(sch);
+        d60.setHttpCode(code);
+
+        if (code == 0) {
+            sch.setDirectiveState(60);
+            // 添加到缓存，延迟入库
+            dayOfDirectives.put60(d60, true);
+            // 通知页面
+            sendD60ToPage(sch);
+        } else {
+            d60.setErrorText("网关通讯失败, code: " + code);
+            dayOfDirectives.put60(d60, false);
+            d60Repository.save(d60);
+        }
+        return code;
+    }
+
+    /**
+     * @Title: sendDirectiveState @Description: TODO(向页面推送班次指令状态) @throws
+     */
+    @Override
+    public void sendD60ToPage(ScheduleRealInfo sch) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("fn", "directive");
+        map.put("t", sch);
+
+        ObjectMapper mapper = new ObjectMapper();
+
+        try {
+            socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
+        } catch (JsonProcessingException e) {
+            logger.error("", e);
+        }
+    }
+
+    @Override
+    public int send60Dispatch(Long id, String sender) {
+        ScheduleRealInfo sch = dayOfSchedule.get(id);
+        // 车辆已完成班次
+        int finish = dayOfSchedule.doneSum(sch.getClZbh());
+        return send60Dispatch(sch, finish, sender);
+    }
+
+    @Override
+    public int send60Operation(String nbbm, int state, int upDown, ScheduleRealInfo sch, String sender) {
+        logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
+
+        String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
+        D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state);
+
+        if (null == d60)
+            return -1;
+        if (null != sender)
+            d60.setSender(sender);
+        else
+            d60.setSender("系统");
+        // 发送指令
+        int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
+        // 添加到缓存，等待入库
+        d60.setHttpCode(code);
+        if (null != sch)
+            d60.setSch(sch);
+
+
+        if (code == 0) {
+            dayOfDirectives.put60(d60, true);
+        } else {
+            d60.setErrorText("网关通讯失败, code: " + code);
+            d60Repository.save(d60);
+            dayOfDirectives.put60(d60, false);
+        }
+        return code;
+    }
+
+    /**
+     * 线路切换
+     */
+    @Override
+    public int lineChange(String nbbm, String lineCode, String sender) {
+        return lineChangeByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm), lineCode, sender);
+    }
+
+
+    @Override
+    public int lineChangeByDeviceId(String deviceId, String lineCode, String sender) {
+        DirectiveCreator crt = new DirectiveCreator();
+        Long t = System.currentTimeMillis();
+        //生成64数据包
+        D64 d64 = crt.create64(deviceId, lineCode, t);
+
+        if (null != sender)
+            d64.setSender(sender);
+        else
+            d64.setSender("系统");
+
+        //String deviceId = d64.getDeviceId();
+        int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64));
+        // 入库
+        d64.setHttpCode(code);
+        d64.getData().setTxtContent("切换线路[" + lineCode + "]");
+        dayOfDirectives.put64(d64);
+
+        // 通知设备刷新线路文件，忽略结果
+        if (code == 0)
+            GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
+        else
+            d64.setErrorText(" 网关通讯失败, code: " + code);
+
+        d64Repository.save(d64);
+        return code;
+    }
+
+    public D60 create60Data(String nbbm, String text, Short dispatchInstruct, ScheduleRealInfo sch) {
+
+        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+        if (null == deviceId) {
+            logger.error("没有设备号对照的车辆：" + nbbm);
+            return null;
+        }
+        // 根据当前GPS确定 上下行和营运状态
+        Byte upDown = null;
+        Integer state = null;
+        if (null == sch) {
+            GpsEntity gpsData = gpsRealDataBuffer.get(deviceId);
+            if (null == gpsData) {
+                /*
 				 * 短语指令不会变更设备状态，所以在没有gps状态对照的情况下可以下发
 				 * 其他指令在不确定状态的情况下，一律不允许
 				 */
-				if(dispatchInstruct == 0){
-					upDown = 0;
-					state = 0;
-				}
-				else{
-					logger.error("没有找到gps对照，无法确认营运状态和上下行：" + nbbm);
-					return null;
-				}
-			}
-			else{
-				upDown = gpsData.getUpDown();
-				state = gpsData.getState();
-			}
-		} else {
-			upDown = Byte.parseByte(sch.getXlDir());
-			state = 0;
-		}
-
-		return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state);
-	}
-
-	@Override
-	public int upDownChange(String nbbm, Integer upDown, String sender) {
-		return send60Operation(nbbm, 0, upDown, null, sender);
-	}
-
-
-	@Override
-	public Map<String, List<D80>> findNoCofm80(String lineCodes) {
-		List<String> lineList = Splitter.on(",").trimResults().splitToList(lineCodes);
-
-		Map<String, List<D80>> rs = new HashMap<>();
-		for (String code : lineList) 
-			rs.put(code, pilotReport.unconfirmed80(Integer.parseInt(code)));
-
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> reply80(int id, int reply) {
-		Map<String, Object> rs = new HashMap<>();
-
-		D80 d80 = pilotReport.findById(id);
-		if (null == d80) {
-			rs.put("status", ResponseCode.ERROR);
-			rs.put("msg", "服务器没有找到对应数据！");
-		} else if (d80.isConfirm()) {
-			rs.put("status", ResponseCode.ERROR);
-			rs.put("msg", "该数据已经被处理了！");
-		} else {
-			SysUser user = SecurityUtils.getCurrentUser();
-			d80.setC0(reply, user.getUserName());
-			// 入库
-			d80Repository.save(d80);
-			//回复网关
-			int code = GatewayHttpUtils.postJson(JSON.toJSONString(d80.getC0()));
-
-			rs.put("status", ResponseCode.SUCCESS);
-			if (code != 0)
-				rs.put("msg", "发送C0响应指令到车载设备失败，但该操作已经被系统记录！");
-
-			pilotReport.reply(d80);
-			// 通知页面
-			Map<String, Object> sockMap = new HashMap<>();
-			sockMap.put("fn", "d80Confirm");
-			sockMap.put("id", d80.getId());
-			sockMap.put("lineId", d80.getData().getLineId());
-			socketHandler.sendMessageToLine(d80.getData().getLineId().toString(), JSON.toJSONString(sockMap));
-		}
-
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> findDirective(String nbbm, int dType, int page, int size) {
-		Map<String, Object> rsMap = new HashMap<>();
-		List<Directive> list = new ArrayList<>();
-		
-		switch (dType) {
-		case -1:
-			//所有指令
-			list = new ArrayList<>(dayOfDirectives.all());
-			break;
-		case 0:
-			//调度指令
-			Collection<D60> dptArray = dayOfDirectives.all60();
-			for(D60 d60 : dptArray){
-				if(d60.isDispatch())
-					list.add(d60);
-			}
-			break;
-		case 1: 
-			//运营指令
-			Collection<D60> yyArray = dayOfDirectives.all60();
-			for(D60 d60 : yyArray){
-				if(d60 != null && d60.getData().getDispatchInstruct() == (short)0x03
-						&& !d60.isDispatch())
-					list.add(d60);
-			}
-			break;
-		case 2:
-			//线路切换指令
-			list.addAll(dayOfDirectives.all64());
-			break;
-		case 3:
-			//消息短语
-			Collection<D60> dyArray = dayOfDirectives.all60();
-			for(D60 d60 : dyArray){
-				if(d60 != null && d60.getData().getDispatchInstruct() == (short)0x00
-						&& !d60.isDispatch())
-					list.add(d60);
-			}
-			break;
-		}
-
-		// 时间倒序
-		Collections.sort(list, new DayOfDirectives.DComparator());
-		if(StringUtils.isNotBlank(nbbm)){
-			String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-			//按车辆过滤
-			List<Directive> subList = new ArrayList<>();
-			for(Directive d : list){
-				if(d.getDeviceId().equals(deviceId)){
-					subList.add(d);
-				}
-			}
-			list = subList;
-		}
-		
-		int count = list.size();
-		// 分页
-		int s = page * size, e = s + size;
-
-		if (e > count)
-			e = count;
-
-		List<Directive> rs = list.subList(s, e);
-
-		// 时间格式化，车辆自编号转换
-		for (Directive d : rs) {
-			if (d.getTimeHHmm() == null)
-				d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));
-			if (d.getNbbm() == null)
-				d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
-		}
-
-		rsMap.put("list", rs);
-		rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);
-		rsMap.put("page", page);
-		return rsMap;
-	}
-
-	@Override
-	public Map<String, Object> findAll80(Map<String, Object> map, int page, int size) {
-		List<D80> d80s = new ArrayList<>();
-		
-		Object nbbm = map.get("nbbm");
-		if(null != nbbm && StringUtils.isNotEmpty(nbbm.toString())){
-			d80s.addAll(pilotReport.findByCar(nbbm.toString()));
-		}
-		else{
-			d80s.addAll(pilotReport.findAll());
-		}
-		
-		Short requestCode = Short.parseShort(map.get("requestCode").toString());
-		if(requestCode != -1){
-			List<D80> temps = new ArrayList<>();
-			for(D80 d80 : d80s){
-				if(d80.getData().getRequestCode().equals(requestCode))
-					temps.add(d80);
-			}
-			d80s = temps;
-		}
-		
-		//排序
-		Collections.sort(d80s, new Comparator<D80>() {
-			@Override
-			public int compare(D80 o1, D80 o2) {
-				return (int) (o2.getTimestamp() - o1.getTimestamp());
-			}
-		});
-		
-		//分页
-		int count = d80s.size();
-		// 分页
-		int s = page * size, e = s + size;
-
-		if (e > count)
-			e = count;
-
-		//SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-		List<D80> rs = d80s.subList(s, e);
-		for(D80 d80 : rs){
-			d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
-		}
-		
-		Map<String, Object> rsMap = new HashMap<>();
-		rsMap.put("list", rs);
-		rsMap.put("totalPages", count % size == 0 ? count / size -1 : count / size);
-		rsMap.put("page", page);
-		
-		return rsMap;
-	}
-
-	@Override
-	public D64 save64(D64 d64) {
-		return d64Repository.save(d64);
-	}
-
-	@Override
-	public int sendC0A4(String nbbm) {
-		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-		
-		Map<String, Object> c0a4 = new HashMap<>();
-		c0a4.put("deviceId", deviceId);
-		c0a4.put("timestamp", System.currentTimeMillis());
-		c0a4.put("operCode", (short)0xC0);
-		
-		Map<String, Object> data = new HashMap<>();
-		data.put("deviceId", deviceId);
-		data.put("operCode2", (short)0xA4);
-		c0a4.put("data", data);
-		
-		return GatewayHttpUtils.postJson(JSON.toJSONString(c0a4));
-	}
-
-	@Override
-	public int sendC0A3(DC0_A3 c0a3) {
-		GatewayHttpUtils.postJson(JSON.toJSONString(c0a3));
-		return 0;
-	}
-
-	@Override
-	public int sendC0A5(String json) {
-		return GatewayHttpUtils.postJson(json);
-	}
-
-	@Override
-	public int refreshLineFile(String deviceId) {
-		GpsEntity gps = gpsRealDataBuffer.get(deviceId);
-		if(gps == null)
-			return -1;
-
-		return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
-	}
-
-	@Override
-	public int stateChange(String nbbm, Integer upDown, Integer state, String userName) {
-		return send60Operation(nbbm, state, upDown, null, userName);
-	}
+                if (dispatchInstruct == 0) {
+                    upDown = 0;
+                    state = 0;
+                } else {
+                    logger.error("没有找到gps对照，无法确认营运状态和上下行：" + nbbm);
+                    return null;
+                }
+            } else {
+                upDown = gpsData.getUpDown();
+                state = gpsData.getState();
+            }
+        } else {
+            upDown = Byte.parseByte(sch.getXlDir());
+            state = 0;
+        }
+
+        return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state);
+    }
+
+    @Override
+    public int upDownChange(String nbbm, Integer upDown, String sender) {
+        return send60Operation(nbbm, 0, upDown, null, sender);
+    }
+
+
+    @Override
+    public Map<String, List<D80>> findNoCofm80(String lineCodes) {
+        List<String> lineList = Splitter.on(",").trimResults().splitToList(lineCodes);
+
+        Map<String, List<D80>> rs = new HashMap<>();
+        for (String code : lineList)
+            rs.put(code, pilotReport.unconfirmed80(Integer.parseInt(code)));
+
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> reply80(int id, int reply) {
+        Map<String, Object> rs = new HashMap<>();
+        D80 d80 = pilotReport.findById(id);
+        try {
+            if (null == d80) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "服务器没有找到对应数据！");
+            } else if (d80.isConfirm()) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "该数据已经被处理了！");
+            } else {
+                SysUser user = SecurityUtils.getCurrentUser();
+                d80.setC0(reply, user.getUserName());
+                // 入库
+                d80Repository.save(d80);
+                //回复网关
+                int code = GatewayHttpUtils.postJson(JSON.toJSONString(d80.getC0()));
+
+                rs.put("status", ResponseCode.SUCCESS);
+                if (code != 0)
+                    rs.put("msg", "发送C0响应指令到车载设备失败，但该操作已经被系统记录！");
+
+                pilotReport.reply(d80);
+            }
+        } catch (Exception e) {
+            logger.error("80响应出现异常...", e);
+            rs.put("status", ResponseCode.SUCCESS);
+        }
+        // 通知页面
+        Map<String, Object> sockMap = new HashMap<>();
+        sockMap.put("fn", "d80Confirm");
+        sockMap.put("id", d80.getId());
+        sockMap.put("lineId", d80.getData().getLineId());
+        socketHandler.sendMessageToLine(d80.getData().getLineId().toString(), JSON.toJSONString(sockMap));
+
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> findDirective(String nbbm, int dType, int page, int size) {
+        Map<String, Object> rsMap = new HashMap<>();
+        List<Directive> list = new ArrayList<>();
+
+        switch (dType) {
+            case -1:
+                //所有指令
+                list = new ArrayList<>(dayOfDirectives.all());
+                break;
+            case 0:
+                //调度指令
+                Collection<D60> dptArray = dayOfDirectives.all60();
+                for (D60 d60 : dptArray) {
+                    if (d60.isDispatch())
+                        list.add(d60);
+                }
+                break;
+            case 1:
+                //运营指令
+                Collection<D60> yyArray = dayOfDirectives.all60();
+                for (D60 d60 : yyArray) {
+                    if (d60 != null && d60.getData().getDispatchInstruct() == (short) 0x03
+                            && !d60.isDispatch())
+                        list.add(d60);
+                }
+                break;
+            case 2:
+                //线路切换指令
+                list.addAll(dayOfDirectives.all64());
+                break;
+            case 3:
+                //消息短语
+                Collection<D60> dyArray = dayOfDirectives.all60();
+                for (D60 d60 : dyArray) {
+                    if (d60 != null && d60.getData().getDispatchInstruct() == (short) 0x00
+                            && !d60.isDispatch())
+                        list.add(d60);
+                }
+                break;
+        }
+
+        // 时间倒序
+        Collections.sort(list, new DayOfDirectives.DComparator());
+        if (StringUtils.isNotBlank(nbbm)) {
+            String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+            //按车辆过滤
+            List<Directive> subList = new ArrayList<>();
+            for (Directive d : list) {
+                if (d.getDeviceId().equals(deviceId)) {
+                    subList.add(d);
+                }
+            }
+            list = subList;
+        }
+
+        int count = list.size();
+        // 分页
+        int s = page * size, e = s + size;
+
+        if (e > count)
+            e = count;
+
+        List<Directive> rs = list.subList(s, e);
+
+        // 时间格式化，车辆自编号转换
+        for (Directive d : rs) {
+            if (d.getTimeHHmm() == null)
+                d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));
+            if (d.getNbbm() == null)
+                d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
+        }
+
+        rsMap.put("list", rs);
+        rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);
+        rsMap.put("page", page);
+        return rsMap;
+    }
+
+    @Override
+    public Map<String, Object> findAll80(Map<String, Object> map, int page, int size) {
+        List<D80> d80s = new ArrayList<>();
+
+        Object nbbm = map.get("nbbm");
+        if (null != nbbm && StringUtils.isNotEmpty(nbbm.toString())) {
+            d80s.addAll(pilotReport.findByCar(nbbm.toString()));
+        } else {
+            d80s.addAll(pilotReport.findAll());
+        }
+
+        Short requestCode = Short.parseShort(map.get("requestCode").toString());
+        if (requestCode != -1) {
+            List<D80> temps = new ArrayList<>();
+            for (D80 d80 : d80s) {
+                if (d80.getData().getRequestCode().equals(requestCode))
+                    temps.add(d80);
+            }
+            d80s = temps;
+        }
+
+        //排序
+        Collections.sort(d80s, new Comparator<D80>() {
+            @Override
+            public int compare(D80 o1, D80 o2) {
+                return (int) (o2.getTimestamp() - o1.getTimestamp());
+            }
+        });
+
+        //分页
+        int count = d80s.size();
+        // 分页
+        int s = page * size, e = s + size;
+
+        if (e > count)
+            e = count;
+
+        //SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+        List<D80> rs = d80s.subList(s, e);
+        for (D80 d80 : rs) {
+            d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
+        }
+
+        Map<String, Object> rsMap = new HashMap<>();
+        rsMap.put("list", rs);
+        rsMap.put("totalPages", count % size == 0 ? count / size - 1 : count / size);
+        rsMap.put("page", page);
+
+        return rsMap;
+    }
+
+    @Override
+    public D64 save64(D64 d64) {
+        return d64Repository.save(d64);
+    }
+
+    @Override
+    public Map<String, Object> sendC0A4(String nbbm) {
+        Map<String, Object> rs = new HashMap<>();
+
+        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+
+        GpsEntity gps = gpsRealDataBuffer.get(deviceId);
+        if(gps == null || gps.isOffline()){
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "下发指令失败，设备离线");
+            return rs;
+        }
+
+        Map<String, Object> c0a4 = new HashMap<>();
+        c0a4.put("deviceId", deviceId);
+        c0a4.put("timestamp", System.currentTimeMillis());
+        c0a4.put("operCode", (short) 0xC0);
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("deviceId", deviceId);
+        data.put("operCode2", (short) 0xA4);
+        c0a4.put("data", data);
+
+        int code = GatewayHttpUtils.postJson(JSON.toJSONString(c0a4));
+        if(code != 0){
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "和网关通讯失败， code " + code);
+        }
+        else{
+            rs.put("status", ResponseCode.SUCCESS);
+        }
+        return rs;
+    }
+
+    @Override
+    public int sendC0A3(DC0_A3 c0a3) {
+        GatewayHttpUtils.postJson(JSON.toJSONString(c0a3));
+        return 0;
+    }
+
+    @Override
+    public int sendC0A5(String json) {
+        return GatewayHttpUtils.postJson(json);
+    }
+
+    @Override
+    public int refreshLineFile(String deviceId) {
+        GpsEntity gps = gpsRealDataBuffer.get(deviceId);
+        if (gps == null)
+            return -1;
+
+        return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
+    }
+
+    @Override
+    public int stateChange(String nbbm, Integer upDown, Integer state, String userName) {
+        return send60Operation(nbbm, state, upDown, null, userName);
+    }
+
+    @Override
+    public Map<String, Object> deviceCofigList(Map<String, String> map, int page, int size) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            String conts="";
+            if(StringUtils.isNotBlank(map.get("lineId"))){
+                conts+=" AND xl='" + map.get("lineId")+"'";
+            }
+            if(StringUtils.isNotBlank(map.get("nbbm"))){
+                conts+=" AND inside_code like '%" + map.get("nbbm")+"%'";
+            }
+            if(StringUtils.isNotBlank(map.get("deviceId"))){
+                conts+=" AND equipment_code like '%" + map.get("deviceId")+"%'";
+            }
+
+            String sql = "select * from (SELECT * FROM (SELECT id AS cl_id,inside_code,equipment_code FROM bsth_c_cars ) t1 LEFT JOIN bsth_v_c0_a4 t2 ON t1.equipment_code = t2.id LEFT JOIN (SELECT xl,cl FROM bsth_c_s_ccinfo WHERE id IN (SELECT max(id) FROM bsth_c_s_ccinfo GROUP BY cl)) t3 ON t1.cl_id = t3.cl ORDER BY t2.`timestamp` DESC) t4 where 1=1 "+conts;
+
+            int count = jdbcTemplate.queryForObject("select count(*) from ("+sql+") c1", Integer.class);
+            int totalPages = count % size == 0 ? count / size : count / size + 1;
+            int s = page * size;
+            List<DeviceConfigDto> list = jdbcTemplate.query(sql + " LIMIT " + s + "," + size, new BeanPropertyRowMapper<>(DeviceConfigDto.class));
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", list);
+            rs.put("totalPages", totalPages);
+            rs.put("page", page);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
 }
+package com.bsth.service.directive.dto;
+
+/**
+ * Created by panzhao on 2017/6/28.
+ */
+public class DeviceConfigDto {
+
+    private String xl;
+    private String id;
+    private String insideCode;
+    private String equipmentCode;
+    /** 网关IP地址 */
+    private String ipAddress;
+    /** 网关端口 */
+    private Integer port;
+    /** 定时定距上报模式 */
+    private Short reportMode;
+    /** 定时上报时间间隔 */
+    private Integer interval;
+    /** 定距上报距离间隔 */
+    private String distance;
+    /** 非线路状态超速阀门 */
+    private Short speedingThreshold;
+    /** 预警阀门 */
+    private Short alarmThreshold;
+    /** pos机IP地址 */
+    private String posIpAddress;
+    /** pos机端口 */
+    private String posPort;
+    /** 延迟机关时间 */
+    private Integer delay;
+    /** 中门视频切换到码表界面速度阀门 默认45 */
+    private Short speedThreshold1;
+    /** 码表界面切换到中门视频速度阀门 默认35 */
+    private Short speedThreshold2;
+    /** 对比度 */
+    private Short contrast;
+    /** 亮度 */
+    private Short brightness;
+    /** 饱和度 */
+    private Short saturation;
+
+    private Long timestamp;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getEquipmentCode() {
+        return equipmentCode;
+    }
+
+    public void setEquipmentCode(String equipmentCode) {
+        this.equipmentCode = equipmentCode;
+    }
+
+    public String getIpAddress() {
+        return ipAddress;
+    }
+
+    public void setIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+
+    public Short getReportMode() {
+        return reportMode;
+    }
+
+    public void setReportMode(Short reportMode) {
+        this.reportMode = reportMode;
+    }
+
+    public Integer getInterval() {
+        return interval;
+    }
+
+    public void setInterval(Integer interval) {
+        this.interval = interval;
+    }
+
+    public String getDistance() {
+        return distance;
+    }
+
+    public void setDistance(String distance) {
+        this.distance = distance;
+    }
+
+    public Short getSpeedingThreshold() {
+        return speedingThreshold;
+    }
+
+    public void setSpeedingThreshold(Short speedingThreshold) {
+        this.speedingThreshold = speedingThreshold;
+    }
+
+    public Short getAlarmThreshold() {
+        return alarmThreshold;
+    }
+
+    public void setAlarmThreshold(Short alarmThreshold) {
+        this.alarmThreshold = alarmThreshold;
+    }
+
+    public String getPosIpAddress() {
+        return posIpAddress;
+    }
+
+    public void setPosIpAddress(String posIpAddress) {
+        this.posIpAddress = posIpAddress;
+    }
+
+    public String getPosPort() {
+        return posPort;
+    }
+
+    public void setPosPort(String posPort) {
+        this.posPort = posPort;
+    }
+
+    public Integer getDelay() {
+        return delay;
+    }
+
+    public void setDelay(Integer delay) {
+        this.delay = delay;
+    }
+
+    public Short getSpeedThreshold1() {
+        return speedThreshold1;
+    }
+
+    public void setSpeedThreshold1(Short speedThreshold1) {
+        this.speedThreshold1 = speedThreshold1;
+    }
+
+    public Short getSpeedThreshold2() {
+        return speedThreshold2;
+    }
+
+    public void setSpeedThreshold2(Short speedThreshold2) {
+        this.speedThreshold2 = speedThreshold2;
+    }
+
+    public Short getContrast() {
+        return contrast;
+    }
+
+    public void setContrast(Short contrast) {
+        this.contrast = contrast;
+    }
+
+    public Short getBrightness() {
+        return brightness;
+    }
+
+    public void setBrightness(Short brightness) {
+        this.brightness = brightness;
+    }
+
+    public Short getSaturation() {
+        return saturation;
+    }
+
+    public void setSaturation(Short saturation) {
+        this.saturation = saturation;
+    }
+
+    public Long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getInsideCode() {
+        return insideCode;
+    }
+
+    public void setInsideCode(String insideCode) {
+        this.insideCode = insideCode;
+    }
+
+    public String getXl() {
+        return xl;
+    }
+
+    public void setXl(String xl) {
+        this.xl = xl;
+    }
+}
@@ -69,8 +69,8 @@ public class OutboundServiceImpl implements OutboundService{
 			}
 		}
-		sql +=" limit ?,?";
-		
+	//	sql +=" order by id limit ?,?";
+		sql +=" order by timestamp limit ?,?";
 		try {
 			conn = DBUtils_MS.getConnection();
@@ -95,15 +95,15 @@ public class OutboundServiceImpl implements OutboundService{
 		Outbound outbound;
 		while(rs.next()){
 			outbound=new Outbound();
-			outbound.setId(Integer.valueOf(rs.getObject("id").toString()));
-			outbound.setLat(Float.valueOf(rs.getObject("lat").toString()));
+	//		outbound.setId(Integer.valueOf(rs.getObject("id").toString()));
 			outbound.setLine(Integer.valueOf(rs.getObject("line").toString()));
+			outbound.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
+			outbound.setLon(Float.valueOf(rs.getObject("lon").toString()));
+			outbound.setLat(Float.valueOf(rs.getObject("lat").toString()));
 			//run 时注解
 			outbound.setLineName(BasicData.lineCode2NameMap.get(outbound.getLine().toString()));
-			outbound.setLon(Float.valueOf(rs.getObject("lon").toString()));
 			outbound.setTimestamp((Long.valueOf(rs.getObject("timestamp").toString())));
 			outbound.setTimestampDate(sdf.format(new Date(outbound.getTimestamp())));
-			outbound.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
 			outbound.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
 //			outbound.setLocation(rs.getObject("location")==null?"":rs.getObject("location").toString());
 			list.add(outbound);
@@ -43,8 +43,10 @@ public class SpeedingServiceImpl implements SpeedingService {
 		Object line=map.get("line");
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
-		Object date=map.get("date");
-
+		Object startDate=map.get("startDate");
+		Object endDate=map.get("endDate");
+		
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		if(line!=null){
 			sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
@@ -58,15 +60,23 @@ public class SpeedingServiceImpl implements SpeedingService {
 		if(updown!=null){
 			sql +="and up_down like '%"+updown.toString()+"%'";
 		}
-		if(date!=null){
-			if (date.toString().length()>0) {
-				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		if(startDate!=null){
+			if (startDate.toString().length()>0) {
 				try {
-					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
-					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
-					sql += " and timestamp >="+t1 +" and timestamp <="+t2;
+					Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime();
+					sql += " and timestamp >="+t1;
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+			}
+			
+		}
+		if(endDate!=null){
+			if (endDate.toString().length()>0) {
+				try {
+					Long t2=sdf.parse(endDate.toString()+" 23:59:59").getTime();
+					sql += " and timestamp <="+t2;
 				} catch (ParseException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			}
@@ -74,18 +84,17 @@ public class SpeedingServiceImpl implements SpeedingService {
 		}
-		sql +=" order by id limit ?,?";
+		/*sql +=" order by id limit ?,?";*/
 		try {
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
-			ps.setInt(1, page*10); // O-最大条数  -- M-起始条数
+		/*	ps.setInt(1, page*10); // O-最大条数  -- M-起始条数
 			ps.setInt(2, 10); // O-最小条数 -- M-显示条数
-			rs = ps.executeQuery();
+*/			rs = ps.executeQuery();
 			list = resultSet2Set(rs);
 		} catch (SQLException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}finally {
 			DBUtils_MS.close(rs, ps, conn);
@@ -106,6 +115,7 @@ public class SpeedingServiceImpl implements SpeedingService {
 			//run 时注解
 			speeding.setLineName(BasicData.lineCode2NameMap.get(speeding.getLine().toString()));
 			speeding.setLon(Float.valueOf(rs.getObject("lon").toString()));
+			speeding.setSpeed(Float.valueOf(rs.getObject("speed").toString()));
 			speeding.setTimestamp((Long.valueOf(rs.getObject("timestamp").toString())));
 			speeding.setTimestampDate(sdf.format(new Date(speeding.getTimestamp())));
 			speeding.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
@@ -114,16 +124,18 @@ public class SpeedingServiceImpl implements SpeedingService {
 		}
 		return list;
 	}
+
 	@Override
 	public PageObject<Speeding> Pagequery(Map<String, Object> map) {
-		// TODO Auto-generated method stub
 		String sql="select count(*) record  from bsth_c_speeding where 1=1 ";
 		Object line=map.get("line");
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
+		Object startDate=map.get("startDate");
+		Object endDate=map.get("endDate");
+		//时间转换
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		Object date=map.get("date");
-
 		if(line!=null){
 			sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
@@ -136,15 +148,23 @@ public class SpeedingServiceImpl implements SpeedingService {
 		if(updown!=null){
 			sql +="and up_down like '%"+updown.toString()+"%'";
 		}
-		if(date!=null){
-			if (date.toString().length()>0) {
-				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+		if(startDate!=null){
+			if (startDate.toString().length()>0) {
 				try {
-					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
-					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
-					sql += " and timestamp >="+t1 +" and timestamp <="+t2;
+					Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime();
+					sql += " and timestamp >="+t1;
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+			}
+			
+		}
+		if(endDate!=null){
+			if (endDate.toString().length()>0) {
+				try {
+					Long t2=sdf.parse(endDate.toString()+" 23:59:59").getTime();
+					sql += " and timestamp <="+t2;
 				} catch (ParseException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			}
@@ -163,49 +183,68 @@ public class SpeedingServiceImpl implements SpeedingService {
 				 totalData=rs.getInt("record");
 			 }		
 		} catch (SQLException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}finally {
 			DBUtils_MS.close(rs, ps, conn);
 		}
-		PageHelper pageHelper = new PageHelper(totalData, map);
-		List<Speeding> list=findAll(pageHelper.getMap());
-		for (int i = 0; i < list.size(); i++) {
-			String nbbm2=list.get(i).getVehicle() ;
-			Long d1=list.get(i).getTimestamp();
-			Date datess = new Date(d1);
-			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
-			String sk=new SimpleDateFormat("HH:mm").format(datess);
-			String sqlPbb="SELECT * FROM ( select lp_name,cl_zbh,j_gh,j_name,MIN(fcsj) as fcsj,MAX(zdsj) as ddsj"
-					+ "  from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
-					+ "   real_exec_date='"+dates+"' GROUP BY cl_zbh,lp_name,j_gh,j_name ) t WHERE t.fcsj<='"+sk+"' AND t.ddsj>='"+sk+"' " ;
-			List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,  
-			        new RowMapper<ScheduleRealInfo>(){  
-			            @Override  
-			            public ScheduleRealInfo  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-			            	ScheduleRealInfo s  = new ScheduleRealInfo(); 
-			            	s.setjGh(rs.getString("j_gh"));
-			            	s.setjName(rs.getString("j_name"));
-			            	s.setLpName(rs.getString("lp_name"));
-			                return s;  
-			            }  
-					});  
-			if(pbb.size()>0){
-				list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
-				list.get(i).setLpname(pbb.get(0).getLpName());
-				
+		List<Speeding> list=findAll(map);
+		List<Speeding> listResult = new ArrayList<Speeding>();
+		int curPage;//页码  
+		int pageData;//每页的记录条数
+		int start;//起始数据下标
+		int totalPage;//总页数
+		if(list.size()>1){
+			Speeding speedingNow;//下标为i的车
+			Speeding speedingLast;//下标为i-1的车
+			String strNow;
+			String strLast;
+			for(int i = 1;i<list.size();i++){
+				speedingNow = list.get(i);
+				speedingLast = list.get(i-1);
+				strNow = speedingNow.getVehicle()+speedingNow.getLine()+speedingNow.getUpDown();//同一车辆同一线路同一方向
+				strLast = speedingLast.getVehicle()+speedingLast.getLine()+speedingLast.getUpDown();
+				//同一车辆同一线路同一方向并且该记录的超速的开始时间减去上一条超速记录的结束时间小于等于10s，证明该车超速。//PS:祛除数据库中的重复发送数据
+				if(strNow.equals(strLast) && Math.abs(speedingNow.getTimestamp()-speedingLast.getTimestamp())<=10*1000 && (speedingNow.getTimestamp()-speedingLast.getTimestamp()!=0)){
+					speedingLast.setEndtimestamp(speedingNow.getTimestamp());
+					speedingLast.setEndtimestampDate(sdf.format(new Date(speedingNow.getTimestamp())));//设置结束时间
+					listResult.add(speedingLast);
+				}
 			}
+			totalData = listResult.size();//总记录条数。
+			if(map.get("curPage") == null || map.get("curPage").equals("0")){
+				curPage = 0;
+			}else{
+				curPage = Integer.parseInt((String) map.get("curPage"));
+			}
+			pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
+			start = (curPage - 0) * pageData; //起始记录下标。
+			totalPage = totalData % pageData == 0 ? totalData / pageData : totalData / pageData +1;//总页数
+			if(curPage == totalPage-1){//如果当前页等于总页数。
+				listResult = listResult.subList(start, totalData);
+			}else{
+				listResult = listResult.subList(start, start+pageData);
+			}
+		}else{
+			curPage = 1;
+			pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
+			totalPage =1;
 		}
+		Map<String,Object> paramMap = new HashMap<String,Object>();
+		paramMap.put("totalPage", totalPage);
+		paramMap.put("curPage", curPage);
+		paramMap.put("pageData", pageData);
+		PageHelper pageHelper = new PageHelper(totalData, paramMap);
+		pageHelper.getMap();
 		PageObject<Speeding> pageObject = pageHelper.getPageObject();
-		pageObject.setDataList(list);
+		pageObject.setDataList(listResult);
 		return pageObject;
 	}
-
+	
+	
 	@Override
 	public Map<String, Object> getReport(Map<String, Object> map) {
-		// TODO Auto-generated method stub
 		String chartStr = "";
 		Map<String, Object> mapValue = new HashMap<String, Object>();
 		try {
@@ -309,10 +348,8 @@ public class SpeedingServiceImpl implements SpeedingService {
  		}
 	} catch (SQLException e) {
-		// TODO Auto-generated catch block
 		e.printStackTrace();
 	}catch (ParseException e1) {
-		// TODO Auto-generated catch block
 		e1.printStackTrace();
 	}finally {
 		DBUtils_MS.close(rs, ps, conn);
@@ -3,6 +3,7 @@ package com.bsth.service.gps;
 import com.bsth.service.gps.entity.GpsOutbound_DTO;
 import com.bsth.service.gps.entity.GpsSpeed_DTO;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
@@ -29,4 +30,12 @@ public interface GpsService {
 	List<GpsOutbound_DTO> outbounds(String nbbm, long st, long et);
 	Map<String, Object> safeDrivList(Map<String, Object> map, int page, int size, String order, String direction);
+
+    Map<String,Object> history_v3(String nbbm, long st, long et);
+
+    void trailExcel(String nbbm, long st, long et, HttpServletResponse resp);
+
+	void abnormalExcel(String nbbm, long st, long et, HttpServletResponse resp);
+
+	void arrivalExcel(String nbbm, long st, long et, HttpServletResponse resp);
 }
@@ -5,6 +5,7 @@ import com.bsth.data.BasicData;
 import com.bsth.data.forecast.entity.ArrivalEntity;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
 import com.bsth.data.safe_driv.SafeDriv;
 import com.bsth.data.safe_driv.SafeDrivCenter;
@@ -13,15 +14,20 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-import com.bsth.service.gps.entity.GpsOutbound_DTO;
-import com.bsth.service.gps.entity.GpsSpeed_DTO;
-import com.bsth.service.gps.entity.HistoryGps_DTO;
-import com.bsth.service.gps.entity.Road_DTO;
+import com.bsth.service.gps.entity.*;
 import com.bsth.util.DateUtils;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+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;
@@ -29,7 +35,12 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
+import java.net.URLEncoder;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -213,7 +224,7 @@ public class GpsServiceImpl implements GpsService {
         // 查询到离站数据
         Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear, st, et, inv);
-        String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO,DIRECTION,LINE_ID,SPEED_GPS from bsth_c_gps_info where days_year=? and device_id in ("
+        String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO,DIRECTION,LINE_ID,SPEED_GPS,SECTION_CODE from bsth_c_gps_info where days_year=? and device_id in ("
                 + inv + ") and ts > ? and ts < ? ORDER BY device_id,ts,stop_no";
         try {
             conn = DBUtils_MS.getConnection();
@@ -268,6 +279,8 @@ public class GpsServiceImpl implements GpsService {
                 map.put("state", 0);
                 // 上下行
                 map.put("upDown", upDown);
+                //路段编码
+                map.put("section_code", rs.getString("SECTION_CODE"));
                 list.add(map);
             }
         } catch (Exception e) {
@@ -562,6 +575,226 @@ public class GpsServiceImpl implements GpsService {
         return rs;
     }
+
+    @Override
+    public Map<String, Object> history_v3(String nbbm, long st, long et) {
+        Map<String, Object> rs = new HashMap<>();
+
+        try {
+            //获取历史gps 数据
+            List<HistoryGps_DTOV3> list = HistoryGps_DTOV3.craete(history(new String[]{nbbm}, st, et));
+            if (list != null && list.size() > 0) {
+                //获取路段信息
+                /*String sql = "select ID, ST_AsText(GROAD_VECTOR) as GROAD_VECTOR,ROAD_CODE,ROAD_NAME,SPEED from bsth_c_road where road_code in(select section_code from bsth_c_sectionroute where line_code=? and destroy=0)";
+                List<Road_DTO> roads = Road_DTO.craete(jdbcTemplate.queryForList(sql, list.get(0).getLineId()));
+
+                //为GPS数据关联路段信息
+                for (HistoryGps_DTOV3 gps : list) {
+                    matchRoadToGps(gps, roads);
+                }*/
+                //关联路段名称
+                Map<String, String> sectionCode2Name = GeoCacheData.sectionCode2NameMap();
+                for(HistoryGps_DTOV3 gps : list){
+                    if(StringUtils.isNotEmpty(gps.getSection_code()))
+                        gps.setSection_name(sectionCode2Name.get(gps.getSection_code()));
+                    else{
+                        gps.setSection_code("-00404");
+                        gps.setSection_name("未知路段");
+                    }
+                }
+            }
+
+            //超速数据
+            List<GpsSpeed_DTO> speedList = speeds(nbbm, st, et);
+
+            //越界数据
+            List<GpsOutbound_DTO> outboundList = outbounds(nbbm, st, et);
+
+            //计算里程
+            List<HistoryGps_DTOV3> effList = new ArrayList<>();
+            for(HistoryGps_DTOV3 gps : list){
+                if(gps.getLat() != 0 && gps.getLon() != 0)
+                    effList.add(gps);
+            }
+            double sum = 0, dist;
+            for (int i = 0; i < effList.size() - 1; i++) {
+                dist = GeoUtils.getDistance(effList.get(i).getPoint(), effList.get(i + 1).getPoint());
+                //点位相同时，dist会NaN
+                if(String.valueOf(dist).matches("^[0.0-9.0]+$")){
+                    if(dist > 0.8)
+                        sum += dist;
+                }
+            }
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", removeDuplicateV3(effList));
+            rs.put("speedList", speedList);
+            rs.put("outboundList", outboundList);
+            rs.put("sumMileage", new DecimalFormat(".##").format(sum / 1000));
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+        return rs;
+    }
+
+    @Override
+    public void trailExcel(String nbbm, long st, long et, HttpServletResponse resp) {
+        //获取历史gps 数据
+        List<HistoryGps_DTOV3> list = HistoryGps_DTOV3.craete(history(new String[]{nbbm}, st, et));
+        if (list != null && list.size() > 0) {
+            //关联路段名称
+            Map<String, String> sectionCode2Name = GeoCacheData.sectionCode2NameMap();
+            for(HistoryGps_DTOV3 gps : list){
+                if(StringUtils.isNotEmpty(gps.getSection_code()))
+                    gps.setSection_name(sectionCode2Name.get(gps.getSection_code()));
+                else{
+                    gps.setSection_code("-00404");
+                    gps.setSection_name("未知路段");
+                }
+            }
+        }
+
+        //创建excel工作簿
+        Workbook wb = new HSSFWorkbook();
+        Sheet sheet = wb.createSheet("行车轨迹");
+        //表头
+        Row row = sheet.createRow(0);
+        row.setHeight((short) (1.5 * 256));
+        row.createCell(0).setCellValue("序号");
+        row.createCell(1).setCellValue("车辆");
+        row.createCell(2).setCellValue("所在道路");
+        row.createCell(3).setCellValue("经度");
+        row.createCell(4).setCellValue("纬度");
+        row.createCell(5).setCellValue("时间");
+        row.createCell(6).setCellValue("速度");
+        //数据
+        DateTimeFormatter fmtHHmmss = DateTimeFormat.forPattern("HH:mm.ss"),
+                fmt = DateTimeFormat.forPattern("yyyyMMddHHmm");
+        HistoryGps_DTOV3 gps;
+        for(int i = 0; i < list.size(); i ++){
+            gps = list.get(i);
+            row = sheet.createRow(i + 1);
+            row.createCell(0).setCellValue(i + 1);
+            row.createCell(1).setCellValue(gps.getNbbm());
+            row.createCell(2).setCellValue(gps.getSection_name());
+            row.createCell(3).setCellValue(gps.getLon());
+            row.createCell(4).setCellValue(gps.getLat());
+            row.createCell(5).setCellValue(fmtHHmmss.print(gps.getTimestamp()));
+            row.createCell(6).setCellValue(gps.getSpeed());
+        }
+
+        st = st * 1000;
+        et = et * 1000;
+        String filename = nbbm + "轨迹数据" + fmt.print(st) + "至" + fmt.print(et) + ".xls";
+        try {
+            resp.setContentType("application/x-msdownload");
+            resp.addHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
+
+            OutputStream out=resp.getOutputStream();
+            wb.write(out);
+            out.flush();
+            out.close();
+        } catch (UnsupportedEncodingException e) {
+            logger.error("", e);
+        } catch (IOException e) {
+            logger.error("", e);
+        }
+    }
+
+    @Override
+    public void abnormalExcel(String nbbm, long st, long et, HttpServletResponse resp) {
+        //超速数据
+        List<GpsSpeed_DTO> speedList = speeds(nbbm, st, et);
+        //越界数据
+        List<GpsOutbound_DTO> outboundList = outbounds(nbbm, st, et);
+
+        //创建excel工作簿
+        Workbook wb = new HSSFWorkbook();
+
+        DateTimeFormatter fmtHHmmss = DateTimeFormat.forPattern("HH:mm.ss"),
+                fmt = DateTimeFormat.forPattern("yyyyMMddHHmm");
+        if(speedList.size() > 0){
+            Sheet sheet = wb.createSheet("超速");
+            //表头
+            Row row = sheet.createRow(0);
+            row.setHeight((short) (1.5 * 256));
+            row.createCell(0).setCellValue("异常信息");
+            row.createCell(1).setCellValue("最大速度");
+            row.createCell(2).setCellValue("开始时间");
+            row.createCell(3).setCellValue("结束时间");
+            row.createCell(4).setCellValue("持续（秒）");
+            row.createCell(5).setCellValue("所在路段");
+
+            GpsSpeed_DTO speed;
+            for(int i = 0; i < speedList.size(); i++){
+                speed = speedList.get(i);
+                row = sheet.createRow(i + 1);
+                row.createCell(0).setCellValue("超速");
+                row.createCell(1).setCellValue(speed.getSpeed());
+                row.createCell(2).setCellValue(fmtHHmmss.print(speed.getSt()));
+                row.createCell(3).setCellValue(fmtHHmmss.print(speed.getEt()));
+                if(speed.getEt() != 0)
+                    row.createCell(4).setCellValue((speed.getEt() - speed.getSt()) / 1000);
+                row.createCell(5).setCellValue("");
+            }
+        }
+
+        if(outboundList.size() > 0){
+            Sheet sheet = wb.createSheet("越界");
+            //表头
+            Row row = sheet.createRow(0);
+            row.setHeight((short) (1.5 * 256));
+            row.createCell(0).setCellValue("异常信息");
+            row.createCell(1).setCellValue("开始时间");
+            row.createCell(2).setCellValue("结束时间");
+            row.createCell(3).setCellValue("持续（秒）");
+            row.createCell(4).setCellValue("所在路段");
+            row.createCell(5).setCellValue("路径");
+
+            GpsOutbound_DTO outbound;
+            //设置路径单元格 水平对齐 填充
+            CellStyle cs = wb.createCellStyle();
+            cs.setAlignment(HSSFCellStyle.ALIGN_FILL);
+            for(int i = 0; i < outboundList.size(); i++){
+                outbound = outboundList.get(i);
+                row = sheet.createRow(i + 1);
+                row.createCell(0).setCellValue("超速");
+                row.createCell(1).setCellValue(fmtHHmmss.print(outbound.getSt()));
+                row.createCell(2).setCellValue(fmtHHmmss.print(outbound.getEt()));
+                if(outbound.getEt() != 0)
+                    row.createCell(3).setCellValue((outbound.getEt() - outbound.getSt()) / 1000);
+                row.createCell(4).setCellValue("");
+                row.createCell(5).setCellValue(outbound.getLocations());
+
+                row.getCell(5).setCellStyle(cs);
+            }
+        }
+
+        st = st * 1000;
+        et = et * 1000;
+        String filename = nbbm + "异常信息" + fmt.print(st) + "至" + fmt.print(et) + ".xls";
+        try {
+            resp.setContentType("application/x-msdownload");
+            resp.addHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
+
+            OutputStream out=resp.getOutputStream();
+            wb.write(out);
+            out.flush();
+            out.close();
+        } catch (UnsupportedEncodingException e) {
+            logger.error("", e);
+        } catch (IOException e) {
+            logger.error("", e);
+        }
+    }
+
+    @Override
+    public void arrivalExcel(String nbbm, long st, long et, HttpServletResponse resp) {
+
+    }
+
     @Override
     public List<GpsSpeed_DTO> speeds(String nbbm, long st, long et) {
         String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
@@ -649,6 +882,31 @@ public class GpsServiceImpl implements GpsService {
         gps.setRoadMinDistance(min);
     }
+
+    private void matchRoadToGps(HistoryGps_DTOV3 gps, List<Road_DTO> roads) {
+        double min = -1, distance;
+        Road_DTO nearRoad = null;
+        for (Road_DTO road : roads) {
+            distance = GeoUtils.getDistanceFromLine(road.getLineStr(), gps.getPoint());
+
+            if (min > distance || min == -1) {
+                min = distance;
+                nearRoad = road;
+            }
+        }
+
+        if(min < 200){
+            gps.setSection_code(nearRoad.getROAD_CODE());
+            gps.setSection_name(nearRoad.getROAD_NAME());
+        }
+        else {
+            gps.setSection_code("-00404");
+            gps.setSection_name("未知路段");
+        }
+        //gps.setRoad(nearRoad);
+        //gps.setRoadMinDistance(min);
+    }
+
     /**
      * 去重复
      *
@@ -663,6 +921,21 @@ public class GpsServiceImpl implements GpsService {
         return set;
     }
+    /**
+     * 去重复
+     *
+     * @param list
+     * @return
+     */
+    private Set<HistoryGps_DTOV3> removeDuplicateV3(List<HistoryGps_DTOV3> list) {
+        Set<HistoryGps_DTOV3> set = new HashSet<>();
+        for (HistoryGps_DTOV3 gps : list) {
+            set.add(gps);
+        }
+        return set;
+    }
+
+
     private void sortGpsList(final Field f, List<GpsEntity> rs) {
         Collections.sort(rs, new Comparator<GpsEntity>() {
@@ -86,6 +86,11 @@ public class GpsOutbound_DTO {
      */
     private String locations;
+    /**
+     * 所在路段
+     */
+    private String sectionName;
+
     private String abnormalType = "outbound";
     public String getDeviceId() {
@@ -135,4 +140,12 @@ public class GpsOutbound_DTO {
     public void setAbnormalType(String abnormalType) {
         this.abnormalType = abnormalType;
     }
+
+    public String getSectionName() {
+        return sectionName;
+    }
+
+    public void setSectionName(String sectionName) {
+        this.sectionName = sectionName;
+    }
 }
@@ -84,6 +84,11 @@ public class GpsSpeed_DTO {
      */
     private float speed;
+    /**
+     * 所在路段
+     */
+    private String sectionName;
+
     private String abnormalType = "speed";
     public String getDeviceId() {
@@ -133,4 +138,12 @@ public class GpsSpeed_DTO {
     public void setAbnormalType(String abnormalType) {
         this.abnormalType = abnormalType;
     }
+
+    public String getSectionName() {
+        return sectionName;
+    }
+
+    public void setSectionName(String sectionName) {
+        this.sectionName = sectionName;
+    }
 }
+package com.bsth.service.gps.entity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.forecast.entity.ArrivalEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.Point;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 历史GPS DTO
+ * Created by panzhao on 2017/4/5.
+ */
+public class HistoryGps_DTOV3 {
+
+    public static List<HistoryGps_DTOV3> craete(List<Map<String, Object>> mapList) {
+        List<HistoryGps_DTOV3> list = JSONObject.parseArray(JSON.toJSONString(mapList), HistoryGps_DTOV3.class);
+
+        GeometryFactory geometryFactory = new GeometryFactory();
+        Point point;
+        for (HistoryGps_DTOV3 gps : list) {
+            point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+            gps.setPoint(point);
+        }
+        return list;
+    }
+
+
+    private double bd_lon;
+    private double bd_lat;
+
+    private double lon;
+    private double lat;
+
+    private String deviceId;
+    private long ts;
+    private long timestamp;
+    private String stopNo;
+    private float direction;
+
+    private String lineId;
+    private float speed;
+    private ArrivalEntity inout_stop_info;
+    private int inout_stop;
+
+    private String nbbm;
+    private int state;
+    private int upDown;
+
+    private String section_code;
+    private String section_name;
+
+    @JsonIgnore
+    private Point point;
+
+    @Override
+    public int hashCode() {
+        return this.toString().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        HistoryGps_DTOV3 g2 = (HistoryGps_DTOV3) obj;
+        return this.toString().equals(g2.toString());
+    }
+
+
+    @Override
+    public String toString() {
+        return (this.getDeviceId() + "_" + (inout_stop_info==null?this.getStopNo():inout_stop_info.getStopName()) + "_" + this.getTs() + "_" + this.getLon() + "_" + this.getLat());
+    }
+
+    public double getBd_lon() {
+        return bd_lon;
+    }
+
+    public void setBd_lon(double bd_lon) {
+        this.bd_lon = bd_lon;
+    }
+
+    public double getBd_lat() {
+        return bd_lat;
+    }
+
+    public void setBd_lat(double bd_lat) {
+        this.bd_lat = bd_lat;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public long getTs() {
+        return ts;
+    }
+
+    public void setTs(long ts) {
+        this.ts = ts;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getStopNo() {
+        return stopNo;
+    }
+
+    public void setStopNo(String stopNo) {
+        this.stopNo = stopNo;
+    }
+
+    public float getDirection() {
+        return direction;
+    }
+
+    public void setDirection(float direction) {
+        this.direction = direction;
+    }
+
+    public String getLineId() {
+        return lineId;
+    }
+
+    public void setLineId(String lineId) {
+        this.lineId = lineId;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    public ArrivalEntity getInout_stop_info() {
+        return inout_stop_info;
+    }
+
+    public void setInout_stop_info(ArrivalEntity inout_stop_info) {
+        this.inout_stop_info = inout_stop_info;
+    }
+
+    public int getInout_stop() {
+        return inout_stop;
+    }
+
+    public void setInout_stop(int inout_stop) {
+        this.inout_stop = inout_stop;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public double getLon() {
+        return lon;
+    }
+
+    public void setLon(double lon) {
+        this.lon = lon;
+    }
+
+    public double getLat() {
+        return lat;
+    }
+
+    public void setLat(double lat) {
+        this.lat = lat;
+    }
+
+    public Point getPoint() {
+        return point;
+    }
+
+    public void setPoint(Point point) {
+        this.point = point;
+    }
+
+    public String getSection_code() {
+        return section_code;
+    }
+
+    public void setSection_code(String section_code) {
+        this.section_code = section_code;
+    }
+
+    public String getSection_name() {
+        return section_name;
+    }
+
+    public void setSection_name(String section_name) {
+        this.section_name = section_name;
+    }
+}
@@ -69,10 +69,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private StationRouteRepository stationRouteRepository;
-	// 线路标准信息repository
-	@Autowired
-	private LineInformationRepository lineInformationRepository;
-
 	// 车辆repository
 	@Autowired
 	private CarsRepository carsRepository;
@@ -89,14 +85,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private TTInfoDetailRepository ttInfoDetailRepository;
-	// 车辆配置信息repository
-	@Autowired
-	private CarConfigInfoRepository carConfigInfoRepository;
-
-	// 人员配置信息repository
-	@Autowired
-	private EmployeeConfigInfoRepository employeeConfigInfoRepository;
-
 	// 排班计划明细repository
 	@Autowired
 	private SchedulePlanInfoRepository schedulePlanInfoRepository;
@@ -109,6 +97,10 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private SKBUploadLoggerRepository skbUploadLoggerRepository;
+	// 线路站点repository
+	@Autowired
+	private StationRepository stationRepository;
+
 	// 运管处接口
 	private InternalPortType portType = null;//new Internal().getInternalHttpSoap11Endpoint();
@@ -367,7 +359,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 								continue;
 							}
-							scheduleRealInfo.getQdzCode();
 							sf.append("<LD>");
 							sf.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>");
 							sf.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>");
@@ -822,13 +813,15 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						sBuffer.append("<BC>");
 						sBuffer.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
 						sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>");
-						sBuffer.append("<FCZDMC>").append(ttInfoDetail.getQdz().getStationName()).append("</FCZDMC>");
+						sBuffer.append("<FCZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
+								+"_"+ttInfoDetail.getQdzCode())).append("</FCZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","B");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
 						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
-						sBuffer.append("<DDZDMC>").append(ttInfoDetail.getZdz().getStationName()).append("</DDZDMC>");
+						sBuffer.append("<DDZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
+								+"_"+ttInfoDetail.getZdzCode())).append("</DDZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","E");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
@@ -1331,9 +1324,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			if(otherParam != null && otherParam.get("stationMark") != null){
 				stationMark = otherParam.get("stationMark");
 				if(stationMark.equals("B")){ // 起点站
-					stationCode = ttid.getQdz().getStationCod();
+					stationCode = ttid.getQdzCode();
 				}else if(stationMark.equals("E")){ // 终点站
-					stationCode = ttid.getZdz().getStationCod();
+					stationCode = ttid.getZdzCode();
 				}
 			}
 		}
@@ -22,4 +22,6 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
     Map<String,Object> bufferTimeDiff(String lineCode, String field, String value);
     Map<String,Object> yjtkSet(Map<String, String> map);
+
+    Map<String,Object> parkAndStationSet(Map<String, String> map);
 }
@@ -172,4 +172,12 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
     Map<String,Object> addToHistory(ScheduleRealInfo sch);
 	Map<String, Object> deleteToHistory(Long id);
+
+    List<ScheduleRealInfo> queryListWaybill2(String jName, String clZbh, String lpName, String date, String line);
+
+    Map<String,Object> findKMBC_mh_2(String jGh, String clZbh, String lpName, String date, String line);
+
+    List<Map<String,Object>> statisticsDaily_mh_2(String line, String date, String xlName, String type);
+
+	List<ScheduleRealInfo> realScheduleList_mh_2(String line, String date);
 }
@@ -179,4 +179,28 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> parkAndStationSet(Map<String, String> map) {
+        String lineCode = map.get("lineCode").toString();
+        String twinsPark = map.get("twinsPark").toString();
+        String twinsStation = map.get("twinsStation").toString();
+
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            LineConfig conf = lineConfigData.get(lineCode);
+            conf.setTwinsPark(twinsPark);
+            conf.setTwinsStation(twinsStation);
+
+            lineConfigData.set(conf);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("conf", conf);
+        } catch (Exception e) {
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+            logger.error("", e);
+        }
+        return rs;
+    }
 }