update

徐烜
2 parents 553f02e7 0dcfcc10
Showing 7 changed files with 136 additions and 125 deletions
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata/GpsRealDataList.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/account.html
src/main/resources/static/pages/forms/statement/correctForm.html
src/main/resources/static/pages/forms/statement/daily.html
src/main/resources/static/pages/forms/statement/historyMessage.html
+
 package com.bsth.data;
 import java.util.HashMap;
@@ -182,3 +183,4 @@ public class BasicData {
 		}
 	}
 }
+
-package com.bsth.data.gpsdata;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableSet;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.data.BasicData;
-import com.bsth.util.ConfigUtil;
-import com.bsth.vehicle.gpsdata.entity.GpsRealData;
-import com.google.common.collect.TreeMultimap;
-
-/**
- * 
- * @ClassName: GpsRealDataBuffer
- * @Description: TODO(实时GPS数据集合)
- * @author PanZhao
- * @date 2016年8月12日 下午2:04:41
- *
- */
-public class GpsRealDataList {
-	
-	private static Map<String, GpsRealData> gpsMap;
-	
-	private static TreeMultimap<Integer, String> lineCode2Devices;
-
-	// 网关数据接口地址
-	private static String url;
-	
-	static{
-		gpsMap = new HashMap<>();
-		lineCode2Devices = TreeMultimap.create();
-		url = ConfigUtil.get("http.gps.real.url");
-	}
-
-	static Logger logger = LoggerFactory.getLogger(GpsRealDataList.class);
-
-	public static GpsRealData add(GpsRealData gps) {
-		String device = gps.getDeviceId();
-		gpsMap.put(device, gps);
-		lineCode2Devices.put(gps.getLineId(), device);
-		return gps;
-	}
-
-	/**
-	 * 
-	 * @Title: get @Description: TODO(设备号获取GPS) @param @param deviceId @throws
-	 */
-	public static GpsRealData get(String deviceId) {
-		return gpsMap.get(deviceId);
-	}
-
-	/**
-	 * 
-	 * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
-	 */
-	public static List<GpsRealData> get(Integer lineCode) {
-		NavigableSet<String> set = lineCode2Devices.get(lineCode);
-		
-		List<GpsRealData> rs = new ArrayList<>();
-		for(String device : set){
-			rs.add(gpsMap.get(device));
-		}
-		
-		return rs;
-	}
-
-	public static void LoadGpsRealData() throws Exception {
-		List<GpsRealData> list = new ArrayList<>();
-		CloseableHttpClient httpClient = null;
-
-		try {
-			httpClient = HttpClients.createDefault();
-			HttpGet get = new HttpGet(url);
-
-			CloseableHttpResponse response = httpClient.execute(get);
-
-			try {
-				HttpEntity entity = response.getEntity();
-				if (null != entity) {
-					// 返回数据量比较大，建议以流的形式读取
-					BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
-					StringBuffer stringBuffer = new StringBuffer();
-					String str = "";
-					while ((str = br.readLine()) != null) 
-						stringBuffer.append(str);
-
-					JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
-
-					if (jsonObj != null) 
-						list = JSON.parseArray(jsonObj.getString("data"), GpsRealData.class);
-					
-					for(GpsRealData gps : list){
-						gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps));
-						add(gps);
-					}
-				} else
-					logger.error("result is null");
-			} finally {
-				response.close();
-			}
-
-		} finally {
-			if (null != httpClient)
-				httpClient.close();
-		}
-	}
-}
+//package com.bsth.data.gpsdata;
+//
+//import java.io.BufferedReader;
+//import java.io.InputStreamReader;
+//import java.util.ArrayList;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.NavigableSet;
+//
+//import org.apache.http.HttpEntity;
+//import org.apache.http.client.methods.CloseableHttpResponse;
+//import org.apache.http.client.methods.HttpGet;
+//import org.apache.http.impl.client.CloseableHttpClient;
+//import org.apache.http.impl.client.HttpClients;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONObject;
+//import com.bsth.data.BasicData;
+//import com.bsth.util.ConfigUtil;
+//import com.bsth.vehicle.gpsdata.entity.GpsRealData;
+//import com.google.common.collect.TreeMultimap;
+//
+///**
+// * 
+// * @ClassName: GpsRealDataBuffer
+// * @Description: TODO(实时GPS数据集合)
+// * @author PanZhao
+// * @date 2016年8月12日 下午2:04:41
+// *
+// */
+//public class GpsRealDataList {
+//	
+//	private static Map<String, GpsRealData> gpsMap;
+//	
+//	private static TreeMultimap<Integer, String> lineCode2Devices;
+//
+//	// 网关数据接口地址
+//	private static String url;
+//	
+//	static{
+//		gpsMap = new HashMap<>();
+//		lineCode2Devices = TreeMultimap.create();
+//		url = ConfigUtil.get("http.gps.real.url");
+//	}
+//
+//	static Logger logger = LoggerFactory.getLogger(GpsRealDataList.class);
+//
+//	public static GpsRealData add(GpsRealData gps) {
+//		String device = gps.getDeviceId();
+//		gpsMap.put(device, gps);
+//		lineCode2Devices.put(gps.getLineId(), device);
+//		return gps;
+//	}
+//
+//	/**
+//	 * 
+//	 * @Title: get @Description: TODO(设备号获取GPS) @param @param deviceId @throws
+//	 */
+//	public static GpsRealData get(String deviceId) {
+//		return gpsMap.get(deviceId);
+//	}
+//
+//	/**
+//	 * 
+//	 * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
+//	 */
+//	public static List<GpsRealData> get(Integer lineCode) {
+//		NavigableSet<String> set = lineCode2Devices.get(lineCode);
+//		
+//		List<GpsRealData> rs = new ArrayList<>();
+//		for(String device : set){
+//			rs.add(gpsMap.get(device));
+//		}
+//		
+//		return rs;
+//	}
+//
+//	public static void LoadGpsRealData() throws Exception {
+//		List<GpsRealData> list = new ArrayList<>();
+//		CloseableHttpClient httpClient = null;
+//
+//		try {
+//			httpClient = HttpClients.createDefault();
+//			HttpGet get = new HttpGet(url);
+//
+//			CloseableHttpResponse response = httpClient.execute(get);
+//
+//			try {
+//				HttpEntity entity = response.getEntity();
+//				if (null != entity) {
+//					// 返回数据量比较大，建议以流的形式读取
+//					BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+//					StringBuffer stringBuffer = new StringBuffer();
+//					String str = "";
+//					while ((str = br.readLine()) != null) 
+//						stringBuffer.append(str);
+//
+//					JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
+//
+//					if (jsonObj != null) 
+//						list = JSON.parseArray(jsonObj.getString("data"), GpsRealData.class);
+//					
+//					for(GpsRealData gps : list){
+//						gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps));
+//						add(gps);
+//					}
+//				} else
+//					logger.error("result is null");
+//			} finally {
+//				response.close();
+//			}
+//
+//		} finally {
+//			if (null != httpClient)
+//				httpClient.close();
+//		}
+//	}
+//}
@@ -993,7 +993,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				map.put("xlName", xlName);
 				map.put("clZbh", code);
 				map.put("company", obj[0]);
-				map.put("requestType", obj[1]);
+				map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[1]+"")).toUpperCase());
 				map.put("requestTime", obj[2]);
 				listMap.add(map);
 			}
@@ -69,7 +69,8 @@
 </div>
 <script>
-	$(function(){
+	$(function(){
+		var reqCodeMap = {"0xA1": '请求恢复运营', "0xA2": '申请调档', "0xA3": '出场请求', "0xA5": '进场请求', "0xA7": '加油请求', "0x50": '车辆故障', "0x70": '路阻报告', "0x60": '事故报告', "0x11": '扣证纠纷', "0x12" : '报警'};
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
@@ -82,6 +83,7 @@
 		$('#line').select2({
             ajax: {
                 url: '/realSchedule/findLine',
+                type: 'post',
                 dataType: 'json',
                 delay: 150,
                 data: function(params){
@@ -161,7 +163,10 @@
 			var date = $("#date").val();
 			var code = $("#code").val();
 			$(".hidden").removeClass("hidden");
-			$get('/realSchedule/account',{line:line,date:date,code:code,xlName:xlName},function(result){
+			$post('/realSchedule/account',{line:line,date:date,code:code,xlName:xlName},function(result){
+				$.each(result, function(i, obj) {
+					obj.requestType = reqCodeMap[obj.requestType];
+                });
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_account',{list:result});
 				// 把渲染好的模版html文本追加到表格中
@@ -110,6 +110,7 @@
 		$('#line').select2({
             ajax: {
                 url: '/realSchedule/findLine',
+                type: 'post',
                 dataType: 'json',
                 delay: 150,
                 data: function(params){
@@ -147,6 +148,7 @@
         $('#lpName').select2({
             ajax: {
                 url: '/realSchedule/findLpName',
+                type: 'post',
                 dataType: 'json',
                 delay: 150,
                 data: function(params){
@@ -226,7 +228,7 @@
 		    var endDate = $("#endDate").val();
 		    var lpName = $("#lpName").val();
 		    var code = $("#code").val();
-		    $get("/realSchedule/correctForm",{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code},function(result){
+		    $post("/realSchedule/correctForm",{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code},function(result){
 		        $("#sDate").text(startDate);
 		        $("#eDate").text(endDate);
 		        var temp = {};
@@ -95,6 +95,7 @@
 		$('#line').select2({
             ajax: {
                 url: '/realSchedule/findLine',
+                type: 'post',
                 dataType: 'json',
                 delay: 150,
                 data: function(params){
@@ -83,6 +83,7 @@
 		$('#line').select2({
 			ajax: {
 				url: '/realSchedule/findLine',
+				type: 'post',
 				dataType: 'json',
 				delay: 150,
 				data: function(params){