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

徐烜
2 parents c1c24590 0743fc80
Showing 36 changed files with 3282 additions and 79 deletions
src/main/java/com/bsth/controller/excep/NowAbnormalController.java
src/main/java/com/bsth/controller/excep/NowOfflineController.java
src/main/java/com/bsth/controller/excep/NowOutboundController.java
src/main/java/com/bsth/controller/excep/NowSpeedingController.java
src/main/java/com/bsth/controller/excep/SpeedingController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/status_manager/gps_line_state/LineStateHandle.java
src/main/java/com/bsth/data/gpsdata/status_manager/gps_service_state/ServiceStateHandle.java
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
src/main/java/com/bsth/service/excep/NowAbnormalService.java
src/main/java/com/bsth/service/excep/NowOfflineService.java
src/main/java/com/bsth/service/excep/NowOutboundService.java
src/main/java/com/bsth/service/excep/NowSpeedingService.java
src/main/java/com/bsth/service/excep/impl/NowAbnormalServiceImpl.java
src/main/java/com/bsth/service/excep/impl/NowOfflineServiceImpl.java
src/main/java/com/bsth/service/excep/impl/NowOutboundServiceImpl.java
+package com.bsth.controller.excep;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.excep.Abnormal;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.service.excep.NowAbnormalService;
+import com.bsth.util.PageObject;
+
+@RestController
+@RequestMapping("nowabnormal")
+public class NowAbnormalController extends BaseController<SysUser, Integer>{
+	@Autowired
+	private NowAbnormalService nowAbnormalService;
+	
+	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
+	public PageObject<Abnormal> pagequery(@RequestParam Map<String, Object> map){
+		PageObject<Abnormal> pageObject = null;
+		map.put("curPage", map.get("page").toString());
+		map.put("pageData","10");
+		pageObject=nowAbnormalService.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>();
+		try {
+			map.put("isShow", 1);
+//			modelMap = offlineService.getReport(map);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return modelMap;
+	}
+	
+	
+}
+package com.bsth.controller.excep;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.excep.Offline;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.service.excep.NowOfflineService;
+import com.bsth.util.PageObject;
+
+@RestController
+@RequestMapping("nowoffline")
+public class NowOfflineController extends BaseController<SysUser, Integer>{
+	@Autowired
+	private NowOfflineService nowOfflineService;
+	
+	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
+	public PageObject<Offline> pagequery(@RequestParam Map<String, Object> map){
+		PageObject<Offline> pageObject = null;
+		map.put("curPage", map.get("page").toString());
+		map.put("pageData","10");
+		pageObject=nowOfflineService.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>();
+		try {
+			map.put("isShow", 1);
+			modelMap = nowOfflineService.getReport(map);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return modelMap;
+	}
+	
+	
+}
+package com.bsth.controller.excep;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.excep.Outbound;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.service.excep.NowOutboundService;
+import com.bsth.util.PageObject;
+
+@RestController
+@RequestMapping("nowbound")
+public class NowOutboundController extends BaseController<SysUser, Integer>{
+	@Autowired
+	private NowOutboundService nowOutboundService;
+	
+	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
+	public PageObject<Outbound> pagequery(@RequestParam Map<String, Object> map){
+		PageObject<Outbound> pageObject = null;
+		map.put("curPage", map.get("page").toString());
+		map.put("pageData","10");
+		pageObject=nowOutboundService.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>();
+		try {
+			map.put("isShow", 1);
+			modelMap = nowOutboundService.getReport(map);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return modelMap;
+	}
+	
+	
+}
+package com.bsth.controller.excep;
+
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.controller.BaseController;
+import com.bsth.data.BasicData;
+import com.bsth.entity.excep.Speeding;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.service.excep.NowSpeedingService;
+import com.bsth.util.PageObject;
+
+@RestController
+@RequestMapping("nowspeeding")
+public class NowSpeedingController extends BaseController<SysUser, Integer>{
+
+	@Autowired
+	private NowSpeedingService nowSpeedingService;
+	
+	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
+	public PageObject<Speeding> pagequery(@RequestParam Map<String, Object> map){
+		PageObject<Speeding> pageObject = null;
+		map.put("curPage", map.get("page").toString());
+		map.put("pageData","10");
+		pageObject=nowSpeedingService.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>();
+		try {
+			map.put("isShow", 1);
+			modelMap = nowSpeedingService.getReport(map);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		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 = nowSpeedingService.findPosition(deviceid,startdate,enddate);
+    	return listSpeeding;
+	}
+	
+}
 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;
@@ -10,17 +9,13 @@ 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.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
@@ -169,8 +169,6 @@ public class BasicData implements CommandLineRunner {
                 geoCacheData.loadData();
                 station2ParkBuffer.saveAll();
                 logger.info("加载基础数据成功！，");
-                //人员拼音转换
-                persionPinYinBuffer.refresh();
             } catch (Exception e) {
                 logger.error("加载基础数据时出现异常，", e);
             }
@@ -355,6 +353,9 @@ public class BasicData implements CommandLineRunner {
             //spyMap = spyTempMap;
             allPerson = allPersonMap;
             perMap = perTempMap;
+
+            //人员拼音转换
+            persionPinYinBuffer.refresh();
         }
     }
 }
@@ -64,7 +64,7 @@ public class LineConfigData implements CommandLineRunner {
      */
     public long applyOut(ScheduleRealInfo sch, Long timestamp) {
         LineConfig config = lineConfMap.get(sch.getXlBm());
-        int diff = sch.getXlDir()=="0"?config.getUpOutDiff():config.getDownOutDiff();
+        int diff = sch.getXlDir().equals("0")?config.getUpOutDiff():config.getDownOutDiff();
         return timestamp - (diff * 1000);
     }
  
@@ -76,7 +76,7 @@ public class LineConfigData implements CommandLineRunner {
      */
     public long applyIn(ScheduleRealInfo sch, Long timestamp){
         LineConfig config = lineConfMap.get(sch.getXlBm());
-        int diff = sch.getXlDir()=="0"?config.getUpInDiff():config.getDownInDiff();
+        int diff = sch.getXlDir().equals("0")?config.getUpInDiff():config.getDownInDiff();
         return timestamp - (diff * 1000);
     }
  
@@ -53,18 +53,18 @@ public class CorrectSignalHandle extends SignalHandle {
  
         //（转发的数据不管）
         if(gps.getSource() != 0){
-            //gps=非营运 && 班次=非空驶 ;切换到营运状态
-            if(!gps.isService() &&
+            //gps=非营运 或走向不对 && 班次=非空驶 ;切换到营运状态
+            if((!gps.isService() || gps.getUpDown() != updown) &&
                     !dayOfSchedule.emptyService(task)){
-                gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, null);
+                gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, "同步@系统");
             }
  
             //需要切换线路
             if(!task.getXlBm().equals(gps.getLineId())){
-                gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), null);
+                gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), "同步@系统");
             }
         }
  
         return true;
     }
-}
+}
 \ No newline at end of file
@@ -2,6 +2,7 @@ package com.bsth.data.gpsdata.arrival.handlers;
  
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.SignalHandle;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
@@ -178,7 +179,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             outStationAndOutPark(sch);
             logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
         }
-        else if(sch.getBcType().equals("out")){
+        else if(isOutSch(sch)){
             //有出场动作（起点站覆盖停车场时，并且不设置出站既出场，逻辑可能会走到这里）
             try{
                 if(isOutPark(gps, prev)){
@@ -364,7 +365,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             }
 */
             //被起点站覆盖的情况下进场，没有设置出站既是出场，逻辑会走到这里（模拟进站信号）
-            if(sch.getBcType().equals("in")){
+            if(isInSch(sch)){
                 try{
                     if(isInPark(gps, prev)){
                         if(gps.getCarparkNo().equals(sch.getZdzCode())){
@@ -505,4 +506,12 @@ public class InOutStationSignalHandle extends SignalHandle{
             return true;
         return false;
     }
+
+    private boolean isOutSch(ScheduleRealInfo sch){
+        return sch.getBcType().equals("out") || GeoCacheData.tccMap.keySet().contains(sch.getQdzCode());
+    }
+
+    private boolean isInSch(ScheduleRealInfo sch){
+        return sch.getBcType().equals("in") || GeoCacheData.tccMap.keySet().contains(sch.getZdzCode());
+    }
 }
 \ No newline at end of file
@@ -31,7 +31,7 @@ public class LineStateHandle {
     /** 重发次数 */
     private final static int MAX_SEND_COUNT=3;
     /** 重发间隔 */
-    private final static int SEND_SPACE=1000 * 60 * 5;
+    private final static int SEND_SPACE=1000 * 60 * 4;
     /** 最大有效时间 */
     private final static int MAX_AVAIL_TIME=1000 * 60 * 60 * 2;
  
@@ -13,7 +13,7 @@ import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
  
 /**
- * 设备营运状态处理
+ * 设备营运状态/上下行 处理
  * Created by panzhao on 2017/7/13.
  */
 @Component
@@ -31,9 +31,9 @@ public class ServiceStateHandle {
     /** 重发次数 */
     private final static int MAX_SEND_COUNT=3;
     /** 重发间隔 */
-    private final static int SEND_SPACE=1000 * 60 * 4;
+    private final static int SEND_SPACE=1000 * 60 * 3;
     /** 最大有效时间 */
-    private final static int MAX_AVAIL_TIME=1000 * 60 * 60;
+    private final static int MAX_AVAIL_TIME=1000 * 60 * 50;
  
     static{
         map = new ConcurrentHashMap();
@@ -67,9 +67,9 @@ public class ServiceStateHandle {
             if(gps == null)
                 return;
  
-            if(gps.getState().equals(sb.getState())){
+            if(gps.getState().equals(sb.getState()) && gps.getUpDown() == sb.getUpDown()){
                 map.remove(sb.getNbbm());
-                logger.info("营运状态切换成功，" + sb.getNbbm() + "、" + sb.getState());
+                logger.info("状态切换成功，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getUpDown());
             }
             else
                 reSend(sb);
@@ -88,14 +88,14 @@ public class ServiceStateHandle {
         long diff = System.currentTimeMillis() - sb.getSt();
         if(diff >= MAX_AVAIL_TIME){
             map.remove(sb.getNbbm());
-            logger.info("营运状态切换超过有效时间，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getSt());
+            logger.info("状态切换超过有效时间，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getSt());
             return;
         }
  
         if(diff >= SEND_SPACE){
             sb.setSender("补发@系统");
             changeState(sb);
-            logger.info("重发营运状态切换指令，" + sb.getNbbm() + "、" + sb.getState());
+            logger.info("重发状态切换指令，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getUpDown());
             return;
         }
     }
@@ -154,6 +154,7 @@ public class GpsDataLoaderThread extends Thread {
         CloseableHttpResponse response = null;
  
         try {
+            logger.error("load start...");
             httpClient = HttpClients.createDefault();
             HttpGet get = new HttpGet(clientUrl);
             //超时时间
@@ -174,6 +175,7 @@ public class GpsDataLoaderThread extends Thread {
  
                 list = JSON.parseArray(stringBuffer.toString(), GpsEntity.class);
                 String nbbm;
+                logger.error("load end!");
                 for (GpsEntity gps : list) {
  
                     //没有设备号
@@ -34,7 +34,16 @@ public class PredicatesBuilder {
         Class<?> leftType = expression.getJavaType();
         Class<?> rightType = object.getClass();
  
-        if (Number.class.isAssignableFrom(leftType) &&
+		if(Date.class.isAssignableFrom(leftType) &&
+				String.class.isAssignableFrom(rightType)){
+			DateTime dateTime = new DateTime(object);
+			return cb.equal(expression, dateTime.toDate());
+		}
+		else {
+			return cb.equal(expression, object);
+		}
+
+        /*if (Number.class.isAssignableFrom(leftType) &&
                 (Number.class.isAssignableFrom(rightType) || String.class.isAssignableFrom(rightType))) { // Number == Number/String
             return cb.equal(expression, object);
         } else if (String.class.isAssignableFrom(leftType) &&
@@ -52,8 +61,7 @@ public class PredicatesBuilder {
             return cb.equal(expression, dateTime.toDate());
         } else {
             throw new RuntimeException("eq 不支持类型组合：" + expression.getJavaType() + "==" + object.getClass());
-        }
-
+        }*/
 	}
  
 	public static Predicate ne(CriteriaBuilder cb,Path<?> expression, Object object){
+package com.bsth.service.excep;
+
+import java.util.Map;
+
+import com.bsth.entity.excep.Abnormal;
+import com.bsth.util.PageObject;
+
+public interface NowAbnormalService {
+	PageObject <Abnormal> Pagequery(Map<String, Object> map) ;
+}
+package com.bsth.service.excep;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.excep.Offline;
+import com.bsth.util.PageObject;
+
+public interface NowOfflineService {
+//	List<Offline> findAll(Map<String, Object> map);
+	PageObject <Offline> Pagequery(Map<String, Object> map) ;
+//	List<Offline> resultSet2Set(ResultSet rs) throws SQLException;
+	Map<String, Object> getReport( Map<String, Object> map);
+}
+package com.bsth.service.excep;
+
+import java.util.Map;
+
+import com.bsth.entity.excep.Outbound;
+import com.bsth.util.PageObject;
+
+public interface NowOutboundService {
+	PageObject <Outbound> Pagequery(Map<String, Object> map) ;
+	Map<String, Object> getReport( Map<String, Object> map);
+}
+package com.bsth.service.excep;
+
+import java.util.List;
+import java.util.Map;
+import com.bsth.entity.excep.Speeding;
+import com.bsth.util.PageObject;
+
+public interface NowSpeedingService {
+	PageObject <Speeding> Pagequery(Map<String, Object> map);
+	Map<String, Object> getReport( Map<String, Object> map);
+	List<Speeding> findPosition(String deviceid, String startdate,
+			String enddate);
+	
+}
+package com.bsth.service.excep.impl;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.bsth.entity.excep.Abnormal;
+import com.bsth.service.excep.AbnormalService;
+import com.bsth.service.excep.NowAbnormalService;
+import com.bsth.util.PageHelper;
+import com.bsth.util.PageObject;
+import com.bsth.util.db.DBUtils_MS;
+
+@Service
+public class NowAbnormalServiceImpl implements NowAbnormalService {
+	
+	static List<Abnormal> findAll(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		
+		//查询条件
+		
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		int page=Integer.parseInt(map.get("page").toString());
+		List<Abnormal> list=new ArrayList<Abnormal>();
+		/*
+		String sql="SELECT * FROM (SELECT A.*,ROWNUM R FROM (  "
+				+ "select * from bsth_c_offline) A "
+				+ "WHERE ROWNUM <= ? ) B WHERE R >?";*/
+		String sql="select * from bsth_c_device_abnormal where 1=1 ";
+		Object nbbm=map.get("nbbm");
+
+		if(nbbm!=null){
+			if(nbbm.toString()!="")
+			sql +=" and vehicle like '%"+nbbm+"%'";
+		}
+		
+		sql +=" order by id limit ?,?";
+
+		try {
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setInt(1, page*10); // O-最大条数  -- M-起始条数
+			ps.setInt(2, 10); // O-最小条数 -- M-显示条数
+			rs = ps.executeQuery();
+			list = resultSet2Set(rs);
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		
+		return list;
+	}
+	
+	/**
+	 * 数据转换
+	 */
+//	@Override
+	static List<Abnormal> resultSet2Set(ResultSet rs) throws SQLException{
+		// TODO Auto-generated method stub
+		List<Abnormal> list=new ArrayList<Abnormal>();
+		Abnormal abnormal;
+		while(rs.next()){
+			abnormal=new Abnormal();
+			abnormal.setId(Integer.valueOf(rs.getObject("id").toString()));
+			abnormal.setDrift(Integer.valueOf(rs.getObject("drift").toString()));
+			abnormal.setOffline(Integer.valueOf(rs.getObject("offline").toString()));
+			abnormal.setProtocol(Integer.valueOf(rs.getObject("protocol").toString()));
+			abnormal.setVehicle(rs.getObject("vehicle").toString());
+			list.add(abnormal);
+		}
+		return list;
+	}
+	
+	@Override
+	public PageObject<Abnormal> Pagequery(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		String sql="select count(*) record  from bsth_c_device_abnormal where 1=1 ";
+		Object nbbm=map.get("nbbm");
+		if(nbbm!=null){
+			if(nbbm.toString()!="")
+			sql +=" and vehicle like '%"+nbbm+"%'";
+		}
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		int totalData = 0;
+		try {
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			rs = ps.executeQuery();
+			 if(rs.next()){
+				 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<T> list = this.baseDao.queryByObject(pageHelper.getMap());
+		List<Abnormal> list=findAll(pageHelper.getMap());
+		PageObject<Abnormal> pageObject = pageHelper.getPageObject();
+		pageObject.setDataList(list);
+		return pageObject;
+	}
+
+}
+package com.bsth.service.excep.impl;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.excep.Offline;
+import com.bsth.entity.oil.Ylb;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.excep.NowOfflineService;
+import com.bsth.service.excep.OfflineService;
+import com.bsth.util.EchartConver;
+import com.bsth.util.PageHelper;
+import com.bsth.util.PageObject;
+import com.bsth.util.db.DBUtils_MS;
+import com.github.abel533.echarts.Option;
+import com.google.gson.Gson;
+
+@Service
+public class NowOfflineServiceImpl implements NowOfflineService {
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	public List<Offline> findGPS(Map<String, Object> map) {
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		List<Offline> list=new ArrayList<Offline>();
+		String days_year=map.get("days_year").toString();
+		String line_id=map.get("line_id").toString();
+		String device_id=map.get("device_id").toString();
+		String ts=map.get("ts").toString();
+		String sql="SELECT t.line_id,t.device_id,MIN(ts) as ts,days_year FROM bsth_c_gps_info t "
+				+ "  WHERE t.line_id='"+line_id+"' and t.device_id='"+device_id+"' and t.days_year='"+days_year+"' and t.ts>='"+ts+"' "
+				+ "  GROUP BY  t.device_id,t.line_id ";
+		sql +=" order by ts ";
+		try {
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+//			ps.setInt(1,0*10); // O-最大条数  -- M-起始条数
+//			ps.setInt(2, 1000000); // O-最小条数 -- M-显示条数
+			rs = ps.executeQuery();
+			list = resultSet(rs);
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		
+		return list;
+	}
+	
+ //	@Override
+	static List<Offline> findAll(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		
+		//查询条件
+		
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		int page=Integer.parseInt(map.get("page").toString());
+		List<Offline> list=new ArrayList<Offline>();
+		/*
+		String sql="SELECT * FROM (SELECT A.*,ROWNUM R FROM (  "
+				+ "select * from bsth_c_offline) A "
+				+ "WHERE ROWNUM <= ? ) B WHERE R >?";*/
+		String sql="select * from bsth_c_offline where 1=1 ";
+		Object line=map.get("line");
+		Object nbbm=map.get("nbbm");
+		Object updown=map.get("updown");
+		Object date=map.get("date");
+
+		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+"%'";
+		}
+		
+		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");
+				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;
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			
+		}
+		sql +=" order by id limit ?,?";
+
+		try {
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setInt(1, page*10); // O-最大条数  -- M-起始条数
+			ps.setInt(2, 10); // O-最小条数 -- M-显示条数
+			rs = ps.executeQuery();
+			list = resultSet2Set(rs);
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		
+		return list;
+	}
+ public  List<Offline> resultSet(ResultSet rs) throws SQLException{
+	// TODO Auto-generated method stub
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			List<Offline> list=new ArrayList<Offline>();
+			Offline offline;
+			while(rs.next()){
+				offline=new Offline();
+				offline.setTs(Long.parseLong(rs.getObject("ts").toString()));
+				list.add(offline);
+			}
+			return list;
+ }
+	/**
+	 * 数据转换
+	 */
+//	@Override
+	static List<Offline> resultSet2Set(ResultSet rs) throws SQLException{
+		// TODO Auto-generated method stub
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		List<Offline> list=new ArrayList<Offline>();
+		Offline offline;
+		while(rs.next()){
+			offline=new Offline();
+			offline.setId(Integer.valueOf(rs.getObject("id").toString()));
+			offline.setLat(Float.valueOf(rs.getObject("lat").toString()));
+			offline.setLine(Integer.valueOf(rs.getObject("line").toString()));
+			//run 时注解
+			offline.setLineName(BasicData.lineCode2NameMap.get(offline.getLine().toString()));
+			offline.setLon(Float.valueOf(rs.getObject("lon").toString()));
+			offline.setTimestamp(Long.valueOf(rs.getObject("timestamp").toString()));
+			offline.setTimestampDate(sdf.format(new Date(offline.getTimestamp())));
+			offline.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
+			offline.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
+			offline.setDeviceid(rs.getObject("vehicle").toString());
+			list.add(offline);
+		}
+		return list;
+	}
+	
+	
+	@SuppressWarnings("unchecked")
+	public PageObject <Offline> Pagequery(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+
+		String sql="select count(*) record  from bsth_c_offline where 1=1 ";
+		
+		Object line=map.get("line");
+		Object nbbm=map.get("nbbm");
+		Object updown=map.get("updown");
+		
+		Object date=map.get("date");
+
+		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+"%'";
+		}
+		
+		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");
+				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;
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			
+		}
+		
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		int totalData = 0;
+
+		try {
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			rs = ps.executeQuery();
+			 if(rs.next()){
+				 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<T> list = this.baseDao.queryByObject(pageHelper.getMap());
+		List<Offline> list=findAll(pageHelper.getMap());
+		for (int i = 0; i < list.size(); i++) {
+			int lineid=	list.get(i).getLine();
+			String nbbm2=list.get(i).getVehicle();
+			String deviceid=list.get(i).getDeviceid();
+			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;  
+			            }  
+					});
+			Map<String, Object> gpsmap=new HashMap<>();
+			String str = String.format("%tj",datess);
+			gpsmap.put("device_id",deviceid );
+			gpsmap.put("line_id", lineid);
+			gpsmap.put("days_year", str);
+			gpsmap.put("ts", d1);
+		 List<Offline> gps=findGPS(gpsmap);
+	   if(gps.size()>0){
+		  Long ts= gps.get(0).getTs();
+		String ts1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(ts));
+		   list.get(0).setTsdate(ts1);
+	   }
+		if(pbb.size()>0){
+					list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
+					list.get(i).setLpname(pbb.get(0).getLpName());
+				}
+		
+		}
+         
+		PageObject<Offline> pageObject = pageHelper.getPageObject();
+				pageObject.setDataList(list);
+	
+		return pageObject;
+	}
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		Map<String, Object> map=new HashMap<String,Object>();
+		map.put("pageData","20");
+		map.put("curPage", "1");
+				String sql="select count(*) record  from bsth_c_offline";
+				Connection conn = null;
+				PreparedStatement ps = null;
+				ResultSet rs = null;
+				int totalData = 0;
+
+				try {
+					conn = DBUtils_MS.getConnection();
+					ps = conn.prepareStatement(sql);
+					rs = ps.executeQuery();
+					 if(rs.next()){
+						 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<T> list = this.baseDao.queryByObject(pageHelper.getMap());
+				List<Offline> list=findAll(pageHelper.getMap());
+				PageObject<Offline> pageObject = pageHelper.getPageObject();
+				pageObject.setDataList(list);
+		System.out.println("");
+	}
+
+	@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 {
+			String xAxisName = map.get("xAxisName").toString();
+			String legendName = map.get("legendName").toString();
+			String xAxisItem = "";
+			String xAxisOrderBy = "";
+			String legendItem = "";
+			String legendOrderBy = "";
+			if(xAxisName!=null){
+				String [] xaxis = xAxisName.split(":");
+				if(xaxis.length>1 && xaxis[1].toLowerCase().contains("date")){					
+					//本来还要判断下日期格式是否标准
+					xAxisItem = "to_char("+xaxis[0]+",'"+xaxis[2]+"') ";
+					xAxisOrderBy = (xaxis.length>3?xaxis[3]:"");
+				}else{
+					xAxisItem = xaxis[0];
+				}
+			}
+			if(legendName!=null){
+				String [] legend = legendName.split(":");
+				if(legend.length>1 && legend[1].toLowerCase().contains("date")){					
+					//本来还要判断下日期格式是否标准					
+					legendItem = "to_char("+legend[0]+",'"+legend[2]+"') ";
+					legendOrderBy = (legend[3].length()>3?legend[3]:"");
+				}else{
+					legendItem = legend[0];
+				}
+			}			
+			map.put("xAxisItem", xAxisItem);
+			map.put("xAxisOrderBy", xAxisOrderBy);
+			map.put("legendItem", legendItem);
+			map.put("legendOrderBy", legendOrderBy);
+			List dataList = new ArrayList();
+			dataList =getReportList(map);
+			EchartConver echart = new EchartConver(map);
+			Option option = echart.getOption(dataList);
+			Gson gson = new Gson();
+			chartStr = gson.toJsonTree(option).toString();
+			mapValue.put("dataList", dataList);
+			mapValue.put("option", chartStr);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return mapValue;
+	}
+	
+	static List getReportList(Map<String, Object> map) {
+		List dataList = new ArrayList();
+		String times="";
+		Object dataTime=map.get("dataTime");
+		Object line=map.get("line");
+		String addSql="";
+		if(line !=null){
+			if(line.toString()!=""){
+				addSql =" and line =" +line;
+			}
+		}
+		if(dataTime!=null){
+			times=dataTime.toString();
+		}
+		if(times.equals("")){
+			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+			times=sdf.format(new Date());
+		}
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String times1=times+" 00:00:01";
+		String times2=times+" 23:59:59";
+		
+		Connection conn = null;	
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+	try {
+		Long t1=simpleDateFormat.parse(times1).getTime();
+		Long t2=simpleDateFormat.parse(times2).getTime();
+		String sql="SELECT up_down xAxis , line legend,count(*) series"+
+				 " FROM  bsth_c_offline "+
+				"where timestamp>? and timestamp<? "+addSql+" group by xAxis ,legend";
+		conn = DBUtils_MS.getConnection();
+		ps = conn.prepareStatement(sql);
+		ps.setLong(1, t1);
+		ps.setLong(2, t2);
+		rs = ps.executeQuery();
+		while(rs.next()){
+			Map<String, Object> newMap=new HashMap<String,Object>();
+			if(rs.getObject("xAxis").toString().equals("0"))
+				newMap.put("xAxis", "上行");
+			else if(rs.getObject("xAxis").toString().equals("1"))
+				newMap.put("xAxis", "下行");
+			else
+				newMap.put("xAxis", "无效");
+			
+			if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" )
+				newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString()));
+			else
+				newMap.put("legend", "编码"+rs.getObject("legend").toString());
+			
+			
+			
+			newMap.put("series", Integer.parseInt(rs.getObject("series").toString()));
+			dataList.add(newMap);
+ 		}
+		
+	} 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);
+	}
+	
+		return dataList;
+	}
+
+}
+package com.bsth.service.excep.impl;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.excep.Outbound;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.excep.NowOutboundService;
+import com.bsth.util.EchartConver;
+import com.bsth.util.PageHelper;
+import com.bsth.util.PageObject;
+import com.bsth.util.db.DBUtils_MS;
+import com.github.abel533.echarts.Option;
+import com.google.gson.Gson;
+@Service
+public class NowOutboundServiceImpl implements NowOutboundService{
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	static  List<Outbound> findAll(Map<String, Object> map) {
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		int page=Integer.parseInt(map.get("page").toString());
+		List<Outbound> list=new ArrayList<Outbound>();
+		String sql="select * from bsth_c_outbound where 1=1 ";
+		Object line=map.get("line");
+		Object nbbm=map.get("nbbm");
+		Object updown=map.get("updown");
+		Object date=map.get("date");
+		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(date!=null){
+			if (date.toString().length()>0) {
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				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;
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			
+		}
+	//	sql +=" order by id limit ?,?";
+		sql +=" order by timestamp limit ?,?";
+
+		try {
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setInt(1, page*10); // O-最大条数  -- M-起始条数
+			ps.setInt(2, 10); // O-最小条数 -- M-显示条数
+			rs = ps.executeQuery();
+			list = resultSet2Set(rs);
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		
+		return list;
+	}
+
+	static List<Outbound> resultSet2Set(ResultSet rs) throws SQLException{
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		List<Outbound> list=new ArrayList<Outbound>();
+		Outbound outbound;
+		while(rs.next()){
+			outbound=new Outbound();
+	//		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.setTimestamp((Long.valueOf(rs.getObject("timestamp").toString())));
+			outbound.setTimestampDate(sdf.format(new Date(outbound.getTimestamp())));
+			outbound.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
+//			outbound.setLocation(rs.getObject("location")==null?"":rs.getObject("location").toString());
+			list.add(outbound);
+		}
+		return list;
+	}
+	
+	@Override
+	public PageObject<Outbound> Pagequery(Map<String, Object> map) {
+		// TODO Auto-generated method stub  PageObject<Outbound> Pagequery
+		String sql="select count(*) record  from bsth_c_outbound where 1=1 ";
+		Object line=map.get("line");
+		Object nbbm=map.get("nbbm");
+		Object updown=map.get("updown");
+		Object date=map.get("date");
+		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(date!=null){
+			if (date.toString().length()>0) {
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				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;
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			
+		}
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		int totalData = 0;
+
+		try {
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			rs = ps.executeQuery();
+			 if(rs.next()){
+				 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<Outbound> 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());
+				
+			}
+			
+		}
+		PageObject<Outbound> pageObject = pageHelper.getPageObject();
+		pageObject.setDataList(list);
+		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 {
+			String xAxisName = map.get("xAxisName").toString();
+			String legendName = map.get("legendName").toString();
+			String xAxisItem = "";
+			String xAxisOrderBy = "";
+			String legendItem = "";
+			String legendOrderBy = "";
+			if(xAxisName!=null){
+				String [] xaxis = xAxisName.split(":");
+				if(xaxis.length>1 && xaxis[1].toLowerCase().contains("date")){					
+					//本来还要判断下日期格式是否标准
+					xAxisItem = "to_char("+xaxis[0]+",'"+xaxis[2]+"') ";
+					xAxisOrderBy = (xaxis.length>3?xaxis[3]:"");
+				}else{
+					xAxisItem = xaxis[0];
+				}
+			}
+			if(legendName!=null){
+				String [] legend = legendName.split(":");
+				if(legend.length>1 && legend[1].toLowerCase().contains("date")){					
+					//本来还要判断下日期格式是否标准					
+					legendItem = "to_char("+legend[0]+",'"+legend[2]+"') ";
+					legendOrderBy = (legend[3].length()>3?legend[3]:"");
+				}else{
+					legendItem = legend[0];
+				}
+			}			
+			map.put("xAxisItem", xAxisItem);
+			map.put("xAxisOrderBy", xAxisOrderBy);
+			map.put("legendItem", legendItem);
+			map.put("legendOrderBy", legendOrderBy);
+			List dataList = new ArrayList();
+			dataList =getReportList(map);
+			EchartConver echart = new EchartConver(map);
+			Option option = echart.getOption(dataList);
+			Gson gson = new Gson();
+			chartStr = gson.toJsonTree(option).toString();
+			mapValue.put("dataList", dataList);
+			mapValue.put("option", chartStr);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return mapValue;
+	}
+
+	static List getReportList(Map<String, Object> map) {
+		List dataList = new ArrayList();
+		String times="";
+		Object dataTime=map.get("dataTime");
+		Object line=map.get("line");
+		String addSql="";
+		if(line !=null){
+			if(line.toString()!=""){
+				addSql =" and line =" +line;
+			}
+		}
+		if(dataTime!=null){
+			times=dataTime.toString();
+		}
+		if(times.equals("")){
+			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+			times=sdf.format(new Date());
+		}
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String times1=times+" 00:00:00";
+		String times2=times+" 23:59:59";
+		
+		Connection conn = null;	
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+	try {
+		Long t1=simpleDateFormat.parse(times1).getTime();
+		Long t2=simpleDateFormat.parse(times2).getTime();
+		String sql="SELECT up_down xAxis , line legend,count(*) series"+
+				 " FROM  bsth_c_outbound "+
+				"where timestamp>? and timestamp<? "+addSql+" group by xAxis ,legend";
+		conn = DBUtils_MS.getConnection();
+		ps = conn.prepareStatement(sql);
+		ps.setLong(1, t1);
+		ps.setLong(2, t2);
+		rs = ps.executeQuery();
+		while(rs.next()){
+			Map<String, Object> newMap=new HashMap<String,Object>();
+			if(rs.getObject("xAxis").toString().equals("0"))
+				newMap.put("xAxis", "上行");
+			else if(rs.getObject("xAxis").toString().equals("1"))
+				newMap.put("xAxis", "下行");
+			else
+				newMap.put("xAxis", "无效");
+			
+			if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" )
+				newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString()));
+			else
+				newMap.put("legend", "编码"+rs.getObject("legend").toString());
+			
+			
+			
+			newMap.put("series", Integer.parseInt(rs.getObject("series").toString()));
+			dataList.add(newMap);
+ 		}
+		
+	} 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);
+	}
+	
+		return dataList;
+	}
+}
+package com.bsth.service.excep.impl;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.excep.Speeding;
+import com.bsth.service.excep.NowSpeedingService;
+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;
+
+@Service
+public class NowSpeedingServiceImpl implements NowSpeedingService {
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	static List<Speeding> findAll(Map<String, Object> map) {
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		int page=Integer.parseInt(map.get("page").toString());
+		List<Speeding> list=new ArrayList<Speeding>();
+		String sql="select * from bsth_c_speedingmh where 1=1 ";
+		Object line=map.get("line");
+		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(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 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 endTimestamp <="+t2;
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+			}
+			
+		}
+		
+		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(2, 10); // O-最小条数 -- M-显示条数
+			rs = ps.executeQuery();
+			list = resultSet2Set(rs);
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		return list;
+	}
+
+	static List<Speeding> resultSet2Set(ResultSet rs) throws SQLException{
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		List<Speeding> list=new ArrayList<Speeding>();
+		Speeding speeding;
+		Location location;
+		while(rs.next()){
+			speeding=new Speeding();
+			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.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.setEndtimestamp((Long.valueOf(rs.getObject("endTimestamp").toString())));
+			speeding.setEndtimestampDate(sdf.format(new Date(speeding.getEndtimestamp())));
+			list.add(speeding);
+		}
+		return list;
+	}
+
+	@Override
+	public PageObject<Speeding> Pagequery(Map<String, Object> map) {
+		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 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(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 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 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);
+			rs = ps.executeQuery();
+			 if(rs.next()){
+				 totalData=rs.getInt("record");
+			 }		
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		PageHelper pageHelper = new PageHelper(totalData, map);
+		List<Speeding> list=findAll(pageHelper.getMap());
+		PageObject<Speeding> pageObject = pageHelper.getPageObject();
+		pageObject.setDataList(list);
+		return pageObject;
+	}
+	
+	@Override
+	public Map<String, Object> getReport(Map<String, Object> map) {
+		String chartStr = "";
+		Map<String, Object> mapValue = new HashMap<String, Object>();
+		try {
+			String xAxisName = map.get("xAxisName").toString();
+			String legendName = map.get("legendName").toString();
+			String xAxisItem = "";
+			String xAxisOrderBy = "";
+			String legendItem = "";
+			String legendOrderBy = "";
+			if(xAxisName!=null){
+				String [] xaxis = xAxisName.split(":");
+				if(xaxis.length>1 && xaxis[1].toLowerCase().contains("date")){					
+					//本来还要判断下日期格式是否标准
+					xAxisItem = "to_char("+xaxis[0]+",'"+xaxis[2]+"') ";
+					xAxisOrderBy = (xaxis.length>3?xaxis[3]:"");
+				}else{
+					xAxisItem = xaxis[0];
+				}
+			}
+			if(legendName!=null){
+				String [] legend = legendName.split(":");
+				if(legend.length>1 && legend[1].toLowerCase().contains("date")){					
+					//本来还要判断下日期格式是否标准					
+					legendItem = "to_char("+legend[0]+",'"+legend[2]+"') ";
+					legendOrderBy = (legend[3].length()>3?legend[3]:"");
+				}else{
+					legendItem = legend[0];
+				}
+			}			
+			map.put("xAxisItem", xAxisItem);
+			map.put("xAxisOrderBy", xAxisOrderBy);
+			map.put("legendItem", legendItem);
+			map.put("legendOrderBy", legendOrderBy);
+			List dataList = new ArrayList();
+			dataList =getReportList(map);
+			EchartConver echart = new EchartConver(map);
+			Option option = echart.getOption(dataList);
+			Gson gson = new Gson();
+			chartStr = gson.toJsonTree(option).toString();
+			mapValue.put("dataList", dataList);
+			mapValue.put("option", chartStr);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return mapValue;
+	}
+	static List getReportList(Map<String, Object> map) {
+		List dataList = new ArrayList();
+		String times="";
+		Object dataTime=map.get("dataTime");
+		Object line=map.get("line");
+		String addSql="";
+		if(line !=null){
+			if(line.toString()!=""){
+				addSql =" and line =" +line;
+			}
+		}
+		if(dataTime!=null){
+			times=dataTime.toString();
+		}
+		if(times.equals("")){
+			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+			times=sdf.format(new Date());
+		}
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String times1=times+" 00:00:00";
+		String times2=times+" 23:59:59";
+		
+		Connection conn = null;	
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+	try {
+		Long t1=simpleDateFormat.parse(times1).getTime();
+		Long t2=simpleDateFormat.parse(times2).getTime();
+		String sql="SELECT up_down xAxis , line legend,count(*) series"+
+				 " FROM  bsth_c_speeding "+
+				"where timestamp>? and timestamp<? "+addSql+" group by xAxis ,legend";
+		conn = DBUtils_MS.getConnection();
+		ps = conn.prepareStatement(sql);
+		ps.setLong(1, t1);
+		ps.setLong(2, t2);
+		rs = ps.executeQuery();
+		while(rs.next()){
+			Map<String, Object> newMap=new HashMap<String,Object>();
+			if(rs.getObject("xAxis").toString().equals("0"))
+				newMap.put("xAxis", "上行");
+			else if(rs.getObject("xAxis").toString().equals("1"))
+				newMap.put("xAxis", "下行");
+			else
+				newMap.put("xAxis", "无效");
+			
+			if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" )
+				newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString()));
+			else
+				newMap.put("legend", "编码"+rs.getObject("legend").toString());
+			
+			
+			
+			newMap.put("series", Integer.parseInt(rs.getObject("series").toString()));
+			dataList.add(newMap);
+ 		}
+		
+	} catch (SQLException e) {
+		e.printStackTrace();
+	}catch (ParseException e1) {
+		e1.printStackTrace();
+	}finally {
+		DBUtils_MS.close(rs, ps, conn);
+	}
+	
+		return dataList;
+	}
+	
+	
+    @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(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
+               // 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;
+
+    }
+}
@@ -7,10 +7,8 @@ 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;
 import java.util.List;
 import java.util.Map;
  
@@ -19,10 +17,9 @@ 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.NowSpeedingService;
 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;
@@ -349,8 +346,6 @@ public class SpeedingServiceImpl implements SpeedingService {
             DBUtils_MS.close(rs, ps, conn);
         }
         return listResult;
-
     }
-	
-
+    
 }
@@ -37,10 +37,12 @@ public class SampleServiceImpl extends BaseServiceImpl&lt;Sample, Long&gt; implements 
 		//转换站点名称
 		Iterator<Sample> iterator = rs.iterator();
 		Sample s;
+		String prefix;
 		while(iterator.hasNext()){
 			s = iterator.next();
-			s.setsName(BasicData.stationCode2NameMap.get(s.getsStation()));
-			s.seteName(BasicData.stationCode2NameMap.get(s.geteStation()));
+			prefix = s.getLineCode() + "_" + s.getUpdown() + "_";
+			s.setsName(BasicData.getStationNameByCode(s.getsStation(), prefix));
+			s.seteName(BasicData.getStationNameByCode(s.geteStation(), prefix));
  
 			rsList.add(s);
 		}
@@ -340,6 +340,7 @@
 								<option value="2">二级</option>
 								<option value="3">三级</option>
 								<option value="4">四级</option>
+								<option value="5">五级</option>
 							</select>
 	                    </div>
 	                </div>
@@ -282,14 +282,21 @@
 	                </div>
 	                <!-- 线路规划类型 (* 必填项) END -->
  
-	                 <!-- 开辟日期 START　-->
+	                   <!--大间隔等级 START　-->
 					<div class="col-md-6">
-						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
 	                    <div class="col-md-4">
-	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                     	<select name="spacGrade" class="form-control" id="spacGradeSelect">
+								<option value="">-- 请选择大间隔等级 --</option>
+								<option value="1">一级</option>
+								<option value="2">二级</option>
+								<option value="3">三级</option>
+								<option value="4">四级</option>
+								<option value="5">五级</option>
+							</select>
 	                    </div>
 	                </div>
-	                <!-- 开辟日期 END　-->
+	                <!-- 大间隔等级END　-->
                  </div>
                  <!-- 表单分组组件 form-group START -->
  
@@ -391,6 +398,14 @@
 	                    </div>
 	                </div>
 	                <!-- 空调车辆数 END -->
+	                 <!-- 开辟日期 START　-->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                    </div>
+	                </div>
+	                <!-- 开辟日期 END　-->
                  </div>
                  <!-- 表单分组组件 form-group END -->
  
@@ -290,14 +290,21 @@
 	                </div>
 	                <!-- 线路规划类型 (* 必填项) END -->
  
-	                 <!-- 开辟日期 START　-->
+	                  <!--大间隔等级 START　-->
 					<div class="col-md-6">
-						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
 	                    <div class="col-md-4">
-	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                     	<select name="spacGrade" class="form-control" id="spacGradeSelect">
+								<option value="">-- 请选择大间隔等级 --</option>
+								<option value="1">一级</option>
+								<option value="2">二级</option>
+								<option value="3">三级</option>
+								<option value="4">四级</option>
+								<option value="5">五级</option>
+							</select>
 	                    </div>
 	                </div>
-	                <!-- 开辟日期 END　-->
+	                <!-- 大间隔等级END　-->
                  </div>
                  <!-- 表单分组组件 form-group START -->
  
@@ -399,6 +406,14 @@
 	                    </div>
 	                </div>
 	                <!-- 空调车辆数 END -->
+	                 <!-- 开辟日期 START　-->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                    </div>
+	                </div>
+	                <!-- 开辟日期 END　-->
                  </div>
                  <!-- 表单分组组件 form-group END -->
  
@@ -161,7 +161,7 @@ $(function(){
 	var toDay = new Date();
 	var year = toDay.getFullYear();
 	var Month = toDay.getMonth()+1>10?toDay.getMonth()+1:"0"+(toDay.getMonth()+1); 
- 	var Day = toDay.getDate()>10?toDay.getDate():"0"+toDay.getDate();
+ 	var Day = toDay.getDate()>9?toDay.getDate():"0"+toDay.getDate();
  	var date =  year+"-"+Month+"-"+Day;
  	//时间表单默认选择当日时间。
  	$("input[name='date']")[0].value = date;
+<div class="page-head">
+	<div class="page-title">
+		<h1>超速异常</h1>
+	</div>
+</div>
+
+<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>
+
+<div class="row">
+	<div class="col-md-12">
+		<!-- Begin: life time stats -->
+		<div class="portlet light portlet-fit portlet-datatable bordered">
+			<div class="portlet-title">
+				<div class="caption">
+					 <i class="fa fa-times-circle"></i> <span
+						class="caption-subject font-dark sbold uppercase">超速异常数据表</span>
+				</div>
+				<div class="actions">
+				</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_speeding">
+						<thead>
+							<tr role="row" class="heading">
+								<th width="3%">#</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: 100px;"></select>
+								</td>
+								<td>
+										<select class="form-control" name="nbbm" id="nbbm" style="width: 100px;"></select>
+								</td>
+								<!-- <td>
+									
+								</td>
+								<td>
+								</td> -->
+								<td>
+									<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> 
+									<input class="form-control" type="date" name="startDate" />
+								</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>
+								<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">
+                                                            <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 id="speeding_list_temp" type="text/html">
+{{each list as obj i}}
+<tr>
+	<td style="vertical-align: middle;">
+		<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
+	</td>
+	<td>
+		{{obj.lineName}}
+	</td>
+	<td>
+		{{obj.vehicle}}
+	</td>
+	<td>
+		{{if obj.upDown==0}}
+			上行
+		{{else if obj.upDown==1}}
+			下行 
+		{{else}}
+			无效
+		{{/if}}
+	</td>	
+	<td>
+		{{obj.timestampDate}}
+	</td>
+	<td>
+		{{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}}" data-lineid="{{obj.lineId}}" data-updown="{{obj.upDown}}">
+			查看轨迹										
+		</a>
+	</td>
+	<td>
+		
+	</td>
+</tr>
+{{/each}}
+{{if list.length == 0}}
+<tr>
+	<td colspan=8><h6 class="muted">没有找到相关数据</h6></td>
+</tr>
+{{/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;
+	var icheckOptions = {
+	    checkboxClass: 'icheckbox_flat-blue',
+	    increaseArea: '20%'
+	}
+	
+	var date = new Date();
+	var week = date.getDay();//表明今天是周几。0-6表示周日到周六
+	var dateTime = date.getTime();//当前时间的时间戳，单位秒。		
+	
+ 	var endTime = dateTime-week*24*3600*1000;//上周末、格式为时间戳。
+	var startTime = endTime-6*24*3600*1000;//上周一、格式为时间戳。
+	var endDate = timeToData(endTime);
+	var startDate = timeToData(startTime);
+ 	//表单默认选择上周一到上周日的超速信息。
+ 	$("input[name='endDate']")[0].value = endDate;
+ 	$("input[name='startDate']")[0].value = startDate;
+ 	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 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()>9?date.getDate():"0"+date.getDate();
+		return year+"-"+Month+"-"+Day;
+	}
+	
+	//重置
+	$('tr.filter .filter-cancel').on('click', function(){
+		$('tr.filter input, select').val('').change();
+		jsDoQuery(null, true);
+	});
+	
+	//提交
+	$('tr.filter .filter-submit').on('click', function(){
+		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();
+				}
+			}
+		});
+		page = 0;
+		jsDoQuery(params, true);
+	});
+	
+	/*
+	* 获取数据 p: 要提交的参数， pagination: 是否重新分页
+	*/
+ 	function jsDoQuery(p, pagination){
+		var params = {};
+		if(p)
+			params = p;
+		//更新时间排序
+		params['order'] = 'lastLoginDate';
+		params['page'] = page;
+		var i = layer.load(2);
+		$get('/nowspeeding/pagequery' ,params, function(data){
+			var bodyHtm = template('speeding_list_temp', {list: data.dataList});
+			$('#datatable_speeding tbody').html(bodyHtm)
+					.find('.icheck').iCheck(icheckOptions)
+					.on('ifChanged', iCheckChange);
+			if(pagination && data.dataList.length > 0){
+				//重新分页
+				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 lineid = $(this).data('lineid');
+  				var upDown = $(this).data('updown');
+  				var storage = window.localStorage;
+  				storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat+","+lineid+","+upDown);
+ 				$.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,//内容
+					});
+			    });
+			}) 
+		});
+	}
+	
+	function iCheckChange(){
+		var tr = $(this).parents('tr');
+		if(this.checked)
+			tr.addClass('row-active');
+		else
+			tr.removeClass('row-active');
+		
+		if($('#datatable_resource input.icheck:checked').length == 1)
+			$('#removeButton').removeAttr('disabled');
+		else
+			$('#removeButton').attr('disabled', 'disabled');
+	}
+	
+	function showPagination(data){
+		//分页
+		$('#pagination').jqPaginator({
+		    totalPages: data.totalPage,//总页数
+		    visiblePages: 6,// 中间显示页数
+		    currentPage: page + 1,
+		    first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+            prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+            next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+            last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+            page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+		    onPageChange: function (num, type) {
+		    	if(initPagination){
+		    		initPagination = false;
+		    		return;
+		    	}	
+		    	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();
+					}
+				}
+			});
+			page = num - 1;
+		   	jsDoQuery(params, false);
+		    }
+		});
+	}
+	
+	//删除
+	$('#removeButton').on('click', function(){
+		if($(this).attr('disabled'))
+			return;
+		
+		var id = $('#datatable_resource input.icheck:checked').data('id');
+		
+		removeConfirm('确定要删除选中的数据？', '/resource/' + id ,function(){
+			$('tr.filter .filter-submit').click();
+		});
+	});
+
+$("#line").on("change",initXl);
+function initXl(){
+$('#nbbm').select2({
+    placeholder: '搜索车辆...',
+    ajax: {
+        url: '/report/carList',
+        dataType: 'json',
+        delay: 150,
+        data: function (params) {
+        	   return {nbbm: params.term,
+           	    gsbm:"",
+           	    fgsbm:"",
+           	    xlbm:$('#line').val()}; 	
+        },
+        processResults: function (data) {
+            return {
+                results: data
+            };
+        },
+        cache: true
+    },
+    templateResult: function (repo) {
+        if (repo.loading) return repo.text;
+        var h = '<span>' + repo.text + '</span>';
+        h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');
+        return h;
+    },
+    escapeMarkup: function (markup) {
+        return markup;
+    },
+    minimumInputLength: 1,
+    templateSelection: function (repo) {
+        return repo.text;
+    },
+    language: {
+        noResults: function () {
+            return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+        },
+        inputTooShort: function (e) {
+            return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+        },
+        searching: function () {
+            return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+        }
+    }
+});
+}
+
+
+//改变状态
+function changeEnabled(id,enabled){
+	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
+		jsDoQuery(null, true);
+	})
+}
+});
+</script>
 \ No newline at end of file
@@ -165,7 +165,7 @@ $(function(){
 	var toDay = new Date();
 	var year = toDay.getFullYear();
 	var Month = toDay.getMonth()+1>10?toDay.getMonth()+1:"0"+(toDay.getMonth()+1); 
- 	var Day = toDay.getDate()>10?toDay.getDate():"0"+toDay.getDate();
+ 	var Day = toDay.getDate()>9?toDay.getDate():"0"+toDay.getDate();
  	var date =  year+"-"+Month+"-"+Day;
  	//时间表单默认选择当日时间。
  	$("input[name='date']")[0].value = date;
+<div class="page-head">
+	<div class="page-title">
+		<h1>设备异常</h1>
+	</div>
+</div>
+
+<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>
+
+<div class="row">
+	<div class="col-md-12">
+		<!-- Begin: life time stats -->
+		<div class="portlet light portlet-fit portlet-datatable bordered">
+			<div class="portlet-title">
+				<div class="caption">
+					 <i class="fa fa-times-circle"></i> <span
+						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">
+				<div class="table-container" style="margin-top: 10px">
+					<table
+						class="table table-striped table-bordered table-hover table-checkable"
+						id="datatable_abnormal">
+						<thead>
+							<tr role="row" class="heading">
+								<th width="3%">#</th>
+								<th width="20%">内部编码</th>
+								<th width="20%">离线次数</th>
+								<th width="20%">流动次数</th>
+								<th width="20%">协议错误次数</th>
+								<th width="17%">操作</th>
+							</tr>
+							<tr role="row" class="filter">
+								<td></td>
+								<td>
+								<input type="text" class="form-control form-filter input-sm" name="nbbm">
+								</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">
+                                                            <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 id="abnormal_list_temp" type="text/html">
+{{each list as obj i}}
+<tr>
+	<td style="vertical-align: middle;">
+		<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
+	</td>
+	<td>
+		{{obj.vehicle}}
+	</td>
+	<td>
+		{{obj.offline}}
+	</td>
+	
+	<td>
+		{{obj.drift}}
+	</td>
+	<td>
+		{{obj.protocol}}
+	</td>
+	
+	<td>
+		
+	</td>
+</tr>
+{{/each}}
+{{if list.length == 0}}
+<tr>
+	<td colspan=8><h6 class="muted">没有找到相关数据</h6></td>
+</tr>
+{{/if}}
+</script>
+
+<script>
+$(function(){
+	var page = 0, initPagination;
+	var icheckOptions = {
+	    checkboxClass: 'icheckbox_flat-blue',
+	    increaseArea: '20%'
+	}
+	
+	jsDoQuery(null,true);
+	
+	//重置
+	$('tr.filter .filter-cancel').on('click', function(){
+		$('tr.filter input, select').val('').change();
+		jsDoQuery(null, true);
+	});
+	
+	//提交
+	$('tr.filter .filter-submit').on('click', function(){
+		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();
+				}
+			}
+		});
+		page = 0;
+		jsDoQuery(params, true);
+	});
+	
+	/*
+	* 获取数据 p: 要提交的参数， pagination: 是否重新分页
+	*/
+	function jsDoQuery(p, pagination){
+		var params = {};
+		if(p)
+			params = p;
+		//更新时间排序
+		params['order'] = 'lastLoginDate';
+		params['page'] = page;
+		var i = layer.load(2);
+		$get('/nowabnormal/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('abnormal_list_temp', {list: data.dataList});
+			$('#datatable_abnormal tbody').html(bodyHtm)
+					.find('.icheck').iCheck(icheckOptions)
+					.on('ifChanged', iCheckChange);
+			if(pagination && data.dataList.length > 0){
+				//重新分页
+				initPagination = true;
+				showPagination(data);
+			}
+			layer.close(i);
+		});
+	}
+	
+	function iCheckChange(){
+		var tr = $(this).parents('tr');
+		if(this.checked)
+			tr.addClass('row-active');
+		else
+			tr.removeClass('row-active');
+		
+		if($('#datatable_resource input.icheck:checked').length == 1)
+			$('#removeButton').removeAttr('disabled');
+		else
+			$('#removeButton').attr('disabled', 'disabled');
+	}
+	
+	function showPagination(data){
+		//分页
+		$('#pagination').jqPaginator({
+		    totalPages: data.totalPage,
+		    visiblePages: 6,
+		    currentPage: page + 1,
+		    first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+            prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+            next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+            last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+            page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+		    onPageChange: function (num, type) {
+		    	if(initPagination){
+		    		initPagination = false;
+		    		return;
+		    	}	
+		    	page = num - 1;
+		    	jsDoQuery(null, false);
+		    }
+		});
+	}
+	
+});
+//改变状态
+function changeEnabled(id,enabled){
+	debugger
+	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
+		jsDoQuery(null, true);
+	})
+}
+</script>
 \ No newline at end of file
+<div class="page-head">
+	<div class="page-title">
+		<h1>越界异常</h1>
+	</div>
+</div>
+
+<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>
+
+<div class="row">
+	<div class="col-md-12">
+		<!-- Begin: life time stats -->
+		<div class="portlet light portlet-fit portlet-datatable bordered">
+			<div class="portlet-title">
+				<div class="caption">
+					 <i class="fa fa-times-circle"></i> <span
+						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">
+				<div class="table-container" style="margin-top: 10px">
+					<table
+						class="table table-striped table-bordered table-hover table-checkable"
+						id="datatable_bound">
+						<thead>
+							<tr role="row" class="heading">
+								<th width="3%">#</th>
+								<th width="15%">线路</th>
+								<th width="13%">车辆自编号</th>
+								<th width="100">车辆坐标</th>
+								<th width="11%">路牌名</th>
+								<th width="10%">上下行</th>
+								<th width="18%">时间</th>
+								<th width="18%">操作</th>
+							</tr>
+							<tr role="row" class="filter">
+								<td></td>
+								<td>
+<!-- 									<input type="text" class="form-control form-filter input-sm" name="userName_like"> -->
+										<select class="form-control" name="line" id="line" style="width: 150px;"></select>
+								</td>
+								<td>
+<!-- 									<input type="text" class="form-control form-filter input-sm" name="nbbm"> -->
+								<select class="form-control" name="nbbm" id="nbbm" style="width: 150px;"></select>
+								</td>
+								<td>
+								</td>
+								<td></td>
+								<td>
+									<select class="form-control form-filter " name="updown">
+                                         <option value="">请选择...</option>
+                                         <option value="0">上行</option>
+                                         <option value="1">下行</option>
+                                         <option value="-1">无效</option>
+                                     </select>
+								</td>
+								<td>
+									<input class="form-control" type="date" name="date" />
+								</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">
+                                                            <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 id="bound_list_temp" type="text/html">
+{{each list as obj i}}
+<tr>
+	<td style="vertical-align: middle;">
+		<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
+	</td>
+	<td>
+		{{obj.lineName}}
+	</td>
+	<td>
+		{{obj.vehicle}}
+	</td>
+	<td>
+		<a href="/pages/excep/outBoundMap.html?no={{obj.line}},{{obj.upDown}},{{obj.lon}},{{obj.lat}}" 
+			class="btn default blue-stripe btn-sm" data-pjax>
+			查看车辆位置
+		</a>
+	</td>
+	<td>
+		{{obj.lpname}}
+	</td>
+	<td>
+		{{if obj.upDown==0}}
+			上行
+		{{else if obj.upDown==1}}
+			下行 
+		{{else}}
+			无效
+		{{/if}}
+	</td>	
+	<td>
+		{{obj.timestampDate}}
+	</td>
+	<td>
+		
+	</td>
+</tr>
+{{/each}}
+{{if list.length == 0}}
+<tr>
+	<td colspan=8><h6 class="muted">没有找到相关数据</h6></td>
+</tr>
+{{/if}}
+</script>
+
+<script>
+$(function(){
+	var page = 0, initPagination;
+	var icheckOptions = {
+	    checkboxClass: 'icheckbox_flat-blue',
+	    increaseArea: '20%'
+	}
+	var toDay = new Date();
+	var year = toDay.getFullYear();
+	var Month = toDay.getMonth()+1>10?toDay.getMonth()+1:"0"+(toDay.getMonth()+1); 
+ 	var Day = toDay.getDate()>9?toDay.getDate():"0"+toDay.getDate();
+ 	var date =  year+"-"+Month+"-"+Day;
+ 	//时间表单默认选择当日时间。
+ 	$("input[name='date']")[0].value = date;
+ 	var parameter = new Object();
+ 	parameter.date = $("input[name='date']")[0].value;
+	jsDoQuery(parameter,true);
+	//重置
+	$('tr.filter .filter-cancel').on('click', function(){
+		debugger;
+		$('tr.filter input, select').val('').change();
+		jsDoQuery(null, true);
+	});
+	
+	//提交
+	$('tr.filter .filter-submit').on('click', function(){
+		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();
+				}
+			}
+		});
+		page = 0;
+		jsDoQuery(params, true);
+	});
+	
+	/*
+	* 获取数据 p: 要提交的参数， pagination: 是否重新分页
+	*/
+	function jsDoQuery(p, pagination){
+		var params = {};
+		if(p)
+			params = p;
+		//更新时间排序
+		params['order'] = 'lastLoginDate';
+		params['page'] = page;
+		var i = layer.load(2);
+		$get('/nowbound/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('bound_list_temp', {list: data.dataList});
+			$('#datatable_bound tbody').html(bodyHtm)
+					.find('.icheck').iCheck(icheckOptions)
+					.on('ifChanged', iCheckChange);
+			if(pagination && data.dataList.length > 0){
+				//重新分页
+				initPagination = true;
+				showPagination(data);
+			}
+			layer.close(i);
+		});
+	}
+	
+	function iCheckChange(){
+		var tr = $(this).parents('tr');
+		if(this.checked)
+			tr.addClass('row-active');
+		else
+			tr.removeClass('row-active');
+		
+		if($('#datatable_resource input.icheck:checked').length == 1)
+			$('#removeButton').removeAttr('disabled');
+		else
+			$('#removeButton').attr('disabled', 'disabled');
+	}
+	
+	function showPagination(data){
+		//分页
+		$('#pagination').jqPaginator({
+		    totalPages: data.totalPage,
+		    visiblePages: 6,
+		    currentPage: page + 1,
+		    first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+            prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+            next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+            last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+            page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+		    onPageChange: function (num, type) {
+		    	if(initPagination){
+		    		initPagination = false;
+		    		return;
+		    	}	
+		    	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();
+					}
+				}
+			});
+	    	page = num - 1;
+	    	jsDoQuery(params, false);
+		    }
+		});
+	}
+	
+	
+	//删除
+	$('#removeButton').on('click', function(){
+		if($(this).attr('disabled'))
+			return;
+		
+		var id = $('#datatable_resource input.icheck:checked').data('id');
+		
+		removeConfirm('确定要删除选中的数据？', '/resource/' + id ,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(){
+$('#nbbm').select2({
+    placeholder: '搜索车辆...',
+    ajax: {
+        url: '/report/carList',
+        dataType: 'json',
+        delay: 150,
+        data: function (params) {
+        	   return {nbbm: params.term,
+           	    gsbm:" ",
+           	    fgsbm:" ",
+           	    xlbm:$('#line').val()}; 	
+        },
+        processResults: function (data) {
+            return {
+                results: data
+            };
+        },
+        cache: true
+    },
+    templateResult: function (repo) {
+        if (repo.loading) return repo.text;
+        var h = '<span>' + repo.text + '</span>';
+        h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');
+        return h;
+    },
+    escapeMarkup: function (markup) {
+        return markup;
+    },
+    minimumInputLength: 1,
+    templateSelection: function (repo) {
+        return repo.text;
+    },
+    language: {
+        noResults: function () {
+            return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+        },
+        inputTooShort: function (e) {
+            return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+        },
+        searching: function () {
+            return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+        }
+    }
+})
+};
+
+
+
+//改变状态
+function changeEnabled(id,enabled){
+	debugger
+	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
+		jsDoQuery(null, true);
+	})
+}
+});
+</script>
 \ No newline at end of file
+<div class="page-head">
+	<div class="page-title">
+		<h1>掉线异常</h1>
+	</div>
+</div>
+
+<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>
+
+<div class="row">
+	<div class="col-md-12">
+		<!-- Begin: life time stats -->
+		<div class="portlet light portlet-fit portlet-datatable bordered">
+			<div class="portlet-title">
+				<div class="caption">
+					 <i class="fa fa-times-circle"></i> <span
+						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">
+				<div class="table-container" style="margin-top: 10px">
+					<table
+						class="table table-striped table-bordered table-hover table-checkable"
+						id="datatable_offline">
+						<thead>
+							<tr role="row" class="heading">
+								<th width="3%">#</th>
+								<th width="15%">线路</th>
+								<th width="13%">车辆自编号</th>
+								<th width="10%">工号/名字</th>
+								<th width="11%">路牌名</th>
+								<th width="10%">上下行</th>
+								<th width="18%">掉线时间</th>
+								<th width="18%">恢复时间</th>
+								<th width="20%">操作</th>
+							</tr>
+							<tr role="row" class="filter">
+								<td></td>
+								<td>
+<!-- 									<input type="text" class="form-control form-filter input-sm" name="userName_like"> -->
+										<select class="form-control" name="line" id="line" style="width: 150px;"></select>
+								</td>
+								<td>
+<!-- 									<input type="text" class="form-control form-filter input-sm" name="nbbm" id="nbbm"> -->
+									
+									<select class="form-control" name="nbbm" id="nbbm" style="width: 150px;"></select>
+								</td>
+								<td>
+								</td>
+								<td></td>
+								<td>
+									<select class="form-control form-filter " name="updown">
+                                         <option value="">请选择...</option>
+                                         <option value="0">上行</option>
+                                         <option value="1">下行</option>
+                                         <option value="-1">无效</option>
+                                     </select>
+								</td>
+								<td>
+									<input class="form-control" type="date" name="date" />
+								</td>
+								<td></td>
+								<td>
+									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
+                                                                <i class="fa fa-search"></i> 搜索</button>
+                                                               <br> 
+									<button class="btn btn-sm red btn-outline filter-cancel ">
+                                                            <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 id="offline_list_temp" type="text/html">
+{{each list as obj i}}
+<tr>
+	<td style="vertical-align: middle;">
+		<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
+	</td>
+	<td>
+		{{obj.lineName}}
+	</td>
+	<td>
+		{{obj.vehicle}}
+	</td>
+	
+	<td>
+		{{obj.jsy}}
+	</td>
+	<td>
+		{{obj.lpname}}
+	</td>
+	<td>
+		{{if obj.upDown==0}}
+			上行
+		{{else if obj.upDown==1}}
+			下行 
+		{{else}}
+			无效
+		{{/if}}
+	</td>	
+	<td>
+		{{obj.timestampDate}}
+	</td>
+	<td>
+		{{obj.tsdate}}
+	</td>
+	<td>
+		
+	</td>
+</tr>
+{{/each}}
+{{if list.length == 0}}
+<tr>
+	<td colspan=8><h6 class="muted">没有找到相关数据</h6></td>
+</tr>
+{{/if}}
+</script>
+
+<script>
+$(function(){
+	var page = 0, initPagination;
+	var icheckOptions = {
+	    checkboxClass: 'icheckbox_flat-blue',
+	    increaseArea: '20%'
+	};
+	var toDay = new Date();
+	var year = toDay.getFullYear();
+	var Month = toDay.getMonth()+1>10?toDay.getMonth()+1:"0"+(toDay.getMonth()+1); 
+ 	var Day = toDay.getDate()>9?toDay.getDate():"0"+toDay.getDate();
+ 	var date =  year+"-"+Month+"-"+Day;
+ 	//时间表单默认选择当日时间。
+ 	$("input[name='date']")[0].value = date;
+ 	var parameter = new Object();
+ 	parameter.date = $("input[name='date']")[0].value;
+	jsDoQuery(parameter,true);
+	
+	//重置
+	$('tr.filter .filter-cancel').on('click', function(){
+		$('tr.filter input, select').val('').change();
+		jsDoQuery(null, true);
+	});
+	
+	//提交
+	$('tr.filter .filter-submit').on('click', function(){
+		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();
+				}
+			}
+		});
+		page = 0;
+		jsDoQuery(params, true);
+	});
+	
+	/*
+	* 获取数据 p: 要提交的参数， pagination: 是否重新分页
+	*/
+	function jsDoQuery(p, pagination){
+		var params = {};
+		if(p)
+			params = p;
+		//更新时间排序
+		params['order'] = 'lastLoginDate';
+		params['page'] = page;
+		var i = layer.load(2);
+		$get('/nowoffline/pagequery' ,params, function(data){
+			var bodyHtm = template('offline_list_temp', {list: data.dataList});
+			
+			$('#datatable_offline tbody').html(bodyHtm)
+					.find('.icheck').iCheck(icheckOptions)
+					.on('ifChanged', iCheckChange);
+			if(pagination && data.dataList.length > 0){
+				//重新分页
+				initPagination = true;
+				showPagination(data);
+			}
+			layer.close(i);
+		});
+	}
+	
+	function iCheckChange(){
+		var tr = $(this).parents('tr');
+		if(this.checked)
+			tr.addClass('row-active');
+		else
+			tr.removeClass('row-active');
+		
+		if($('#datatable_resource input.icheck:checked').length == 1)
+			$('#removeButton').removeAttr('disabled');
+		else
+			$('#removeButton').attr('disabled', 'disabled');
+	}
+	
+	function showPagination(data){
+		//分页
+		$('#pagination').jqPaginator({
+		    totalPages: data.totalPage,
+		    visiblePages: 6,
+		    currentPage: page + 1,
+		    first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+            prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+            next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+            last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+            page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+		    onPageChange: function (num, type) {
+		    	if(initPagination){
+		    		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();
+						}
+					}
+				});
+		    	jsDoQuery(params, false);
+		    }
+		});
+	}
+	
+	
+	//删除
+	$('#removeButton').on('click', function(){
+		if($(this).attr('disabled'))
+			return;
+		
+		var id = $('#datatable_resource input.icheck:checked').data('id');
+		
+		removeConfirm('确定要删除选中的数据？', '/resource/' + id ,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(){
+			$('#nbbm').select2({
+			    placeholder: '搜索车辆...',
+			    ajax: {
+			        url: '/report/carList',
+			        dataType: 'json',
+			        delay: 150,
+			        data: function (params) {
+			        	   return {nbbm: params.term,
+			           	    gsbm:"",
+			           	    fgsbm:"",
+			           	    xlbm:$('#line').val()}; 	
+			        },
+			        processResults: function (data) {
+			            return {
+			                results: data
+			            };
+			        },
+			        cache: true
+			    },
+			    templateResult: function (repo) {
+			        if (repo.loading) return repo.text;
+			        var h = '<span>' + repo.text + '</span>';
+			        h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');
+			        return h;
+			    },
+			    escapeMarkup: function (markup) {
+			        return markup;
+			    },
+			    minimumInputLength: 1,
+			    templateSelection: function (repo) {
+			        return repo.text;
+			    },
+			    language: {
+			        noResults: function () {
+			            return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+			        },
+			        inputTooShort: function (e) {
+			            return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+			        },
+			        searching: function () {
+			            return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+			        }
+			    }
+			});
+		}
+
+});
+</script>
 \ No newline at end of file
+<div class="page-head">
+	<div class="page-title">
+		<h1>超速异常</h1>
+	</div>
+</div>
+
+<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>
+
+<div class="row">
+	<div class="col-md-12">
+		<!-- Begin: life time stats -->
+		<div class="portlet light portlet-fit portlet-datatable bordered">
+			<div class="portlet-title">
+				<div class="caption">
+					 <i class="fa fa-times-circle"></i> <span
+						class="caption-subject font-dark sbold uppercase">超速异常数据表</span>
+				</div>
+				<div class="actions">
+				</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_speeding">
+						<thead>
+							<tr role="row" class="heading">
+								<th width="3%">#</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: 100px;"></select>
+								</td>
+								<td>
+										<select class="form-control" name="nbbm" id="nbbm" style="width: 100px;"></select>
+								</td>
+								<!-- <td>
+									
+								</td>
+								<td>
+								</td> -->
+								<td>
+									<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> 
+									<input class="form-control" type="date" name="startDate" />
+								</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>
+								<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">
+                                                            <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 id="speeding_list_temp" type="text/html">
+{{each list as obj i}}
+<tr>
+	<td style="vertical-align: middle;">
+		<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
+	</td>
+	<td>
+		{{obj.lineName}}
+	</td>
+	<td>
+		{{obj.vehicle}}
+	</td>
+	<td>
+		{{if obj.upDown==0}}
+			上行
+		{{else if obj.upDown==1}}
+			下行 
+		{{else}}
+			无效
+		{{/if}}
+	</td>	
+	<td>
+		{{obj.timestampDate}}
+	</td>
+	<td>
+		{{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}}" data-lineid="{{obj.lineId}}" data-updown="{{obj.upDown}}">
+			查看轨迹										
+		</a>
+	</td>
+	<td>
+		
+	</td>
+</tr>
+{{/each}}
+{{if list.length == 0}}
+<tr>
+	<td colspan=8><h6 class="muted">没有找到相关数据</h6></td>
+</tr>
+{{/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;
+	var icheckOptions = {
+	    checkboxClass: 'icheckbox_flat-blue',
+	    increaseArea: '20%'
+	}
+	
+	var date = new Date();
+	var week = date.getDay();//表明今天是周几。0-6表示周日到周六
+	var dateTime = date.getTime();//当前时间的时间戳，单位秒。		
+	
+ 	var endTime = dateTime-week*24*3600*1000;//上周末、格式为时间戳。
+	var startTime = endTime-6*24*3600*1000;//上周一、格式为时间戳。
+	var endDate = timeToData(endTime);
+	var startDate = timeToData(startTime);
+ 	//表单默认选择上周一到上周日的超速信息。
+ 	$("input[name='endDate']")[0].value = endDate;
+ 	$("input[name='startDate']")[0].value = startDate;
+ 	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 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()>9?date.getDate():"0"+date.getDate();
+		return year+"-"+Month+"-"+Day;
+	}
+	
+	//重置
+	$('tr.filter .filter-cancel').on('click', function(){
+		$('tr.filter input, select').val('').change();
+		jsDoQuery(null, true);
+	});
+	
+	//提交
+	$('tr.filter .filter-submit').on('click', function(){
+		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();
+				}
+			}
+		});
+		page = 0;
+		jsDoQuery(params, true);
+	});
+	
+	/*
+	* 获取数据 p: 要提交的参数， pagination: 是否重新分页
+	*/
+ 	function jsDoQuery(p, pagination){
+		var params = {};
+		if(p)
+			params = p;
+		//更新时间排序
+		params['order'] = 'lastLoginDate';
+		params['page'] = page;
+		var i = layer.load(2);
+		$get('/nowspeeding/pagequery' ,params, function(data){
+			var bodyHtm = template('speeding_list_temp', {list: data.dataList});
+			$('#datatable_speeding tbody').html(bodyHtm)
+					.find('.icheck').iCheck(icheckOptions)
+					.on('ifChanged', iCheckChange);
+			if(pagination && data.dataList.length > 0){
+				//重新分页
+				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 lineid = $(this).data('lineid');
+  				var upDown = $(this).data('updown');
+  				var storage = window.localStorage;
+  				storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat+","+lineid+","+upDown);
+ 				$.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,//内容
+					});
+			    });
+			}) 
+		});
+	}
+	
+	function iCheckChange(){
+		var tr = $(this).parents('tr');
+		if(this.checked)
+			tr.addClass('row-active');
+		else
+			tr.removeClass('row-active');
+		
+		if($('#datatable_resource input.icheck:checked').length == 1)
+			$('#removeButton').removeAttr('disabled');
+		else
+			$('#removeButton').attr('disabled', 'disabled');
+	}
+	
+	function showPagination(data){
+		//分页
+		$('#pagination').jqPaginator({
+		    totalPages: data.totalPage,//总页数
+		    visiblePages: 6,// 中间显示页数
+		    currentPage: page + 1,
+		    first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+            prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+            next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+            last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+            page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+		    onPageChange: function (num, type) {
+		    	if(initPagination){
+		    		initPagination = false;
+		    		return;
+		    	}	
+		    	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();
+					}
+				}
+			});
+			page = num - 1;
+		   	jsDoQuery(params, false);
+		    }
+		});
+	}
+	
+	//删除
+	$('#removeButton').on('click', function(){
+		if($(this).attr('disabled'))
+			return;
+		
+		var id = $('#datatable_resource input.icheck:checked').data('id');
+		
+		removeConfirm('确定要删除选中的数据？', '/resource/' + id ,function(){
+			$('tr.filter .filter-submit').click();
+		});
+	});
+
+$("#line").on("change",initXl);
+function initXl(){
+$('#nbbm').select2({
+    placeholder: '搜索车辆...',
+    ajax: {
+        url: '/report/carList',
+        dataType: 'json',
+        delay: 150,
+        data: function (params) {
+        	   return {nbbm: params.term,
+           	    gsbm:"",
+           	    fgsbm:"",
+           	    xlbm:$('#line').val()}; 	
+        },
+        processResults: function (data) {
+            return {
+                results: data
+            };
+        },
+        cache: true
+    },
+    templateResult: function (repo) {
+        if (repo.loading) return repo.text;
+        var h = '<span>' + repo.text + '</span>';
+        h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');
+        return h;
+    },
+    escapeMarkup: function (markup) {
+        return markup;
+    },
+    minimumInputLength: 1,
+    templateSelection: function (repo) {
+        return repo.text;
+    },
+    language: {
+        noResults: function () {
+            return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+        },
+        inputTooShort: function (e) {
+            return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+        },
+        searching: function () {
+            return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+        }
+    }
+});
+}
+
+
+//改变状态
+function changeEnabled(id,enabled){
+	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
+		jsDoQuery(null, true);
+	})
+}
+});
+</script>
 \ No newline at end of file
@@ -59,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>
@@ -104,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}}
 			无效
@@ -124,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>
@@ -165,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=[];
@@ -173,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,'');
 	});
  
 	//时间戳转换为年月日
@@ -224,12 +221,12 @@ $(function(){
 		params['order'] = 'lastLoginDate';
 		params['page'] = page;
 		var i = layer.load(2);
-		$.get('/gps/pagequery' ,params, function(data){
-			var bodyHtm = template('speeding_list_temp', {list: data.list});
+		$get('/speeding/pagequery' ,params, function(data){
+			var bodyHtm = template('speeding_list_temp', {list: data.dataList});
 			$('#datatable_speeding tbody').html(bodyHtm)
 					.find('.icheck').iCheck(icheckOptions)
 					.on('ifChanged', iCheckChange);
-			if(pagination){
+			if(pagination && data.dataList.length > 0){
 				//重新分页
 				initPagination = true;
 				showPagination(data);
@@ -243,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,
@@ -290,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'))
@@ -336,7 +334,6 @@ $(&#39;#nbbm&#39;).select2({
            	    xlbm:$('#line').val()}; 	
         },
         processResults: function (data) {
-        	console.log(data);
             return {
                 results: data
             };
@@ -40,7 +40,7 @@ $(function(){
   		$.ajax({
         	type: "GET",
         	async:false,
-            url: '/speeding/findPosition',
+            url: '/nowspeeding/findPosition',
             data: {vehicle:vehicle,startdate:startdate,enddate:enddate},
             success: function(data){
              	$.each(data,function(i,item){
@@ -263,8 +263,8 @@
     }
  
     //日期选择器
-    $('[name=rq_eq]', f).val('2017-07-25');
-    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-07-25', minDate: '2017-07-01'});
+    $('[name=rq_eq]', f).val('2017-07-27');
+    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-07-27', minDate: '2017-07-01'});
  
     var comps;
     //构建公司级联下拉框