移出配置文件

潘钊
1 parent 172ae0d4
Showing 5 changed files with 56 additions and 31 deletions
src/main/java/com/bsth/gpsdata/buffer/GpsRealDataBuffer.java
src/main/java/com/bsth/gpsdata/config.properties
src/main/java/com/bsth/gpsdata/controller/GpsDataController.java
src/main/java/com/bsth/gpsdata/thread/GpsBufferRefreshThread.java
src/main/java/com/bsth/gpsdata/util/ConfigUtil.java
 package com.bsth.gpsdata.buffer;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -63,6 +64,11 @@ public class GpsRealDataBuffer {
 	 */
 	private static Map<String, String> stationCodeMap;
+	/**
+	 * 最后同步时间
+	 */
+	private static Long lastUpdateTime;
+	
 	public boolean isNullEmpty(){
 		return deviceGpsMap == null;
@@ -170,13 +176,49 @@ public class GpsRealDataBuffer {
 	 * @throws
 	 */
 	public List<GpsRealData> getListByLineCode(Integer lineCode){
-		List<GpsRealData> list = lineGpsMultimap.get(lineCode);
+		List<GpsRealData> list = lineGpsMultimap.get(lineCode)
+					,resList = new ArrayList<>();
 		//写入车辆自编号
+		String nbbm;
+		logger.info("list size..." + list.size());
 		for(GpsRealData gpsData : list){
-			gpsData.setNbbm(vehicDeviceMap.get(gpsData.getDeviceId()));
-			gpsData.setStationName(stationCodeMap.get(gpsData.getStopNo()));
+			nbbm = vehicDeviceMap.get(gpsData.getDeviceId());
+			if(null != nbbm){
+				gpsData.setNbbm(nbbm);
+				gpsData.setStationName(stationCodeMap.get(gpsData.getStopNo()));
+				resList.add(gpsData);
+			}
 		}
+		return resList;
+	}
+	
+	/**
+	 * 
+	 * @Title: getListByLineCode 
+	 * @Description: TODO(根据多个线路编码获取该线路所有的GPS点) 
+	 * @return List<GpsRealData>    返回类型 
+	 * @throws
+	 */
+	public List<GpsRealData> getListByLines(Iterator<String> iterator){
+		
+		List<GpsRealData> list = new ArrayList<>();
+		
+		Integer code;
+		while(iterator.hasNext()){
+			code = Integer.parseInt(iterator.next());
+			list.addAll(getListByLineCode(code));
+		}
+		
 		return list;
 	}
+	
+	
+	public void setLastUpdateTime(Long time){
+		lastUpdateTime = time;
+	}
+	
+	public Long getLastUpdateTime(){
+		return lastUpdateTime;
+	}
 }
-#http.gps.real.url= http://222.66.0.204:5555/transport_server/rtgps/
-http.gps.real.url= http://192.168.168.192:8080/transport_server/rtgps/
 \ No newline at end of file
@@ -5,10 +5,12 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.bsth.gpsdata.buffer.GpsRealDataBuffer;
 import com.bsth.gpsdata.entity.GpsRealData;
+import com.google.common.base.Splitter;
 @RestController
 @RequestMapping("gps")
@@ -21,4 +23,9 @@ public class GpsDataController {
 	public List<GpsRealData> findByLineCode(@PathVariable("lineCode") Integer lineCode){
 		return gpsBuffer.getListByLineCode(lineCode);
 	}
+	
+	@RequestMapping(value = "/real/line")
+	public List<GpsRealData> findByLineCode(@RequestParam String lineCodes){
+		return gpsBuffer.getListByLines(Splitter.on(",").split(lineCodes).iterator());
+	}
 }
@@ -21,7 +21,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.gpsdata.buffer.GpsRealDataBuffer;
 import com.bsth.gpsdata.entity.GpsRealData;
-import com.bsth.gpsdata.util.ConfigUtil;
+import com.bsth.util.Tools;
 import com.google.common.collect.ImmutableMap;
 /**
@@ -42,7 +42,8 @@ public class GpsBufferRefreshThread extends Thread{
 	public GpsBufferRefreshThread() {
-		url = ConfigUtil.getProp("http.gps.real.url");
+		Tools t = new Tools("application.properties");
+		url = t.getValue("http.gps.real.url");
 	}
 	@Autowired
@@ -81,6 +82,7 @@ public class GpsBufferRefreshThread extends Thread{
 				//更新缓存
 				gpsBuffer.updateBuffer(upLines, upGpsList);
+				gpsBuffer.setLastUpdateTime(System.currentTimeMillis());
 			}
 			logger.info("本次刷新GPS实时数据耗时：" + (System.currentTimeMillis() - t) + "毫秒");
-package com.bsth.gpsdata.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-public class ConfigUtil {
-	
-	private static Properties properties = new Properties();
-
-	static {
-		InputStream in = Object.class.getResourceAsStream("/com/bsth/gpsdata/config.properties");
-		try {
-			properties.load(in);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public static String getProp(String key){
-
-		return properties.getProperty(key);
-	}
-}