超速异常更新

zb
1 parent 85371678
Showing 5 changed files with 117 additions and 141 deletions
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/service/gps/GpsService.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/pages/excep/speedingList.html
src/main/resources/static/pages/excep/speedingListmh.html
@@ -195,12 +195,10 @@ public class GpsController {
     }
 	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
-	public PageObject<GpsSpeed> pagequery(@RequestParam Map<String, Object> map){
-		PageObject<GpsSpeed> pageObject = null;
+	public Map<String, Object> pagequery(@RequestParam Map<String, Object> map){
 		map.put("curPage", map.get("page").toString());
 		map.put("pageData","10");
-		pageObject=gpsService.Pagequery(map);
-		return pageObject;
+		return gpsService.Pagequery(map);
 	}
 }
@@ -47,5 +47,5 @@ public interface GpsService {
 	List<GpsSpeed> findPosition(String deviceid, String startdate,
 			String enddate) throws ParseException;
-	PageObject<GpsSpeed> Pagequery(Map<String, Object> map);
+	Map<String, Object> Pagequery(Map<String, Object> map);
 }
@@ -1053,16 +1053,19 @@ public class GpsServiceImpl implements GpsService {
     }
     @Override
-    public PageObject<GpsSpeed> Pagequery(Map<String, Object> map) {
-
+    public Map<String, Object> Pagequery(Map<String, Object> map) {
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Integer totalDays = 0;//数据跨越天数
+		try {
+			totalDays = (int) ((sdf.parse(map.get("endDate").toString()+" 23:59:59").getTime()-sdf.parse(map.get("startDate").toString()+" 00:00:00").getTime()+1)/(3600*24*1000))+1;
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}//总页数
+		map.put("totalDays",totalDays);
         List<GpsSpeed> list=findAll(map);
         List<GpsSpeed> listResult = new ArrayList<GpsSpeed>();
-        int curPage;//页码
-        int pageData;//每页的记录条数
-        int start;//起始数据下标
-        int totalPage;//总页数
-        int totalData = 0;
+        int curPage = 0;//页码
+        int pageData = 0;//每页的记录条数
         if(list.size()>1){
             GpsSpeed GpsSpeedNow;//下标为i的车辆行驶记录
             GpsSpeed GpsSpeedLast;//下标为i-1的车辆行驶记录
@@ -1099,49 +1102,35 @@ public class GpsServiceImpl implements GpsService {
                     }
                 }
             }
-            Iterator<GpsSpeed> speedIt = listResult.iterator();
-            while(speedIt.hasNext()){
-                GpsSpeed GpsSpeed = speedIt.next();
-                if(GpsSpeed.getEndtimestamp()-GpsSpeed.getTimestamp()<=1000){
-                    speedIt.remove();
-                }
-            }
-
-            totalData = listResult.size();//总记录条数。
-            if(map.get("curPage") == null || map.get("curPage").equals("0")){
-                curPage = 0;
-            }else{
-                curPage = Integer.parseInt((String) map.get("curPage"));
-            }
-            pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
-            start = (curPage - 0) * pageData; //起始记录下标。
-            totalPage = totalData % pageData == 0 ? totalData / pageData : totalData / pageData +1;//总页数
-            if(curPage == totalPage-1){//如果当前页等于总页数。
-                listResult = listResult.subList(start, totalData);
-            }else{
-                listResult = listResult.subList(start, start+pageData);
+            if(listResult.size()>0){
+            	Iterator<GpsSpeed> speedIt = listResult.iterator();
+            	while(speedIt.hasNext()){
+            		GpsSpeed GpsSpeed = speedIt.next();
+            		if(GpsSpeed.getEndtimestamp()-GpsSpeed.getTimestamp()<=1000){
+            			speedIt.remove();
+            		}
+            	}
             }
-        }else{
-            curPage = 1;
-            pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
-            totalPage =1;
         }
+    	if(map.get("curPage") == null || map.get("curPage").equals("0")){
+    		curPage = 0;
+    	}else{
+    		curPage = Integer.parseInt((String) map.get("curPage"));
+    	}
+    	Integer totalPage = totalDays;
+    	pageData = listResult.size();//每页的记录条数就是当前页查出的全部数据。
         Map<String,Object> paramMap = new HashMap<String,Object>();
         paramMap.put("totalPage", totalPage);
-        paramMap.put("curPage", curPage);
+        paramMap.put("page", curPage);
         paramMap.put("pageData", pageData);
-        PageHelper pageHelper = new PageHelper(totalData, paramMap);
-        pageHelper.getMap();
-        PageObject<GpsSpeed> pageObject = pageHelper.getPageObject();
-        pageObject.setDataList(listResult);
-        return pageObject;
+        paramMap.put("list", listResult);
+        return paramMap;
     }
     static List<GpsSpeed> findAll(Map<String, Object> map) {
         Connection conn = null;
         PreparedStatement ps = null;
         ResultSet rs = null;
-        int page=Integer.parseInt(map.get("page").toString());
         List<GpsSpeed> list=new ArrayList<GpsSpeed>();
         String sql="select * from bsth_c_gps_info where 1=1 ";
         Object line=map.get("line");
@@ -1149,6 +1138,13 @@ public class GpsServiceImpl implements GpsService {
         Object updown=map.get("updown");
         Object startDate=map.get("startDate");
         Object endDate=map.get("endDate");
+        Integer totalDays = Integer.valueOf(map.get("totalDays").toString());
+        Integer curPage = 0;//页码
+        if(map.get("curPage") == null || map.get("curPage").equals("0")){
+        	curPage = 0;
+    	}else{
+    		curPage = Integer.parseInt((String) map.get("curPage"));
+    	}
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if(line!=null){
@@ -1167,7 +1163,7 @@ public class GpsServiceImpl implements GpsService {
         if(startDate!=null){
             if (startDate.toString().length()>0) {
                 try {
-                    Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime();
+                    Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime()+curPage*3600*24*1000;
                     sql += " and ts >="+t1;
                 } catch (ParseException e) {
                     e.printStackTrace();
@@ -1178,7 +1174,7 @@ public class GpsServiceImpl implements GpsService {
         if(endDate!=null){
             if (endDate.toString().length()>0) {
                 try {
-                    Long t2=sdf.parse(endDate.toString()+" 23:59:59").getTime();
+                    Long t2=sdf.parse(endDate.toString()+" 23:59:59").getTime()-(totalDays-1-curPage)*3600*24*1000;
                     sql += " and ts <="+t2;
                 } catch (ParseException e) {
                     e.printStackTrace();
@@ -20,30 +20,6 @@
 						class="caption-subject font-dark sbold uppercase">超速异常数据表</span>
 				</div>
 				<div class="actions">
-<!-- 					<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加用户</a> -->
-					<!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> ɾ���û�</button> -->
-					<!-- <div class="btn-group">
-						<a class="btn red btn-outline btn-circle" href="javascript:;"
-							data-toggle="dropdown"> <i class="fa fa-share"></i> <span
-							class="hidden-xs"> 系统工具</span> <i class="fa fa-angle-down"></i>
-						</a>
-						<ul class="dropdown-menu pull-right" id="datatable_ajax_tools">
-							<li><a href="javascript:;" data-action="0"
-								class="tool-action"> <i class="fa fa-print"></i>打印
-							</a></li>
-							<li><a href="javascript:;" data-action="1"
-								class="tool-action"> <i class="fa fa-copy"></i> 复制
-							</a></li>
-							<li><a href="javascript:;" data-action="3"
-								class="tool-action"> <i class="fa fa-file-excel-o"></i>
-									导出Excel
-							</a></li>
-							<li class="divider"></li>
-							<li><a href="javascript:;" data-action="5"
-								class="tool-action"> <i class="fa fa-refresh"></i> 刷新数据
-							</a></li>
-						</ul>
-					</div> -->
 				</div>
 			</div>
 			<div class="portlet-body">
@@ -54,23 +30,22 @@
 						<thead>
 							<tr role="row" class="heading">
 								<th width="3%">#</th>
-								<th width="8%">线路</th>
-								<th width="10%">车辆自编号</th>
-								<!-- <th width="100">工号/名字</th>
-								<th width="11%">路牌名</th> -->
-								<th width="10%">上下行</th>
-								<th width="20%">超速时间</th>
-								<th width="6%">持续时间</th>
-								<th width="10%">查看轨迹</th>
-								<th width="18%">操作</th>
+								<th width="4%">线路</th>
+								<th width="6%">车辆自编号</th>
+								<th width="8%">上下行</th>
+								<th width="10%">开始时间</th>
+								<th width="10%">结束时间</th>
+								<th width="8%">持续时间</th>
+								<th width="8%">查看轨迹</th>
+								<th width="6%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
 								<td></td>
 								<td>
-										<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+										<select class="form-control" name="line" id="line" style="width: 100px;"></select>
 								</td>
 								<td>
-										<select class="form-control" name="nbbm" id="nbbm" style="width: 150px;"></select>
+										<select class="form-control" name="nbbm" id="nbbm" style="width: 100px;"></select>
 								</td>
 								<!-- <td>
@@ -78,18 +53,19 @@
 								<td>
 								</td> -->
 								<td>
-									<select class="form-control form-filter " name="updown">
+									<select class="form-control form-filter " name="updown" style="width: 90px;">
                                          <option value="">请选择...</option>
                                          <option value="0">上行</option>
                                          <option value="1">下行</option>
                                          <option value="-1">无效</option>
                                      </select>
 								</td>
-								<td nowrap="nowrap"> 
-									<input class="form-control" type="date" name="startDate" style="width: 180px;"/>
+								<td> 
+									<input class="form-control" type="date" name="startDate" />
 									-
-									<input class="form-control" type="date" name="endDate" style="width: 180px;"/>
-								
+									<input class="form-control" type="date" name="endDate" />
+								</td>
+								<td>
 								</td>
 								<td>
 								</td>
@@ -128,9 +104,9 @@
 		{{obj.vehicle}}
 	</td>
 	<td>
-		{{if obj.upDown==0}}
+		{{if obj.up_down==0}}
 			上行
-		{{else if obj.upDown==1}}
+		{{else if obj.up_down==1}}
 			下行 
 		{{else}}
 			无效
@@ -140,10 +116,18 @@
 		{{obj.timestampDate}}
 	</td>
 	<td>
-		{{obj.durationTime}}秒
+		{{obj.endtimestampDate}}
 	</td>
 	<td>
-		
+		{{(obj.endtimestamp-obj.timestamp)/1000}}秒
+	</td>
+	<td>
+		<a class="btn default blue-stripe btn-sm lookTrajectory" data-vehicle ="{{obj.vehicle}}"
+			data-startdate="{{obj.timestampDate}}" data-enddate="{{obj.endtimestampDate}}"
+			data-lon="{{obj.lon}}"  data-lat="{{obj.lat}}" 
+			data-endlon="{{obj.endlon}}"  data-endlat="{{obj.endlat}}" >
+			查看轨迹
+		</a>
 	</td>
 	<td>
@@ -157,6 +141,8 @@
 {{/if}}
 </script>
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+
 <script>
 $(function(){
 	var page = 0, initPagination;
@@ -171,7 +157,6 @@ $(function(){
  	var endTime = dateTime-week*24*3600*1000;//上周末、格式为时间戳。
 	var startTime = endTime-6*24*3600*1000;//上周一、格式为时间戳。
-	
 	var endDate = timeToData(endTime);
 	var startDate = timeToData(startTime);
  	//表单默认选择上周一到上周日的超速信息。
@@ -180,15 +165,27 @@ $(function(){
  	var parameter = new Object();
  	parameter.endDate = $("input[name='endDate']")[0].value;
  	parameter.startDate = $("input[name='startDate']")[0].value;
-	//jsDoQuery(parameter,true);
-	jsDoQuery(null,true);
+ 	 
+ 	//搜索线路
+	$.get('/basic/lineCode2Name',function(result){
+		var data=[];
+		data.push({id: " ", text: "全部线路"});
+		for(var code in result){
+			data.push({id: code, text: result[code]});
+		}
+		initPinYinSelect2($('#line'),data,function(ldmcSelector) {
+			ldmcSelector.select2("val",data[1].id);//因为数据量太大，所以默认一条线路作为查询参数
+		});
+		parameter.line = data[1].id;
+		jsDoQuery(parameter,true);
+	});
 	//时间戳转换为年月日
 	function timeToData(time){
 		var date = new Date(time);
 		var year = date.getFullYear();
 		var Month = date.getMonth()+1>10?date.getMonth()+1:"0"+(date.getMonth()+1); 
- 		var Day = date.getDate()>10?date.getDate():"0"+date.getDate();
+ 		var Day = date.getDate()>9?date.getDate():"0"+date.getDate();
 		return year+"-"+Month+"-"+Day;
 	}
@@ -219,7 +216,7 @@ $(function(){
 	/*
 	* 获取数据 p: 要提交的参数， pagination: 是否重新分页
 	*/
-	function jsDoQuery(p, pagination){
+ 	function jsDoQuery(p, pagination){
 		var params = {};
 		if(p)
 			params = p;
@@ -227,20 +224,40 @@ $(function(){
 		params['order'] = 'lastLoginDate';
 		params['page'] = page;
 		var i = layer.load(2);
-		$get('/speeding/pagequery' ,params, function(data){
-// 			$.each(data.content, function(i, obj) {
-//                 obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
-//             });
-			var bodyHtm = template('speeding_list_temp', {list: data.dataList});
+		$.get('/gps/pagequery' ,params, function(data){
+			var bodyHtm = template('speeding_list_temp', {list: data.list});
 			$('#datatable_speeding tbody').html(bodyHtm)
 					.find('.icheck').iCheck(icheckOptions)
 					.on('ifChanged', iCheckChange);
-			if(pagination && data.dataList.length > 0){
+			if(pagination){
 				//重新分页
 				initPagination = true;
 				showPagination(data);
 			}
 			layer.close(i);
+  			$(".lookTrajectory").click(function(){
+  				var vehicle = $(this).data('vehicle');
+  				var startDate = $(this).data('startdate');
+  				var endDate = $(this).data('enddate');
+  				var lon = $(this).data('lon');
+  				var lat = $(this).data('lat');
+  				var endLon = $(this).data('endlon');
+  				var endLat = $(this).data('endlat');
+  				var storage = window.localStorage;
+  				storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat);
+ 				$.get('/pages/excep/speedingMap.html?',function (result) {
+			    	layer.open({
+						type: 1,
+						title:'<i class="uk-icon-play-circle"></i>轨迹回放',
+						shadeClose: true,
+						shade: true,
+						scrollbar: false,
+						maxmin: false, //开启最大化最小化按钮
+						area: ['100%', '100%'],
+					    content:result,//内容
+					});
+			    });
+			}) 
 		});
 	}
@@ -291,6 +308,7 @@ $(function(){
 		});
 	}
+	
 	//删除
 	$('#removeButton').on('click', function(){
 		if($(this).attr('disabled'))
@@ -302,17 +320,6 @@ $(function(){
 			$('tr.filter .filter-submit').click();
 		});
 	});
-	
-	//搜索线路
-	$.get('/basic/lineCode2Name',function(result){
-		var data=[];
-		data.push({id: " ", text: "全部线路"});
-		for(var code in result){
-			data.push({id: code, text: result[code]});
-		}
-		initPinYinSelect2('#line',data,'');
-
-	});
 $("#line").on("change",initXl);
 function initXl(){
@@ -329,6 +336,7 @@ $(&#39;#nbbm&#39;).select2({
            	    xlbm:$('#line').val()}; 	
         },
         processResults: function (data) {
+        	console.log(data);
             return {
                 results: data
             };
@@ -365,7 +373,6 @@ $(&#39;#nbbm&#39;).select2({
 //改变状态
 function changeEnabled(id,enabled){
-	debugger
 	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
 		jsDoQuery(null, true);
 	})
@@ -20,30 +20,6 @@
 						class="caption-subject font-dark sbold uppercase">超速异常数据表</span>
 				</div>
 				<div class="actions">
-<!-- 					<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加用户</a> -->
-					<!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> ɾ���û�</button> -->
-					<!-- <div class="btn-group">
-						<a class="btn red btn-outline btn-circle" href="javascript:;"
-							data-toggle="dropdown"> <i class="fa fa-share"></i> <span
-							class="hidden-xs"> 系统工具</span> <i class="fa fa-angle-down"></i>
-						</a>
-						<ul class="dropdown-menu pull-right" id="datatable_ajax_tools">
-							<li><a href="javascript:;" data-action="0"
-								class="tool-action"> <i class="fa fa-print"></i>打印
-							</a></li>
-							<li><a href="javascript:;" data-action="1"
-								class="tool-action"> <i class="fa fa-copy"></i> 复制
-							</a></li>
-							<li><a href="javascript:;" data-action="3"
-								class="tool-action"> <i class="fa fa-file-excel-o"></i>
-									导出Excel
-							</a></li>
-							<li class="divider"></li>
-							<li><a href="javascript:;" data-action="5"
-								class="tool-action"> <i class="fa fa-refresh"></i> 刷新数据
-							</a></li>
-						</ul>
-					</div> -->
 				</div>
 			</div>
 			<div class="portlet-body">
@@ -181,7 +157,6 @@ $(function(){
  	var endTime = dateTime-week*24*3600*1000;//上周末、格式为时间戳。
 	var startTime = endTime-6*24*3600*1000;//上周一、格式为时间戳。
-	debugger;
 	var endDate = timeToData(endTime);
 	var startDate = timeToData(startTime);
  	//表单默认选择上周一到上周日的超速信息。
@@ -249,12 +224,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.dataList});
+		$.get('/gps/pagequery' ,params, function(data){
+			var bodyHtm = template('speeding_list_temp', {list: data.list});
 			$('#datatable_speeding tbody').html(bodyHtm)
 					.find('.icheck').iCheck(icheckOptions)
 					.on('ifChanged', iCheckChange);
-			if(pagination && data.dataList.length > 0){
+			if(pagination){
 				//重新分页
 				initPagination = true;
 				showPagination(data);