Merge branch 'master' into minhang

zb
2 parents ae170ba2 e331185a
Showing 16 changed files with 579 additions and 27 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/sys/IntervalController.java
src/main/java/com/bsth/entity/excep/Speeding.java
src/main/java/com/bsth/entity/sys/Interval.java
src/main/java/com/bsth/repository/sys/IntervalRepository.java
src/main/java/com/bsth/service/excep/impl/SpeedingServiceImpl.java
src/main/java/com/bsth/service/gps/GpsService.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/sys/IntervalService.java
src/main/java/com/bsth/service/sys/impl/IntervalServiceImpl.java
src/main/resources/static/pages/base/interval/list.html
src/main/resources/static/pages/excep/js/outboundmap-load.js
src/main/resources/static/pages/excep/js/speeding-map.js
src/main/resources/static/pages/excep/speedingListmh.html
src/main/resources/static/pages/excep/speedingMap.html
@@ -10,6 +10,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
  
+import java.util.Calendar;
+import java.util.Date;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
  
@@ -4,11 +4,15 @@ import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.service.gps.GpsService;
+import com.bsth.service.gps.entity.GpsSpeed;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
  
 import javax.servlet.http.HttpServletResponse;
+
+import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
  
@@ -178,4 +182,13 @@ public class GpsController {
                                        @RequestParam(defaultValue = "DESC") String direction){
         return gpsService.safeDrivList(map , page, size, order, direction);
     }
+    
+    @RequestMapping(value = "/findPosition", method = RequestMethod.GET)
+    public List<GpsSpeed> findPosition(@RequestParam String vehicle,@RequestParam String startdate,@RequestParam String enddate) throws ParseException {
+    	String deviceid = BasicData.deviceId2NbbmMap.inverse().get(vehicle);
+    	List<GpsSpeed> listGpsSpeed = new ArrayList<GpsSpeed>();
+    	listGpsSpeed = gpsService.findPosition(deviceid,startdate,enddate);
+    	return listGpsSpeed;
+    }
+    
 }
+package com.bsth.controller.sys;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.bsth.entity.sys.Interval;
+import com.bsth.service.sys.IntervalService;
+
+@RestController
+@RequestMapping("interval")
+public class IntervalController {
+	
+	@Autowired
+	IntervalService intervalService;
+	
+	@RequestMapping(value = "/save", method = RequestMethod.POST)
+	public Map<String, Object> save(@RequestParam String array){
+		return intervalService.saveList(JSON.parseArray(array, Interval.class));
+	}
+}
@@ -52,6 +52,33 @@ public class Speeding {
 	private Float lat;
  
 	/**
+	 * 超速结束时的经度
+	 */
+	private Float endlon;
+	
+	public Float getEndlon() {
+		return endlon;
+	}
+
+	public void setEndlon(Float endlon) {
+		this.endlon = endlon;
+	}
+
+	public Float getEndlat() {
+		return endlat;
+	}
+
+	public void setEndlat(Float endlat) {
+		this.endlat = endlat;
+	}
+
+	/**
+	 * 超速结束时的纬度
+	 */
+	private Float endlat;
+	
+	
+	/**
 	 * 速度
 	 */
 	private Float speed;
@@ -38,6 +38,7 @@ public class Interval {
 		this.trough = trough;
 	}
  
+	
 	public Integer getCreateBy() {
 		return createBy;
 	}
+package com.bsth.repository.sys;
+
+
+import org.springframework.stereotype.Repository;
+import com.bsth.entity.sys.Interval;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface IntervalRepository extends BaseRepository<Interval, Integer> {
+
+}
@@ -9,6 +9,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
  
@@ -24,6 +25,8 @@ import com.bsth.service.excep.SpeedingService;
 import com.bsth.util.EchartConver;
 import com.bsth.util.PageHelper;
 import com.bsth.util.PageObject;
+import com.bsth.util.TransGPS;
+import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
 import com.github.abel533.echarts.Option;
 import com.google.gson.Gson;
@@ -39,7 +42,7 @@ public class SpeedingServiceImpl implements SpeedingService {
 		ResultSet rs = null;
 		int page=Integer.parseInt(map.get("page").toString());
 		List<Speeding> list=new ArrayList<Speeding>();
-		String sql="select * from bsth_c_speeding where 1=1 ";
+		String sql="select * from bsth_c_speeding where speed > 60 ";
 		Object line=map.get("line");
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
@@ -83,7 +86,6 @@ public class SpeedingServiceImpl implements SpeedingService {
  
 		}
  
-		
 		/*sql +=" order by id limit ?,?";*/
  
  
@@ -104,17 +106,23 @@ public class SpeedingServiceImpl implements SpeedingService {
 	}
  
 	static List<Speeding> resultSet2Set(ResultSet rs) throws SQLException{
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		List<Speeding> list=new ArrayList<Speeding>();
 		Speeding speeding;
+		Float lon, lat;
+		Location location;
 		while(rs.next()){
+			lon = rs.getFloat("lon");
+			lat = rs.getFloat("lat");
+            location = TransGPS.LocationMake(lon, lat);
+            location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
 			speeding=new Speeding();
 			speeding.setId(Integer.valueOf(rs.getObject("id").toString()));
-			speeding.setLat(Float.valueOf(rs.getObject("lat").toString()));
+			speeding.setLon((float)location.getLng());
+			speeding.setLat((float)location.getLat());
 			speeding.setLine(Integer.valueOf(rs.getObject("line").toString()));
 			//run 时注解
 			speeding.setLineName(BasicData.lineCode2NameMap.get(speeding.getLine().toString()));
-			speeding.setLon(Float.valueOf(rs.getObject("lon").toString()));
 			speeding.setSpeed(Float.valueOf(rs.getObject("speed").toString()));
 			speeding.setTimestamp((Long.valueOf(rs.getObject("timestamp").toString())));
 			speeding.setTimestampDate(sdf.format(new Date(speeding.getTimestamp())));
@@ -127,14 +135,12 @@ public class SpeedingServiceImpl implements SpeedingService {
  
 	@Override
 	public PageObject<Speeding> Pagequery(Map<String, Object> map) {
-		String sql="select count(*) record  from bsth_c_speeding where 1=1 ";
+/*		String sql="select count(*) record  from bsth_c_speeding where 1=1 ";
 		Object line=map.get("line");
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
 		Object startDate=map.get("startDate");
 		Object endDate=map.get("endDate");
-		//时间转换
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  
 		if(line!=null){
 			sql +=" and line like'%"+line.toString().trim()+"%'";
@@ -186,14 +192,17 @@ public class SpeedingServiceImpl implements SpeedingService {
 			e.printStackTrace();
 		}finally {
 			DBUtils_MS.close(rs, ps, conn);
-		}
+		}*/
  
+		//时间转换
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		List<Speeding> list=findAll(map);
 		List<Speeding> listResult = new ArrayList<Speeding>();
 		int curPage;//页码  
 		int pageData;//每页的记录条数
 		int start;//起始数据下标
 		int totalPage;//总页数
+		int totalData = 0;
 		if(list.size()>1){
 			Speeding speedingNow;//下标为i的车
 			Speeding speedingLast;//下标为i-1的车
@@ -206,11 +215,20 @@ public class SpeedingServiceImpl implements SpeedingService {
 				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.setEndtimestamp(speedingNow.getTimestamp());//设置结束时间时间戳
 					speedingLast.setEndtimestampDate(sdf.format(new Date(speedingNow.getTimestamp())));//设置结束时间
+					speedingLast.setEndlon(speedingNow.getLon());//设置结束时的经度
+					speedingLast.setEndlat(speedingNow.getLat());//设置结束时的纬度
 					listResult.add(speedingLast);
 				}
 			}
+			Iterator<Speeding> speedIt = listResult.iterator(); 
+			while(speedIt.hasNext()){
+				Speeding speeding = speedIt.next(); 
+			    if(speeding.getEndtimestamp()-speeding.getTimestamp()<=1000){  
+			    	speedIt.remove();  
+			    }  
+			}
  
 			totalData = listResult.size();//总记录条数。
 			if(map.get("curPage") == null || map.get("curPage").equals("0")){
 package com.bsth.service.gps;
  
+import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.service.gps.entity.GpsOutbound_DTO;
+import com.bsth.service.gps.entity.GpsSpeed;
 import com.bsth.service.gps.entity.GpsSpeed_DTO;
  
 import javax.servlet.http.HttpServletResponse;
+
+import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
  
@@ -38,4 +42,7 @@ public interface GpsService {
 	void abnormalExcel(String nbbm, long st, long et, HttpServletResponse resp);
  
 	void arrivalExcel(String nbbm, long st, long et, HttpServletResponse resp);
+
+	List<GpsSpeed> findPosition(String deviceid, String startdate,
+			String enddate) throws ParseException;
 }
@@ -45,6 +45,8 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
  
 @Service
@@ -975,4 +977,57 @@ public class GpsServiceImpl implements GpsService {
         }
         return true;
     }
+
+	@Override
+	public List<GpsSpeed> findPosition(String deviceid, String startdate,
+			String enddate) throws ParseException{
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    	Calendar c = Calendar.getInstance();
+    	Date date = sdf.parse(startdate);	
+    	c.setTime(date);
+    	int daysYear = c.get(Calendar.DAY_OF_YEAR);//获取当前是今年的第几天。
+    	
+    	long startTime = sdf.parse(startdate).getTime();
+    	long endTime = sdf.parse(enddate).getTime();
+    	
+        String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,speed_gps from bsth_c_gps_info where days_year=? and device_id=? and ts >= ? and ts <= ?" +
+        		"     ORDER BY TS ";
+        Connection conn = null;
+        PreparedStatement ps = null;
+        ResultSet rs = null;
+        List<GpsSpeed> listResult = new ArrayList<GpsSpeed>();
+        GpsSpeed gpsSpeed = null;
+        try {
+            conn = DBUtils_MS.getConnection();
+            ps = conn.prepareStatement(sql);
+            ps.setInt(1, daysYear);
+            ps.setString(2, deviceid);
+            ps.setLong(3,startTime);
+            ps.setLong(4,endTime);
+            rs = ps.executeQuery();
+            Float lon, lat;
+            Location location;
+            while (rs.next()) {
+            	gpsSpeed = new GpsSpeed();
+                // to 百度坐标
+                lon = rs.getFloat("LON");
+                lat = rs.getFloat("LAT");
+                location = TransGPS.LocationMake(lon, lat);
+                location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
+                gpsSpeed.setVehicle(rs.getString("device_id"));
+                gpsSpeed.setLon((float)location.getLng());
+                gpsSpeed.setLat((float)location.getLat());
+                gpsSpeed.setSpeed(rs.getFloat("speed_gps"));
+                gpsSpeed.setTimestamp(rs.getLong("TS"));
+                // 上下行
+                listResult.add(gpsSpeed);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            DBUtils_MS.close(rs, ps, conn);
+        }
+        return listResult;
+    	
+	}
 }
+package com.bsth.service.sys;
+
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.sys.Interval;
+import com.bsth.service.BaseService;
+
+public interface IntervalService extends BaseService<Interval, Integer> {
+
+	Map<String, Object> saveList(List<Interval> parseArray);
+
+}
+package com.bsth.service.sys.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.sys.Interval;
+import com.bsth.repository.sys.IntervalRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.IntervalService;
+
+@Service
+public class IntervalServiceImpl extends BaseServiceImpl<Interval, Integer> implements IntervalService {
+	
+	@Autowired
+	IntervalRepository intervalRepository;
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	@Override
+	public Map<String, Object> saveList(List<Interval> parseArray) {
+		Map<String, Object> map = new HashMap<>();
+		try{
+			intervalRepository.save(parseArray);
+			map.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			map.put("status", ResponseCode.ERROR);
+			logger.error("", e);
+		}
+		return map;
+	}
+	
+}
+<!-- <link href="/pages/base/line/css/animate.css" rel="stylesheet" type="text/css" />
+<link href="/pages/base/line/css/tipso.css" rel="stylesheet" type="text/css" /> -->
+<!-- 片段标题 START -->
+<div class="page-head">
+	<div class="page-title">
+		<h1>大间隔信息</h1>
+	</div>
+</div>
+<!-- 片段标题 END -->
+
+<!-- 线路信息导航栏组件 START -->
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
+	<li><span class="active">大间隔信息</span></li>
+</ul>
+<!-- 线路信息导航栏组件 END -->
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<div class="tipso-animation">
+				</div>
+				<div class="caption">
+					 <i class="fa fa-info-circle font-dark"></i> 
+					 <span class="caption-subject font-dark sbold uppercase">线路信息</span>
+				</div>
+				<div class="actions">
+					<div class="btn-group btn-group-devided" data-toggle="buttons">
+						<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加线路</a>
+					</div>
+				</div>
+			</div>
+			<div class="portlet-body">
+				<div class="table-container" style="margin-top: 10px">
+					<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_line">
+						<thead>
+							<tr role="row" class="heading">
+								<th >#</th>
+								<th >序号</th>
+								<th >大间隔ID</th>
+								<th >大间隔等级</th>
+								<th >高峰间隔时间</th>
+								<th >低谷间隔时间</th>
+								<th >操作</th>
+							</tr>
+							<tr role="row" class="filter">
+								<td>#</td>
+								<td></td>
+								<td></td>
+								<td></td>
+								<td></td>
+								<td></td>
+								<td>
+									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
+										<i class="fa fa-search"></i> 搜索
+									</button>
+                                                                
+									<button class="btn btn-sm red btn-outline filter-cancel" id="notification-trigger">
+										<i class="fa fa-times"></i> 重置
+									</button>
+								</td>
+							</tr>
+						</thead>
+						<tbody></tbody>
+					</table>
+					<div style="text-align: right;">
+						<ul id="pagination" class="pagination"></ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/html" id="line_list_temp">
+	{{each list as obj i }}
+		<tr>
+			<td style="vertical-align: middle;">
+				<input type="checkbox" class="group-checkable icheck" value="{{obj.name}}" id="{{obj.id}}" data-id="{{obj.id}}" data-lineName="{{obj.name}}">
+			</td>
+			<td style="vertical-align: middle;">
+				{{(list.page*10)+(i+1)}}
+			</td>
+			<td>
+				{{obj.lineCode}}
+			</td>
+			<td>
+				{{obj.name}}
+			</td>
+			<td>
+				{{if obj.nature == 'lj'}}
+						路救
+				{{else if obj.nature == 'bc'}}
+						备车
+				{{else if obj.nature == 'dbc'}}
+						定班车
+				{{else if obj.nature == 'yxl'}}
+						夜宵路
+				{{else if obj.nature == 'cgxl'}}
+						常规线路
+				{{else if obj.nature == 'gjxl'}}
+						过江线路
+				{{else if obj.nature == 'csbs'}}
+						穿梭巴士
+				{{else if obj.nature == 'tyxl'}}
+						特约线路
+				{{else if obj.nature == 'qt'}}
+						其他
+				{{else if obj.nature == 'cctxl'}}
+						村村通线路
+				{{/if}}
+			</td>
+			<td>
+				{{if obj.level == '1'}}
+						一级线路
+				{{else if obj.level == '2'}}
+						 二级线路
+				{{else if obj.level == '0'}}
+						 未知等级
+				{{/if}}
+			</td>
+			<td>
+				{{obj.shanghaiLinecode}}
+			</td>
+			<td>
+				{{if obj.destroy == 1}}
+					<span style="font-weight: bold; color: red; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">撤销</span>
+				{{else if obj.destroy == 0}}
+					<span style="font-weight: bold; color: #07824e; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">运营</span>
+				{{/if}}
+			</td>
+			<td>
+				<a href="/pages/base/lineinformation/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
+			</td>
+			<td>
+				<a href="/pages/base/stationroute/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
+			</td>
+			<td>
+				<a href="details.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a>
+				<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
+			</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan=13><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<!-- <script src="/pages/base/line/js/tipso.js"></script> -->
+<!-- 线路信息片段JS模块 -->
+<script src="/pages/base/line/js/line-list-table.js"></script>
 \ No newline at end of file
@@ -8,7 +8,6 @@ $(function(){
  
 	// 获取参数线路ID
 	var no = $.url().param('no');
-	var up =  $.url().param('up');
 	var paramArr = new Array();
 	paramArr = no.split(",");// 在每个逗号(,)处进行分解。
   /*paramArr[0]：id
+/**
+ * 百度地图
+ * 
+ * - - - - - -》init：地图初始化
+ * 
+ * - - - - - -》lineInfoPanl：从百度地图抓去站点与路段数据
+ * 
+ * - - - - - -》getDistanceAndDuration：获取距离与时间
+ * 
+ * - - - - - -》pointsPolygon：地图画多边行
+ * 
+ * - - - - - -》pointsCircle：画圆
+ * 
+ * - - - - - -》localSearchFromAdreesToPoint：根据地理名称获取百度经纬度坐标
+ * 
+ * - - - - - -》drawingUpline：在地图上画出上行线路走向
+ * 
+ * - - - - - -》stationsNameToPoints：站点名称获取百度坐标（手动规划）
+ * 
+ * - - - - - -》getDistanceAndTotime：根据坐标点获取两点之间的时间与距离（手动规划）
+ * 
+ * - - - - - -》getSectionListPlonly：根据坐标点获取两点之间的折线路段（手动规划）
+ */
+
+var SpeedingMap = function () {
+	
+	/** WorldsBMap 全局变量定义 mapBValue：地图对象；polygon：多边形；polyUpline：走向折线；circle：圆 *//*
+	var mapBValue = '';polygon='',polyUpline='',circle='',iseditStatus = false;*/
+	
+	var Bmap = {
+			
+			init : function() {
+				// 设置中心点,
+				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
+				
+				// 百度API Key
+				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				
+				// 初始化百度地图
+				mapBValue = new BMap.Map("speedingMap");
+				
+				//中心点和缩放级别
+				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
+				
+				//启用地图拖拽事件，默认启用(可不写)
+				mapBValue.enableDragging(); 
+				
+				//启用地图滚轮放大缩小
+				mapBValue.enableScrollWheelZoom(); 
+				
+				//禁用鼠标双击放大
+				mapBValue.disableDoubleClickZoom();
+				
+				//启用键盘上下左右键移动地图
+				mapBValue.enableKeyboard();
+				
+				return mapBValue;
+			},
+			
+			/** 获取地图对象 @return 地图对象map */
+			getmapBValue : function() {
+				
+				return mapBValue;
+				
+			},
+			
+		/*	drawTravelRoute：function(data){
+				var driving = Bmap.DrivingRoute(map, {renderOptions:{map: map}})
+				
+			}*/
+			
+	}
+	
+	return Bmap;
+	
+}();
 \ No newline at end of file
@@ -146,7 +146,10 @@
 		{{(obj.endtimestamp-obj.timestamp)/1000}}秒
 	</td>
 	<td>
-		<a class="btn default blue-stripe btn-sm lookTrajectory" data-pjax>
+		<a class="btn default blue-stripe btn-sm lookTrajectory" data-vehicle ="{{obj.vehicle}}"
+			data-startdate="{{obj.timestampDate}}" data-enddate="{{obj.endtimestampDate}}"
+			data-lon="{{obj.lon}}"  data-lat="{{obj.lat}}" 
+			data-endlon="{{obj.endlon}}"  data-endlat="{{obj.endlat}}" >
 			查看轨迹
 		</a>
 	</td>
@@ -162,6 +165,8 @@
 {{/if}}
 </script>
  
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+
 <script>
 $(function(){
 	var page = 0, initPagination;
@@ -185,7 +190,20 @@ $(function(){
  	var parameter = new Object();
  	parameter.endDate = $("input[name='endDate']")[0].value;
  	parameter.startDate = $("input[name='startDate']")[0].value;
-	jsDoQuery(parameter,true);
+ 	 
+ 	//搜索线路
+	$.get('/basic/lineCode2Name',function(result){
+		var data=[];
+		data.push({id: " ", text: "全部线路"});
+		for(var code in result){
+			data.push({id: code, text: result[code]});
+		}
+		initPinYinSelect2($('#line'),data,function(ldmcSelector) {
+			ldmcSelector.select2("val",data[1].id);//因为数据量太大，所以默认一条线路作为查询参数
+		});
+		parameter.line = data[1].id;
+		jsDoQuery(parameter,true);
+	});
  
 	//时间戳转换为年月日
 	function timeToData(time){
@@ -223,7 +241,7 @@ $(function(){
 	/*
 	* 获取数据 p: 要提交的参数， pagination: 是否重新分页
 	*/
-	function jsDoQuery(p, pagination){
+ 	function jsDoQuery(p, pagination){
 		var params = {};
 		if(p)
 			params = p;
@@ -243,7 +261,27 @@ $(function(){
 			}
 			layer.close(i);
   			$(".lookTrajectory").click(function(){
-				layer.alert("暂未开放此功能！");
+  				var vehicle = $(this).data('vehicle');
+  				var startDate = $(this).data('startdate');
+  				var endDate = $(this).data('enddate');
+  				var lon = $(this).data('lon');
+  				var lat = $(this).data('lat');
+  				var endLon = $(this).data('endlon');
+  				var endLat = $(this).data('endlat');
+  				var storage = window.localStorage;
+  				storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat);
+ 				$.get('/pages/excep/speedingMap.html?',function (result) {
+			    	layer.open({
+						type: 1,
+						title:'<i class="uk-icon-play-circle"></i>轨迹回放',
+						shadeClose: true,
+						shade: true,
+						scrollbar: false,
+						maxmin: false, //开启最大化最小化按钮
+						area: ['100%', '100%'],
+					    content:result,//内容
+					});
+			    });
 			}) 
 		});
 	}
@@ -307,17 +345,6 @@ $(function(){
 			$('tr.filter .filter-submit').click();
 		});
 	});
-	
-	//搜索线路
-	$.get('/basic/lineCode2Name',function(result){
-		var data=[];
-		data.push({id: " ", text: "全部线路"});
-		for(var code in result){
-			data.push({id: code, text: result[code]});
-		}
-		initPinYinSelect2('#line',data,'');
-
-	});
  
 $("#line").on("change",initXl);
 function initXl(){
@@ -334,6 +361,7 @@ $(&#39;#nbbm&#39;).select2({
            	    xlbm:$('#line').val()}; 	
         },
         processResults: function (data) {
+        	console.log(data);
             return {
                 results: data
             };
@@ -370,7 +398,6 @@ $(&#39;#nbbm&#39;).select2({
  
 //改变状态
 function changeEnabled(id,enabled){
-	debugger
 	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
 		jsDoQuery(null, true);
 	})
+<style>
+	.play_back-layer .layui-layer-title{
+    	height: 36px;
+    	border-bottom: none;
+	}
+</style>
+
+<div id="titleMap">
+<button id="run" style="margin-left:10px" class="btn btn-sm green btn-outline filter-submit margin-bottom">运行</button>
+</div>
+<div id="speedingMap">
+</div>
+<style type="text/css">
+
+#speedingMap{
+	width: 100%; 
+	border: 2px solid #fdfdfd;
+	height: calc(100% - 30px);
+	overflow: hidden;
+}
+</style>
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script type="text/javascript" src="/pages/excep/js/speeding-map.js"></script>
+<script type="text/javascript">
+$(function(){
+		var dataArr = window.localStorage.zbhAndDate.split(",");//获取页面传递过来的车辆自编号以及超速起始时间和超速结束时间
+		var vehicle = dataArr[0];
+		var startdate = dataArr[1];
+		var enddate = dataArr[2];
+		var lon = dataArr[3];//起点经度
+		var lat = dataArr[4];//起点纬度
+		var endLon = dataArr[5];//终点经度
+		var endLat = dataArr[6];//终点纬度
+		var Points = [];
+  		$.ajax({
+        	type: "GET",
+        	async:false,
+            url: '/gps/findPosition',
+            data: {vehicle:vehicle,startdate:startdate,enddate:enddate},
+            success: function(data){
+            	console.log("123"+data);
+             	$.each(data,function(i,item){
+            		console.log(item);
+             		if(item.lon>1 && item.lat>1){
+			 			var point = new BMap.Point(item.lon,item.lat);
+			 			Points.push(point);
+            		} 
+ 				});
+            }
+        });
+ setTimeout(function(){
+		var map = SpeedingMap.init();//创建地图
+		var myP1 = new BMap.Point(lon,lat);    //起点
+		var myP2 = new BMap.Point(endLon,endLat);    //终点
+ 		map.centerAndZoom(myP1,18);//地图中心点坐标
+ 		console.log(Points); 
+ 		var polyline = new BMap.Polyline(Points, {strokeColor:"blue", strokeWeight:5, strokeOpacity:0.5});   //创建折线	
+		var myIcon = new BMap.Icon("/pages/excep/img/bus.png", new BMap.Size(32, 70), {//小车图片
+			imageOffset: new BMap.Size(5,20) //图片的偏移量。为了是图片底部中心对准坐标点。
+		}); 
+		$(document).on('click', '#run', function() {
+ 			map.clearOverlays();//清空上一次的轨迹
+			map.addOverlay(polyline);//增加折线
+			var paths = Points.length;//获得有几个点
+			var carMk = new BMap.Marker(Points[0],{icon:myIcon});
+			map.addOverlay(carMk);
+			i=0;
+				function resetMkPoint(i){
+					carMk.setPosition(Points[i]);
+					if(i < paths){
+						setTimeout(function(){
+							i++;
+							resetMkPoint(i);
+						},100);
+					}
+				}
+				setTimeout(function(){
+					resetMkPoint(0);
+				},100)
+			});	 
+		});
+}, 100);
+</script>
+
+