update...

潘钊
1 parent ccac49b8
Showing 16 changed files with 231 additions and 343 deletions
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/controller/sys/util/jCryption.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/directive/DirectiveCreator.java
src/main/java/com/bsth/data/forecast/ForecastRealServer.java
src/main/java/com/bsth/data/forecast/SampleTimeDataLoader.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/match/Arrival2Schedule.java
src/main/java/com/bsth/data/match/Arrival2Schedule_old.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/directive/DirectiveService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/forecast/SampleServiceImpl.java
src/main/resources/application-dev.properties
@@ -63,7 +63,7 @@ public class DirectiveController {
 	 * @throws
 	 */
 	@RequestMapping(value = "/lineChnage", method = RequestMethod.POST)
-	public int lineChange(@RequestParam String nbbm, @RequestParam Integer lineId){
+	public int lineChange(@RequestParam String nbbm, @RequestParam String lineId){
 		SysUser user = SecurityUtils.getCurrentUser();
 		return directiveService.lineChange(nbbm, lineId, user.getUserName());
 	}
@@ -40,7 +40,8 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 	@RequestMapping(value = "/login", method = RequestMethod.POST)
 	public Map<String, Object> login(HttpServletRequest request, @RequestParam String userName,
-			@RequestParam String password) {
+			@RequestParam String password, String captcha) {
+		
 		Map<String, Object> rs = new HashMap<>();
 		rs.put("status", ResponseCode.ERROR);
 		try {
@@ -51,29 +52,20 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 				//校验验证码
 				String verCode = (String) session
 						.getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY);
-				String captcha = request.getParameter("captcha");
-				if(StringUtils.isBlank(captcha)){
-					rs.put("msg", "请输入验证码");
-					return rs;
-				}
+				if(StringUtils.isBlank(captcha))
+					return put(rs, "msg", "请输入验证码");
-				if(!verCode.equals(captcha)){
-					rs.put("msg", "验证码有误，请刷新后重新输入");
-					return rs;
-				}
+				if(!verCode.equals(captcha))
+					return put(rs, "msg", "验证码有误，请刷新后重新输入");
 			}
 			SysUser user = sysUserService.findByUserName(userName);
-			if (null == user) {
-				rs.put("msg", "不存在的用户");
-				return rs;
-			}
+			if (null == user) 
+				return put(rs, "msg", "不存在的用户");
-			if (!user.isEnabled()) {
-				rs.put("msg", "该用户已被锁定，请联系管理员");
-				return rs;
-			}
+			if (!user.isEnabled()) 
+				return put(rs, "msg", "该用户已被锁定，请联系管理员");
 			// 校验密码
 			password = fourDecodeBase64(password);
@@ -109,6 +101,11 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 		Integer size = captchaMap.get(userName);
 		return size == null?0:size;
 	}
+	
+	public Map<String, Object> put(Map<String, Object> rs, String key, Object val){
+		rs.put(key, val);
+		return rs;
+	}
 	private String fourDecodeBase64(String t) {
 		return new String(Base64.decodeBase64(Base64.decodeBase64(Base64.decodeBase64(Base64.decodeBase64(t)))));
+package com.bsth.controller.sys.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.security.GeneralSecurityException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.interfaces.RSAPublicKey;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.crypto.Cipher;
+
+public class jCryption {
+	
+    public KeyPair generateKeypair(int keyLength) {
+        try {
+            KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
+            kpg.initialize(keyLength);
+            return kpg.generateKeyPair();
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("RSA algorithm not supported",e);
+        }
+    }
+    
+    public String decrypt( String encrypted, KeyPair keys ) {
+        Cipher dec;
+        try {
+            dec = Cipher.getInstance("RSA/NONE/NoPadding");
+            dec.init(Cipher.DECRYPT_MODE, keys.getPrivate());
+        } catch (GeneralSecurityException e) {
+            throw new RuntimeException("RSA algorithm not supported",e);
+        }
+        String[] blocks = encrypted.split("\\s");
+        StringBuffer result = new StringBuffer();
+        try {
+            for ( int i = blocks.length-1; i >= 0; i-- ) {
+                byte[] data = hexStringToByteArray(blocks[i]);
+                byte[] decryptedBlock = dec.doFinal(data);
+                result.append( new String(decryptedBlock) );
+            }
+        } catch (GeneralSecurityException e) {
+            throw new RuntimeException("Decrypt error",e);
+        }
+        return result.reverse().toString();
+    }
+    
+    public static Map<String, String> parse(String url,String encoding) {
+        try {
+            String urlToParse = URLDecoder.decode(url,encoding);
+            String[] params = urlToParse.split("&");
+            Map<String, String> parsed = new HashMap<>();
+            for (int i = 0; i<params.length; i++ )  {
+                String[] p = params[i].split("=");
+                String name = p[0];
+                String value = (p.length==2)?p[1]:null;
+                parsed.put(name, value);
+            }
+            return parsed;
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("Unknown encoding.",e);
+        }
+    }
+    
+    public static String getPublicKeyModulus( KeyPair keyPair ) {
+        RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic();
+        return publicKey.getModulus().toString(16);
+    }
+    
+    public static String getPublicKeyExponent( KeyPair keyPair ) {
+        RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic();
+        return publicKey.getPublicExponent().toString(16);
+    }
+    
+    public static int getMaxDigits(int keyLength)   {
+        return ((keyLength *2)/16)+3;
+    }
+    
+    public static String byteArrayToHexString(byte[] bytes) {
+        StringBuffer result = new StringBuffer();
+        for (int i=0; i < bytes.length; i++) {
+            result.append( Integer.toString( ( bytes[i] & 0xff ) + 0x100, 16).substring( 1 ) );
+        }
+        return result.toString();
+    }
+    
+    public static byte[] hexStringToByteArray(String data) {
+        int k = 0;
+        byte[] results = new byte[data.length() / 2];
+        for (int i = 0; i < data.length();) {
+            results[k] = (byte) (Character.digit(data.charAt(i++), 16) << 4);
+            results[k] += (byte) (Character.digit(data.charAt(i++), 16));
+            k++;
+        }
+        return results;
+    }
+}
@@ -127,7 +127,7 @@ public class BasicData implements CommandLineRunner{
 		private void loadStationRouteInfo() {
-			Iterator<StationRoute> iterator = stationRouteRepository.findAll2().iterator();
+			Iterator<StationRoute> iterator = stationRouteRepository.findAllEffective().iterator();
 			Map<String, Integer> map = new HashMap<>();
 			StationRoute route;
@@ -50,7 +50,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
-		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 12, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 10, TimeUnit.SECONDS);
 	}
 	@Component
@@ -43,7 +43,7 @@ public class DirectiveCreator {
 	 * @return Directive60    返回类型 
 	 * @throws
 	 */
-	public static D60 createD60(String nbbm, String text, Short dispatchInstruct, int upDown, int state) {
+	public D60 createD60(String nbbm, String text, Short dispatchInstruct, int upDown, int state) {
 		Long timestamp = System.currentTimeMillis();
 		Short company = Short.parseShort(BasicData.nbbm2CompanyCodeMap.get(nbbm));
@@ -81,7 +81,7 @@ public class DirectiveCreator {
 	}
-	public static D60 createD60_02(String nbbm, String text, int upDown, int state, Date alarmTime){
+	public D60 createD60_02(String nbbm, String text, int upDown, int state, Date alarmTime){
 		SimpleDateFormat sdfMMddHHmm = new SimpleDateFormat("MMddHHmm");
 		Long timestamp = System.currentTimeMillis();
@@ -129,19 +129,16 @@ public class DirectiveCreator {
 	 * @param @param t 时间戳
 	 * @throws
 	 */
-	public static D64 createD64(String nbbm, Integer lineCode, long t){
+	public D64 createD64(String nbbm, String lineCode, long t){
 		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
 		D64 change = new D64();
 		D64Data data = new D64Data();
 		data.setCityCode(cityCode);
 		data.setDeviceId(deviceId);
+		
 		//线路编码补满6位数
-		if(lineCode > 999999){
-			logger.error("线路编码不能超过6位，code：" + lineCode);
-			return null;
-		}
-		String lineCodeStr = String.format("%06d", lineCode);
+		String lineCodeStr = padLeft(lineCode, 6, '0');
 		data.setLineId(lineCodeStr);
 		change.setDeviceId(deviceId);
@@ -160,7 +157,7 @@ public class DirectiveCreator {
 	 * @param @param lineId  线路ID
 	 * @throws
 	 */
-	public static String createDeviceRefreshData(String deviceId, Integer lineCode) {
+	public String createDeviceRefreshData(String deviceId, String lineCode) {
 		Long t = System.currentTimeMillis();
 		Map<String, Object> param = new HashMap<>();
 		param.put("deviceId", deviceId);
@@ -175,11 +172,7 @@ public class DirectiveCreator {
 		data.put("centerId", 1);
 		//线路编码补满6位数
-		if(lineCode > 999999){
-			logger.error("线路编码不能超过6位，code：" + lineCode);
-			return null;
-		}
-		String lineCodeStr = String.format("%06d", lineCode);
+		String lineCodeStr = padLeft(lineCode, 6, '0');
 		data.put("lineId", lineCodeStr);
 		data.put("lineVersion", 0);
@@ -189,7 +182,15 @@ public class DirectiveCreator {
 		return JSON.toJSONString(param);
 	}
-	public static void main(String[] args) {
-		System.out.println(String.format("%06d", "1025"));
-	}
+	 public String padLeft(String oriStr,int len,char alexin){
+	   String str = "";
+	   int strlen = oriStr.length();
+	   if(strlen < len){
+	   for(int i=0;i<len-strlen;i++){
+	    str = str+alexin;
+	   }
+	  }
+	  str = str + oriStr;
+	  return str;
+	 }
 }
@@ -103,7 +103,6 @@ public class ForecastRealServer implements CommandLineRunner {
 							, gps.getStopNo(), eStation
 							, t - gps.getArrTime()));
-			
 			forecastMap.put(nbbm, forecastRes);
 			//GPS附加预计终点时间
 			gps.setExpectStopTime(expectStopTime(nbbm));
@@ -118,14 +117,24 @@ public class ForecastRealServer implements CommandLineRunner {
 	 * @Description: TODO(预计到达终点时间) 
 	 */
 	public Float expectStopTime(String nbbm){
-		long t = System.currentTimeMillis();
+		long t = System.currentTimeMillis()
+			,diff = 0L
+			,firstExpTime;
 		Float rs = null;
 		ForecastResult forecastRes = forecastMap.get(nbbm);
-		if(null != forecastRes){
-			List<ForecastResultItem> trs = forecastRes.getFollows();
-			if(null != trs && trs.size() > 0)
-				rs = ((float)((trs.get(trs.size() - 1).getTime()) - t)) / 1000 / 60;
+		if(null == forecastRes)
+			return rs;
+		
+		List<ForecastResultItem> trs = forecastRes.getFollows();
+		if(null != trs && trs.size() > 0){
+			
+			//当前时间已超过第一个预计到站时间，后续预测时间补上差值
+			firstExpTime = trs.get(0).getTime();
+			if(firstExpTime < t)
+				diff = t - firstExpTime;
+			
+			rs = ((float)((trs.get(trs.size() - 1).getTime()) - t + diff)) / 1000 / 60;
 		}
 		//保留2位小数
@@ -61,7 +61,7 @@ public class SampleTimeDataLoader extends Thread {
 		}
 		// 加载全部路由信息
-		List<StationRoute> allRoutes = stationRouteRepository.findAll2();
+		List<StationRoute> allRoutes = stationRouteRepository.findAllEffective();
 		// 线路和走向分组
 		ArrayListMultimap<String, StationRoute> groupMap = ArrayListMultimap.create();
 		for (StationRoute sr : allRoutes)
@@ -71,7 +71,7 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 8, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 7, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
@@ -91,14 +91,6 @@ public class Arrival2Schedule implements ApplicationContextAware {
 			for(ArrivalEntity arr : arrList){
 				match(arr, schList);
 			}
-			
-			//车辆关联到班次
-			//ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(this.nbbm);
-			//if(null == sch){
-				//dayOfSchedule.findByNbbm(this.nbbm);
-				//dayOfSchedule.addExecPlan(sch);
-				//dayOfSchedule.linkToSchPlan(this.nbbm);
-			//}
 		}
 		private void match(ArrivalEntity arr, List<ScheduleRealInfo> schList) {
@@ -166,13 +158,7 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				//漂移判定
 				if(driftCheck(mr, arr)){
-					mr.sch.setFcsjActualAll(mr.ts);
-					//通知客户端
-					sendUtils.sendFcsj(mr.sch);
-					//持久化
-					dayOfSchedule.save(mr.sch);
-					//车辆当前执行班次
-					dayOfSchedule.addExecPlan(mr.sch);
+					carOut(mr);
 				}
 			}
 		}
@@ -213,29 +199,58 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				//排序后的第一个 就是最合适的匹配
 				Collections.sort(mrs, mrComparator);
 				mr = mrs.get(0);
-				mr.sch.setZdsjActualAll(mr.ts);
+				carInStop(mr);
+			}
+		}
+		
+		/**
+		 * 
+		 * @Title: carOut 
+		 * @Description: TODO(车辆发出) 
+		 */
+		public void carOut(MatchResult mr){
+			//设置发车时间
+			mr.sch.setFcsjActualAll(mr.ts);
+			//通知客户端
+			sendUtils.sendFcsj(mr.sch);
+			//持久化
+			dayOfSchedule.save(mr.sch);
+			//车辆当前执行班次
+			dayOfSchedule.addExecPlan(mr.sch);
+		}
+		
+		/**
+		 * 
+		 * @Title: carInStop 
+		 * @Description: TODO(车辆进入终点站) 
+		 */
+		public void carInStop(MatchResult mr){
+			mr.sch.setZdsjActualAll(mr.ts);
+			
+			int doneSum = dayOfSchedule.doneSum(mr.sch.getClZbh());
+			ScheduleRealInfo next = dayOfSchedule.next(mr.sch);
+			if(null != next){
+				next.setQdzArrDateSJ(mr.sch.getZdsjActual());
+				//下发调度指令
+				directiveService.send60Dispatch(next, doneSum, "到站@系统");
-				int doneSum = dayOfSchedule.doneSum(mr.sch.getClZbh());
-				ScheduleRealInfo next = dayOfSchedule.next(mr.sch);
-				if(null != next){
-					next.setQdzArrDateSJ(mr.sch.getZdsjActual());
-					//下发调度指令
-					directiveService.send60Dispatch(next, doneSum, "到站@系统");
-					
-					//起点既停车场的进场班次
-					if(next.getBcType().equals("in") && next.getJhlc() == null)
-						next.setFcsjActualAll(mr.ts);
-				}
-				else//下发文本指令（已结束运营）
-					directiveService.send60Phrase(nbbm, "到达终点 " + mr.sch.getZdzName() + "，已完成当日所有排班。", "系统");
-				//通知客户端
-				sendUtils.sendZdsj(mr.sch, next, doneSum);
-				//持久化
-				dayOfSchedule.save(mr.sch);
-				logger.info(mr.sch.getClZbh() + "移除正在执行班次，" + mr.sch.getFcsj());
-				//移除车辆正在执行班次引用
-				dayOfSchedule.removeExecPlan(mr.sch.getClZbh());
+				//完成“起点既停车场”的进场班次
+				if(next.getBcType().equals("in") && next.getJhlc() == null)
+					next.setFcsjActualAll(mr.ts);
+				
+				//套跑  -下发线路切换指令
+				if(!next.getXlBm().equals(mr.sch.getXlBm()))
+					directiveService.lineChange(next.getClZbh(), next.getXlBm(), "套跑@系统");
 			}
+			else//下发文本指令（已结束运营）
+				directiveService.send60Phrase(nbbm, "到达终点 " + mr.sch.getZdzName() + "，已完成当日所有排班。", "系统");
+			//通知客户端
+			sendUtils.sendZdsj(mr.sch, next, doneSum);
+			//持久化
+			dayOfSchedule.save(mr.sch);
+			logger.info(mr.sch.getClZbh() + "移除正在执行班次，" + mr.sch.getFcsj());
+			//移除车辆正在执行班次索引
+			dayOfSchedule.removeExecPlan(mr.sch.getClZbh());
 		}
 		/**
-package com.bsth.data.match;
-//package com.bsth.data.match;
-//
-//import java.util.ArrayList;
-//import java.util.Collections;
-//import java.util.List;
-//import java.util.Set;
-//
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.BeansException;
-//import org.springframework.context.ApplicationContext;
-//import org.springframework.context.ApplicationContextAware;
-//import org.springframework.stereotype.Component;
-//
-//import com.bsth.data.arrival.ArrivalComparator;
-//import com.bsth.data.arrival.ArrivalData_GPS;
-//import com.bsth.data.arrival.ArrivalEntity;
-//import com.bsth.data.schedule.DayOfSchedule;
-//import com.bsth.data.schedule.ScheduleComparator;
-//import com.bsth.entity.realcontrol.ScheduleRealInfo;
-//import com.bsth.service.directive.DirectiveService;
-//import com.bsth.websocket.handler.SendUtils;
-//
-///**
-// * 
-// * @ClassName: Arrival2Schedule 
-// * @Description: TODO(进出数据匹配班次) 
-// * @author PanZhao 
-// * @date 2016年8月10日 下午2:26:22 
-// *
-// */
-//@Component
-//public class Arrival2Schedule implements ApplicationContextAware{
-//	
-//	private static ScheduleComparator.FCSJ schComparator;
-//	private static ArrivalComparator arrComparator;
-//	private static SendUtils sendUtils;
-//	private static DayOfSchedule dayOfSchedule;
-//	private static DirectiveService directiveService;
-//	
-//	private final static long MAX_RANGE = 1000 * 60 * 60 * 1L;
-//	
-//	static{
-//		schComparator = new ScheduleComparator.FCSJ();
-//		arrComparator = new ArrivalComparator();
-//	}
-//	
-//	static Logger logger = LoggerFactory.getLogger(Arrival2Schedule.class);
-//	
-//	/**
-//	 * 
-//	 * @Title: start 
-//	 * @Description: TODO(开始) 
-//	 * @param @param cars    需要匹配的车辆集合
-//	 */
-//	public static void start(Set<String> cars){
-//		
-//		for(String car : cars){
-//			new GpsMatchThread(car).start();
-//		}
-//	}
-//	
-//	public static class GpsMatchThread extends Thread{
-//
-//		String nbbm;
-//		public GpsMatchThread(String nbbm){
-//			this.nbbm = nbbm;
-//		}
-//		
-//		@Override
-//		public void run() {
-//			//班次列表
-//			List<ScheduleRealInfo> schList = dayOfSchedule.findByNbbm(nbbm);
-//			//进出起终点数据
-//			List<ArrivalEntity> arrList = ArrivalData_GPS.getIncrement(nbbm);
-//			logger.info("####匹配进出站增量数据 " + arrList.size());
-//			//排序
-//			Collections.sort(schList, schComparator);
-//			Collections.sort(arrList, arrComparator);
-//			
-//			int si = lastMatchPoint(schList);
-//			int ai = afterByTime(arrList, lastMatchTime(schList.get(si)));
-//			
-//			//按起始索引开始匹配
-//			match(arrList, ai, schList, si);
-//		}
-//		
-//		public void match(List<ArrivalEntity> arrList, int ai, List<ScheduleRealInfo> schList, int si){
-//			
-//			int sLen = schList.size();
-//			for(; si < sLen; si ++)
-//				match(arrList, ai, schList.get(si));
-//		}
-//		
-//		public void match(List<ArrivalEntity> arrList, int ai, ScheduleRealInfo sch){
-//			//烂班不参与
-//			if(sch.isDestroy())
-//				return;
-//			
-//			int aLen = arrList.size();
-//			
-//			List<MatchResult> inRsList = new ArrayList<>()
-//						,outRsList = new ArrayList<>();
-//			
-//			MatchResult mrs;
-//			for(;ai < aLen; ai ++){
-//				mrs = match(arrList.get(ai), sch);
-//				if(!mrs.success)
-//					continue;
-//				
-//				if(mrs.inOut == 0)
-//					inRsList.add(mrs);
-//				else if(mrs.inOut == 1)
-//					outRsList.add(mrs);
-//			}
-//			
-//			if(outRsList.size() > 0){
-//				//排序后的第一个 就是最合适的匹配
-//				Collections.sort(outRsList, new MatchResultComparator());
-//				mrs = outRsList.get(0);
-//				
-//				mrs.sch.setFcsjActualAll(mrs.ts);
-//				//通知客户端
-//				sendUtils.sendFcsj(mrs.sch);
-//				//持久化
-//				dayOfSchedule.save(mrs.sch);
-//			}
-//			
-//			if(inRsList.size() > 0){
-//				//排序后的第一个 就是最合适的匹配
-//				Collections.sort(inRsList, new MatchResultComparator());
-//				mrs = inRsList.get(0);
-//				
-//				/*if(!dayOfSchedule.validEndTime(mrs.sch, mrs.ts)){
-//					return;
-//				}*/
-//				
-//				mrs.sch.setZdsjActualAll(mrs.ts);
-//				int doneSum = dayOfSchedule.doneSum(mrs.sch.getClZbh());
-//				ScheduleRealInfo next = dayOfSchedule.next(mrs.sch);
-//				if(null != next){
-//					next.setQdzArrDateSJ(mrs.sch.getZdsjActual());
-//					//下发调度指令
-//					directiveService.send60Dispatch(next, doneSum, "系统");
-//				}
-//				else{
-//					//下发文本指令（已结束运营）
-//					directiveService.send60Phrase(nbbm, "到达终点 " + mrs.sch.getZdzName() + "，已完成当日所有排班。", "系统");
-//				}
-//				//通知客户端
-//				sendUtils.sendZdsj(mrs.sch, next, doneSum);
-//				//持久化
-//				dayOfSchedule.save(mrs.sch);
-//			}
-//		}
-//		
-//		public MatchResult match(ArrivalEntity arr, ScheduleRealInfo sch){
-//			MatchResult mrs = new MatchResult();
-//			mrs.inOut = arr.getInOut();
-//			mrs.sch = sch;
-//			mrs.ts = arr.getTs();
-//			
-//			if(Integer.parseInt(sch.getXlDir()) != arr.getUpDown()){
-//				return mrs;
-//			}
-//			
-//			if(arr.getInOut() == 1){
-//				if(sch.getFcsjActual() == null
-//						&& sch.getQdzCode().equals(arr.getStopNo())
-//						&& dayOfSchedule.validStartTime(sch, arr.getTs())){
-//					
-//						mrs.diff = arr.getTs() - sch.getDfsjT();
-//						if(Math.abs(mrs.diff) < MAX_RANGE)
-//							mrs.success = true;
-//				}
-//			}
-//			else if(arr.getInOut() == 0 && sch.getZdsj() != null){
-//				if(sch.getZdsjActual() == null 
-//						&& sch.getZdzCode().equals(arr.getStopNo())
-//						&& dayOfSchedule.validEndTime(sch, arr.getTs())){
-//						
-//						mrs.diff = arr.getTs() - sch.getZdsjT();
-//						if(Math.abs(mrs.diff) < MAX_RANGE)
-//							mrs.success = true;
-//				}
-//			}
-//			
-//			return mrs;
-//		}
-//		
-//		/**
-//		 * 
-//		 * @Title: lastMatchPoint 
-//		 * @Description: TODO(最后一个已实发的班次索引) 
-//		 */
-//		public int lastMatchPoint(List<ScheduleRealInfo> schList){
-//			int len = schList.size()
-//						,rs = 0;
-//			
-//			ScheduleRealInfo sch;
-//			for(int i = len - 2; i >= 0; i --){
-//				sch = schList.get(i);
-//				if(sch.getFcsjActual() != null){
-//					rs = i;
-//					if(sch.getStatus() == 2)
-//						rs ++;
-//					break;
-//				}
-//			}
-//			return rs;
-//		}
-//		
-//		public long lastMatchTime(ScheduleRealInfo sch){
-//			Long t = 0L;
-//			if(null != sch.getFcsjActualTime())
-//				t = sch.getFcsjActualTime();
-//			if(null != sch.getZdsjActualTime())
-//				t = sch.getZdsjActualTime();
-//			return t;
-//		}
-//		
-//		/**
-//		 * 
-//		 * @Title: afterByTime 
-//		 * @Description: TODO(参数时间戳之后的起始索引) 
-//		 */
-//		public int afterByTime(List<ArrivalEntity> arrList, long t){
-//			int len = arrList.size()
-//				,rs = len - 1;
-//			
-//			for(int i = 0; i < len; i ++){
-//				if(arrList.get(i).getTs() > t){
-//					rs = i;
-//					break;
-//				}
-//			}
-//			return rs;
-//		}
-//	}
-//
-//	@Override
-//	public void setApplicationContext(ApplicationContext arg0) throws BeansException {
-//		sendUtils = arg0.getBean(SendUtils.class);
-//		dayOfSchedule = arg0.getBean(DayOfSchedule.class);
-//		directiveService = arg0.getBean(DirectiveService.class);
-//	}
-//}
@@ -6,6 +6,7 @@ import java.util.Map;
 import com.bsth.entity.schedule.CarConfigInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
@@ -229,9 +230,22 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
 	@Query("select s from StationRoute s where s.destroy=0")
-	List<StationRoute> findAll2();
+	List<StationRoute> findAllEffective();
-    @Query("select new map(sr.station.id as stationid, sr.stationName as stationname) from StationRoute sr where sr.line.id=?1 and sr.directions=?2")
+	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+    @Override
+	Page<StationRoute> findAll(Specification<StationRoute> spec, Pageable pageable);
+
+	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+	@Override
+	List<StationRoute> findAll(Specification<StationRoute> spec);
+
+	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+	@Override
+	List<StationRoute> findAll(Specification<StationRoute> spec, Sort sort);
+
+
+	@Query("select new map(sr.station.id as stationid, sr.stationName as stationname) from StationRoute sr where sr.line.id=?1 and sr.directions=?2")
     List<Map<String, Object>> findStations(Integer xlid, Integer xldir);
 	@Query("select r from StationRoute r where r.lineCode=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
@@ -53,7 +53,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	 * @param @param lineId 新线路编码
 	 * @throws
 	 */
-	int lineChange(String nbbm, Integer lineId, String sender);
+	int lineChange(String nbbm, String lineId, String sender);
 	/**
 	 * 
@@ -38,7 +38,6 @@ import com.bsth.repository.directive.D64Repository;
 import com.bsth.repository.directive.D80Repository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
-import com.bsth.util.DateUtils;
 import com.bsth.websocket.handler.RealControlSocketHandler;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -119,7 +118,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 			//下发0x02指令  调度指令(闹钟有效)
 			Long alarmTime = System.currentTimeMillis() + 1000 * 30;
-			d60 = DirectiveCreator.createD60_02(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
+			d60 = new DirectiveCreator().createD60_02(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
 					, 0, new Date(alarmTime));
 		} catch (Exception e) {
 			logger.error("生成调度指令时出现异常", e);
@@ -193,7 +192,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
 		String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
-		D60 d60 = DirectiveCreator.createD60(nbbm, text, (short) 0x03, upDown, state);
+		D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state);
 		if (null == d60)
 			return -1;
@@ -220,10 +219,12 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 	 * 线路切换
 	 */
 	@Override
-	public int lineChange(String nbbm, Integer lineCode, String sender) {
+	public int lineChange(String nbbm, String lineCode, String sender) {
+		DirectiveCreator crt = new DirectiveCreator();
+		
 		Long t = System.currentTimeMillis();
 		//生成64数据包
-		D64 d64 = DirectiveCreator.createD64(nbbm, lineCode, t);
+		D64 d64 = crt.createD64(nbbm, lineCode, t);
 		if(null != sender)
 			d64.setSender(sender);
@@ -238,7 +239,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		// 通知设备刷新线路文件，忽略结果
 		if (code == 0)
-			GatewayHttpUtils.postJson(DirectiveCreator.createDeviceRefreshData(deviceId, lineCode));
+			GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
 		else
 			d64.setErrorText("[刷新线路文件] 网关通讯失败, code: " + code);
@@ -278,7 +279,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 			state = 0;
 		}
-		return DirectiveCreator.createD60(nbbm, text, dispatchInstruct, upDown, state);
+		return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state);
 	}
 	@Override
@@ -66,7 +66,8 @@ public class SampleServiceImpl extends BaseServiceImpl&lt;Sample, Long&gt; implements 
 	@Override
 	public Map<String, Object> save(Sample t) {
-		t.setTag(t.getTag() + t.getsDate() + " - " + t.geteDate());
+		if(null == t.getId())
+			t.setTag(t.getTag() + t.getsDate() + " - " + t.geteDate());
 		return super.save(t);
 	}
@@ -26,6 +26,6 @@ spring.datasource.validation-query=select 1
 ##
 #222.66.0.204:5555
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://192.168.168.192:8080/transport_server/rtgps/
+http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.192:8080/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://192.168.168.201:9090/transport_server/message/
 \ No newline at end of file