update

潘钊
1 parent 038dee30
Showing 9 changed files with 205 additions and 73 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/vehicle/gpsdata/entity/ArrivalInfo.java
src/main/java/com/bsth/vehicle/gpsdata/service/GpsDataServiceImpl.java
src/main/resources/static/pages/mapmonitor/real/css/real.css
src/main/resources/static/pages/mapmonitor/real/js/map_platform.js
src/main/resources/static/pages/mapmonitor/real/js/playBack.js
src/main/resources/static/pages/mapmonitor/real/js/vehicle.js
src/main/resources/static/pages/mapmonitor/real/real.html
src/main/resources/static/pages/mapmonitor/real/temps/playBack.html
@@ -679,9 +679,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("directions_eq", 1);
 		List<Map<String, Object>>  downList = sectionRouteService.getSectionRoute(map);
-		System.out.println(upList);
-		System.out.println(downList);
-		
 		Map<String, Object> rs = new HashMap<>();
 		String upVectors = "", vec;
@@ -24,14 +24,21 @@ public class ArrivalInfo {
 			Date createDate, Integer weeksYear) {
 		this.deviceId = deviceId;
-		//gps是2014年的数据，临时将ts拉到6月1号
-		/*try {
-			this.ts = sdf2.parse("2016-06-01 " + sdf.format(new Date(ts))).getTime();
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}*/
 		this.ts = ts;
+		this.lineCode = lineCode;
+		this.upDown = upDown;
+		this.stopNo = stopNo;
+		this.inOut = inOut;
+		this.createDate = createDate;
+		this.weeksYear = weeksYear;
+	}
+	
+	public ArrivalInfo(String deviceId, Long ts, String lineCode, Integer upDown, String stopNo, Integer inOut,
+			Date createDate, Integer weeksYear, String stopName) {
+		this.deviceId = deviceId;
+		
+		this.ts = ts;
 		this.lineCode = lineCode;
 		this.upDown = upDown;
@@ -39,6 +46,7 @@ public class ArrivalInfo {
 		this.inOut = inOut;
 		this.createDate = createDate;
 		this.weeksYear = weeksYear;
+		this.stopName = stopName;
 	}
 	/**
@@ -62,9 +70,14 @@ public class ArrivalInfo {
 	private Integer upDown;
 	/**
-	 * 站点
+	 * 站点编码
 	 */
 	private String stopNo;
+	
+	/**
+	 * 站点名称
+	 */
+	private String stopName;
 	/**
 	 * 0: 进 1：出
@@ -141,4 +154,12 @@ public class ArrivalInfo {
 	public void setTs(Long ts) {
 		this.ts = ts;
 	}
+
+	public String getStopName() {
+		return stopName;
+	}
+
+	public void setStopName(String stopName) {
+		this.stopName = stopName;
+	}
 }
@@ -12,6 +12,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import com.bsth.util.DateUtils;
@@ -19,6 +21,7 @@ import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
 import com.bsth.vehicle.common.CommonMapped;
+import com.bsth.vehicle.gpsdata.entity.ArrivalInfo;
 @Service
 public class GpsDataServiceImpl implements GpsDataService{
@@ -26,6 +29,13 @@ public class GpsDataServiceImpl implements GpsDataService{
 	/** 历史gps查询最大范围 24小时 */
 	final static Long GPS_RANGE= 60 * 60 * 24L;
+	/** jdbc */
+	Connection conn = null;
+	PreparedStatement ps = null;
+	ResultSet rs = null;
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
 	//历史gps查询
 	@Override
 	public List<Map<String, Object>> history(String device, Long startTime, Long endTime, int directions) {
@@ -111,12 +121,11 @@ public class GpsDataServiceImpl implements GpsDataService{
 		if(et - st > GPS_RANGE)
 			return list;
-		//转换设备号
+		//车辆编码转换成设备号
 		String[] devices = new String[nbbmArray.length];
 		for(int i = 0; i < nbbmArray.length; i ++){
 			devices[i] = CommonMapped.vehicDeviceBiMap.inverse().get(nbbmArray[i]);
 		}
-		//String device = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
 		//day_of_year
 		Calendar sCal = Calendar.getInstance();
 		sCal.setTime(new Date(st * 1000));
@@ -126,21 +135,33 @@ public class GpsDataServiceImpl implements GpsDataService{
 		eCal.setTime(new Date(et * 1000));
 		int eDayOfYear = /*eCal.get(Calendar.DAY_OF_YEAR)*/200;
+		Calendar weekCal = Calendar.getInstance();
+		
 		//如果是同一天
 		if(sDayOfYear == eDayOfYear){
-			list = findByTs(sDayOfYear, st, et, devices);
+			weekCal.setTimeInMillis(st);
+			list = findByTs(weekCal.get(Calendar.WEEK_OF_YEAR), sDayOfYear, st, et, devices);
 		}
 		else{
 			//跨天
+			Long tempSt = 0L, tempEt = 0L;
 			for(int i = sDayOfYear; i <= eDayOfYear; i ++){
-				if(i == sDayOfYear)
-					list.addAll(findByTs(i, st, DateUtils.getTimesnight(sCal), devices));
-				else if(i == eDayOfYear)
-					list.addAll(findByTs(i, DateUtils.getTimesmorning(sCal), et, devices));
-				else
-					list.addAll(findByTs(i, DateUtils.getTimesmorning(sCal), DateUtils.getTimesnight(sCal), devices));
+				if(i == sDayOfYear){
+					tempSt = st;
+					tempEt = DateUtils.getTimesnight(sCal);
+				}
+				else if(i == eDayOfYear){
+					tempSt = DateUtils.getTimesmorning(sCal);
+					tempEt = et;
+				}
+				else{
+					tempSt = DateUtils.getTimesmorning(sCal);
+					tempEt = DateUtils.getTimesnight(sCal);
+				}
+				weekCal.setTimeInMillis(tempSt);
+				list.addAll(findByTs(weekCal.get(Calendar.WEEK_OF_YEAR), i, tempSt, tempEt, devices));
 				//加一天
 				sCal.add(Calendar.DATE, 1);
 			}
@@ -157,7 +178,7 @@ public class GpsDataServiceImpl implements GpsDataService{
 		return list;
 	}
-	public List<Map<String, Object>> findByTs(int dayOfYear,Long st, Long et, String[] devices){
+	public List<Map<String, Object>> findByTs(int weekOfYear, int dayOfYear,Long st, Long et, String[] devices){
 		List<Map<String, Object>> list = new ArrayList<>();
 		Map<String, Object> map = null;
@@ -167,10 +188,10 @@ public class GpsDataServiceImpl implements GpsDataService{
 			inv += ("'" + device + "',");
 		inv = inv.substring(0, inv.length() - 1);
+		//查询到离站数据
+		Map<String, ArrivalInfo> arrivalMap = findArrivalByTs(/*weekOfYear*/30, st, et, inv);
+		
 		String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO from bsth_c_gps_info where days_year=? and device_id in ("+inv+") and ts > ? and ts < ?";
-		Connection conn = null;
-		PreparedStatement ps = null;
-		ResultSet rs = null;
 		try{
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
@@ -182,7 +203,7 @@ public class GpsDataServiceImpl implements GpsDataService{
 			rs = ps.executeQuery();
 			Float lon, lat;
 			Location bdLoc, gdLoc;
-			int upDown;
+			int upDown,inOutStop;
 			while (rs.next()) {
 				upDown = getUpOrDown(rs.getLong("SERVICE_STATE"));
 				map = new HashMap<>();
@@ -201,7 +222,14 @@ public class GpsDataServiceImpl implements GpsDataService{
 				map.put("device", rs.getString("DEVICE_ID"));
 				map.put("ts", rs.getLong("TS"));
 				map.put("stopNo", rs.getString("STOP_NO"));
-				map.put("inout_stop", rs.getInt("INOUT_STOP"));
+				
+				inOutStop = rs.getInt("INOUT_STOP");
+				map.put("inout_stop", inOutStop);
+				
+				if(inOutStop != -1){
+					map.put("inout_stop_info", 
+							arrivalMap.get(rs.getString("DEVICE_ID") + "_" + rs.getLong("TS") + "_" + inOutStop));
+				}
 				map.put("nbbm", CommonMapped.vehicDeviceBiMap.get(rs.getString("DEVICE_ID")));
 				map.put("state", 0);
 				//上下行
@@ -209,18 +237,42 @@ public class GpsDataServiceImpl implements GpsDataService{
 				list.add(map);
 			}
 		}catch(Exception e){
-			e.printStackTrace();
+			logger.error("", e);
 		}finally {
 			DBUtils_MS.close(rs, ps, conn);
 		}
 		return list;
 	}
-/*	
-	public static void main(String[] args) {
-		Calendar eCal = Calendar.getInstance();
-		eCal.setTime(new Date());
+	
+	public Map<String, ArrivalInfo> findArrivalByTs(int weekOfYear, Long st, Long et, String devicesInSql){
+		Map<String, ArrivalInfo> map = new HashMap<>();
-		int dayOfYear = eCal.get(Calendar.DAY_OF_YEAR);
-		System.out.println(dayOfYear);
-	}*/
+		String sql = "SELECT DEVICE_ID,LINE_ID,STOP_NO,TS,UP_DOWN,IN_OUT,WEEKS_YEAR,CREATE_DATE FROM bsth_c_arrival_info where weeks_year=? and device_id in ("+devicesInSql+") and ts > ? and ts < ?";
+		try{
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setInt(1, weekOfYear);
+			ps.setLong(2, st * 1000);
+			ps.setLong(3, et * 1000);
+			
+			rs = ps.executeQuery();
+			ArrivalInfo arr;
+			int inOut;
+			while (rs.next()) {
+				arr = new ArrivalInfo(rs.getString("DEVICE_ID"), rs.getLong("TS"), rs.getString("LINE_ID"), rs.getInt("UP_DOWN")
+						, rs.getString("STOP_NO"), rs.getInt("IN_OUT"), rs.getDate("CREATE_DATE") , rs.getInt("WEEKS_YEAR")
+						, CommonMapped.stationCodeMap.get(rs.getString("STOP_NO")));
+				
+				//设备号_时间戳_进出状态  为key
+				//反转进出状态
+				inOut = arr.getInOut() == 0?1:0;
+				map.put(arr.getDeviceId() + "_" + arr.getTs() + "_" + inOut, arr);
+			}
+		}catch(Exception e){
+			logger.error("", e);
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		return map;
+	}
 }
@@ -88,7 +88,7 @@ label.BMapLabel{
 .mapRightWrap.to_playBack{
 	transform:rotateY(180deg);
 	height: 476px;
-	width: 370px
+	width: 390px
 }
 .mapRightWrap.to_playBack .alert{
@@ -698,8 +698,8 @@ html{
 }
 .play-back-btns .dropdown-menu{
-	min-width: 88px;
-	width: 88px;
+	min-width: 70px;
+    width: 70px;
 }
 .play-back-btns>i.playBtn{
@@ -768,8 +768,9 @@ html{
     margin-right: 12px;
     color: #565555;
     padding: 4px 8px 4px 13px;
-    border-radius: 5px !important;
     cursor: pointer;
+    border-left: 1px solid #e1e5ec;
+    border-right: 1px solid #e1e5ec;
 }
 #playSpeed .fa-angle-up{
@@ -48,6 +48,9 @@ var realMap = (function() {
 	//线路路由
 	var polylines;
+	//百度 -轨迹回放点聚合
+	//var historyClusterer;
+	
 	//设备号和marker对照
 	var markersMap;
 	var real_map = {
@@ -81,6 +84,7 @@ var realMap = (function() {
 				var ctrl = new BMapLib.TrafficControl();
 				map.addControl(ctrl);
+				//historyClusterer = new BMapLib.MarkerClusterer(map, {isAverangeCenter : true,minClusterSize : 2})
 				var isVisible;
 				trafficBtn.on('click', function() {
 					if (isVisible) {
@@ -167,13 +171,13 @@ var realMap = (function() {
 				local.search(val);
 			},
-			drawLine: function(lineCode){
+			drawLine: function(route){
 				var map = currentMap.map;
 				map.clearOverlays();
 				polylines = [];
 				//画线路
 				//从localStorage里读取路由信息
-				var route = JSON.parse(storage.getItem(lineCode + '_route'));
+				//var route = JSON.parse(storage.getItem(lineCode + '_route'));
 				var upLineOps = {strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
 					,downLineOps = {strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
@@ -251,14 +255,22 @@ var realMap = (function() {
 			},
 			//绘制轨迹回放 marker
 			addHistoryMarker: function(gps){
-				//var marker = new BMap.Marker(new BMap.Point(gps.bd_lon, gps.bd_lat));
+				
 				var marker = bdHistoryMarker(gps);
 				currentMap.map.addOverlay(marker);
+				
+				//historyClusterer.addMarker(marker);
 				return marker;
 			},
 			//移动marker
-			moveMarker: function(marker , lon, lat){
-				marker.setPosition(new BMap.Point(lon, lat));
+			moveMarker: function(marker , gps){
+				marker.setPosition(new BMap.Point(gps.bd_lon, gps.bd_lat));
+				//重新设置颜色
+				marker.getLabel().setStyle({borderColor: bgColor(gps), backgroundColor: bgColor(gps)});
+			},
+			//居中marker
+			markerToCenter: function(marker){
+				currentMap.map.panTo(marker.getPosition());
 			}
 		},
 		//高德地图
@@ -378,12 +390,12 @@ var realMap = (function() {
 				     placeSearch.search(val);
 				});
 			},
-			drawLine: function(lineCode){
+			drawLine: function(route){
 				polylines = [];
 				var map = currentMap.map;
 				map.clearMap();
-				var route = JSON.parse(storage.getItem(lineCode + '_route'));
+				//var route = JSON.parse(storage.getItem(lineCode + '_route'));
 				var upArr = [], downArr = [];
 				var upLineOps = {path: upArr, strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
@@ -10,7 +10,6 @@ var playBack = (function() {
 	var sTime;
 	//结束时间戳
 	var eTime;
-	//10秒一个进度
 	var tRange;
 	//进度条宽度
 	var pWidth;
@@ -28,9 +27,13 @@ var playBack = (function() {
 	var cIndex = 0;
 	var size;
 	//播放速度
-	var speed = 1;
+	var speed = parseInt($('#playSpeedText').text());
 	//车辆编码和marker映射
 	var markerMap = {};
+	//线路路由数据
+	var lineRoute;
+	//默认以第一辆车为焦点
+	var firstCar;
 	//S0I-058，S0I-055 ，隧道六线
 	function getCurrMap(){
@@ -66,9 +69,16 @@ var playBack = (function() {
 	//退出
 	$('.play-back-close').on('click', function(){
 		stop();
+		//重置位置
 		$pmk.css('width', '0px');
 		topW = 0;
 		$presMark.css('left', '0px');
+		//删掉marker映射
+		markerMap = {};
+		//清理地图
+		getCurrMap().clear();
+		//坐标归0
+		cIndex = 0;
 		//动画
 		$('.play-back-list').removeClass('fadeInRightBig').addClass('fadeOutRightBig');
 		$('.play-back-btns,.progress-wrap').removeClass('fadeInUpBig').addClass('fadeOutDownBig');
@@ -85,24 +95,40 @@ var playBack = (function() {
 		var t = showMark($presMark, w);
 		//时间戳找gps
 		var gps;
-		console.log('showMarkText', cIndex, t);
-
 		var marker;
 		for(;cIndex < size; cIndex ++){
 			gps = gpsArray[cIndex];
 			if(gps.ts <= t){
 				marker = markerMap[gps.nbbm];
 				if(marker)
-					getCurrMap().moveMarker(marker, gps.bd_lon, gps.bd_lat);//移动marker
+					getCurrMap().moveMarker(marker, gps);//移动marker
 				else
-					markerMap[gps.nbbm] = getCurrMap().addHistoryMarker(gps);//画出marker
+					markerMap[gps.nbbm] = getCurrMap().addHistoryMarker(gps);//添加marker
+				
+				if(gps.inout_stop != -1){
+					//到离站信息
+					addInOutText(gps);
+				}
 			}
 			else{
 				break;
 			}
 		}
-		console.log('markerMap : ' , markerMap);
-		//console.log(moment(t).format('YYYY-MM-DD HH:mm:ss'));
+		//定位焦点
+		/*if(markerMap[firstCar]){
+			getCurrMap().markerToCenter(markerMap[firstCar]);
+		}*/
+	}
+	
+	function addInOutText(gps){
+		var info = gps.inout_stop_info
+			,date = moment(gps.ts).format('HH:mm.ss');
+		var html = '<div class="pback-logs-item">'+
+						gps.nbbm + ' '+ (info.inOut==1?'出':'进') +'站 '+info.stopName+' '+
+						'<span class="pback-logs-item-date">'+ date +'</span>'+
+					'</div>';
+		
+		$('.pback-logs').prepend(html);
 	}
 	//播放速度
@@ -146,23 +172,25 @@ var playBack = (function() {
 			$('.mapRightWrap').html(htmlStr);
 			//车辆搜索框
 			createVehSearch($('.mapRightWrap select[name="nbbm[]"]'));
-			//线路选择框
+			//线路下拉框
+			var lineData = [{id:'-1', text: '请选择...'}];
 			$get('/line/all', null, function(array){
-				console.log(array);
+				$.each(array, function(){
+					lineData.push({id: this.id, text: this.name});
+				});
+				initPinYinSelect2('.mapRightWrap select[name=lineCode]', lineData);
 			});
 			//点击轨迹回放按钮
 			$('#playBackBtn').on('click', function(){
 				var params = $('#playBackForm').serializeJSON();
-				console.log(params);
 				//查询历史gps数据
 				var fs = 'YYYY-MM-DDHH:mm'
 					,st = moment(params.sDate + params.sTime, fs).format('X')
 					,et = moment(params.eDate + params.eTime, fs).format('X')
 					,nbbm = params.nbbm;
-				layer.msg('查询历史GPS...', {icon: 16, time: 0});
-				
+				layer.msg('查询历史GPS...', {icon: 16, time: 0,shade:0.3});
 				$.ajax({
 					url: '/gps/gpsHistory/multiple',
 					traditional: true,
@@ -170,7 +198,7 @@ var playBack = (function() {
 					success:function(rs){
 						gpsArray = rs;
 						size = gpsArray.length;
-						layer.closeAll();
+						//layer.closeAll();
 						//切出轨迹回放面板
 						$('.mapRightWrap,.mapTools,.leftUtilsWrap').fadeOut();
 						$('.play-back-list,.play-back-btns,.progress-wrap').show();
@@ -182,18 +210,27 @@ var playBack = (function() {
 						//获取进度条宽度
 						pWidth = $('.progress-body').width();
 						cell = pWidth / tRange;
-						console.log('gpsArray', gpsArray);
 						//清理地图
 						getCurrMap().clear();
+						
+						firstCar = params.nbbm[0];
+						layer.msg('加载线路图层数据...', {icon: 16, time: 0,shade:0.3});
+						$.get('/realSchedule/findRouteByLine', {lineId: $('.mapRightWrap select[name=lineCode]').val()}
+							,function(route){
+								lineRoute = route;
+								getCurrMap().drawLine(lineRoute);
+								//开始播放
+								play();
+						});
 					}
 				});
 			});
 			//默认值
 			 $('input[name=sDate]').val('2016-04-24');
-			 $('input[name=sTime]').val('03:10');
+			 $('input[name=sTime]').val('04:00');
 			 $('input[name=eDate]').val('2016-04-24');
-			 $('input[name=eTime]').val('03:50');
+			 $('input[name=eTime]').val('04:40');
 		}
 	};
@@ -204,11 +241,22 @@ var playBack = (function() {
 	}
 	function play(){
+		if(topW == pWidth){
+			//从头再来
+			reset();
+		}
 		$('#progress-mark-time').show();
 		$('.play-back-btns .playBtn').removeClass('fa-play').addClass('fa-pause').data('status', 1);
 		start();
 	}
+	function reset(){
+		topW = 0;
+		$pmk.css('width', topW + 'px');
+		cIndex = 0;
+		$('.pback-logs').html('');
+	}
+	
 	var topW = 0;
 	function start(){
 		prgTimer = setTimeout(start, 1000);
@@ -227,6 +275,8 @@ var playBack = (function() {
 	}
 	function goTo(w){
+		$('.pback-logs').html('');
+		cIndex = 0;
 		stop();
 		topW = w;
 		showMarkText(w);
@@ -47,7 +47,9 @@ var vehiclePanel = (function() {
 		setTimeout(function(){
 			//在地图上画出线路
 			var mapObj = getCurrMap();
-			mapObj.drawLine(lineCode);
+			//从storage里获取路由数据
+			var route = JSON.parse(storage.getItem(lineCode + '_route'));
+			mapObj.drawLine(route);
 			//画GPS
 			mapObj.drawGpsMarker(showList);
 		}, 500);
@@ -43,7 +43,7 @@
 <!-- 轨迹回放面板 -->
 <div class="play-back-list animated fadeInRightBig">
 	<div class="pback-logs">
-		<div class="pback-logs-item">
+		<!-- <div class="pback-logs-item">
 			W2B-012 进站 金桥路浦东大道站 
 			<span class="pback-logs-item-date">07月17 12:40</span>
 		</div>
@@ -154,7 +154,7 @@
 		<div class="pback-logs-item">
 			W2B-012  出站 金桥路浦东大道站
 			<span class="pback-logs-item-date">07月17 12:42</span>
-		</div>
+		</div> -->
 	</div>
 </div>
@@ -166,12 +166,12 @@
 	<div class="dropup" >
 	  <span id="playSpeed" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-			<i class="fa fa-close"></i><span id="playSpeedText">1</span><i class="fa fa-angle-up" ></i>
+			<i class="fa fa-close"></i><span id="playSpeedText">10</span><i class="fa fa-angle-up" ></i>
 	  </span>
 	  <ul class="dropdown-menu play-speed-select" >
-	    <li data-speed=10><a href="javascript:;">10秒每帧 </a></li>
-	    <li data-speed=5><a href="javascript:;">5秒每帧 </a></li>
-	    <li data-speed=1><a href="javascript:;">1秒每帧</a></li>
+	    <li data-speed=10><a href="javascript:;">10秒 </a></li>
+	    <li data-speed=5><a href="javascript:;">5秒 </a></li>
+	    <li data-speed=1><a href="javascript:;">1秒</a></li>
 	  </ul>
 	</div>
-
 <script id="play_back_panel_temp" type="text/html">
 <div class="alert alert-info animated flipInX">
-<i class="fa fa-exclamation-circle" ></i> 最多跨一天回放，请尽量小范围的查询 S0I-058，S0I-055 ，隧道六线 </div>
+<i class="fa fa-exclamation-circle" ></i> 最多跨一天回放，请尽量小范围的查询 W2B-083 , W2B-084 , W2B-087 85路</div>
 <form class="form-horizontal" role="form" id="playBackForm">
 	<div class="form-body">
 		<div class="form-group">
@@ -31,9 +30,7 @@
 		<div class="form-group">
 			<label class="col-md-3 control-label">线路图层</label>
 			<div class="col-md-9">
-				<select class="form-control" name="lineCode" >
-					<option>85路</option>
-				</select>
+				<select class="form-control" name="lineCode" ></select>
 			</div>
 		</div>
 </form>