update...

潘钊
1 parent b6d02551
Showing 8 changed files with 311 additions and 220 deletions
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/pages/control/lineallot/allot.html
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/north/nav/all_devices.html
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch/h_add_temp_sch.html
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
@@ -315,7 +315,7 @@ public class GpsEntity {
 		this.setAbnormalStatus("offline");
 	}
-	public boolean isOnline(){
+/*	public boolean isOnline(){
 		if(isOffline())
 			return false;
@@ -329,7 +329,7 @@ public class GpsEntity {
 			return false;
 		}
 		return true;
-	}
+	}*/
 	/**
 	 * 是否营运
@@ -144,29 +144,17 @@ public class GeoCacheData {
     }
     private void loadRoadsData() {
+        //加载线路下路段空间数据
         String sql = "select r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) as GSECTION_VECTOR, r.DIRECTIONS, s.CROSES_ROAD from bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section=s.id where r.destroy=0 and GSECTION_VECTOR is not null order by line_code,directions,sectionroute_code";
         List<Map<String, Object>> secList = jdbcTemplate.queryForList(sql);
         String polygonStr, key;
         String[] coords;
         int i, len;
-
         ArrayListMultimap<String, LineString> sectionCacheTempMap = ArrayListMultimap.create();
-        Map<String, String> sectionCode2NameTemp = new HashMap<>();
-
         Coordinate[] cds;
         String[] temps1, temps2;
-        String name = null, code;
         for (Map<String, Object> tMap : secList) {
-            //编码和名称对照
-            if(tMap.get("CROSES_ROAD") != null && StringUtils.isNotEmpty(tMap.get("CROSES_ROAD").toString()))
-                name = tMap.get("CROSES_ROAD").toString();
-            else if(tMap.get("SECTION_NAME") != null && StringUtils.isNotEmpty(tMap.get("SECTION_NAME").toString()))
-                name = tMap.get("SECTION_NAME").toString();
-
-            code = tMap.get("SECTION_CODE").toString();
-            sectionCode2NameTemp.put(code, name);
-
             //空间数据映射
             polygonStr = tMap.get("GSECTION_VECTOR").toString();
             key = tMap.get("LINE_CODE") + "_" + tMap.get("DIRECTIONS");
@@ -188,6 +176,22 @@ public class GeoCacheData {
         if(sectionCacheTempMap.size() > 0)
             sectionCacheMap = sectionCacheTempMap;
+
+        Map<String, String> sectionCode2NameTemp = new HashMap<>();
+
+        //加载全量路段编码和名称对照
+        sql = "select SECTION_CODE,SECTION_NAME,CROSES_ROAD from bsth_c_section";
+        secList = jdbcTemplate.queryForList(sql);
+        String name = null, code;
+        for (Map<String, Object> tMap : secList) {
+            if(tMap.get("CROSES_ROAD") != null && StringUtils.isNotEmpty(tMap.get("CROSES_ROAD").toString()))
+                name = tMap.get("CROSES_ROAD").toString();
+            else if(tMap.get("SECTION_NAME") != null && StringUtils.isNotEmpty(tMap.get("SECTION_NAME").toString()))
+                name = tMap.get("SECTION_NAME").toString();
+
+            code = tMap.get("SECTION_CODE").toString();
+            sectionCode2NameTemp.put(code, name);
+        }
         if(sectionCode2NameTemp.size() > 0)
             sectionCode2Name = sectionCode2NameTemp;
     }
@@ -821,7 +821,7 @@ public class GpsServiceImpl implements GpsService {
     @Override
     public List<GpsSpeed_DTO> speeds(String nbbm, long st, long et) {
         String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-        String sql = "select vehicle, line, up_down, lon, lat, speed,timestamp from bsth_c_GpsSpeed where vehicle=? and timestamp>? and timestamp<?";
+        String sql = "select vehicle, line, up_down, lon, lat, speed,timestamp from bsth_c_speeding where vehicle=? and timestamp>? and timestamp<?";
         return GpsSpeed_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql, deviceId, st * 1000, et * 1000));
     }
@@ -999,20 +999,20 @@ public class GpsServiceImpl implements GpsService {
         return true;
     }
-	@Override
-	public List<GpsSpeed> findPosition(String deviceid, String startdate,
-			String enddate) throws ParseException{
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    	Calendar c = Calendar.getInstance();
-    	Date date = sdf.parse(startdate);	
-    	c.setTime(date);
-    	int daysYear = c.get(Calendar.DAY_OF_YEAR);//获取当前是今年的第几天。
-    	
-    	long startTime = sdf.parse(startdate).getTime();
-    	long endTime = sdf.parse(enddate).getTime();
-    	
+    @Override
+    public List<GpsSpeed> findPosition(String deviceid, String startdate,
+                                       String enddate) throws ParseException{
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Calendar c = Calendar.getInstance();
+        Date date = sdf.parse(startdate);
+        c.setTime(date);
+        int daysYear = c.get(Calendar.DAY_OF_YEAR);//获取当前是今年的第几天。
+
+        long startTime = sdf.parse(startdate).getTime();
+        long endTime = sdf.parse(enddate).getTime();
+
         String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,speed_gps from bsth_c_gps_info where days_year=? and device_id=? and ts >= ? and ts <= ?" +
-        		"     ORDER BY TS ";
+                "     ORDER BY TS ";
         Connection conn = null;
         PreparedStatement ps = null;
         ResultSet rs = null;
@@ -1029,7 +1029,7 @@ public class GpsServiceImpl implements GpsService {
             Float lon, lat;
             Location location;
             while (rs.next()) {
-            	gpsSpeed = new GpsSpeed();
+                gpsSpeed = new GpsSpeed();
                 // to 百度坐标
                 lon = rs.getFloat("LON");
                 lat = rs.getFloat("LAT");
@@ -1049,184 +1049,184 @@ public class GpsServiceImpl implements GpsService {
             DBUtils_MS.close(rs, ps, conn);
         }
         return listResult;
-    	
-	}
-
-	@Override
-	public PageObject<GpsSpeed> Pagequery(Map<String, Object> map) {
-		
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		List<GpsSpeed> list=findAll(map);
-		List<GpsSpeed> listResult = new ArrayList<GpsSpeed>();
-		int curPage;//页码  
-		int pageData;//每页的记录条数
-		int start;//起始数据下标
-		int totalPage;//总页数
-		int totalData = 0;
-		if(list.size()>1){
-			GpsSpeed GpsSpeedNow;//下标为i的车辆行驶记录
-			GpsSpeed GpsSpeedLast;//下标为i-1的车辆行驶记录
-			GpsSpeed spped = null;//整合后的车辆行驶记录
-			String strNow;
-			String strLast;
-			boolean Flag = false;//判断是否有连续超速记录,默认没有
-			for(int i = 1;i<list.size();i++){
-				GpsSpeedNow = list.get(i);
-				GpsSpeedLast = list.get(i-1);
-				strNow = GpsSpeedNow.getVehicle()+GpsSpeedNow.getLine()+GpsSpeedNow.getUp_down();
-				strLast = GpsSpeedLast.getVehicle()+GpsSpeedLast.getLine()+GpsSpeedLast.getUp_down();
-				if(GpsSpeedNow.getSpeed()>60 && GpsSpeedLast.getSpeed()>60 && strNow.equals(strLast)){//如果两条连续的记录都是超速且属于同一辆车。
-					if(Flag==false){//
-						spped = new GpsSpeed();
-						spped.setLine(GpsSpeedLast.getLine());//设置连续超速记录线路
-						spped.setLineName(GpsSpeedLast.getLineName());//设置连续超速记录线路名称
-						spped.setVehicle(GpsSpeedLast.getVehicle());//设置连续超速记录的车辆编号
-						spped.setUp_down(GpsSpeedLast.getUp_down());//设置上下行
-						spped.setLon(GpsSpeedLast.getLon());//设置开始时经度
-						spped.setLat(GpsSpeedLast.getLat());//设置开始时纬度
-						spped.setTimestamp(GpsSpeedLast.getTimestamp());//设置连续超速记录的开始时间
-						spped.setTimestampDate(GpsSpeedLast.getTimestampDate());//设置连续超速记录的开始时间戳
-					}
-					spped.setEndtimestamp(GpsSpeedNow.getTimestamp());//设置结束时间戳
-					spped.setEndtimestampDate(sdf.format(new Date(GpsSpeedNow.getTimestamp())));//设置结束时间
-					spped.setEndlon(GpsSpeedNow.getLon());//设置结束时的经度
-					spped.setEndlat(GpsSpeedNow.getLat());//设置结束时的纬度
-					Flag = true;
-				}else{
-					if(Flag){//如果上一条记录超速。
-						listResult.add(spped);
-						Flag = false;
-					}
-				}
-			}
-			Iterator<GpsSpeed> speedIt = listResult.iterator(); 
-			while(speedIt.hasNext()){
-				GpsSpeed GpsSpeed = speedIt.next(); 
-			    if(GpsSpeed.getEndtimestamp()-GpsSpeed.getTimestamp()<=1000){  
-			    	speedIt.remove();  
-			    }  
-			}
-			
-			totalData = listResult.size();//总记录条数。
-			if(map.get("curPage") == null || map.get("curPage").equals("0")){
-				curPage = 0;
-			}else{
-				curPage = Integer.parseInt((String) map.get("curPage"));
-			}
-			pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
-			start = (curPage - 0) * pageData; //起始记录下标。
-			totalPage = totalData % pageData == 0 ? totalData / pageData : totalData / pageData +1;//总页数
-			if(curPage == totalPage-1){//如果当前页等于总页数。
-				listResult = listResult.subList(start, totalData);
-			}else{
-				listResult = listResult.subList(start, start+pageData);
-			}
-		}else{
-			curPage = 1;
-			pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
-			totalPage =1;
-		}
-		Map<String,Object> paramMap = new HashMap<String,Object>();
-		paramMap.put("totalPage", totalPage);
-		paramMap.put("curPage", curPage);
-		paramMap.put("pageData", pageData);
-		PageHelper pageHelper = new PageHelper(totalData, paramMap);
-		pageHelper.getMap();
-		PageObject<GpsSpeed> pageObject = pageHelper.getPageObject();
-		pageObject.setDataList(listResult);
-		return pageObject;
-	}
-	
-	static List<GpsSpeed> findAll(Map<String, Object> map) {
-		Connection conn = null;
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-		int page=Integer.parseInt(map.get("page").toString());
-		List<GpsSpeed> list=new ArrayList<GpsSpeed>();
-		String sql="select * from bsth_c_gps_info where 1=1 ";
-		Object line=map.get("line");
-		Object nbbm=map.get("nbbm");
-		Object updown=map.get("updown");
-		Object startDate=map.get("startDate");
-		Object endDate=map.get("endDate");
-		
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		if(line!=null){
-			sql +=" and line_id 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 industry_code like '%"+updown.toString()+"%'";
-		}
-		if(startDate!=null){
-			if (startDate.toString().length()>0) {
-				try {
-					Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime();
-					sql += " and ts >="+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 ts <="+t2;
-				} catch (ParseException e) {
-					e.printStackTrace();
-				}
-			}
-			
-		}
-
-		try {
-			conn = DBUtils_MS.getConnection();
-			ps = conn.prepareStatement(sql);
-			rs = ps.executeQuery();
-			list = resultSet2Set(rs);
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}finally {
-			DBUtils_MS.close(rs, ps, conn);
-		}
-		
-		return list;
-	}
-	
-	static List<GpsSpeed> resultSet2Set(ResultSet rs) throws SQLException{
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		List<GpsSpeed> list=new ArrayList<GpsSpeed>();
-		GpsSpeed GpsSpeed;
-		Float lon, lat;
-		Location location;
-		while(rs.next()){
-			lon = rs.getFloat("lon");
-			lat = rs.getFloat("lat");
+
+    }
+
+    @Override
+    public PageObject<GpsSpeed> Pagequery(Map<String, Object> map) {
+
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<GpsSpeed> list=findAll(map);
+        List<GpsSpeed> listResult = new ArrayList<GpsSpeed>();
+        int curPage;//页码
+        int pageData;//每页的记录条数
+        int start;//起始数据下标
+        int totalPage;//总页数
+        int totalData = 0;
+        if(list.size()>1){
+            GpsSpeed GpsSpeedNow;//下标为i的车辆行驶记录
+            GpsSpeed GpsSpeedLast;//下标为i-1的车辆行驶记录
+            GpsSpeed spped = null;//整合后的车辆行驶记录
+            String strNow;
+            String strLast;
+            boolean Flag = false;//判断是否有连续超速记录,默认没有
+            for(int i = 1;i<list.size();i++){
+                GpsSpeedNow = list.get(i);
+                GpsSpeedLast = list.get(i-1);
+                strNow = GpsSpeedNow.getVehicle()+GpsSpeedNow.getLine()+GpsSpeedNow.getUp_down();
+                strLast = GpsSpeedLast.getVehicle()+GpsSpeedLast.getLine()+GpsSpeedLast.getUp_down();
+                if(GpsSpeedNow.getSpeed()>60 && GpsSpeedLast.getSpeed()>60 && strNow.equals(strLast)){//如果两条连续的记录都是超速且属于同一辆车。
+                    if(Flag==false){//
+                        spped = new GpsSpeed();
+                        spped.setLine(GpsSpeedLast.getLine());//设置连续超速记录线路
+                        spped.setLineName(GpsSpeedLast.getLineName());//设置连续超速记录线路名称
+                        spped.setVehicle(GpsSpeedLast.getVehicle());//设置连续超速记录的车辆编号
+                        spped.setUp_down(GpsSpeedLast.getUp_down());//设置上下行
+                        spped.setLon(GpsSpeedLast.getLon());//设置开始时经度
+                        spped.setLat(GpsSpeedLast.getLat());//设置开始时纬度
+                        spped.setTimestamp(GpsSpeedLast.getTimestamp());//设置连续超速记录的开始时间
+                        spped.setTimestampDate(GpsSpeedLast.getTimestampDate());//设置连续超速记录的开始时间戳
+                    }
+                    spped.setEndtimestamp(GpsSpeedNow.getTimestamp());//设置结束时间戳
+                    spped.setEndtimestampDate(sdf.format(new Date(GpsSpeedNow.getTimestamp())));//设置结束时间
+                    spped.setEndlon(GpsSpeedNow.getLon());//设置结束时的经度
+                    spped.setEndlat(GpsSpeedNow.getLat());//设置结束时的纬度
+                    Flag = true;
+                }else{
+                    if(Flag){//如果上一条记录超速。
+                        listResult.add(spped);
+                        Flag = false;
+                    }
+                }
+            }
+            Iterator<GpsSpeed> speedIt = listResult.iterator();
+            while(speedIt.hasNext()){
+                GpsSpeed GpsSpeed = speedIt.next();
+                if(GpsSpeed.getEndtimestamp()-GpsSpeed.getTimestamp()<=1000){
+                    speedIt.remove();
+                }
+            }
+
+            totalData = listResult.size();//总记录条数。
+            if(map.get("curPage") == null || map.get("curPage").equals("0")){
+                curPage = 0;
+            }else{
+                curPage = Integer.parseInt((String) map.get("curPage"));
+            }
+            pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
+            start = (curPage - 0) * pageData; //起始记录下标。
+            totalPage = totalData % pageData == 0 ? totalData / pageData : totalData / pageData +1;//总页数
+            if(curPage == totalPage-1){//如果当前页等于总页数。
+                listResult = listResult.subList(start, totalData);
+            }else{
+                listResult = listResult.subList(start, start+pageData);
+            }
+        }else{
+            curPage = 1;
+            pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
+            totalPage =1;
+        }
+        Map<String,Object> paramMap = new HashMap<String,Object>();
+        paramMap.put("totalPage", totalPage);
+        paramMap.put("curPage", curPage);
+        paramMap.put("pageData", pageData);
+        PageHelper pageHelper = new PageHelper(totalData, paramMap);
+        pageHelper.getMap();
+        PageObject<GpsSpeed> pageObject = pageHelper.getPageObject();
+        pageObject.setDataList(listResult);
+        return pageObject;
+    }
+
+    static List<GpsSpeed> findAll(Map<String, Object> map) {
+        Connection conn = null;
+        PreparedStatement ps = null;
+        ResultSet rs = null;
+        int page=Integer.parseInt(map.get("page").toString());
+        List<GpsSpeed> list=new ArrayList<GpsSpeed>();
+        String sql="select * from bsth_c_gps_info where 1=1 ";
+        Object line=map.get("line");
+        Object nbbm=map.get("nbbm");
+        Object updown=map.get("updown");
+        Object startDate=map.get("startDate");
+        Object endDate=map.get("endDate");
+
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if(line!=null){
+            sql +=" and line_id 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 industry_code like '%"+updown.toString()+"%'";
+        }
+        if(startDate!=null){
+            if (startDate.toString().length()>0) {
+                try {
+                    Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime();
+                    sql += " and ts >="+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 ts <="+t2;
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+            }
+
+        }
+
+        try {
+            conn = DBUtils_MS.getConnection();
+            ps = conn.prepareStatement(sql);
+            rs = ps.executeQuery();
+            list = resultSet2Set(rs);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }finally {
+            DBUtils_MS.close(rs, ps, conn);
+        }
+
+        return list;
+    }
+
+    static List<GpsSpeed> resultSet2Set(ResultSet rs) throws SQLException{
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<GpsSpeed> list=new ArrayList<GpsSpeed>();
+        GpsSpeed GpsSpeed;
+        Float lon, lat;
+        Location location;
+        while(rs.next()){
+            lon = rs.getFloat("lon");
+            lat = rs.getFloat("lat");
             location = TransGPS.LocationMake(lon, lat);
             location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
-			GpsSpeed=new GpsSpeed();
-			GpsSpeed.setLon((float)location.getLng());
-			GpsSpeed.setLat((float)location.getLat());
-			GpsSpeed.setLine(rs.getObject("line_id").toString());
-			//run 时注解
-			GpsSpeed.setLineName(BasicData.lineCode2NameMap.get(GpsSpeed.getLine().toString()));
-			GpsSpeed.setSpeed(Float.valueOf(rs.getObject("speed_gps").toString()));
-			GpsSpeed.setTimestamp((Long.valueOf(rs.getObject("ts").toString())));
-			GpsSpeed.setTimestampDate(sdf.format(new Date(GpsSpeed.getTimestamp())));
-			GpsSpeed.setUp_down(((Integer.valueOf(rs.getObject("service_state").toString())) & 0x10000000)==0?0:1);
-			GpsSpeed.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("device_id").toString()));
-			list.add(GpsSpeed);
-		}
-		return list;
-	}
-	
+            GpsSpeed=new GpsSpeed();
+            GpsSpeed.setLon((float)location.getLng());
+            GpsSpeed.setLat((float)location.getLat());
+            GpsSpeed.setLine(rs.getObject("line_id").toString());
+            //run 时注解
+            GpsSpeed.setLineName(BasicData.lineCode2NameMap.get(GpsSpeed.getLine().toString()));
+            GpsSpeed.setSpeed(Float.valueOf(rs.getObject("speed_gps").toString()));
+            GpsSpeed.setTimestamp((Long.valueOf(rs.getObject("ts").toString())));
+            GpsSpeed.setTimestampDate(sdf.format(new Date(GpsSpeed.getTimestamp())));
+            GpsSpeed.setUp_down(((Integer.valueOf(rs.getObject("service_state").toString())) & 0x10000000)==0?0:1);
+            GpsSpeed.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("device_id").toString()));
+            list.add(GpsSpeed);
+        }
+        return list;
+    }
+
 }
@@ -324,6 +324,17 @@
             }
             showLoad('更新缓存信息...');
+            //清理一下localStorage
+            var rms=[];
+            for (var i=0, len = storage.length; i  <  len; i++){
+                var key = storage.key(i);
+                if(key=='car2DeviceId' || key.endsWith('_route'))
+                    rms.push(key);
+            }
+            $.each(rms, function () {
+                storage.removeItem(this);
+            });
+
             //将选择的线路写入localstorage
             var lsData = [];
             $.each(lines, function (i, e) {
@@ -337,9 +348,9 @@
             var ep = new EventProxy();
             //缓存车辆自编号和设备号对照
-            cacheCar2DeviceId(function () {
+            //cacheCar2DeviceId(function () {
                 delayEmit(ep, 'cacheRoute');
-            });
+            //});
             //缓存线路路由
             ep.tail('cacheRoute', function () {
@@ -367,11 +378,8 @@
             //进入线调
             ep.tail('gotoControl', function () {
-                //alert('进入线调');
                 layer.closeAll();
-                //loadPage('/pages/control/line/index.html');
                 window.location.href = "/real_control/v2";
-                //window.open("/real_control/v2");
             });
         });
@@ -411,13 +419,13 @@
             })();
         }
-        function cacheCar2DeviceId(cb) {
+/*        function cacheCar2DeviceId(cb) {
             //showLoad('缓存基础对照信息...');
             $.get('/gps/Car2DeviceId', function (rs) {
                 storage.setItem('car2DeviceId', JSON.stringify(rs));
                 cb && cb();
             });
-        }
+        }*/
         function cacheRoute(lsData, cb) {
             //showLoad('缓存线路路由信息...');
@@ -1580,4 +1580,20 @@ ul.left_tabs_lg li{
     margin-left: 25px;
     vertical-align: bottom;
     color: #929292;
-}
 \ No newline at end of file
+}
+
+#all-devices-modal .search-form input{
+    width: 160px;
+}
+
+#all-devices-modal .uk-margin-small-top {
+    margin-top: 0 !important;
+}
+
+#history-sch-maintain-modal .add_lp_link{
+    display: inline-block;
+    vertical-align: bottom;
+    margin-left: 15px;
+    text-decoration: underline;
+    font-size: 13px;
+}
@@ -33,6 +33,10 @@
                             <option value="0">转发</option>
                         </select>
                     </div>
+                    <span class="horizontal-field">程序版本</span>
+                    <div class="uk-autocomplete uk-form " >
+                        <input type="text" name="version" placeholder="程序版本" style="width: 110px;">
+                    </div>
                     <button class="uk-button">检索</button>
                 </fieldset>
             </form>
@@ -46,7 +50,7 @@
                     <th style="width: 11%;">车辆</th>
                     <th style="width: 11%;">设备号</th>
                     <th style="width: 9%;">速度</th>
-                    <th style="width: 9%;">上下行</th>
+                    <th style="width: 9%;">走向/营运</th>
                     <th style="width: 10%;">程序版本</th>
                     <th>最后GPS时间</th>
                     <th style="width: 8%;">来源</th>
@@ -69,7 +73,7 @@
             <td>{{gps.nbbm}}</td>
             <td>{{gps.deviceId}}</td>
             <td>{{gps.speed}}</td>
-            <td>{{gps.upDown}}</td>
+            <td>{{gps.upDown}}/{{gps.state}}</td>
             <td>{{gps.version}}</td>
             <td>{{gps.timeStr}}</td>
             <td>
@@ -758,7 +758,7 @@
                         disabled_submit_btn(f);
                         var data = $(f).serializeJSON();
                         submitScheduleForm(data, function (rs) {
-                            $('#history-sch-maintain-modal').trigger('refresh');
+                            $('#history-sch-maintain-modal').trigger('refresh', {lpName: sch.lpName});
                             UIkit.modal(modal).hide();
                         });
                     });
@@ -36,6 +36,7 @@
                         <input type="text" name="jGh_like" placeholder="驾驶员">
                     </div>
                     <button class="uk-button">检索</button>
+                    <a class="add_lp_link" ><i class="uk-icon-plus"></i> 临加路牌</a>
                 </fieldset>
             </form>
         </div>
@@ -140,7 +141,13 @@
                 });
             });
-            $(modal).on('refresh', jsQuery);
+            $(modal).on('refresh', function (e, data) {
+                var lpName = data.lpName;
+                if(is_new_temp_lp(lpName)){
+                    $('[name=lpName_eq]', modal).append('<option value="'+lpName+'" selected>'+lpName+'</option>');
+                }
+                jsQuery();
+            });
             $(modal).on('click', '.h-s-time li,.h-s-line li', function () {
                 if(loading)
@@ -167,7 +174,7 @@
             var reLoadLp;
             var nbbmArray,jsyArray,lpArray,loading;
             var schArray;//主键映射
-            function jsQuery() {
+            function jsQuery(cb) {
                 var data = $('.search-form', modal).serializeJSON();
                 var rq = $('.h-s-time li.uk-active', modal).text(),
                         lineCode = $('.h-s-line li.uk-active', modal).data('id');
@@ -221,6 +228,8 @@
                     //更新滚动条高度
                     $('.history-sch-wrap', modal).perfectScrollbar('update');
+
+                    cb && cb();
                 });
             }
@@ -313,6 +322,11 @@
                     var str = '<h3>确定要删除临加班次<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>?</h3><h5 style="color: #6c6c6c;font-size: 12px;">班次删除后，调度指令会保留</h5>';
                     alt_confirm(str, function () {
                         gb_common.$del('/realSchedule/history/' + sch.id, function (rs) {
+                            if($('.history-sch-table .ct_table_body dl', modal).length == 1){
+                                $('[name=lpName_eq]', modal).val('');
+                                reLoadLp = true;
+                            }
+
                             jsQuery();
                         });
                     }, '确定删除');
@@ -352,6 +366,51 @@
                     }
                 }
             });
+
+            //临加路牌
+            $('.add_lp_link', modal).on('click', function () {
+                var index = 0, max;
+                $.each(lpArray, function (i, obj) {
+                    var lp = obj.value;
+                    if (lp.indexOf('临') != -1) {
+                        max = lp.substr(lp.indexOf('临') + 1);
+                        if (!isNaN(max))
+                            index = parseInt(max);
+                    }
+                });
+
+                var lpName = '临' + (index + 1);
+                var rq = $('.h-s-time li.uk-active', modal).text(),
+                        lineName = $('.h-s-line li.uk-active', modal).text(),
+                        lineCode = $('.h-s-line li.uk-active', modal).data('id');
+
+                var sch = {
+                    scheduleDateStr: rq,
+                    xlBm: lineCode,
+                    xlName: lineName,
+                    lpName: lpName
+                };
+
+                open_modal(folder + '/h_add_temp_sch.html', {
+                    sch: sch
+                }, modal_opts);
+            });
+
+            /**
+             * 是否是临加路牌
+             * @param lpName
+             */
+            function is_new_temp_lp(lpName) {
+                if(lpName.indexOf('临') ==-1)
+                    return false;
+
+                for(var i=0,obj;obj=lpArray[i++];){
+                    if(obj.value==lpName)
+                        return false;
+                }
+
+                return true;
+            }
         })();
     </script>
 </div>
 \ No newline at end of file