update 超速信息

zb
2 parents 4edb5f24 a2558d9d
Showing 12 changed files with 616 additions and 327 deletions
src/main/java/com/bsth/controller/excep/SpeedingController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/entity/excep/Speeding.java
src/main/java/com/bsth/service/excep/SpeedingService.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/resources/static/pages/excep/boundList.html
src/main/resources/static/pages/excep/js/speeding-map.js
src/main/resources/static/pages/excep/speedingList.html
src/main/resources/static/pages/excep/speedingListmh.html
src/main/resources/static/pages/excep/speedingMap.html
 package com.bsth.controller.excep;
+import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,11 +14,13 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.bsth.controller.BaseController;
+import com.bsth.data.BasicData;
 import com.bsth.entity.excep.Offline;
 import com.bsth.entity.excep.Speeding;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.excep.OfflineService;
 import com.bsth.service.excep.SpeedingService;
+import com.bsth.service.gps.entity.GpsSpeed;
 import com.bsth.util.PageObject;
 @RestController
@@ -45,5 +50,11 @@ public class SpeedingController extends BaseController&lt;SysUser, Integer&gt;{
 		return modelMap;
 	}
+	@RequestMapping(value = "/findPosition", method = RequestMethod.GET)
+	public List<Speeding> findPosition(@RequestParam String vehicle,@RequestParam String startdate,@RequestParam String enddate) throws ParseException {
+    	String deviceid = BasicData.deviceId2NbbmMap.inverse().get(vehicle);
+    	List<Speeding> listSpeeding = speedingService.findPosition(deviceid,startdate,enddate);
+    	return listSpeeding;
+	}
 }
@@ -195,12 +195,10 @@ public class GpsController {
     }
 	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
-	public PageObject<GpsSpeed> pagequery(@RequestParam Map<String, Object> map){
-		PageObject<GpsSpeed> pageObject = null;
+	public Map<String, Object> pagequery(@RequestParam Map<String, Object> map){
 		map.put("curPage", map.get("page").toString());
 		map.put("pageData","10");
-		pageObject=gpsService.Pagequery(map);
-		return pageObject;
+		return gpsService.Pagequery(map);
 	}
 }
@@ -35,7 +35,11 @@ public class Speeding {
 	 */
 	private String lineName;
-
+	/**
+	 * 线路ID
+	 */
+	private Integer lineId;
+	
 	/**
 	 * 上下行（0 上行 ， 1 下行 ， -1 无效）
 	 */
@@ -243,4 +247,12 @@ public class Speeding {
 		this.endtimestamp = endtimestamp;
 	}
+	public Integer getLineId() {
+		return lineId;
+	}
+
+	public void setLineId(Integer lineId) {
+		this.lineId = lineId;
+	}
+
 }
 package com.bsth.service.excep;
+import java.util.List;
 import java.util.Map;
 import com.bsth.entity.excep.Speeding;
@@ -8,4 +9,6 @@ import com.bsth.util.PageObject;
 public interface SpeedingService {
 	PageObject <Speeding> Pagequery(Map<String, Object> map) ;
 	Map<String, Object> getReport( Map<String, Object> map);
+	List<Speeding> findPosition(String deviceid, String startdate,
+			String enddate);
 }
@@ -7,6 +7,7 @@ import java.sql.SQLException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -18,8 +19,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.bsth.data.BasicData;
+import com.bsth.entity.excep.Outbound;
 import com.bsth.entity.excep.Speeding;
 import com.bsth.service.excep.SpeedingService;
+import com.bsth.service.gps.entity.GpsSpeed;
 import com.bsth.util.EchartConver;
 import com.bsth.util.PageHelper;
 import com.bsth.util.PageObject;
@@ -40,24 +43,17 @@ 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_speedingmh 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");
+		Object times=map.get("times");
 		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		if(line!=null){
 			sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
-		
-		if(nbbm!=null){
-			 nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-			 if(nbbm!=null)
-			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
-		}
-		
 		if(updown!=null){
 			sql +="and up_down like '%"+updown.toString()+"%'";
 		}
@@ -65,41 +61,42 @@ public class SpeedingServiceImpl implements SpeedingService {
 			if (startDate.toString().length()>0) {
 				try {
 					Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime();
-					sql += " and timestamp >="+t1;
+					sql += " and startTimestamp >="+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;
+					sql += " and endTimestamp <="+t2;
 				} catch (ParseException e) {
 					e.printStackTrace();
 				}
 			}
 		}
-
-		/*sql +=" order by id limit ?,?";*/
+		if(times!=null && times.toString().length()>0){
+			sql +=" and (endTimestamp-startTimestamp) >="+Integer.valueOf(times.toString())*1000;
+		}
+
+		sql +=" order by startTimestamp 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) {
 			e.printStackTrace();
 		}finally {
 			DBUtils_MS.close(rs, ps, conn);
 		}
-		
 		return list;
 	}
@@ -107,25 +104,27 @@ public class SpeedingServiceImpl implements SpeedingService {
 		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.setLon((float)location.getLng());
-			speeding.setLat((float)location.getLat());
-			speeding.setLine(Integer.valueOf(rs.getObject("line").toString()));
+			speeding.setId(rs.getInt("id"));
+			speeding.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
+			speeding.setLine(rs.getInt("line"));
 			//run 时注解
 			speeding.setLineName(BasicData.lineCode2NameMap.get(speeding.getLine().toString()));
-			speeding.setSpeed(Float.valueOf(rs.getObject("speed").toString()));
-			speeding.setTimestamp((Long.valueOf(rs.getObject("timestamp").toString())));
+			speeding.setLineId(BasicData.lineId2CodeMap.inverse().get(speeding.getLine().toString()));
+			speeding.setUpDown(rs.getInt("up_down"));
+			//将gps的经纬度转成百度的经纬度
+            location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(rs.getFloat("startLon"), rs.getFloat("startLat"))));
+            speeding.setLon((float)location.getLng());
+            speeding.setLat((float)location.getLat());
+            location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(rs.getFloat("endLon"), rs.getFloat("endLat"))));
+            speeding.setEndlon((float)location.getLng());
+            speeding.setEndlat((float)location.getLat());
+			speeding.setTimestamp((Long.valueOf(rs.getObject("startTimestamp").toString())));
 			speeding.setTimestampDate(sdf.format(new Date(speeding.getTimestamp())));
-			speeding.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
-			speeding.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
+			speeding.setEndtimestamp((Long.valueOf(rs.getObject("endTimestamp").toString())));
+			speeding.setEndtimestampDate(sdf.format(new Date(speeding.getEndtimestamp())));
 			list.add(speeding);
 		}
 		return list;
@@ -133,52 +132,49 @@ 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_speedingmh where 1=1 ";
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		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");
+		Object times=map.get("times");
 		if(line!=null){
 			sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
-		
-		if(nbbm!=null){
-			nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-			if(nbbm!=null)
-			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
-		}
 		if(updown!=null){
 			sql +="and up_down like '%"+updown.toString()+"%'";
 		}
 		if(startDate!=null){
 			if (startDate.toString().length()>0) {
 				try {
-					Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime();
-					sql += " and timestamp >="+t1;
+					Long t1 = sdf.parse(startDate.toString()+" 00:00:00").getTime();
+					sql += " and startTimestamp >="+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;
+					sql += " and endTimestamp <="+t2;
 				} catch (ParseException e) {
 					e.printStackTrace();
 				}
 			}
-			
 		}
+		
+		if(times!=null && times.toString().length()>0){
+			sql +=" and (endTimestamp-startTimestamp) >="+Integer.valueOf(times.toString())*1000;
+		}
+		
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		int totalData = 0;
-
 		try {
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
@@ -190,93 +186,14 @@ public class SpeedingServiceImpl implements SpeedingService {
 			e.printStackTrace();
 		}finally {
 			DBUtils_MS.close(rs, ps, conn);
-		}*/
-		
-		//时间转换
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		List<Speeding> list=findAll(map);
-		List<Speeding> listResult = new ArrayList<Speeding>();
-		int curPage;//页码  
-		int pageData;//每页的记录条数
-		int start;//起始数据下标
-		int totalPage;//总页数
-		int totalData = 0;
-		if(list.size()>1){
-			Speeding speedingNow;//下标为i的车辆行驶记录
-			Speeding speedingLast;//下标为i-1的车辆行驶记录
-			Speeding spped = null;//整合后的车辆行驶记录
-			String strNow;
-			String strLast;
-			boolean Flag = false;//判断是否有连续超速记录,默认没有
-			for(int i = 1;i<list.size();i++){
-				speedingNow = list.get(i);
-				speedingLast = list.get(i-1);
-				strNow = speedingNow.getVehicle()+speedingNow.getLine()+speedingNow.getUpDown();
-				strLast = speedingLast.getVehicle()+speedingLast.getLine()+speedingLast.getUpDown();
-				if(speedingNow.getSpeed()>60 && speedingLast.getSpeed()>60 && strNow.equals(strLast)){//如果两条连续的记录都是超速且属于同一辆车。
-					if(Flag==false){//
-						spped = new Speeding();
-						spped.setId(speedingLast.getId());//设置连续超速记录Id
-						spped.setLine(speedingLast.getLine());//设置连续超速记录线路
-						spped.setLineName(speedingLast.getLineName());//设置连续超速记录线路名称
-						spped.setVehicle(speedingLast.getVehicle());//设置连续超速记录的车辆编号
-						spped.setUpDown(speedingLast.getUpDown());//设置上下行
-						spped.setLon(speedingLast.getLon());//设置开始时经度
-						spped.setLat(speedingLast.getLat());//设置开始时纬度
-						spped.setTimestamp(speedingLast.getTimestamp());//设置连续超速记录的开始时间
-						spped.setTimestampDate(speedingLast.getTimestampDate());//设置连续超速记录的开始时间戳
-					}
-					spped.setEndtimestamp(speedingNow.getTimestamp());//设置结束时间戳
-					spped.setEndtimestampDate(sdf.format(new Date(speedingNow.getTimestamp())));//设置结束时间
-					spped.setEndlon(speedingNow.getLon());//设置结束时的经度
-					spped.setEndlat(speedingNow.getLat());//设置结束时的纬度
-					Flag = true;
-				}else{
-					if(Flag){//如果上一条记录超速。
-						listResult.add(spped);
-						Flag = false;
-					}
-				}
-			}
-			Iterator<Speeding> speedIt = listResult.iterator(); 
-			while(speedIt.hasNext()){
-				Speeding speeding = speedIt.next(); 
-			    if(speeding.getEndtimestamp()-speeding.getTimestamp()<=1000){  
-			    	speedIt.remove();  
-			    }  
-			}
-			
-			totalData = listResult.size();//总记录条数。
-			if(map.get("curPage") == null || map.get("curPage").equals("0")){
-				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();
+		PageHelper pageHelper = new PageHelper(totalData, map);
+		List<Speeding> list=findAll(pageHelper.getMap());
 		PageObject<Speeding> pageObject = pageHelper.getPageObject();
-		pageObject.setDataList(listResult);
+		pageObject.setDataList(list);
 		return pageObject;
 	}
-	
 	@Override
 	public Map<String, Object> getReport(Map<String, Object> map) {
 		String chartStr = "";
@@ -393,5 +310,46 @@ public class SpeedingServiceImpl implements SpeedingService {
 	}
+    @Override
+    public List<Speeding> findPosition(String deviceid, String startdate,
+                                       String enddate){
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String sql = "select id,vehicle,line,up_down,lon,lat,speed,timestamp from bsth_c_speeding where vehicle = ? and timestamp >= ? and timestamp <= ? order by timestamp ";
+        Connection conn = null;	                                        
+        PreparedStatement ps = null;
+        ResultSet rs = null;
+        List<Speeding> listResult = new ArrayList<Speeding>();
+        Speeding speed = null;
+        try {
+            conn = DBUtils_MS.getConnection();
+            ps = conn.prepareStatement(sql);
+            long startTime = sdf.parse(startdate).getTime();
+            long endTime = sdf.parse(enddate).getTime();
+            ps.setString(1, deviceid);
+            ps.setLong(2,startTime);
+            ps.setLong(3,endTime);
+            rs = ps.executeQuery();
+            Location location;
+            while (rs.next()) {
+            	speed = new Speeding();
+                speed.setVehicle(rs.getString("vehicle"));
+                location = TransGPS.LocationMake(rs.getFloat("lon"), rs.getFloat("lat"));
+                location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
+                speed.setLon((float)location.getLng());
+                speed.setLat((float)location.getLat());
+                speed.setSpeed(rs.getFloat("speed"));
+                speed.setTimestamp(rs.getLong("timestamp"));
+                // 上下行
+                listResult.add(speed);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            DBUtils_MS.close(rs, ps, conn);
+        }
+        return listResult;
+
+    }
+	
 }
@@ -47,5 +47,5 @@ public interface GpsService {
 	List<GpsSpeed> findPosition(String deviceid, String startdate,
 			String enddate) throws ParseException;
-	PageObject<GpsSpeed> Pagequery(Map<String, Object> map);
+	Map<String, Object> Pagequery(Map<String, Object> map);
 }
@@ -1053,16 +1053,19 @@ public class GpsServiceImpl implements GpsService {
     }
     @Override
-    public PageObject<GpsSpeed> Pagequery(Map<String, Object> map) {
-
+    public Map<String, Object> Pagequery(Map<String, Object> map) {
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Integer totalDays = 0;//数据跨越天数
+		try {
+			totalDays = (int) ((sdf.parse(map.get("endDate").toString()+" 23:59:59").getTime()-sdf.parse(map.get("startDate").toString()+" 00:00:00").getTime()+1)/(3600*24*1000))+1;
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}//总页数
+		map.put("totalDays",totalDays);
         List<GpsSpeed> list=findAll(map);
         List<GpsSpeed> listResult = new ArrayList<GpsSpeed>();
-        int curPage;//页码
-        int pageData;//每页的记录条数
-        int start;//起始数据下标
-        int totalPage;//总页数
-        int totalData = 0;
+        int curPage = 0;//页码
+        int pageData = 0;//每页的记录条数
         if(list.size()>1){
             GpsSpeed GpsSpeedNow;//下标为i的车辆行驶记录
             GpsSpeed GpsSpeedLast;//下标为i-1的车辆行驶记录
@@ -1099,49 +1102,35 @@ public class GpsServiceImpl implements GpsService {
                     }
                 }
             }
-            Iterator<GpsSpeed> speedIt = listResult.iterator();
-            while(speedIt.hasNext()){
-                GpsSpeed GpsSpeed = speedIt.next();
-                if(GpsSpeed.getEndtimestamp()-GpsSpeed.getTimestamp()<=1000){
-                    speedIt.remove();
-                }
-            }
-
-            totalData = listResult.size();//总记录条数。
-            if(map.get("curPage") == null || map.get("curPage").equals("0")){
-                curPage = 0;
-            }else{
-                curPage = Integer.parseInt((String) map.get("curPage"));
-            }
-            pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
-            start = (curPage - 0) * pageData; //起始记录下标。
-            totalPage = totalData % pageData == 0 ? totalData / pageData : totalData / pageData +1;//总页数
-            if(curPage == totalPage-1){//如果当前页等于总页数。
-                listResult = listResult.subList(start, totalData);
-            }else{
-                listResult = listResult.subList(start, start+pageData);
+            if(listResult.size()>0){
+            	Iterator<GpsSpeed> speedIt = listResult.iterator();
+            	while(speedIt.hasNext()){
+            		GpsSpeed GpsSpeed = speedIt.next();
+            		if(GpsSpeed.getEndtimestamp()-GpsSpeed.getTimestamp()<=1000){
+            			speedIt.remove();
+            		}
+            	}
             }
-        }else{
-            curPage = 1;
-            pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
-            totalPage =1;
         }
+    	if(map.get("curPage") == null || map.get("curPage").equals("0")){
+    		curPage = 0;
+    	}else{
+    		curPage = Integer.parseInt((String) map.get("curPage"));
+    	}
+    	Integer totalPage = totalDays;
+    	pageData = listResult.size();//每页的记录条数就是当前页查出的全部数据。
         Map<String,Object> paramMap = new HashMap<String,Object>();
         paramMap.put("totalPage", totalPage);
-        paramMap.put("curPage", curPage);
+        paramMap.put("page", curPage);
         paramMap.put("pageData", pageData);
-        PageHelper pageHelper = new PageHelper(totalData, paramMap);
-        pageHelper.getMap();
-        PageObject<GpsSpeed> pageObject = pageHelper.getPageObject();
-        pageObject.setDataList(listResult);
-        return pageObject;
+        paramMap.put("list", listResult);
+        return paramMap;
     }
     static List<GpsSpeed> findAll(Map<String, Object> map) {
         Connection conn = null;
         PreparedStatement ps = null;
         ResultSet rs = null;
-        int page=Integer.parseInt(map.get("page").toString());
         List<GpsSpeed> list=new ArrayList<GpsSpeed>();
         String sql="select * from bsth_c_gps_info where 1=1 ";
         Object line=map.get("line");
@@ -1149,6 +1138,13 @@ public class GpsServiceImpl implements GpsService {
         Object updown=map.get("updown");
         Object startDate=map.get("startDate");
         Object endDate=map.get("endDate");
+        Integer totalDays = Integer.valueOf(map.get("totalDays").toString());
+        Integer curPage = 0;//页码
+        if(map.get("curPage") == null || map.get("curPage").equals("0")){
+        	curPage = 0;
+    	}else{
+    		curPage = Integer.parseInt((String) map.get("curPage"));
+    	}
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if(line!=null){
@@ -1167,7 +1163,7 @@ public class GpsServiceImpl implements GpsService {
         if(startDate!=null){
             if (startDate.toString().length()>0) {
                 try {
-                    Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime();
+                    Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime()+curPage*3600*24*1000;
                     sql += " and ts >="+t1;
                 } catch (ParseException e) {
                     e.printStackTrace();
@@ -1178,7 +1174,7 @@ public class GpsServiceImpl implements GpsService {
         if(endDate!=null){
             if (endDate.toString().length()>0) {
                 try {
-                    Long t2=sdf.parse(endDate.toString()+" 23:59:59").getTime();
+                    Long t2=sdf.parse(endDate.toString()+" 23:59:59").getTime()-(totalDays-1-curPage)*3600*24*1000;
                     sql += " and ts <="+t2;
                 } catch (ParseException e) {
                     e.printStackTrace();
@@ -262,8 +262,8 @@ $(function(){
 					}
 				}
 			});
-		    	page = num - 1;
-		    	jsDoQuery(params, false);
+	    	page = num - 1;
+	    	jsDoQuery(params, false);
 		    }
 		});
 	}
@@ -3,33 +3,23 @@
  * 
  * - - - - - -》init：地图初始化
  * 
- * - - - - - -》lineInfoPanl：从百度地图抓去站点与路段数据
- * 
  * - - - - - -》getDistanceAndDuration：获取距离与时间
  * 
- * - - - - - -》pointsPolygon：地图画多边行
- * 
- * - - - - - -》pointsCircle：画圆
- * 
- * - - - - - -》localSearchFromAdreesToPoint：根据地理名称获取百度经纬度坐标
- * 
  * - - - - - -》drawingUpline：在地图上画出上行线路走向
  * 
- * - - - - - -》stationsNameToPoints：站点名称获取百度坐标（手动规划）
- * 
- * - - - - - -》getDistanceAndTotime：根据坐标点获取两点之间的时间与距离（手动规划）
- * 
- * - - - - - -》getSectionListPlonly：根据坐标点获取两点之间的折线路段（手动规划）
+ * - - - - - -》stationsPointsToLibraryPoint：根据站点坐标匹配库中的公交站点（手动规划）
  */
 var SpeedingMap = function () {
-	/** WorldsBMap 全局变量定义 mapBValue：地图对象；polygon：多边形；polyUpline：走向折线；circle：圆 *//*
-	var mapBValue = '';polygon='',polyUpline='',circle='',iseditStatus = false;*/
+	/** SpeedingMap 全局变量定义 mapBValue：地图对象；polyUpline：走向折线；sectionList：截取过的路段 ；pointIndex：计算路段被切的次数;
+	 * firstPoint:截取路段的第一个点;iseditStatus：路段是否在编辑状态；isCutSection ： 获取路段是否在截取状态*/
+	var mapBValue = '', polyUpline='', sectionList = [], pointIndex = 0, iseditStatus = false, firstPoint = {}, isCutSection = false;
 	var Bmap = {
 			init : function() {
+				
 				// 设置中心点,
 				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
@@ -40,7 +30,7 @@ var SpeedingMap = function () {
 				mapBValue = new BMap.Map("speedingMap");
 				//中心点和缩放级别
-				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
+				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat),15);
 				//启用地图拖拽事件，默认启用(可不写)
 				mapBValue.enableDragging(); 
@@ -56,7 +46,10 @@ var SpeedingMap = function () {
 				return mapBValue;
 			},
-			
+			/** 获取第一个切路段的点  @return Point*/
+			getFirstPoint : function() {
+				return firstPoint;
+			},
 			/** 获取地图对象 @return 地图对象map */
 			getmapBValue : function() {
@@ -64,10 +57,337 @@ var SpeedingMap = function () {
 			},
-		/*	drawTravelRoute：function(data){
-				var driving = Bmap.DrivingRoute(map, {renderOptions:{map: map}})
+			getPolyUpline : function() {
+				
+				return polyUpline;
+			},
+			
+			/** 获取截取过的路段 @return 路段对象List */
+			getSectionList : function() {
+				
+				return sectionList;
+				
+			},
+			setSectionList : function(list) {
+				
+				sectionList = list;
+			},
+			initCutSectionPoint : function() {
+				sectionList = [];
+				var tbodyHtml = template('section_list',{list : sectionList});
+				$('#section_table tbody').html(tbodyHtml);
+			},
+			/** 获取切路段的点下标  @return int*/
+			setPointIndex : function(index) {
+				pointIndex = index;
+			},
+			getPointIndex : function() {
+				
+				return pointIndex;
+				
+			},
+			/** 获取路段是否在编辑状态 @return boolean*/
+			getIsEditStatus : function() {
+				return iseditStatus;
+			},			
+			setIsEditStatus : function(v) {
+				iseditStatus = v ;
+			},
+					
+			/** 获取路段是否在截取状态 @return boolean*/
+			getIsCutSection : function() {
+				return isCutSection;
+			},			
+			setIsCutSection : function(v) {
+				isCutSection = v ;
+			},
+			
+			/** 获取距离与时间 @param <points：坐标点集合> */
+			getDistanceAndDuration : function(points,callback){
+				
+				// 获取长度
+				var len = points.length;
+				(function(){
+					
+					if (!arguments.callee.count) {
+						 
+						 arguments.callee.count = 0;
+						 
+					 }
+					 
+					 arguments.callee.count++;
+					 
+					 var index = parseInt(arguments.callee.count) - 1;
+					 
+					 if (index >= len-1) {
+						 
+						 callback && callback(points);
+			        	  
+			              return;
+			          }
+					 
+					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
+					 var f = arguments.callee;
+					 // 起点坐标 <坐标格式：40.056878,116.30815>
+					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
+					 
+					 // 终点坐标 <坐标格式：40.056878,116.30815>
+					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
+					 var region = '上海';
+					 
+					 var origin_region = '上海';
+					 
+					 var destination_region = '上海';
+					 
+					 var output = 'json';
+					 
+					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
+					 
+					 /** 
+					  *  origin：起点名称或经纬度；
+					  * 
+					  *  destination：终点名称或经纬度；
+					  *  
+					  *  origin_region：起始点所在城市，驾车导航时必填。
+					  *  
+					  *  destination_region：终点所在城市，驾车导航时必填。
+					  * 
+					  *  output :表示输出类型，可设置为xml或json，默认为xml。
+					  *  
+					  **/
+					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
+					 
+					 /** @description :未认证开发者默认配额为：2000次/天。 */
+					 $.ajax({
+						  
+						  // 百度地图根据坐标获取两点之间的时间与距离
+			              url: 'http://api.map.baidu.com/direction/v1?mode=transit',
+			              
+			              data: paramsB,
+			              
+			              dataType: 'jsonp',
+			              
+			              success: function(r){
+			            	  
+			            	  if(r) {
+			            		  
+			            		  if(r.message=='ok') {
+			            			  
+			            			  if(r.result.taxi==null) {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = 0;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = 0;
+			            				  
+			            			  }else {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = r.result.taxi.distance;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = r.result.taxi.duration;
+			            				  
+			            			  }
+			            			  
+			            			  
+			            		  }
+			            		  
+			            	  }
+			            	  
+			            	  f();
+			              }
+			          });
+					
+				})();
+				
+			},
+			// 在地图上画出上行线路走向
+			drawingUpline01 : function (polylineArray,polyline_center,data) {
+				var polyUpline01 = 'polyline' + '_' + data.sectionrouteId;
+				// 创建线路走向
+				polyUpline01 = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
+				polyUpline01.data = data;
+				// 把折线添加到地图上
+				mapBValue.addOverlay(polyUpline01);
+				var sectionPoint = [];
+				// 线路单击事件
+				polyUpline01.addEventListener('click',function(e) {
+					if(SpeedingMap.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					if(SpeedingMap.getIsCutSection()) {
+						layer.msg('请先撤销所有切路段的点...');
+						return false;
+					}
+					polyUpline01.enableEditing();
+					SpeedingMap.setIsEditStatus(true);
+				});
+				
+				// 添加路段双击事件
+				polyUpline01.addEventListener("dblclick",function(e){
+					if(SpeedingMap.getIsCutSection()) {
+						layer.msg('请先撤销所有切路段的点...');
+						return false;
+					}
+					SpeedingMap.setIsEditStatus(false);
+					// 关闭
+					layer.closeAll();
+					polyUpline01.disableEditing();
+					EditSectionObj.setEitdSection(polyUpline01.data);
+					// 获取折线坐标集合
+					var editPloyLineArray = polyUpline01.getPath();
+					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					sectionList = [];
+					var tbodyHtml = template('section_list',{list : sectionList});
+					// 截取路段
+					$('#section_table tbody').html(tbodyHtml);
+					// 加载修改路段弹出层mobal页面
+					$.get('editsection.html', function(m){
+						$(pjaxContainer).append(m);
+						$('#edit_section_mobal_cache').trigger('editSectionMobalCache_show', [SpeedingMap,GetAjaxData,EditSectionObj,PublicFunctions]);
+					});
+				});
+				
+				// 路段右击事件
+				var editSection = function(e,ee,marker){
+					if(SpeedingMap.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					var lng = e.lng;
+					var lat = e.lat;	
+					var sectionName = null;
+					var marker = new BMap.Marker(new BMap.Point(lng, lat)); // 创建点
+					marker.isFlag = true;
+					if(pointIndex == 0) {
+						sectionPoint[pointIndex] = {lng:lng , lat:lat};
+						layer.msg('进入切路段状态，请选择本路段的终点！');
+						mapBValue.addOverlay(marker);// 添加覆盖物
+						firstPoint = {lng:lng, lat:lat};
+						pointIndex++;
+						EditSectionObj.setEitdSection(polyUpline01.data);
+						// 获取折线坐标集合
+						var editPloyLineArray = polyUpline01.getPath();
+						EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					} else if (pointIndex > 0) {
+						layer.prompt({title: '请输入路段名！'}, function(sectionName, index){
+							pointList = [];
+							sectionPoint[pointIndex] = {lng:lng , lat:lat};
+							pointList[0] = sectionPoint[pointIndex-1];
+							pointList[1] = sectionPoint[pointIndex];
+							sectionList.push({name:sectionName, section:pointList});	
+							layer.close(index);
+							layer.msg('路段截取成功，请选择下一个路段的终点');
+							mapBValue.addOverlay(marker);// 添加覆盖物
+							var tbodyHtml = template('section_list',{list : sectionList});
+							// 截取路段
+							$('#section_table tbody').html(tbodyHtml);
+							pointIndex++;
+						});
+					}
+					SpeedingMap.setIsCutSection(true);
+				}
+				var markerMenu=new BMap.ContextMenu();
+				markerMenu.addItem(new BMap.MenuItem('切路段',editSection.bind(polyUpline01)));
+				polyUpline01.addContextMenu(markerMenu);
+				
+				
+		  		var PanOptions_ ={noAnimation :true};
+		  		mapBValue.reset();
+		  		mapBValue.panTo(polyline_center,PanOptions_);
+		  		mapBValue.panBy(500,-510,PanOptions_);
+		  		mapBValue.setZoom(14);
+			},
+			// 删除点刷新cutSectionTable
+			refreshCutSectionTable : function() {
+				var tbodyHtml = template('section_list',{list : sectionList});
+				$('#section_table tbody').html(tbodyHtml);
+			},
+			// 删除点刷新覆盖物
+			deleteCutSectionPoint : function(point) {
+				var lng = point.lng;
+				var lat = point.lat;
+				var allOverlay = mapBValue.getOverlays();
+				// 删除最后一个点
+				for (var i = 0; i < allOverlay.length -1; i++){
+					if(allOverlay[i].isFlag) {
+						if(allOverlay[i].point.lng == lng && allOverlay[i].point.lat == lat){
+							mapBValue.removeOverlay(allOverlay[i]);
+							break;
+						}
+					}
+				}		
+			},			
+			/** 在地图上画点 @param：<point_center：中心坐标点> */
+			drawingUpStationPoint : function(point_center,stationName,s) {
+				
+				// 自定义标注物图片
+			  	var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/gjzd.png',new BMap.Size(10, 10));
+			  		
+			  	var html2 = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -10px; top: -35px; overflow: hidden;">'
+			            +     		'<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">'
+						+ 		'</div>'
+						+ 		'<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 15px; top: -35px;"><span style="float: left; color: #fdfdfd; margin-left: -22px;  font-size: 6px;">'+ s+'</span>'+ stationName+'</label>';
+						 
+						
+				var	myRichMarker1 = new BMapLib.RichMarker(html2, point_center,{
+                        "anchor" : new BMap.Size(-10,8),
+						  "enableDragging" : true});
+				
+			
+				myRichMarker1.disableDragging();
+				mapBValue.addOverlay(myRichMarker1);
+		  		
+		  		
+		  		// 创建标注物
+		  		marker = new BMap.Marker(point_center,{icon : icon_target});
+  				
+		  		// 允许覆盖物在map.clearOverlays方法中被清除。
+		  		marker.enableMassClear();
+		  		
+		  		mapBValue.addOverlay(marker);
+			},
+			
+			// 根据站点坐标匹配库中的公交站点（手动规划）
+			stationsPointsToLibraryPoint : function(arra,callback) {
+				// 获取长度
+				var len = arra.length;
+				var station = {};
+				var stationList = [];
+				(function(){
+					if (!arguments.callee.count) {
+						arguments.callee.count = 0;
+					}
+					arguments.callee.count++;
+					var index = parseInt(arguments.callee.count) - 1;
+					if (index >= len) {
+						callback && callback(stationList);
+			        	return ; 
+			        }
+					var f = arguments.callee;
+					station = arra[index];					
+					if(arra[index].name!=''){
+						
+						$.get('/station/matchStation',station,function(resultStation) {
+							stationList.push({name:resultStation.name ,wgs:arra[index].wgs,potion:{lng:resultStation.potion_lng, lat:resultStation.potion_lat}, isHave:resultStation.isHave , id:resultStation.id});
+							f();
+						});							 
+					 }else {
+						 f();
+					 }	
+				})()
+			},
+			clearMarkAndOverlays : function() {
+				
+				// 清楚地图覆盖物
+				mapBValue.clearOverlays();
+				
+				mapBValue.removeOverlay();
-			}*/
+			}
 	}
@@ -20,30 +20,6 @@
 						class="caption-subject font-dark sbold uppercase">超速异常数据表</span>
 				</div>
 				<div class="actions">
-<!-- 					<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加用户</a> -->
-					<!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> ɾ���û�</button> -->
-					<!-- <div class="btn-group">
-						<a class="btn red btn-outline btn-circle" href="javascript:;"
-							data-toggle="dropdown"> <i class="fa fa-share"></i> <span
-							class="hidden-xs"> 系统工具</span> <i class="fa fa-angle-down"></i>
-						</a>
-						<ul class="dropdown-menu pull-right" id="datatable_ajax_tools">
-							<li><a href="javascript:;" data-action="0"
-								class="tool-action"> <i class="fa fa-print"></i>打印
-							</a></li>
-							<li><a href="javascript:;" data-action="1"
-								class="tool-action"> <i class="fa fa-copy"></i> 复制
-							</a></li>
-							<li><a href="javascript:;" data-action="3"
-								class="tool-action"> <i class="fa fa-file-excel-o"></i>
-									导出Excel
-							</a></li>
-							<li class="divider"></li>
-							<li><a href="javascript:;" data-action="5"
-								class="tool-action"> <i class="fa fa-refresh"></i> 刷新数据
-							</a></li>
-						</ul>
-					</div> -->
 				</div>
 			</div>
 			<div class="portlet-body">
@@ -54,23 +30,22 @@
 						<thead>
 							<tr role="row" class="heading">
 								<th width="3%">#</th>
-								<th width="8%">线路</th>
-								<th width="10%">车辆自编号</th>
-								<!-- <th width="100">工号/名字</th>
-								<th width="11%">路牌名</th> -->
-								<th width="10%">上下行</th>
-								<th width="20%">超速时间</th>
-								<th width="6%">持续时间</th>
-								<th width="10%">查看轨迹</th>
-								<th width="18%">操作</th>
+								<th width="4%">线路</th>
+								<th width="6%">车辆自编号</th>
+								<th width="8%">上下行</th>
+								<th width="10%">开始时间</th>
+								<th width="10%">结束时间</th>
+								<th width="8%">持续时间</th>
+								<th width="8%">查看轨迹</th>
+								<th width="6%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
 								<td></td>
 								<td>
-										<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+										<select class="form-control" name="line" id="line" style="width: 100px;"></select>
 								</td>
 								<td>
-										<select class="form-control" name="nbbm" id="nbbm" style="width: 150px;"></select>
+										<select class="form-control" name="nbbm" id="nbbm" style="width: 100px;"></select>
 								</td>
 								<!-- <td>
@@ -78,18 +53,19 @@
 								<td>
 								</td> -->
 								<td>
-									<select class="form-control form-filter " name="updown">
+									<select class="form-control form-filter " name="updown" style="width: 90px;">
                                          <option value="">请选择...</option>
                                          <option value="0">上行</option>
                                          <option value="1">下行</option>
                                          <option value="-1">无效</option>
                                      </select>
 								</td>
-								<td nowrap="nowrap"> 
-									<input class="form-control" type="date" name="startDate" style="width: 180px;"/>
+								<td> 
+									<input class="form-control" type="date" name="startDate" />
 									-
-									<input class="form-control" type="date" name="endDate" style="width: 180px;"/>
-								
+									<input class="form-control" type="date" name="endDate" />
+								</td>
+								<td>
 								</td>
 								<td>
 								</td>
@@ -128,9 +104,9 @@
 		{{obj.vehicle}}
 	</td>
 	<td>
-		{{if obj.upDown==0}}
+		{{if obj.up_down==0}}
 			上行
-		{{else if obj.upDown==1}}
+		{{else if obj.up_down==1}}
 			下行 
 		{{else}}
 			无效
@@ -140,10 +116,18 @@
 		{{obj.timestampDate}}
 	</td>
 	<td>
-		{{obj.durationTime}}秒
+		{{obj.endtimestampDate}}
 	</td>
 	<td>
-		
+		{{(obj.endtimestamp-obj.timestamp)/1000}}秒
+	</td>
+	<td>
+		<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>
 	<td>
@@ -157,6 +141,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;
@@ -171,7 +157,6 @@ $(function(){
  	var endTime = dateTime-week*24*3600*1000;//上周末、格式为时间戳。
 	var startTime = endTime-6*24*3600*1000;//上周一、格式为时间戳。
-	
 	var endDate = timeToData(endTime);
 	var startDate = timeToData(startTime);
  	//表单默认选择上周一到上周日的超速信息。
@@ -180,15 +165,27 @@ $(function(){
  	var parameter = new Object();
  	parameter.endDate = $("input[name='endDate']")[0].value;
  	parameter.startDate = $("input[name='startDate']")[0].value;
-	//jsDoQuery(parameter,true);
-	jsDoQuery(null,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){
 		var date = new Date(time);
 		var year = date.getFullYear();
 		var Month = date.getMonth()+1>10?date.getMonth()+1:"0"+(date.getMonth()+1); 
- 		var Day = date.getDate()>10?date.getDate():"0"+date.getDate();
+ 		var Day = date.getDate()>9?date.getDate():"0"+date.getDate();
 		return year+"-"+Month+"-"+Day;
 	}
@@ -219,7 +216,7 @@ $(function(){
 	/*
 	* 获取数据 p: 要提交的参数， pagination: 是否重新分页
 	*/
-	function jsDoQuery(p, pagination){
+ 	function jsDoQuery(p, pagination){
 		var params = {};
 		if(p)
 			params = p;
@@ -227,20 +224,40 @@ $(function(){
 		params['order'] = 'lastLoginDate';
 		params['page'] = page;
 		var i = layer.load(2);
-		$get('/speeding/pagequery' ,params, function(data){
-// 			$.each(data.content, function(i, obj) {
-//                 obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
-//             });
-			var bodyHtm = template('speeding_list_temp', {list: data.dataList});
+		$.get('/gps/pagequery' ,params, function(data){
+			var bodyHtm = template('speeding_list_temp', {list: data.list});
 			$('#datatable_speeding tbody').html(bodyHtm)
 					.find('.icheck').iCheck(icheckOptions)
 					.on('ifChanged', iCheckChange);
-			if(pagination && data.dataList.length > 0){
+			if(pagination){
 				//重新分页
 				initPagination = true;
 				showPagination(data);
 			}
 			layer.close(i);
+  			$(".lookTrajectory").click(function(){
+  				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,//内容
+					});
+			    });
+			}) 
 		});
 	}
@@ -291,6 +308,7 @@ $(function(){
 		});
 	}
+	
 	//删除
 	$('#removeButton').on('click', function(){
 		if($(this).attr('disabled'))
@@ -302,17 +320,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(){
@@ -329,6 +336,7 @@ $(&#39;#nbbm&#39;).select2({
            	    xlbm:$('#line').val()}; 	
         },
         processResults: function (data) {
+        	console.log(data);
             return {
                 results: data
             };
@@ -365,7 +373,6 @@ $(&#39;#nbbm&#39;).select2({
 //改变状态
 function changeEnabled(id,enabled){
-	debugger
 	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
 		jsDoQuery(null, true);
 	})
@@ -20,30 +20,6 @@
 						class="caption-subject font-dark sbold uppercase">超速异常数据表</span>
 				</div>
 				<div class="actions">
-<!-- 					<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加用户</a> -->
-					<!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> ɾ���û�</button> -->
-					<!-- <div class="btn-group">
-						<a class="btn red btn-outline btn-circle" href="javascript:;"
-							data-toggle="dropdown"> <i class="fa fa-share"></i> <span
-							class="hidden-xs"> 系统工具</span> <i class="fa fa-angle-down"></i>
-						</a>
-						<ul class="dropdown-menu pull-right" id="datatable_ajax_tools">
-							<li><a href="javascript:;" data-action="0"
-								class="tool-action"> <i class="fa fa-print"></i>打印
-							</a></li>
-							<li><a href="javascript:;" data-action="1"
-								class="tool-action"> <i class="fa fa-copy"></i> 复制
-							</a></li>
-							<li><a href="javascript:;" data-action="3"
-								class="tool-action"> <i class="fa fa-file-excel-o"></i>
-									导出Excel
-							</a></li>
-							<li class="divider"></li>
-							<li><a href="javascript:;" data-action="5"
-								class="tool-action"> <i class="fa fa-refresh"></i> 刷新数据
-							</a></li>
-						</ul>
-					</div> -->
 				</div>
 			</div>
 			<div class="portlet-body">
@@ -83,15 +59,16 @@
                                          <option value="1">下行</option>
                                          <option value="-1">无效</option>
                                      </select>
-								</td>
+								</td> 
 								<td> 
 									<input class="form-control" type="date" name="startDate" />
-									-
-									<input class="form-control" type="date" name="endDate" />
 								</td>
 								<td>
+									<input class="form-control" type="date" name="endDate" />
 								</td>
 								<td>
+									>=<input class="form-control" type="text" name="times" style="width:50px;display:inline!important"
+									  onkeyup="(this.v=function(){this.value=this.value.replace(/[^0-9-]+/,'');}).call(this)" onblur="this.v();"/> 
 								</td>
 								<td>
 								</td>
@@ -128,9 +105,9 @@
 		{{obj.vehicle}}
 	</td>
 	<td>
-		{{if obj.up_down==0}}
+		{{if obj.upDown==0}}
 			上行
-		{{else if obj.up_down==1}}
+		{{else if obj.upDown==1}}
 			下行 
 		{{else}}
 			无效
@@ -148,9 +125,9 @@
 	<td>
 		<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}}" >
-			查看轨迹
+			data-lon="{{obj.lon}}"  data-lat="{{obj.lat}}" data-endlon="{{obj.endlon}}"  
+            data-endlat="{{obj.endlat}}" data-lineid="{{obj.lineId}}" data-updown="{{obj.upDown}}">
+			查看轨迹										
 		</a>
 	</td>
 	<td>
@@ -181,7 +158,6 @@ $(function(){
  	var endTime = dateTime-week*24*3600*1000;//上周末、格式为时间戳。
 	var startTime = endTime-6*24*3600*1000;//上周一、格式为时间戳。
-	debugger;
 	var endDate = timeToData(endTime);
 	var startDate = timeToData(startTime);
  	//表单默认选择上周一到上周日的超速信息。
@@ -190,7 +166,7 @@ $(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=[];
@@ -198,11 +174,7 @@ $(function(){
 		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);
+		initPinYinSelect2('#line',data,'');
 	});
 	//时间戳转换为年月日
@@ -249,7 +221,7 @@ $(function(){
 		params['order'] = 'lastLoginDate';
 		params['page'] = page;
 		var i = layer.load(2);
-		$get('/gps/pagequery' ,params, function(data){
+		$get('/speeding/pagequery' ,params, function(data){
 			var bodyHtm = template('speeding_list_temp', {list: data.dataList});
 			$('#datatable_speeding tbody').html(bodyHtm)
 					.find('.icheck').iCheck(icheckOptions)
@@ -268,8 +240,10 @@ $(function(){
   				var lat = $(this).data('lat');
   				var endLon = $(this).data('endlon');
   				var endLat = $(this).data('endlat');
+  				var lineid = $(this).data('lineid');
+  				var upDown = $(this).data('updown');
   				var storage = window.localStorage;
-  				storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat);
+  				storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat+","+lineid+","+upDown);
  				$.get('/pages/excep/speedingMap.html?',function (result) {
 			    	layer.open({
 						type: 1,
@@ -315,25 +289,24 @@ $(function(){
 		    		initPagination = false;
 		    		return;
 		    	}	
-		    	page = num - 1;
 		    	var cells = $('tr.filter')[0].cells
 				,params = {}
 				,name;
-				$.each(cells, function(i, cell){
-					var items = $('input,select', cell);
-					for(var j = 0, item; item = items[j++];){
-						name = $(item).attr('name');
-						if(name){
-							params[name] = $(item).val();
-						}
+			$.each(cells, function(i, cell){
+				var items = $('input,select', cell);
+				for(var j = 0, item; item = items[j++];){
+					name = $(item).attr('name');
+					if(name){
+						params[name] = $(item).val();
 					}
-				});
-		    	jsDoQuery(params, false);
+				}
+			});
+			page = num - 1;
+		   	jsDoQuery(params, false);
 		    }
 		});
 	}
-	
 	//删除
 	$('#removeButton').on('click', function(){
 		if($(this).attr('disabled'))
@@ -361,7 +334,6 @@ $(&#39;#nbbm&#39;).select2({
            	    xlbm:$('#line').val()}; 	
         },
         processResults: function (data) {
-        	console.log(data);
             return {
                 results: data
             };
@@ -20,6 +20,8 @@
 }
 </style>
 <script type="text/javascript" src="/pages/excep/js/speeding-map.js"></script>
+<script type="text/javascript" src="/pages/excep/js/line-list-function.js"></script>
+
 <script type="text/javascript">
 $(function(){
 		var dataArr = window.localStorage.zbhAndDate.split(",");//获取页面传递过来的车辆自编号以及超速起始时间和超速结束时间
@@ -30,13 +32,15 @@ $(function(){
 		var lat = dataArr[4];//起点纬度
 		var endLon = dataArr[5];//终点经度
 		var endLat = dataArr[6];//终点纬度
+		var lineid = dataArr[7];
+		var directionData = dataArr[8];
 		var pointObj;//坐标和速度组成的对象
 		var Points = [];//坐标和速度对象的集合
 		var coordinateArr = [];//坐标点数组
   		$.ajax({
         	type: "GET",
         	async:false,
-            url: '/gps/findPosition',
+            url: '/speeding/findPosition',
             data: {vehicle:vehicle,startdate:startdate,enddate:enddate},
             success: function(data){
              	$.each(data,function(i,item){
@@ -44,6 +48,7 @@ $(function(){
              			pointObj = new Object();
              			pointObj.coordinate = new BMap.Point(item.lon,item.lat);
 			 			pointObj.speed = item.speed;
+			 			pointObj.vehicle = item.vehicle;
 			 			Points.push(pointObj);
             		} 
  				});
@@ -51,38 +56,44 @@ $(function(){
         });      
  setTimeout(function(){
 		var map = SpeedingMap.init();//创建地图
+		$get('/sectionroute/findSection',{'line.id_eq' : lineid , 'directions_eq' :directionData},function(data) {
+			// 在地图上画出线路走向
+			PublicFunctions.linePanlThree(lineid,data,directionData);
+		});
 		var myP1 = new BMap.Point(lon,lat);    //起点
 		var myP2 = new BMap.Point(endLon,endLat);    //终点
-		var centerLon = (parseFloat(lon)+parseFloat(endLon))/2;
+/* 		var centerLon = (parseFloat(lon)+parseFloat(endLon))/2;
 		var centerLat = (parseFloat(lat)+parseFloat(endLat))/2;
- 		map.centerAndZoom(new BMap.Point(centerLon,centerLat),18);//地图中心点坐标
- 		
+ 		map.centerAndZoom(new BMap.Point(centerLon,centerLat),18);//地图中心点坐标 */
  		for(i in Points){
  			coordinateArr.push(Points[i].coordinate);
  		}
- 		var polyline = new BMap.Polyline(coordinateArr, {strokeColor:"blue", strokeWeight:5, strokeOpacity:0.5});//创建折线
+ 		var polyline = new BMap.Polyline(coordinateArr, {strokeColor:"red", 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) //图片的偏移量。为了是图片底部中心对准坐标点。
 		}); 
+		var carMk;
 		$(document).on('click', '#run', function() {
- 			map.clearOverlays();//清空上一次的轨迹
+			map.centerAndZoom(new BMap.Point(lon,lat),16);//地图中心点坐标 */
+			if(typeof(carMk)!="undefined"){
+ 				map.removeOverlay(carMk);//清空上一次的轨迹
+			}
+ 			carMk = new BMap.Marker(coordinateArr[0],{icon:myIcon});
 			map.addOverlay(polyline);//增加折线
 			var paths = coordinateArr.length;//获得有几个点
-			var carMk = new BMap.Marker(coordinateArr[0],{icon:myIcon});
 			map.addOverlay(carMk);
-			var sContent ="车辆即时速度:"+Points[0].speed;
+			var sContent ="车辆编号:"+Points[0].vehicle+"</br>车辆速度:"+Points[0].speed+"km/h";
 			var infoWindow = new BMap.InfoWindow(sContent);// 创建信息窗口对象
 			map.openInfoWindow(infoWindow,coordinateArr[0]); //开启信息窗口
 			i=0;
-			
 			setTimeout(function(){
 				resetMkPoint(0);
 			},500);
 			function resetMkPoint(i){
 				carMk.setPosition(coordinateArr[i]);
-				sContent ="车辆即时速度是:"+Points[i].speed;
+				sContent ="车辆编号:"+Points[i].vehicle+"</br>车辆速度:"+Points[i].speed+"km/h";
 				infoWindow = new BMap.InfoWindow(sContent);// 创建信息窗口对象
 				map.openInfoWindow(infoWindow,coordinateArr[i]); //开启信息窗口
 				if(i < paths-1){
@@ -91,9 +102,10 @@ $(function(){
 						resetMkPoint(i);
 					},500);
 				}
-			};	 
+			};
+				 
 		});
-}, 500);
+	}, 500);
  });
 </script>