查询车载上报停靠信息

zlz
1 parent f3240571
Showing 4 changed files with 288 additions and 130 deletions
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
src/main/java/com/bsth/entity/traffic/VehicleInoutStop.java
src/main/resources/static/pages/trafficManage/js/lineStationUploadRecord.js
src/main/resources/static/pages/trafficManage/lineStationUploadRecord.html
@@ -108,7 +108,10 @@ public class PredicatesBuilder {
                 String.class.isAssignableFrom(rightType)) { // Date >= String
             DateTime dateTime = new DateTime(object);
             return cb.greaterThanOrEqualTo((Path<Date>) expression, dateTime.toDate());
-        } else {
+        } else if (long.class.isAssignableFrom(leftType) &&
+				String.class.isAssignableFrom(rightType)) { // Long >= String
+			return cb.greaterThanOrEqualTo((Path<Long>) expression, Long.valueOf(object+""));
+		} else {
             throw new RuntimeException("ge 不支持类型组合：" + expression.getJavaType() + ">=" + object.getClass());
         }
 	}
@@ -140,7 +143,10 @@ public class PredicatesBuilder {
                 String.class.isAssignableFrom(rightType)) { // Date <= String
             DateTime dateTime = new DateTime(object);
             return cb.lessThanOrEqualTo((Path<Date>) expression, dateTime.toDate());
-        } else {
+        }else if (long.class.isAssignableFrom(leftType) &&
+				String.class.isAssignableFrom(rightType)) { // Long <= String
+			return cb.lessThanOrEqualTo((Path<Long>) expression, Long.valueOf(object + "") );
+		} else {
             throw new RuntimeException("le 不支持类型组合：" + expression.getJavaType() + "<=" + object.getClass());
         }
 	}
@@ -46,7 +46,7 @@ public class VehicleInoutStop {
 	private Integer inOutStop;
  
 	// 上报时间
-	private Date reportDate;
+	private long reportDate;
  
 	public Integer getId() {
 		return id;
@@ -104,11 +104,7 @@ public class VehicleInoutStop {
 		this.inOutStop = inOutStop;
 	}
  
-	public Date getReportDate() {
-		return reportDate;
-	}
+	public long getReportDate() { return reportDate; }
  
-	public void setReportDate(Date reportDate) {
-		this.reportDate = reportDate;
-	}
+	public void setReportDate(long reportDate) { this.reportDate = reportDate; }
 }
@@ -13,16 +13,57 @@
  */
  
 (function(){
+    var page = 0, initPag;
 	// 关闭左侧栏
 	if (!$('body').hasClass('page-sidebar-closed'))
 		$('.menu-toggler.sidebar-toggler').click();
-	 // 日期控件
-	 $('#dateInput').datetimepicker({
-		 // 日期控件时间格式
-		 format : 'YYYY-MM-DD',
-		 // 语言
-		 locale: 'zh-cn'
-	 });
+
+    $("#dateInput").datetimepicker({
+        format : 'YYYY-MM-DD',
+        locale : 'zh-cn'
+    });
+
+    var lines = new Array();
+
+    $('#line').select2({
+        ajax: {
+            url: '/realSchedule/findLine',
+            type: 'post',
+            dataType: 'json',
+            delay: 150,
+            data: function(params){
+                return{line: params.term};
+            },
+            processResults: function (data) {
+                return {
+                    results: data
+                };
+            },
+            cache: true
+        },
+        templateResult: function(repo){
+            if (repo.loading) return repo.text;
+            var h = '<span>'+repo.text+'</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>';
+            }
+        }
+    });
+
 	 // 日期范围输入框限制，绑定按键和粘贴事件
 	 $(".dateRange").keyup(function(){     
 	        var tmptxt=$(this).val(); 
@@ -48,81 +89,112 @@
 	        if(tmptxt < 0){
 	        	$(this).val(00);   
 	        }
-	    }).css("ime-mode", "disabled");  
-	 	/**
-		 *  取得编码-公司map
-		 *  gsmap["5"] = 南汇公司
-		 *  gsmap["5_3"] = 芦潮港分公司
-		 */
-		function getBusMap(){
-			// 取得公司信息，替换公司编码
-			var gsmap = {};
-			$get('/business/all', null, function(array){
-				$.each(array, function(i, gs){
-					var k = gs.upCode + '_' + gs.businessCode;
-					if(gs.upCode === '88'){
-						k = gs.businessCode;
-					}
-					gsmap[k] = gs.businessName;
-				});
-			});
-			return gsmap;
-		}
-		/**
-		 * 设置公司自动完成
-		 */
-		var lines = new Array();
-		var gsmap = getBusMap();
-		// 取得所有线路
-		$get('/line/all', null, function(allLine) {
-			// 遍历数组
-			$.each(allLine, function(i, e) {
-				var companyCode = e.company;
-				e.company = gsmap[e.company];
-				e.brancheCompany = gsmap[companyCode+"_"+e.brancheCompany];
-				var line = '{"hex":"' + e.company + '","label":"' + e.name
-						+ '"}';
-				var obj = jQuery.parseJSON(line);
-				lines[i] = obj;
-			});
-		});
-		// 给输入框绑定autocomplete事件
-		$("input[name='xl.name_eq']").autocompleter({
-			highlightMatches : true,
-			source : lines,
-			template : '{{ label }} <span>({{ hex }})</span>',
-			hint : true,
-			empty : false,
-			limit : 5,
-		});
-		// 设置autocompleter的宽度和输入框一样
-		$(".autocompleter").css("width",
-				$("input[name='xl.name_eq']").css("width"));
-		
-		/**
-		 * 设置内部编码自动完成
-		 */
-		var cars = new Array();
-		// 取得所有车辆
-		$get('/cars/all', null, function(allCars) {
-			// 遍历数组
-			$.each(allCars, function(i, e) {
-				var car = '{"hex":"' + e.insideCode + '","label":"' + e.insideCode
-						+ '"}';
-				var obj = jQuery.parseJSON(car);
-				cars[i] = obj;
-			});
-		});
-		// 给输入框绑定autocomplete事件
-		$("input[name='xl.insideCode_eq']").autocompleter({
-			highlightMatches : true,
-			source : cars,
-			template : '{{ label }}',
-			hint : true,
-			empty : false,
-			limit : 5,
-		});
-		// 设置autocompleter的宽度和输入框一样
-		$(".autocompleter").css("width",
-				$("input[name='xl.insideCode_eq']").css("width"));
+	    }).css("ime-mode", "disabled");
+
+    // 绑定查询事件
+    $("#search").click(searchM);
+    // 查询方法
+    function searchM(pagination) {
+        if($("#dateInput").val() == ""){
+            alert("请选择时间");
+            return ;
+        }
+        var params = {};
+        // 排序（按方向与序号）
+        params['order'] = 'reportDate';
+        // 排序方向.
+        params['direction'] = 'ASC';
+        // 记录当前页数
+        params['page'] = page;
+        // 弹出正在加载层
+        var i = layer.load(2);
+        // 取得输入框的值
+        var inputs = $(".form-inline input,select");
+        // 遍历数组
+        $.each(inputs, function(i, element) {
+            params[$(element).attr("name")] = $(element).val();
+        });
+
+        var startDate = params['startDate'];
+        var endDate = params['endDate'];
+        var reportDate = params['reportDate'];
+        if($("#carPlate").val() != ''){
+            params['cars.carPlate_eq'] = changeCarPlate($("#carPlate").val());
+        }
+        if($("#insideCode").val() != ''){
+            params['cars.insideCode_eq'] = $("#insideCode").val().toUpperCase();
+        }
+        // 默认开始时间
+        params['reportDate_ge'] = str2datetime(reportDate+" 00:00:00");
+        // 默认结束时间
+        params['reportDate_le'] = str2datetime(reportDate+" 23:59:59");
+
+        // 指定的开始时间
+        if(startDate != ''){
+            params['reportDate_gt'] = str2datetime(reportDate+" "+ (startDate > 9 ? startDate : "0"+startDate + ":00:00"));
+        }
+        // 指定的结束时间
+        if(endDate != ''){
+            params['reportDate_lt'] = str2datetime(reportDate+" "+ (endDate > 9 ? endDate : "0"+endDate + ":59:59"));
+        }
+        $get('/vehicle_stop', params, function(data) {
+            var content = data.content;
+            _dateFormat(content);
+            var bodyHtm = template('lineStationUploadRecord_list_temp', {
+                list : content
+            });
+            $('#vehicle_stop tbody').html(bodyHtm);
+            if(pagination && data.content.length > 0){
+                //重新分页
+                initPag = true;
+                showPagination(data);
+            }
+            layer.close(i);
+        });
+    }
+
+    /** 分页栏组件 */
+    function showPagination(data){
+        // 分页组件
+        $('#pagination').jqPaginator({
+            // 总页数
+            totalPages: data.totalPages,
+            // 中间显示页数
+            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(initPag){
+                    initPag = false;
+                    return;
+                }
+                page = num - 1;
+                searchM(false);
+            }
+        });
+    }
+
+    //转换时间格式
+    function _dateFormat(list) {
+        var fs = 'YYYY-MM-DD HH:mm:ss';
+        $.each(list, function(i, obj) {
+            obj.reportDate = moment(obj.reportDate).format(fs);
+        });
+    }
+
+    // 时间字符串转成时间戳
+    function str2datetime(stringTime){
+        return Date.parse(new Date(stringTime));
+    }
+
+    // 时间字符串转成时间戳
+    function changeCarPlate(carPlate){
+        var tmp = "沪" + carPlate.substr(0, 1) + "-" + carPlate.substr(1, carPlate.length);
+        return tmp.toUpperCase();;
+    }
 })();
 \ No newline at end of file
@@ -8,30 +8,40 @@
 </ul>
 <div class="tab_line">
 	<div class="col-md-12">
-		<ul class="breadcrumb">
-			<li>筛选数据:</li>
-			<li>日期:</li>
-			<li><input type="text" class="inputCommon dateTime" name="date" id="dateInput" placeholder="日期"></li>
-			<li>时间范围:</li>
-			<li><input type="text" class="inputCommon dateRange" name="startDate">至
-				<input type="text" class="inputCommon dateRange" name="endDate">时</li>
-			<li>线路名称:</li>
-			<li><input type="text" class="form-control form-filter input-sm"
-				name="xl.name_eq" maxlength="40" /></li>
-			<li>内部编码:</li>
-			<li><input type="text" class="form-control form-filter input-sm"
-				name="xl.insideCode_eq"  maxlength="40" /></li>
-			<li>车牌号:</li>
-			<li><input type="text" class="inputCommon inputCarPlate"
-				name="xl.carPlate_eq" maxlength="40" /></li>
-			<li><a class="btn btn-circle blue" id="search">筛选</a></li>
-		</ul>
+		<form class="form-inline" action="">
+			<div class="inLine_block" class="param">
+				<span class="item-label" style="width: 80px;">筛选数据:日期:</span>
+				<input class="form-control" name="reportDate" type="text" id="dateInput" style="width: 180px;"/>
+			</div>
+			<div class="inLine_block" style="display: inline-block;margin-left: 15px;">
+				<span class="item-label" style="width: 80px;">时间范围:</span>
+				<input type="text" name="startDate" class="inputCommon dateRange">至
+				<input type="text" name="endDate" class="inputCommon dateRange">时
+			</div>
+			<div class="inLine_block" style="display: inline-block;margin-left: 15px;">
+				<span class="item-label" style="width: 80px;">线路名称:</span>
+				<select class="form-control" name="line.id_eq" id="line" style="width: 150px;"></select>
+			</div>
+			<div class="inLine_block" style="display: inline-block;margin-left: 15px;">
+				<span class="item-label" style="width: 80px;">内部编码:</span>
+				<input type="text" name="cars.insideCode_eq" id="insideCode" style="width: 120px;" maxlength="40"/>
+			</div>
+			<div class="inLine_block" style="display: inline-block;margin-left: 15px;">
+				<span class="item-label" style="width: 80px;">车牌号:</span>
+				<input type="text" name="cars.carPlate_eq" id="carPlate" style="width: 120px;"  maxlength="40"/>
+				<span style="color: red;width: 80px;">(沪D-12345 '沪'和'-'去掉)</span>
+			</div>
+			<div class="form-group" style="display: inline-block;margin-left: 15px;">
+				<a class="btn btn-circle blue" id="search">筛选</a>
+			</div>
+		</form>
 	</div>
 	<div class="col-md-12 panel-wrap">
 		<div class="_panel">
 			<div class="table-container">
 				<table
-					class="table table-striped table-bordered table-advance pb-table head">
+					class="table table-striped table-bordered table-advance pb-table head"
+					id="vehicle_stop">
 					<thead>
 						<tr>
 							<th>序号</th>
@@ -59,53 +69,127 @@
 		</div>
 	</div>
 </div>
-<script id="lineStationRecord_list_temp" type="text/html">
+<script id="lineStationUploadRecord_list_temp" type="text/html">
 {{each list as obj i}}
 <tr>
 	<td class="seq" style="vertical-align: middle;">
 		{{i+1}}
 	</td>
 	<td>
-		{{obj.name}}
+		{{if obj.line.company == '55'}}
+		上南公司
+		{{else if obj.line.company == '22'}}
+		金高公司
+		{{else if obj.line.company == '05'}}
+		杨高公司
+		{{else if obj.line.company == '26'}}
+		南汇公司
+		{{else if obj.line.company == '77'}}
+		闵行公司
+		{{/if}}
 	</td>
-	<td class="ttInfoId">
-		{{obj.company}}
+	<td>
+		{{if obj.line.company == '55'}}
+
+		{{if obj.line.brancheCompany == '1'}}
+		上南二分公司
+		{{else if obj.line.brancheCompany == '2'}}
+		上南三分公司
+		{{else if obj.line.brancheCompany == '3'}}
+		上南六分公司
+		{{else if obj.line.brancheCompany == '4'}}
+		上南一分公司
+		{{/if}}
+
+		{{else if obj.line.company == '22'}}
+
+		{{if obj.line.brancheCompany == '1'}}
+		四分公司
+		{{else if obj.line.brancheCompany == '2'}}
+		二分公司
+		{{else if obj.line.brancheCompany == '3'}}
+		三分公司
+		{{else if obj.line.brancheCompany == '5'}}
+		一分公司
+		{{/if}}
+
+		{{else if obj.line.company == '05'}}
+
+		{{if obj.line.brancheCompany == '1'}}
+		川沙分公司
+		{{else if obj.line.brancheCompany == '2'}}
+		金桥分公司
+		{{else if obj.line.brancheCompany == '3'}}
+		芦潮港分公司
+		{{else if obj.line.brancheCompany == '5'}}
+		杨高分公司
+		{{else if obj.line.brancheCompany == '6'}}
+		周浦分公司
+		{{/if}}
+
+		{{else if obj.line.company == '26'}}
+
+		{{if obj.line.brancheCompany == '1'}}
+		南汇一分
+		{{else if obj.line.brancheCompany == '2'}}
+		南汇二分
+		{{else if obj.line.brancheCompany == '3'}}
+		南汇三分
+		{{else if obj.line.brancheCompany == '4'}}
+		南汇维修公司
+		{{else if obj.line.brancheCompany == '5'}}
+		南汇公司
+		{{/if}}
+
+		{{/if}}
 	</td>
 	<td>
-		
+		{{obj.line.name}}
 	</td>
-	<td >
-		
+	<td>
+		{{obj.line.shanghaiLinecode}}
 	</td>
 	<td>
-		{{obj.name}}
+		{{obj.cars.insideCode}}
 	</td>
 	<td>
-		{{obj.company}}
+		{{obj.cars.equipmentCode}}
 	</td>
 	<td>
-		
+		{{obj.cars.carPlate}}
 	</td>
-	<td >
-		
+	<td>
+		{{obj.stop}}
 	</td>
 	<td>
-		{{obj.name}}
+		{{if obj.serviceState == 0}}
+		营运
+		{{else if obj.serviceState == 1}}
+		停运
+		{{/if}}
 	</td>
 	<td>
-		{{obj.company}}
+		{{if obj.upDown == 0}}
+		上行
+		{{else if obj.upDown == 1}}
+		下行
+		{{/if}}
 	</td>
 	<td>
-		
+		{{if obj.inOutStop == 0}}
+		站内
+		{{else if obj.inOutStop == 1}}
+		站外
+		{{/if}}
 	</td>
-	<td >
-		
+	<td>
+		{{obj.reportDate}}
 	</td>
 </tr>
 {{/each}}
 {{if list.length == 0}}
 <tr class="muted">
-	<td colspan=5 style="text-align: center;"><h6>没有找到相关数据</h6></td>
+	<td colspan=13 style="text-align: center;"><h6>没有找到相关数据</h6></td>
 </tr>
 {{/if}}
 	</script>