update

潘钊
1 parent 4fa4687e
Showing 9 changed files with 203 additions and 22 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/repository/schedule/CarConfigInfoRepository.java
src/main/java/com/bsth/repository/schedule/EmployeeConfigInfoRepository.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/vehicle/gpsdata/GpsArrivalStationThread.java
src/main/java/com/bsth/vehicle/gpsdata/controller/GpsDataController.java
src/main/java/com/bsth/vehicle/gpsdata/entity/ArrivalInfo.java
src/main/java/com/bsth/vehicle/gpsdata/service/GpsDataServiceImpl.java
 package com.bsth.controller.realcontrol;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,4 +67,40 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, String> carDeviceMapp(){
 		return CommonMapped.vehicDeviceBiMap.inverse();
 	}
+	
+	/**
+	 * 
+	 * @Title: findPersionByLine 
+	 * @Description: TODO(根据线路主键获取驾驶员) 
+	 * @param @param lineId
+	 * @throws
+	 */
+	@RequestMapping(value = "/driver", method = RequestMethod.GET)
+	public List<Map<String, String>> findDriverByLine(@RequestParam String lineCode){
+		return scheduleRealInfoService.findDriverByLine(lineCode);
+	}
+	
+	/**
+	 * 
+	 * @Title: findPersionByLine 
+	 * @Description: TODO(根据线路主键获取售票员) 
+	 * @param @param lineId
+	 * @throws
+	 */
+	@RequestMapping(value = "/conductor", method = RequestMethod.GET)
+	public List<Map<String, String>> findConductorByLine(@RequestParam String lineCode){
+		return scheduleRealInfoService.findConductorByLine(lineCode);
+	}
+	
+	/**
+	 * 
+	 * @Title: findPersionByLine 
+	 * @Description: TODO(根据线路主键获取车辆) 
+	 * @param @param lineId
+	 * @throws
+	 */
+	@RequestMapping(value = "/cars", method = RequestMethod.GET)
+	public List<Map<String, String>> findCarByLine(@RequestParam String lineCode){
+		return scheduleRealInfoService.findCarByLine(lineCode);
+	}
 }
@@ -2,9 +2,13 @@ package com.bsth.repository.schedule;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.BaseRepository;
+
+import java.util.List;
+
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 /**
@@ -16,4 +20,9 @@ public interface CarConfigInfoRepository extends BaseRepository&lt;CarConfigInfo, L
     @EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
     @Override
     Page<CarConfigInfo> findAll(Pageable pageable);
+    
+    
+	@EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
+	@Query("select cc from CarConfigInfo cc where cc.xl.lineCode=?1")
+	List<CarConfigInfo> findBylineCode(String lineCode);
 }
@@ -16,6 +16,6 @@ import org.springframework.stereotype.Repository;
 public interface EmployeeConfigInfoRepository extends BaseRepository<EmployeeConfigInfo, Long> {
 	@EntityGraph(value = "employeeConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
-	@Query("select ec from EmployeeConfigInfo ec where ec.xl.id=?1")
-	List<EmployeeConfigInfo> findByLine(Integer lineId);
+	@Query("select ec from EmployeeConfigInfo ec where ec.xl.lineCode=?1")
+	List<EmployeeConfigInfo> findBylineCode(String lineCode);
 }
 package com.bsth.service.realcontrol;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import org.springframework.stereotype.Service;
@@ -17,4 +18,10 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Object> destroy(String idsStr, int spaceAdjust, String  remarks, String reason, int spaceNum);
+	List<Map<String, String>> findDriverByLine(String lineCode);
+
+	List<Map<String, String>> findConductorByLine(String lineCode);
+
+	List<Map<String, String>> findCarByLine(String lineCode);
+
 }
@@ -14,8 +14,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bsth.common.ResponseCode;
+import com.bsth.entity.Cars;
+import com.bsth.entity.Personnel;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
+import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
@@ -30,6 +36,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Autowired
 	ScheduleRealInfoRepository scheduleRealInfoRepository;
+	@Autowired
+	EmployeeConfigInfoRepository employeeConfigInfoRepository;
+	
+	@Autowired
+	CarConfigInfoRepository carConfigInfoRepository;
+	
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd")
@@ -139,4 +151,73 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		}
 		return map;
 	}
+
+	//线路id获取驾驶员
+	@Override
+	public List<Map<String, String>> findDriverByLine(String lineCode) {
+		List<EmployeeConfigInfo> list = employeeConfigInfoRepository.findBylineCode(lineCode);
+		
+		List<Map<String, String>> rsList = new ArrayList<>();
+		Map<String, String> map = null;
+		Personnel driver = null;
+		String code = null;
+		
+		for(EmployeeConfigInfo employee : list){
+			driver = employee.getJsy();
+			if(driver != null){
+				map = new HashMap<>();
+				code = driver.getJobCode();
+				map.put("id", code);
+				map.put("text", code + "/" + driver.getPersonnelName());
+				rsList.add(map);
+			}
+		}
+		return rsList;
+	}
+
+	//线路id获取售票员
+	@Override
+	public List<Map<String, String>> findConductorByLine(String lineCode) {
+		List<EmployeeConfigInfo> list = employeeConfigInfoRepository.findBylineCode(lineCode);
+		
+		List<Map<String, String>> rsList = new ArrayList<>();
+		Map<String, String> map = null;
+		Personnel conductor = null;
+		String code = null;
+		
+		for(EmployeeConfigInfo employee : list){
+			conductor = employee.getSpy();
+			if(conductor != null){
+				code = conductor.getJobCode();
+				map = new HashMap<>();
+				map.put("id", code);
+				map.put("text", code + "/" + conductor.getPersonnelName());
+				rsList.add(map);
+			}
+		}
+		return rsList;
+	}
+
+	@Override
+	public List<Map<String, String>> findCarByLine(String lineCode) {
+		
+		List<CarConfigInfo> list = carConfigInfoRepository.findBylineCode(lineCode);
+		
+		List<Map<String, String>> rsList = new ArrayList<>();
+		Map<String, String> map = null;
+		Cars car = null;
+		String code = null;
+		
+		for(CarConfigInfo cci : list){
+			car = cci.getCl();
+			if(car != null){
+				code = car.getInsideCode();
+				map = new HashMap<>();
+				map.put("id", code);
+				map.put("text", code);
+				rsList.add(map);
+			}
+		}
+		return rsList;
+	}
 }
@@ -8,7 +8,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -37,7 +36,7 @@ public class GpsArrivalStationThread extends Thread{
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
-	private static int diff = 1000 * 60 * 60;
+	private static int diff = 1000 * 60 * 20;
 	@Override
 	public void run() {
@@ -47,7 +46,6 @@ public class GpsArrivalStationThread extends Thread{
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
-		System.out.println("size: " + list.size());
 		GpsArrivalDataBuffer.putAll(list);
 		//实际到离站和计划排班相匹配
@@ -85,26 +83,62 @@ public class GpsArrivalStationThread extends Thread{
 		}
 	}
-	//单个匹配
 	public void match(ScheduleRealInfo scInfo, ArrivalInfo arr){
+		try{
+			//匹配起点
+			matchStart(scInfo, arr);
+			
+			//计划终点
+			matchEnd(scInfo, arr);
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+	}
+	
+	/**
+	 * 
+	 * @Title: matchStart 
+	 * @Description: TODO(匹配起点 出站时间) 
+	 * @param @param scInfo
+	 * @throws
+	 */
+	public void matchStart(ScheduleRealInfo scInfo, ArrivalInfo arr){
+		if(scInfo.getFcsjT() == null
+				|| arr.getInOut() != 1)
+			return;
+		
 		Long ts = arr.getTs();
-		//起点
-		if(scInfo.getFcsjActualTime() == null
-				&& scInfo.getQdzCode().equals(arr.getStopNo())
+		//起点站和发车时间比比较
+		if(scInfo.getQdzCode().equals(arr.getStopNo())
 				&& Math.abs(scInfo.getFcsjT() - ts) < diff){
-			
 			scInfo.setFcsjActualTime(ts);
 			scInfo.setFcsjActual(sdf.format(ts));
+			
 			System.out.println("成功匹配一个起点...");
+			ScheduleBuffer.persistentList.add(scInfo);
 		}
-		//终点
-		if(scInfo.getZdsjActualTime() == null
-				&& scInfo.getZdzCode().equals(arr.getStopNo())
+	}
+	
+	/**
+	 * 
+	 * @Title: matchEnd 
+	 * @Description: TODO(匹配终点 进站时间) 
+	 * @throws
+	 */
+	public void matchEnd(ScheduleRealInfo scInfo, ArrivalInfo arr){
+		if(scInfo.getZdsjT() == null
+				|| arr.getInOut() != 0)
+			return;
+		
+		Long ts = arr.getTs();
+		//终点站和发车时间比较
+		if(scInfo.getZdzCode().equals(arr.getStopNo())
 				&& Math.abs(scInfo.getZdsjT() - ts) < diff){
-			
 			scInfo.setZdsjActualTime(ts);
 			scInfo.setZdsjActual(sdf.format(ts));
+			
 			System.out.println("成功匹配一个终点...");
+			ScheduleBuffer.persistentList.add(scInfo);
 		}
 	}
@@ -136,7 +170,7 @@ public class GpsArrivalStationThread extends Thread{
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
 			ps.setInt(1, weeks_year);
-			ps.setLong(2, GpsArrivalDataBuffer.markTime);
+			ps.setLong(2, /*GpsArrivalDataBuffer.markTime*/1467099600000L);
 			Long t = System.currentTimeMillis();
 			rs = ps.executeQuery();
 package com.bsth.vehicle.gpsdata.controller;
 import java.util.List;
+import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.bsth.vehicle.gpsdata.buffer.GpsRealDataBuffer;
 import com.bsth.vehicle.gpsdata.entity.GpsRealData;
+import com.bsth.vehicle.gpsdata.service.GpsDataService;
 import com.google.common.base.Splitter;
 @RestController
@@ -19,6 +21,9 @@ public class GpsDataController {
 	@Autowired
 	GpsRealDataBuffer gpsBuffer;
+	@Autowired
+	GpsDataService gpsDataService;
+	
 	@RequestMapping(value = "/real/line/{lineCode}")
 	public List<GpsRealData> findByLineCode(@PathVariable("lineCode") Integer lineCode){
 		return gpsBuffer.getListByLineCode(lineCode);
@@ -28,4 +33,13 @@ public class GpsDataController {
 	public List<GpsRealData> findByLineCode(@RequestParam String lineCodes){
 		return gpsBuffer.getListByLines(Splitter.on(",").split(lineCodes).iterator());
 	}
+	
+	@RequestMapping(value = "/history/{device}")
+	public List<Map<String, Object>> history(@PathVariable("device") String device
+			,@RequestParam Long startTime
+			,@RequestParam Long endTime,
+			@RequestParam int directions){
+		
+		return gpsDataService.history(device, startTime, endTime, directions);
+	}
 }
@@ -17,18 +17,17 @@ import javax.persistence.Transient;
 public class ArrivalInfo {
 	@Transient
-	static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd")
-		,sdf2 = new SimpleDateFormat("HH:mm")
-		,sdf3 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+	static SimpleDateFormat sdf = new SimpleDateFormat("HH:mm")
+		,sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 	public ArrivalInfo(String deviceId, Long ts, String lineCode, Integer upDown, String stopNo, Integer inOut,
 			Date createDate, Integer weeksYear) {
 		this.deviceId = deviceId;
-		//gps是2014年的数据，临时将ts拉到当天
+		//gps是2014年的数据，临时将ts拉到6月1号
 		try {
-			this.ts = sdf3.parse(sdf.format(new Date()) +" " + sdf2.format(new Date(ts))).getTime();
+			this.ts = sdf2.parse("2016-06-01 " + sdf.format(new Date(ts))).getTime();
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
@@ -59,7 +59,7 @@ public class GpsDataServiceImpl implements GpsDataService{
 				//to 百度坐标
 				lon = rs.getFloat("LON");
-				lat = rs.getFloat("lat");
+				lat = rs.getFloat("LAT");
 				location = TransGPS.LocationMake(lon, lat);
 				location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
@@ -67,7 +67,7 @@ public class GpsDataServiceImpl implements GpsDataService{
 				map.put("device", rs.getString("DEVICE_ID"));
 				map.put("lon", location.getLng());
 				map.put("lat", location.getLat());
-				map.put("ts", rs.getLong("ts"));
+				map.put("ts", rs.getLong("TS"));
 				map.put("inout_stop", rs.getInt("INOUT_STOP"));
 				//上下行
 				map.put("upDown", upDown);