Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into minhang

廖磊
2 parents 94029b6c 2987450f
Showing 73 changed files with 2797 additions and 776 deletions
README.md
pom.xml
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/Test.java
src/main/java/com/bsth/Test2.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/directive/UpstreamEntrance.java
src/main/java/com/bsth/controller/forecast/SampleController.java
src/main/java/com/bsth/controller/forecast/dto/CreateSampleParam.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/schedule/CarConfigInfoController.java
src/main/java/com/bsth/controller/schedule/EmployeeConfigInfoController.java
src/main/java/com/bsth/controller/schedule/SchedulePlanController.java
src/main/java/com/bsth/controller/schedule/SchedulePlanInfoController.java
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/controller/sys/util/RSAUtils.java
-公交调度系统BS版 0.1
+公交调度系统BS版 0.1
 ======
 ----------
 ## 目录
@@ -336,4 +336,4 @@
 {
     "errCode":0
 }
-```
 \ No newline at end of file
+```
@@ -197,6 +197,28 @@
         	<artifactId>kaptcha</artifactId>
         	<version>0.0.9</version>
     	</dependency>
+    	
+		<dependency>
+	      <groupId>commons-codec</groupId>
+	      <artifactId>commons-codec</artifactId>
+	      <version>1.4</version>
+	      <scope>compile</scope>
+	    </dependency>
+	    <dependency>
+	      <groupId>org.bouncycastle</groupId>
+	      <artifactId>bcprov-jdk15on</artifactId>
+	      <version>1.52</version>
+	    </dependency>   
+	   <dependency>
+		    <groupId>axis</groupId>
+		    <artifactId>axis</artifactId>
+		    <version>1.4</version>
+		</dependency>	
+		<dependency>
+		    <groupId>javax.xml</groupId>
+		    <artifactId>jaxrpc-api</artifactId>
+		    <version>1.1</version>
+		</dependency>
 	</dependencies>
  
     <dependencyManagement>
@@ -16,7 +16,7 @@ import org.springframework.context.annotation.Primary;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
  
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(8);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(11);
  
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-//package com.bsth;
-//
-//import java.io.ByteArrayOutputStream;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.io.OutputStream;
-//import java.net.HttpURLConnection;
-//import java.net.URL;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-//import org.apache.commons.io.IOUtils;
-//
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//
-//public class Test {
-//	
-//	public static void main(String[] args) {
-//		Map<String, Object> map = new HashMap<>();
-//		map.put("timestamp", 1469764939000L);
-//		map.put("operCode", 128);
-//		map.put("deviceId", "66ML0007");
-//		
-//		Map<String , Object> dataMap = new HashMap<>();
-//		dataMap.put("requestCode", 161);
-//		dataMap.put("lineId", 1025);
-//		dataMap.put("operCode2", 38);
-//		
-//		map.put("data", dataMap);
-//		request(map, "http://192.168.168.171:9088/control/upstream");
-//		
-//	}
-//	
-//	private static Map<String, Object> request(Map<String, Object> map, String url) {
-//		InputStream in = null;
-//		OutputStream out = null;
-//		HttpURLConnection con = null;
-//		try {
-//			con = (HttpURLConnection)new URL(url).openConnection();
-//			con.setRequestMethod("POST");
-//			con.setRequestProperty("keep-alive", "true");
-//			con.setRequestProperty("accept", "*/*");
-//			con.setDoInput(true);
-//			con.setDoOutput(true);
-//			con.setReadTimeout(2500);
-//			con.setConnectTimeout(2500);
-//			out = con.getOutputStream();
-//			out.write("json=".getBytes());
-//			out.write(new ObjectMapper().writeValueAsBytes(map));
-//			out.flush();
-//			System.out.println("con.getResponseCode(): " + con.getResponseCode());
-//			if (con.getResponseCode() == 200) {
-//				in = con.getInputStream();
-//				ByteArrayOutputStream bout = new ByteArrayOutputStream();
-//				IOUtils.copy(in, bout); bout.close();
-//				System.out.println("Message:" + new String(bout.toByteArray()));
-//				return new ObjectMapper().readValue(bout.toByteArray(), Map.class);
-//			}
-//		} catch (IOException e) {
-//			e.printStackTrace();
-//		} finally {
-//			con.disconnect();
-//			try {
-//				if (in != null) in.close();
-//				if (out != null) out.close();
-//			} catch (IOException e) {
-//				e.printStackTrace();
-//			}
-//		}
-//		return null;
-//	}
-//}
-package com.bsth;
-
-public class Test2 {
-	
-	public static void main(String[] args) {
-		
-		for(int i = 0; i < 20; i ++){
-			new MyThread(i + "").start();
-		}
-	}
-	
-	public static class MyThread extends Thread {
-		
-		private String name ;
-		
-		public MyThread(String name) {
-			this.name = name;
-		}
-
-		@Override
-		public void run() {
-			method(name);
-		}
-	}
-	
-	public static void method(String name){
-		System.out.println("线程" + name + "开始...");
-		int a = 0;
-		for(int i = 0; i < 1000; i ++){
-			a ++;
-		}
-		a--;
-		System.out.println("线程" + name + "结束... a = " + a);
-	}
-}
@@ -120,6 +120,15 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
         return stationRouteRepository.findStations(xlid, xldir);
     }
  
-
+    /**
+     * 
+     * @Title: findByMultiLine 
+     * @Description: TODO(多线路路由查询) 
+     */
+    @RequestMapping(value = "/multiLine", method = RequestMethod.GET)
+    public Map<String, Object> findByMultiLine(@RequestParam String lineIds){
+    	
+    	return service.findByMultiLine(lineIds);
+    }
  
 }
@@ -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());
 	}
@@ -3,7 +3,6 @@ package com.bsth.controller.directive;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -26,7 +25,6 @@ import com.bsth.entity.directive.DirectiveReponse;
  */
 @RestController
 @RequestMapping("/control")
-@Scope("prototype")
 public class UpstreamEntrance {
  
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 package com.bsth.controller.forecast;
  
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
+import com.bsth.controller.forecast.dto.CreateSampleParam;
 import com.bsth.entity.forecast.Sample;
 import com.bsth.service.forecast.SampleService;
  
@@ -15,8 +27,20 @@ public class SampleController extends BaseController&lt;Sample, Long&gt;{
 	@Autowired
 	SampleService sampleService;
  
+	Logger loger = LoggerFactory.getLogger(this.getClass());
+	
 	@RequestMapping("/create/gps")
-	public int createDataByGps(String lineCode, Integer updown){
-		return sampleService.createDataByGps(lineCode, updown);
+	public Map<String, Object> createDataByGps(@RequestParam String data){
+		Map<String, Object> rs = new HashMap<>();
+		try {
+			data = URLDecoder.decode(data, "utf-8");
+			CreateSampleParam param = JSONObject.toJavaObject(JSON.parseObject(data), CreateSampleParam.class);
+			
+			rs = sampleService.createDataByGps(param);
+		} catch (UnsupportedEncodingException e) {
+			loger.info("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		return rs;
 	}
 }
+package com.bsth.controller.forecast.dto;
+
+import java.util.Set;
+
+public class CreateSampleParam {
+	
+	private String lineCode;
+	
+	private String startDate;
+	
+	private String endDate;
+	
+	private Integer updown;
+	
+	private Set<TimeRange> timeRange;
+	
+	public static class TimeRange{
+		private String s;
+		private String e;
+		private String tag;
+		public String getS() {
+			return s;
+		}
+		public void setS(String s) {
+			this.s = s;
+		}
+		public String getE() {
+			return e;
+		}
+		public void setE(String e) {
+			this.e = e;
+		}
+		public String getTag() {
+			return tag;
+		}
+		public void setTag(String tag) {
+			this.tag = tag;
+		}
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+
+	public String getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+
+	public Integer getUpdown() {
+		return updown;
+	}
+
+	public void setUpdown(Integer updown) {
+		this.updown = updown;
+	}
+
+	public Set<TimeRange> getTimeRange() {
+		return timeRange;
+	}
+
+	public void setTimeRange(Set<TimeRange> timeRange) {
+		this.timeRange = timeRange;
+	}
+}
@@ -24,14 +24,25 @@ public class GpsController {
  
 	@Autowired
 	GpsService gpsService;
+	
+	@RequestMapping(value = "/real/all")
+	public Map<String, Object> search(@RequestParam Map<String, Object> map,
+			@RequestParam(defaultValue = "0") int page,
+			@RequestParam(defaultValue = "15") int size,
+			@RequestParam(defaultValue = "timestamp") String order,
+			@RequestParam(defaultValue = "DESC") String direction){
+		
+		
+		return gpsService.search(map, page, size, order, direction);
+	}
  
 	@RequestMapping(value = "/real/line/{lineCode}")
-	public List<GpsEntity> findByLineCode(@PathVariable("lineCode") Integer lineCode) {
-		return gpsRealData.get(lineCode);
+	public List<GpsEntity> findByLineCode(@PathVariable("lineCode") String lineCode) {
+		return gpsRealData.getByLine(lineCode);
 	}
  
 	@RequestMapping(value = "/real/line")
-	public List<GpsEntity> findByLineCode(@RequestParam String lineCodes) {
+	public List<GpsEntity> findByLineCodes(@RequestParam String lineCodes) {
 		return gpsRealData.get(Splitter.on(",").splitToList(lineCodes));
 	}
  
+package com.bsth.controller.realcontrol;
+
+import java.util.Map;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.data.BasicData;
+
+@RestController
+@RequestMapping("/basic")
+public class BasicDataController {
+
+	
+	@RequestMapping("/cars")
+	public Iterable<String> findAllNbbm(Map<String, Object> map){
+		return BasicData.deviceId2NbbmMap.values();
+	}
+	
+	@RequestMapping("/lineCode2Name")
+	public Map<String, String> findLineCodeMap(){
+		return BasicData.lineCode2NameMap;
+	}
+}
 package com.bsth.controller.realcontrol;
  
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
  
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -223,6 +226,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value = "/outgoAdjustAll", method = RequestMethod.POST)
 	public Map<String, Object> outgoAdjustAll(@RequestParam String params){
+		//反转义
+		params = StringEscapeUtils.unescapeHtml4(params);
 		return scheduleRealInfoService.outgoAdjustAll(params);
 	}
  
@@ -257,7 +262,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @throws
 	 */
 	@RequestMapping(value = "/findRouteByLine")
-	public Map<String, Object> findRouteByLine(@RequestParam Integer lineCode){
+	public Map<String, Object> findRouteByLine(@RequestParam String lineCode){
 		return scheduleRealInfoService.findRouteByLine(lineCode);
 	}
  
@@ -51,4 +51,9 @@ public class CarConfigInfoController extends BaseController&lt;CarConfigInfo, Long&gt;
     public List<Map<String, Object>> findCarConfigCars() {
         return carConfigInfoRepository.findCarConfigCars();
     }
+
+    @RequestMapping(value = "/cars2", method = RequestMethod.GET)
+    public List<Map<String, Object>> findCarsFromConfig() {
+        return carConfigInfoRepository.findCarsFromConfig();
+    }
 }
@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.web.bind.annotation.*;
  
+import java.util.List;
 import java.util.Map;
  
 /**
@@ -45,4 +46,14 @@ public class EmployeeConfigInfoController extends BaseController&lt;EmployeeConfigI
     public Map<String, Object> save(@RequestBody EmployeeConfigInfo t){
         return baseService.save(t);
     }
+
+    @RequestMapping(value = "/jsy", method = RequestMethod.GET)
+    public List<Map<String, Object>> findJsyFromConfig() {
+        return employeeConfigInfoRepository.findJsyFromConfig();
+    }
+
+    @RequestMapping(value = "/spy", method = RequestMethod.GET)
+    public List<Map<String, Object>> findSpyFromConfig() {
+        return employeeConfigInfoRepository.findSpyFromConfig();
+    }
 }
@@ -4,10 +4,11 @@ import com.bsth.controller.BaseController;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.service.schedule.SchedulePlanService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
  
-import java.util.Date;
-import java.util.List;
 import java.util.Map;
  
 /**
@@ -34,21 +35,18 @@ public class SchedulePlanController extends BaseController&lt;SchedulePlan, Long&gt; {
         return baseService.save(t);
     }
  
-    // TODO:
-//    @RequestMapping(value = "/groupinfos/{xlid}/{date}", method = RequestMethod.GET)
-//    public List<Map<String, Object>> findGroupInfo(
-//            Integer xlid, Date scheduleDate) {
-//
-//    }
-
-    @RequestMapping(value = "/groupinfos/{xlid}/{date}", method = RequestMethod.GET)
-    public List<Map<String, Object>> findGroupInfo(
-            @PathVariable(value = "xlid") Integer xlid,
-            @PathVariable(value = "date") Date scheduleDate) {
-        return schedulePlanService.findGroupInfo(xlid, scheduleDate);
+    /**
+     * 获取明天的一歌排班计划。
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tommorw", method = RequestMethod.GET)
+    public SchedulePlan getTommorwPlan() throws Exception {
+        try {
+            return schedulePlanService.findSchedulePlanTommorw();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
     }
  
-//    public int updateGroupInfo
-
-
 }
 package com.bsth.controller.schedule;
  
+import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.schedule.SchedulePlanInfo;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.bsth.service.schedule.SchedulePlanInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
  
 /**
  * Created by xu on 16/6/16.
@@ -11,5 +18,30 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("spic")
 public class SchedulePlanInfoController extends BaseController<SchedulePlanInfo, Long> {
+    @Autowired
+    private SchedulePlanInfoService schedulePlanInfoService;
+
+    @RequestMapping(value = "/groupinfos/{xlid}/{date}", method = RequestMethod.GET)
+    public List<SchedulePlanInfoService.GroupInfo> findGroupInfo(
+            @PathVariable(value = "xlid") Integer xlid,
+            @PathVariable(value = "date") Date scheduleDate) {
+        return schedulePlanInfoService.findGroupInfo(xlid, scheduleDate);
+    }
+
+    @RequestMapping(value = "/groupinfos/update", method = RequestMethod.POST)
+    public Map<String, Object> updateGroupInfo(@RequestBody SchedulePlanInfoService.GroupInfoUpdate groupInfoUpdate) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            schedulePlanInfoService.updateGroupInfo(groupInfoUpdate);
+
+            resultMap.put("status", ResponseCode.SUCCESS);
+            resultMap.put("msg", "更新成功");
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            resultMap.put("status", ResponseCode.ERROR);
+            resultMap.put("msg", exp.getLocalizedMessage());
+        }
  
+        return resultMap;
+    }
 }
+package com.bsth.controller.schedule;
+
+import com.bsth.service.TrafficManageService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 
+ * @author BSTH
+ *
+ */
+@RestController
+@RequestMapping("trmg")
+public class TrafficManageController {
+	
+    @Autowired
+	private TrafficManageService trManageService;
+    
+    
+    @RequestMapping(value = "/setXL", method = RequestMethod.GET)
+    public String setXL() throws Exception {
+        try {
+            return trManageService.setXL();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+}
@@ -7,7 +7,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
  
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.net.util.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
+import com.bsth.controller.sys.util.RSAUtils;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.sys.SysUserService;
@@ -35,12 +35,21 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 	@Autowired
 	SysUserService sysUserService;
  
+	@RequestMapping(value = "/login/jCryptionKey")
+	public Map<String, Object> jCryptionKey(HttpServletRequest request){
+		//公匙返回页面
+		Map<String, Object> rs = new HashMap<>();
+		rs.put("publickey", RSAUtils.generateBase64PublicKey());
+		return rs;
+	}
+	
 	//需要验证码的账号
 	public static Map<String, Integer> captchaMap = new HashMap<>();
  
 	@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,32 +60,26 @@ 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", "验证码有误，请刷新后重新输入");
 			}
  
+			//解密RSA
+			userName = RSAUtils.decryptBase64(userName);
+			password = RSAUtils.decryptBase64(password);
+			
 			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);
 			boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
 			if (!matchStatus) {
 				rs.put("msg", "密码有误");
@@ -109,9 +112,10 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 		Integer size = captchaMap.get(userName);
 		return size == null?0:size;
 	}
-
-	private String fourDecodeBase64(String t) {
-		return new String(Base64.decodeBase64(Base64.decodeBase64(Base64.decodeBase64(Base64.decodeBase64(t)))));
+	
+	public Map<String, Object> put(Map<String, Object> rs, String key, Object val){
+		rs.put(key, val);
+		return rs;
 	}
  
 	/**
+package com.bsth.controller.sys.util;
+
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.SecureRandom;
+import java.security.Security;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+
+import javax.crypto.Cipher;
+
+import org.apache.commons.net.util.Base64;
+
+public class RSAUtils {
+    private static final KeyPair keyPair = initKey();
+    
+    private static KeyPair initKey(){
+        try {
+            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
+            SecureRandom random = new SecureRandom();
+            KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA", "BC");
+            generator.initialize(1024, random);
+            return generator.generateKeyPair();
+        }catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+ 
+    /**
+     * 生成public key
+     * @return
+     */
+    public static String generateBase64PublicKey(){
+        RSAPublicKey key = (RSAPublicKey)keyPair.getPublic();
+        return new String(Base64.encodeBase64(key.getEncoded()));
+    }
+     
+    /**
+     * 解密
+     * @param string
+     * @return
+     */
+    public static String decryptBase64(String string) {
+        return new String(decrypt(Base64.decodeBase64(string)));
+    }
+     
+    private static byte[] decrypt(byte[] string) {
+        try {
+            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
+            Cipher cipher = Cipher.getInstance("RSA/None/PKCS1Padding", "BC");
+            RSAPrivateKey pbk = (RSAPrivateKey)keyPair.getPrivate();
+            cipher.init(Cipher.DECRYPT_MODE, pbk);
+            byte[] plainText = cipher.doFinal(string);
+            return plainText;
+        }catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
@@ -57,7 +57,7 @@ public class BasicData implements CommandLineRunner{
 	public static TreeMultimap<String, String> lineCode2SocketUserMap = TreeMultimap.create();
  
 	//线路ID和code 对照
-	public static BiMap<Integer, Integer> lineId2CodeMap;
+	public static BiMap<Integer, String> lineId2CodeMap;
  
 	//线路编码和名称对照
 	public static Map<String, String> lineCode2NameMap;
@@ -127,7 +127,7 @@ public class BasicData implements CommandLineRunner{
  
  
 		private void loadStationRouteInfo() {
-			Iterator<StationRoute> iterator = stationRouteRepository.findAll().iterator();
+			Iterator<StationRoute> iterator = stationRouteRepository.findAllEffective().iterator();
 			Map<String, Integer> map = new HashMap<>();
 			StationRoute route;
  
@@ -211,12 +211,12 @@ public class BasicData implements CommandLineRunner{
 			Iterator<Line> iterator = lineRepository.findAll().iterator();
  
 			Line line;
-			BiMap<Integer, Integer> biMap = HashBiMap.create();
+			BiMap<Integer, String> biMap = HashBiMap.create();
 			Map<String, String> code2name = new HashMap<>();
  
 			while(iterator.hasNext()){
 				line = iterator.next();
-				biMap.put(line.getId(), Integer.parseInt(line.getLineCode()));
+				biMap.put(line.getId(), line.getLineCode());
 				code2name.put(line.getLineCode(), line.getName());
 			}
  
@@ -50,7 +50,8 @@ public class ArrivalData_GPS implements CommandLineRunner{
  
 	@Override
 	public void run(String... arg0) throws Exception {
-		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 15, TimeUnit.SECONDS);
+		logger.info("ArrivalData_GPS,30,10");
+		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 10, TimeUnit.SECONDS);
 	}
  
 	@Component
@@ -88,6 +89,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 				}
 				//从专业的角度分析一下数据
 				analyseData.analyse(carSet);
+				
 				//开始匹配
 				Arrival2Schedule.start(carSet);
 			}catch(Exception e){
 package com.bsth.data.arrival;
  
+import java.text.SimpleDateFormat;
 import java.util.Date;
  
 import com.bsth.data.BasicData;
-import com.bsth.util.DateUtils;
  
 /**
  * 
@@ -88,7 +88,8 @@ public class ArrivalEntity {
 	@Override
 	public String toString() {
 		try {
-			return "["+BasicData.deviceId2NbbmMap.get(this.deviceId)+"， "+DateUtils.sdfHHmm.format(new Date(this.ts))
+			SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+			return "["+BasicData.deviceId2NbbmMap.get(this.deviceId)+"， "+sdfHHmm.format(new Date(this.ts))
 			+"，"+(this.getUpDown()==0?"上行":"下行")+"，"+(this.inOut==0?"进":"出")+"，"+this.stopNo+" （"+this.stopName+"）]";
 		} catch (Exception e) {
 			return "";
@@ -141,6 +141,41 @@ public class DataLoader {
 		return list;
 	}
  
+	/**
+	 * 
+	 * @Title: loadByLineAndStartTime 
+	 * @Description: TODO(根据线路，走向和时间戳加载数据) 
+	 */
+	public List<ArrivalEntity> loadByLineAndTime(String lineCode, int updown, long st, long et){
+		Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(st);
+		int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
+		
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		
+		List<ArrivalEntity> list = new ArrayList<>();
+		String sql = "select * from bsth_c_arrival_info where weeks_year=? and line_id=? and up_down=? and in_out=0 AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by ts";
+		try{
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setInt(1, weeks_year);
+			ps.setString(2, lineCode);
+			ps.setInt(3, updown);
+			ps.setLong(4, st);
+			ps.setLong(5, et);
+			rs = ps.executeQuery();
+			
+			list = resultSet2Set(rs);
+		}catch(Exception e){
+			logger.error("", e);
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		return list;
+	}
+	
 	public List<ArrivalEntity> resultSet2Set(ResultSet rs) throws SQLException{
 		List<ArrivalEntity> list = new ArrayList<>();
  
@@ -38,6 +38,9 @@ public class DayOfDirectives {
  
 	// 线路切换指令 64
 	public static Map<String, D64> d64Map;
+	
+	//等待C0_A4回复的用户
+	//public static Map<K, V>
  
 	@Autowired
 	DirectiveService directiveService;
@@ -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;
+	 }
 }
+package com.bsth.data.forecast;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import com.bsth.Application;
+import com.bsth.data.forecast.entity.ForecastResult;
+import com.bsth.data.forecast.entity.ForecastResult.ForecastResultItem;
+import com.bsth.data.forecast.entity.SimpleRoute;
+import com.bsth.data.forecast.entity.SimpleRoute.TimeRange;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.google.common.collect.ArrayListMultimap;
+
+/**
+ * 
+ * @ClassName: SampleTimeData 
+ * @Description: TODO(实时到离站预测) 
+ * @author PanZhao 
+ * @date 2016年9月18日 上午10:15:17 
+ *
+ */
+@Component
+public class ForecastRealServer implements CommandLineRunner {
+	
+	@Autowired
+	SampleTimeDataLoader dataLoader;
+	
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+	
+	@Autowired
+	GpsRealData gpsRealData;
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	//车辆 ——> 预测终点时间
+	//static Map<String, Float> forecastMap = new HashMap<>(); 
+	//线路_上下行 ——> 封装耗时数据的路由链
+	public static ArrayListMultimap<String, SimpleRoute> lineSampleMap;
+	//车辆 ——> 预测结果
+	public static Map<String, ForecastResult> forecastMap;
+	
+	static{
+		lineSampleMap = ArrayListMultimap.create();
+		forecastMap = new HashMap<>();
+	}
+	
+	@Override
+	public void run(String... arg0) throws Exception {
+		//2小时更新一次站点间耗时数据
+		Application.mainServices.scheduleWithFixedDelay(dataLoader, 12, 120 * 60, TimeUnit.SECONDS);
+	}
+	
+	/**
+	 * 
+	 * @Title: forecast 
+	 * @Description: TODO(预测后续时间) 
+	 * @param @param nbbm 车辆自编号
+	 */
+/*	public void forecast(String nbbm){
+		logger.info("预测，" + nbbm);
+		//当前执行班次
+		ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(nbbm);
+		if(null == sch)
+			return;
+		
+		//车辆当前位置
+		//GpsEntity gps = gpsRealData.findByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh()));
+		GpsEntity gps = gpsRealData.findByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
+		forecast(nbbm, gps);
+	}*/
+	
+	public void forecast(String nbbm, GpsEntity gps){
+		try{
+			long t = System.currentTimeMillis();
+			//终点站
+			String eStation = null;
+			//当前执行班次
+			ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(nbbm);
+			if(null != sch)
+				eStation = sch.getZdzCode();
+			
+			//预测结果
+			ForecastResult forecastRes = new ForecastResult();
+			forecastRes.setStation(gps.getStopNo());
+			forecastRes.setArrTime(gps.getArrTime());
+			forecastRes.setFollows(
+					calc(gps.getLineId()
+							,gps.getUpDown()
+							, gps.getStopNo(), eStation
+							, t - gps.getArrTime()));
+
+			forecastMap.put(nbbm, forecastRes);
+			//GPS附加预计终点时间
+			gps.setExpectStopTime(expectStopTime(nbbm));
+		}catch(Exception e){
+			logger.error("", e);
+		}
+	}
+	
+	/**
+	 * 
+	 * @Title: expectStopTime 
+	 * @Description: TODO(预计到达终点时间) 
+	 */
+	public Float expectStopTime(String nbbm){
+		long t = System.currentTimeMillis()
+			,diff = 0L
+			,firstExpTime;
+		
+		Float rs = null;
+		ForecastResult forecastRes = forecastMap.get(nbbm);
+		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位小数
+		if(null != rs)
+			rs = Float.parseFloat(new DecimalFormat(".00").format(rs));
+		
+		return rs;
+	}
+	
+	/**
+	 * 
+	 * @Title: expectDetail 
+	 * @Description: TODO(预测明细) 
+	 */
+	public List<TimeRange> expectDetail(String nbbm){
+		
+		return null;
+	}
+
+	
+	public List<ForecastResultItem> calc(String lineCode, int updown , String sStation, String eStation, long diff){
+		long t = System.currentTimeMillis()
+			, ct = t - diff;
+		
+		List<SimpleRoute> srs = lineSampleMap.get(lineCode + "_" + updown);
+		SimpleRoute curr;
+		int len = srs.size();
+		
+		List<ForecastResultItem> rs = null;
+		ForecastResultItem frItem;
+		
+		for(int i = 0; i < len; i ++){
+			curr = srs.get(i);
+			
+			if(curr.stationCode.equals(sStation)){
+				rs = new ArrayList<>();
+				continue;
+			}
+			
+			if(null == rs)
+				continue;
+			
+			frItem = new ForecastResultItem();
+			frItem.setStationId(curr.stationCode);
+			frItem.setStationName(curr.stationName);
+			if(null == curr.ranges || curr.ranges.size() == 0)
+				break;
+			
+			//从多个时区耗时中选择一个
+			for(TimeRange tr : curr.ranges){
+				if(tr.startTime < t){
+					ct += ((long)(tr.runTime * 60 * 1000));
+					frItem.setTime(ct);
+					break;
+				}
+			}
+			
+			if(null != eStation && eStation.equals(curr.stationCode))
+				break;
+			
+			rs.add(frItem);
+		}
+		
+		return rs;
+	}
+}
+package com.bsth.data.forecast;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.bsth.data.forecast.entity.SimpleRoute;
+import com.bsth.data.forecast.entity.SimpleRoute.TimeRange;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.forecast.Sample;
+import com.bsth.repository.StationRouteRepository;
+import com.bsth.repository.forecast.SampleRepository;
+import com.google.common.collect.ArrayListMultimap;
+
+/**
+ * 
+ * @Title: loadData
+ * @Description: TODO(从数据库加载数据)
+ */
+@Component
+public class SampleTimeDataLoader extends Thread {
+
+	@Autowired
+	SampleRepository sampleRepository;
+
+	@Autowired
+	StationRouteRepository stationRouteRepository;
+
+	// 当天日期
+	String rq;
+
+	SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	@Override
+	public void run() {
+		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+		rq = sdfyyyyMMdd.format(new Date());
+
+		Iterator<Sample> iterator = sampleRepository.findAll().iterator();
+		ArrayListMultimap<String, Sample> sampleMap = ArrayListMultimap.create();
+
+		Sample sample;
+		String key;
+		while (iterator.hasNext()) {
+			sample = iterator.next();
+			key = sample.getLineCode() + "_" + sample.getUpdown() + "_" + sample.getsStation() + "_"
+					+ sample.geteStation();
+			sampleMap.put(key, sample);
+		}
+
+		// 加载全部路由信息
+		List<StationRoute> allRoutes = stationRouteRepository.findAllEffective();
+		// 线路和走向分组
+		ArrayListMultimap<String, StationRoute> groupMap = ArrayListMultimap.create();
+		for (StationRoute sr : allRoutes)
+			groupMap.put(sr.getLineCode() + "_" + sr.getDirections(), sr);
+
+		ArrayListMultimap<String, SimpleRoute> lineSampleMapCopy = ArrayListMultimap.create();
+		// 排序路由链并附加各个时区耗时信息
+		StationRouteComp comp = new StationRouteComp();
+		Set<String> kys = groupMap.keySet();
+		List<StationRoute> routeList;
+		StationRoute sRoute;
+		
+		List<Sample> sapList;
+		for (String k : kys) {
+			routeList = groupMap.get(k);
+			// 排序
+			Collections.sort(routeList, comp);
+
+			for (int i = 1; i < routeList.size(); i++) {
+				sRoute = routeList.get(i);
+
+				sapList = sampleMap.get(k + "_" +routeList.get(i - 1).getStationCode() + "_" + sRoute.getStationCode());
+				
+				lineSampleMapCopy.put(k, createSimpleRoute(sRoute, sapList));
+			}
+		}
+
+		ForecastRealServer.lineSampleMap = lineSampleMapCopy;
+		logger.info("SampleTimeDataLoader.... over...");
+	}
+
+	private SimpleRoute createSimpleRoute(StationRoute sRoute, List<Sample> list) {
+		SimpleRoute simple = new SimpleRoute();
+
+		simple.stationCode = sRoute.getStationCode();
+		simple.ranges = new ArrayList<>();
+
+		try{
+			TimeRange tg;
+			for (Sample s : list) {
+				tg = new TimeRange();
+				tg.startTime = sdfyyyyMMddHHmm.parse(rq + s.getsDate()).getTime();
+				tg.endTime = sdfyyyyMMddHHmm.parse(rq + s.geteDate()).getTime();
+				tg.runTime = s.getRunTime();
+				simple.ranges.add(tg);
+			}
+			
+			//排序
+			Collections.sort(simple.ranges);
+		}catch(Exception e){
+			logger.error("", e);
+		}
+		return simple;
+	}
+	
+	public static class StationRouteComp implements Comparator<StationRoute> {
+
+		@Override
+		public int compare(StationRoute o1, StationRoute o2) {
+			return o1.getStationRouteCode() - o2.getStationRouteCode();
+		}
+	}
+}
+package com.bsth.data.forecast.entity;
+
+import java.util.List;
+
+/**
+ * 
+ * @ClassName: ForecastResult 
+ * @Description: TODO(预测结果) 
+ * @author PanZhao 
+ * @date 2016年9月19日 上午11:09:28 
+ *
+ */
+public class ForecastResult {
+	
+	/** 当前站 */
+	private String station;
+	
+	/** 到站时间 */
+	private long arrTime;
+	
+	/** 后续站点预测明细  */
+	private List<ForecastResultItem> follows;
+	
+	/** 预计到达终点时间（分钟） */
+	private Float stopTime;
+	
+	public static class ForecastResultItem {
+		
+		/** 站点ID */
+		private String stationId;
+		
+		/** 站点名称 */
+		private String stationName;
+		
+		/** 时间戳 */
+		private long time;
+
+		public String getStationId() {
+			return stationId;
+		}
+
+		public void setStationId(String stationId) {
+			this.stationId = stationId;
+		}
+
+		public String getStationName() {
+			return stationName;
+		}
+
+		public void setStationName(String stationName) {
+			this.stationName = stationName;
+		}
+
+		public long getTime() {
+			return time;
+		}
+
+		public void setTime(long time) {
+			this.time = time;
+		}
+	}
+
+	public String getStation() {
+		return station;
+	}
+
+	public void setStation(String station) {
+		this.station = station;
+	}
+
+	public long getArrTime() {
+		return arrTime;
+	}
+
+	public void setArrTime(long arrTime) {
+		this.arrTime = arrTime;
+	}
+
+	public Float getStopTime() {
+		return stopTime;
+	}
+
+	public void setStopTime(Float stopTime) {
+		this.stopTime = stopTime;
+	}
+
+	public List<ForecastResultItem> getFollows() {
+		return follows;
+	}
+
+	public void setFollows(List<ForecastResultItem> follows) {
+		this.follows = follows;
+	}
+}
+package com.bsth.data.forecast.entity;
+
+import java.util.List;
+
+/**
+ * 
+ * @ClassName: SimpleStationRoute 
+ * @Description: TODO(简单的路由耗时封装) 
+ * @author PanZhao 
+ * @date 2016年9月18日 上午10:51:56 
+ *
+ */
+public class SimpleRoute {
+	
+	/** 站点编码 */
+	public String stationCode;
+	
+	/** 站点名称  */
+	public String stationName;
+	
+	public List<TimeRange> ranges;
+	
+	public static class TimeRange implements Comparable<TimeRange>{
+		
+		/**  开始时间 */
+		public long startTime;
+		
+		/** 截止时间 */
+		public long endTime;
+		
+		/** 运行时间 */
+		public float runTime;
+
+		@Override
+		public int compareTo(TimeRange o) {
+			return (int) (o.startTime - this.startTime);
+		}
+	}
+}
@@ -14,7 +14,7 @@ public class GpsEntity {
 	private Integer companyCode;
  
 	/** 线路编码 */
-	private Integer lineId;
+	private String lineId;
  
 	/** 设备编码 */
 	private String deviceId;
@@ -24,6 +24,12 @@ public class GpsEntity {
  
 	/** 站点编码 */
 	private String stopNo;
+	
+	/** 站点名称 */
+	private String stationName;
+	
+	/** 到站时间  */
+	private long arrTime;
  
 	/** 经度 */
 	private Float lon;
@@ -49,17 +55,17 @@ public class GpsEntity {
 	/** 车辆内部编码 */
 	private String nbbm;
  
-	/** 站点名称 */
-	private String stationName;
-	
-	/** 当前班次ID */
-	private Long currSchId;
-	
-	/** 下一个班次ID */
-	private Long nextSchId;
+	/** 预计到达终点时间 */
+	private Float expectStopTime;
  
 	/** 设备是否在线 */
 	private boolean online;
+	
+	/** 当前执行班次ID */
+	private Long schId;
+	
+	/** 是否异常数据 */
+	private boolean abnormal;
  
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -69,14 +75,6 @@ public class GpsEntity {
 		this.companyCode = companyCode;
 	}
  
-	public Integer getLineId() {
-		return lineId;
-	}
-
-	public void setLineId(Integer lineId) {
-		this.lineId = lineId;
-	}
-
 	public String getDeviceId() {
 		return deviceId;
 	}
@@ -156,22 +154,6 @@ public class GpsEntity {
 	public void setUpDown(Integer upDown) {
 		this.upDown = upDown;
 	}
-	
-	public Long getCurrSchId() {
-		return currSchId;
-	}
-
-	public void setCurrSchId(Long currSchId) {
-		this.currSchId = currSchId;
-	}
-
-	public Long getNextSchId() {
-		return nextSchId;
-	}
-
-	public void setNextSchId(Long nextSchId) {
-		this.nextSchId = nextSchId;
-	}
  
 	public String getNbbm() {
 		return nbbm;
@@ -196,4 +178,44 @@ public class GpsEntity {
 	public void setOnline(boolean online) {
 		this.online = online;
 	}
+
+	public long getArrTime() {
+		return arrTime;
+	}
+
+	public void setArrTime(long arrTime) {
+		this.arrTime = arrTime;
+	}
+
+	public Float getExpectStopTime() {
+		return expectStopTime;
+	}
+
+	public void setExpectStopTime(Float expectStopTime) {
+		this.expectStopTime = expectStopTime;
+	}
+
+	public String getLineId() {
+		return lineId;
+	}
+
+	public void setLineId(String lineId) {
+		this.lineId = lineId;
+	}
+
+	public Long getSchId() {
+		return schId;
+	}
+
+	public void setSchId(Long schId) {
+		this.schId = schId;
+	}
+
+	public boolean isAbnormal() {
+		return abnormal;
+	}
+
+	public void setAbnormal(boolean abnormal) {
+		this.abnormal = abnormal;
+	}
 }
@@ -3,12 +3,14 @@ package com.bsth.data.gpsdata;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.NavigableSet;
 import java.util.concurrent.TimeUnit;
  
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -24,6 +26,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.Application;
 import com.bsth.data.BasicData;
+import com.bsth.data.forecast.ForecastRealServer;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.util.ConfigUtil;
 import com.google.common.collect.TreeMultimap;
  
@@ -43,7 +48,7 @@ public class GpsRealData implements CommandLineRunner{
 	private static Map<String, GpsEntity> gpsMap;
  
 	//按线路分组设备号
-	private static TreeMultimap<Integer, String> lineCode2Devices;
+	private static TreeMultimap<String, String> lineCode2Devices;
  
 	// 网关数据接口地址
 	private static String url;
@@ -51,6 +56,11 @@ public class GpsRealData implements CommandLineRunner{
 	@Autowired
 	GpsDataLoader gpsDataLoader;
  
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+	
+	@Autowired
+	ForecastRealServer forecastRealServer;	
 	/**
 	 * 构造函数
 	 */
@@ -62,12 +72,25 @@ public class GpsRealData implements CommandLineRunner{
  
 	@Override
 	public void run(String... arg0) throws Exception {
-		logger.info("gpsDataLoader,20,8");
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 8, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 7, TimeUnit.SECONDS);
 	}
  
-	public static GpsEntity add(GpsEntity gps) {
+	public GpsEntity add(GpsEntity gps) {
 		String device = gps.getDeviceId();
+		GpsEntity old = gpsMap.get(device);
+		
+		//定时定距数据附带站点编码改变
+		if(null == old || !old.getStopNo().equals(gps.getStopNo())){
+			gps.setArrTime(gps.getTimestamp());
+			//预测到达终点时间
+			forecastRealServer.forecast(gps.getNbbm(), gps);
+		}
+		else{
+			gps.setArrTime(old.getArrTime());
+			//不预测， 重新计算终点时间
+			gps.setExpectStopTime(forecastRealServer.expectStopTime(gps.getNbbm()));
+		}
+		
 		gpsMap.put(device, gps);
 		lineCode2Devices.put(gps.getLineId(), device);
 		return gps;
@@ -85,12 +108,22 @@ public class GpsRealData implements CommandLineRunner{
 	 * 
 	 * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
 	 */
-	public List<GpsEntity> get(Integer lineCode) {
+	public List<GpsEntity> getByLine(String lineCode) {
 		NavigableSet<String> set = lineCode2Devices.get(lineCode);
  
 		List<GpsEntity> rs = new ArrayList<>();
+		GpsEntity gps;
+		ScheduleRealInfo sch;
 		for(String device : set){
-			rs.add(gpsMap.get(device));
+			gps = gpsMap.get(device);
+			//过滤异常GPS数据
+			if(gps.isAbnormal())
+				continue;
+			
+			sch = dayOfSchedule.execPlamMap().get(gps.getNbbm());
+			if(null != sch)
+				gps.setSchId(sch.getId());
+			rs.add(gps);
 		}
  
 		return rs;
@@ -100,7 +133,7 @@ public class GpsRealData implements CommandLineRunner{
 		List<GpsEntity> list = new ArrayList<>();
  
 		for(String code : pArray)
-			list.addAll(get(Integer.parseInt(code)));
+			list.addAll(getByLine(code));
 		return list;
 	}
  
@@ -108,10 +141,17 @@ public class GpsRealData implements CommandLineRunner{
 		return gpsMap.get(deviceId);
 	}
  
+	public Collection<GpsEntity> all(){
+		return gpsMap.values();
+	}
+	
 	@Component
 	public static class GpsDataLoader extends Thread{
  
 		Logger logger = LoggerFactory.getLogger(GpsDataLoader.class);
+		
+		@Autowired
+		GpsRealData gpsRealData;
  
 		@Override
 		public void run() {
@@ -129,7 +169,7 @@ public class GpsRealData implements CommandLineRunner{
 			try {
 				httpClient = HttpClients.createDefault();
 				HttpGet get = new HttpGet(url);
-
+				
 				response = httpClient.execute(get);
  
 				HttpEntity entity = response.getEntity();
@@ -146,11 +186,17 @@ public class GpsRealData implements CommandLineRunner{
 					if (jsonObj != null) 
 						list = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
  
+					String nbbm;
 					//附加车辆内部编码
 					for(GpsEntity gps : list){
-						gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
+						nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
+						if(StringUtils.isBlank(nbbm))
+							gps.setAbnormal(true);//标记为异常数据
+						else
+							gps.setNbbm(nbbm);
+						
 						gps.setStationName(BasicData.stationCode2NameMap.get(gps.getStopNo()));
-						add(gps);
+						gpsRealData.add(gps);
 					}
 				} else
 					logger.error("result is null");
@@ -158,11 +158,7 @@ public class Arrival2Schedule implements ApplicationContextAware {
  
 				//漂移判定
 				if(driftCheck(mr, arr)){
-					mr.sch.setFcsjActualAll(mr.ts);
-					//通知客户端
-					sendUtils.sendFcsj(mr.sch);
-					//持久化
-					dayOfSchedule.save(mr.sch);
+					carOut(mr);
 				}
 			}
 		}
@@ -203,26 +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);
+				//完成“起点既停车场”的进场班次
+				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);
-//	}
-//}
 package com.bsth.data.schedule;
  
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -23,8 +24,11 @@ import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.FirstScheduleCheckThread;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.schedule.thread.ScheduleLateThread;
 import com.bsth.data.schedule.thread.SchedulePstThread;
 import com.bsth.data.schedule.thread.ScheduleRefreshThread;
@@ -60,6 +64,9 @@ public class DayOfSchedule implements CommandLineRunner {
  
 	// 车辆和排班起终点站对照（包括进出的停车场，区间起终点）
 	private static TreeMultimap<String, String> nbbm2SEStationMap;
+	
+	//车辆 ——> 当前执行班次
+	private static Map<String, ScheduleRealInfo> carExecutePlanMap;
  
 	// 持久化缓冲区
 	public static LinkedList<ScheduleRealInfo> pstBuffer;
@@ -81,6 +88,9 @@ public class DayOfSchedule implements CommandLineRunner {
  
 	@Autowired
 	SendUtils sendUtils;
+	
+	@Autowired
+	GpsRealData gpsRealData;
  
 	/** 线路当前使用的排班的日期 */
 	public static Map<String, String> currSchDateMap;
@@ -92,6 +102,7 @@ public class DayOfSchedule implements CommandLineRunner {
 		schFCSJComparator = new ScheduleComparator.FCSJ();
 		currSchDateMap = new HashMap<>();
 		nbbm2SEStationMap = TreeMultimap.create();
+		carExecutePlanMap = new HashMap<>();
 	}
  
 	@Autowired
@@ -130,7 +141,9 @@ public class DayOfSchedule implements CommandLineRunner {
 	public String calcSchDate(String lineCode) {
 		LineConfig conf = lineConfigData.get(lineCode);
 		long ct = System.currentTimeMillis();
-		String schDate = DateUtils.sdfyyyyMMdd.format(new Date(ct));
+		
+		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+		String schDate = sdfyyyyMMdd.format(new Date(ct));
 		// 小于当天起始运营时间,则取前一天的排班
 		if (ct < conf.getCurrStartTime())
 			schDate = DateUtils.subtractDay(schDate, 1);
@@ -283,7 +296,10 @@ public class DayOfSchedule implements CommandLineRunner {
  
 		try {
 			Map<String, Object> data = new HashMap<>();
-			data.put("scheduleDate_eq", DateUtils.sdfyyyyMMdd.parse(schDate));
+			SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd")
+						,sdfHHmm = new SimpleDateFormat("HH:mm");
+			
+			data.put("scheduleDate_eq", sdfyyyyMMdd.parse(schDate));
 			data.put("xlBm_eq", lineCode);
  
 			// 查询计划排班
@@ -293,13 +309,13 @@ public class DayOfSchedule implements CommandLineRunner {
 			realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
  
 			for (ScheduleRealInfo sch : realList) {
-				sch.setScheduleDateStr(DateUtils.sdfyyyyMMdd.format(sch.getScheduleDate()));
+				sch.setScheduleDateStr(sdfyyyyMMdd.format(sch.getScheduleDate()));
 				sch.setRealExecDate(sch.getScheduleDateStr());
 				// 计划终点时间
 				if (sch.getBcsj() != null) {
 					try{
-						sch.setZdsjT(DateUtils.sdfHHmm.parse(sch.getFcsj()).getTime() + (sch.getBcsj() * 60 * 1000));
-						sch.setZdsj(DateUtils.sdfHHmm.format(sch.getZdsjT()));
+						sch.setZdsjT(sdfHHmm.parse(sch.getFcsj()).getTime() + (sch.getBcsj() * 60 * 1000));
+						sch.setZdsj(sdfHHmm.format(sch.getZdsjT()));
 						sch.setLate(false);
 					}catch(ParseException pe){
 						logger.error("loadPlanSch... 计算终点时间失败...");
@@ -326,10 +342,11 @@ public class DayOfSchedule implements CommandLineRunner {
 			id = 0L;
 		id++;
  
+		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
 		for (ScheduleRealInfo item : list) {
 			item.setSpId(item.getId());// 保留原始的计划ID
 			item.setId(id++);// 设置ID
-			item.setScheduleDateStr(DateUtils.sdfyyyyMMdd.format(item.getScheduleDate()));
+			item.setScheduleDateStr(sdfyyyyMMdd.format(item.getScheduleDate()));
 		}
  
 		// 入库
@@ -596,4 +613,44 @@ public class DayOfSchedule implements CommandLineRunner {
 	public Collection<ScheduleRealInfo> findAll(){
 		return nbbmScheduleMap.values();
 	}
+	
+	public void addExecPlan(ScheduleRealInfo sch){
+		carExecutePlanMap.put(sch.getClZbh(), sch);
+	}
+	
+	public void removeExecPlan(String clzbh){
+		carExecutePlanMap.remove(clzbh);
+	}
+	
+	public Map<String, ScheduleRealInfo> execPlamMap(){
+		return carExecutePlanMap;
+	}
+
+	/**
+	 * 
+	 * @Title: linkToSchPlan 
+	 * @Description: TODO(车辆关联到班次) 
+	 */
+/*	public void linkToSchPlan(String nbbm) {
+		//当前GPS状态
+		GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
+		if(null == gps)
+			return;
+		
+		//班次集合
+		List<ScheduleRealInfo> schArr = nbbmScheduleMap.get(nbbm);
+		
+		for(ScheduleRealInfo sch : schArr){
+			if(sch.getStatus() == 2)
+				continue;
+			if(sch.isDestroy())
+				continue;
+			if(!sch.getXlBm().equals(gps.getLineId()) 
+					|| Integer.parseInt(sch.getXlDir()) != gps.getUpDown().intValue())
+				continue;
+			
+			addExecPlan(sch);
+			break;
+		}
+	}*/
 }
 package com.bsth.data.schedule;
  
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -13,7 +14,6 @@ import org.springframework.stereotype.Component;
 import com.bsth.data.LineConfigData;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.util.DateUtils;
  
 /**
  * 
@@ -48,11 +48,13 @@ public class SchAttrCalculator {
 			 * 早于线路开始运营时间的，加一天
 			 * 如该线路 2点开始运营，2016-08-23的班次，则 2016-08-23 0:25 的班次应该调整成 2016-08-24 0:25
 			 */
-			long st = DateUtils.sdfyyyyMMddHHmm.parse(sch.getScheduleDateStr() + conf.getStartOpt()).getTime();
+			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm")
+						,sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+			long st = sdfyyyyMMddHHmm.parse(sch.getScheduleDateStr() + conf.getStartOpt()).getTime();
 			if (st > sch.getFcsjT()) 
 				sch.setFcsjAll(sch.getFcsjT() + DAY_TIME);
  
-			sch.setRealExecDate(DateUtils.sdfyyyyMMdd.format(new Date(sch.getFcsjT())));
+			sch.setRealExecDate(sdfyyyyMMdd.format(new Date(sch.getFcsjT())));
 		} catch (Exception e) {
 			logger.error("", e);
 		}
@@ -69,11 +71,12 @@ public class SchAttrCalculator {
 			// 生成时间戳
 			calcTimestamp(sch);
  
+			SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 			// 计划终点时间
 			if (sch.getBcsj() != null) {
 				Date zdDate = new Date(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
 				sch.setZdsjT(zdDate.getTime());
-				sch.setZdsj(DateUtils.sdfHHmm.format(zdDate));
+				sch.setZdsj(sdfHHmm.format(zdDate));
 			}
 		} catch (ParseException e) {
 			logger.error("", e);
@@ -132,7 +135,8 @@ public class SchAttrCalculator {
 	}
  
 	public SchAttrCalculator calcFcsjTime(ScheduleRealInfo sch) throws ParseException {
-		sch.setFcsjT(DateUtils.sdfyyyyMMddHHmm.parse(sch.getRealExecDate() + sch.getFcsj()).getTime());
+		SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+		sch.setFcsjT(sdfyyyyMMddHHmm.parse(sch.getRealExecDate() + sch.getFcsj()).getTime());
 		return this;
 	}
  
@@ -47,7 +47,9 @@ public class ScheduleLateThread extends Thread{
 			if(sch.getDfsjT() > t)
 				break;
  
-			if(sch.getStatus() == 0 && sch.getFcsjActual() == null){
+			if(sch.isLate() == false 
+					&& sch.getStatus() == 0 
+					&& sch.getFcsjActual() == null){
 				//应发未发
 				sch.setLate(true);
 				//通知客户端
@@ -57,7 +57,7 @@ public class Cars implements Serializable {
     /** 设备终端号 */
     @Column(nullable = false)
     private String equipmentCode;
-
+    
     // 以下信息来自总公司的业务系统，可能需要调用相关接口
 	/** 车型类别 */
 	private String carClass ;
@@ -115,6 +115,8 @@ public class Cars implements Serializable {
     private String vehicleStats;
     /** 营运状态 */
     private String operatorsState;
+    /** 营运证编码 */
+    private String serviceNo;
     /** 是否电车（TODO：在原系统里没有，这里暂时留着） */
     private Boolean sfdc;
     /** 备注/描述 */
@@ -148,8 +150,16 @@ public class Cars implements Serializable {
 	/** 修改日期 */
 	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
+	
+    public String getServiceNo() {
+		return serviceNo;
+	}
+
+	public void setServiceNo(String serviceNo) {
+		this.serviceNo = serviceNo;
+	}
  
-    public Integer getId() {
+	public Integer getId() {
         return id;
     }
  
@@ -42,18 +42,6 @@ public class Line implements Serializable {
 	// 简称
 	private String shortName;
  
-	/** 配置车辆总数   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 */
-	private Integer carSumNumber;
-	
-	/** 空调车辆数量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 */
-	private Integer hvacCarNumber;
-	
-	/** 普通车辆数量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 */
-	private Integer ordCarNumber;
-	
-	/** 停车场编码   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 */
-	private String carParkCode;
-	
 	// 起始站名称
 	private String  startStationName;
  
@@ -118,6 +106,21 @@ public class Line implements Serializable {
 	// 设备线路编码
 	private String eqLinecode;
  
+	/** 配置车辆总数   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 */
+	private Integer carSumNumber;
+	
+	/** 空调车辆数量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 */
+	private Integer hvacCarNumber;
+	
+	/** 普通车辆数量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 */
+	private Integer ordCarNumber;
+	
+	/** 停车场编码   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 */
+	private String carParkCode;
+	
+	/** 线路规划类型 <0:双向;1:环线> */
+	private Integer linePlayType; 
+	
 	// 描述
 	private String descriptions;
  
@@ -134,6 +137,14 @@ public class Line implements Serializable {
 	// 修改日期
 	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
+	
+	public Integer getLinePlayType() {
+		return linePlayType;
+	}
+
+	public void setLinePlayType(Integer linePlayType) {
+		this.linePlayType = linePlayType;
+	}
  
 	public Integer getId() {
 		return id;
@@ -53,7 +53,17 @@ public class Personnel {
     private String personnelType;
     /** 所属岗位/工种（字典类型gzType） */
     private String posts;
+    
+    /** 身份证 */
+    private String card;
  
+	public String getCard() {
+		return card;
+	}
+
+	public void setCard(String card) {
+		this.card = card;
+	}
  
 	/** 人员编码（TODO：在原系统里没有，这里暂时留着） */
 	private String personnelCode;
@@ -41,6 +41,9 @@ public class Station {
 	// 所在道路编码
 	private String roadCoding;
  
+	// 站点的具体地址
+	private String addr;
+	
 	/**
 	 * 经纬坐标类型 
 	 * 
@@ -111,6 +114,14 @@ public class Station {
 	// 修改日期
 	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
+	
+	public String getAddr() {
+		return addr;
+	}
+
+	public void setAddr(String addr) {
+		this.addr = addr;
+	}
  
 	public Integer getId() {
 		return id;
@@ -21,7 +21,8 @@ import java.util.Date;
 @Table(name = "bsth_c_stationroute")
 @NamedEntityGraphs({
     @NamedEntityGraph(name = "stationRoute_station", attributeNodes = {
-            @NamedAttributeNode("station")
+            @NamedAttributeNode("station"),
+            @NamedAttributeNode("line")
     })
 })
 public class StationRoute {
@@ -40,6 +40,8 @@ public class D64 extends Directive{
 		private String deviceId;
  
 		private String lineId;
+		
+		private String txtContent;
  
 		public Short getCityCode() {
 			return cityCode;
@@ -64,6 +66,14 @@ public class D64 extends Directive{
 		public void setLineId(String lineId) {
 			this.lineId = lineId;
 		}
+
+		public String getTxtContent() {
+			return txtContent;
+		}
+
+		public void setTxtContent(String txtContent) {
+			this.txtContent = txtContent;
+		}
 	}
  
 	public Integer getId() {
+package com.bsth.entity.directive;
+
+import javax.persistence.Embeddable;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * 
+ * @ClassName: DC0_A4 
+ * @Description: TODO(参数查询) 
+ * @author PanZhao 
+ * @date 2016年10月18日 下午5:22:36 
+ *
+ */
+public class DC0_A4 extends Directive{
+	
+	@Id
+	@GeneratedValue
+	private Integer id;
+	
+	
+	@Embeddable
+	public static class DC0A4Data {
+		/**
+		 * 二级协议
+		 */
+		private Short operCode2;
+		/** 设备编号 */
+		private String deviceId;
+		/** 网关IP地址 */
+		private String ipAddress;
+		/** 网关端口 */
+		private int port;
+		/** 定时定距上报模式 */
+		private short reportMode;
+		/** 定时上报时间间隔 */
+		private int interval;
+		/** 定距上报距离间隔 */
+		private String distance; 
+		/** 非线路状态超速阀门 */
+		private short speedingThreshold;
+		/** 预警阀门 */
+		private short alarmThreshold;
+		/** pos机IP地址 */
+		private String posIpAddress;
+	}
+}
 package com.bsth.entity.forecast;
  
  
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Transient;
  
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.bsth.data.arrival.ArrivalEntity;
+
 /**
  * 
  * @ClassName: Sample
@@ -19,11 +27,36 @@ import javax.persistence.Transient;
 @Table(name = "bsth_forecast_sample")
 public class Sample {
  
+	@Transient
+	static Logger logger = LoggerFactory.getLogger(Sample.class);
+	
+	public Sample(ArrivalEntity prve, ArrivalEntity curr) {
+		//SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+		
+		this.setsStation(prve.getStopNo());
+		this.seteStation(curr.getStopNo());
+		this.setsTime(prve.getTs());
+		this.seteTime(curr.getTs());
+		//this.setsDate(sdfHHmm.format(new Date(prve.getTs())));
+		//this.seteDate(sdfHHmm.format(new Date(curr.getTs())));
+		
+		/*try{
+			this.setsTime(sdfHHmm.parse(this.sDate).getTime());
+			this.seteTime(sdfHHmm.parse(this.eDate).getTime());
+		}catch(Exception e){
+			logger.error("", e);
+		}*/
+		Long diff = (curr.getTs() - prve.getTs());
+		this.setRunTime(Float.parseFloat(diff.toString()) / 1000 / 60);
+	}
+	
+	public Sample(){}
+	
 	@Id
 	@GeneratedValue
 	private Long id;
  
-	private Integer lineCode;
+	private String lineCode;
  
 	// 开始时间
 	private String sDate;
@@ -135,11 +168,11 @@ public class Sample {
 		this.runTime = runTime;
 	}
  
-	public Integer getLineCode() {
+	public String getLineCode() {
 		return lineCode;
 	}
  
-	public void setLineCode(Integer lineCode) {
+	public void setLineCode(String lineCode) {
 		this.lineCode = lineCode;
 	}
  
 package com.bsth.entity.realcontrol;
  
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -137,7 +138,9 @@ public class LineConfig {
 	public long getCurrStartTime() {
 		Date d = null;
 		try {
-			d = DateUtils.sdfyyyyMMddHHmm.parse(DateUtils.sdfyyyyMMdd.format(new Date()) + this.startOpt);
+			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm")
+						,sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+			d = sdfyyyyMMddHHmm.parse(sdfyyyyMMdd.format(new Date()) + this.startOpt);
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
 package com.bsth.entity.realcontrol;
  
 import com.bsth.entity.sys.SysUser;
-import com.bsth.util.DateUtils;
 import com.fasterxml.jackson.annotation.JsonIgnore;
  
 import javax.persistence.*;
@@ -9,6 +8,7 @@ import javax.persistence.*;
 import org.apache.commons.lang3.StringUtils;
  
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -510,13 +510,15 @@ public class ScheduleRealInfo {
  
 	public void setDfsjAll(Long dfsjT) {
 		this.dfsjT = dfsjT;
-		this.dfsj = DateUtils.sdfHHmm.format(new Date(this.dfsjT));
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+		this.dfsj = sdfHHmm.format(new Date(this.dfsjT));
 	}
  
 	public void setDfsjAll(String dfsj) {
  
 		try {
-			this.dfsjT = DateUtils.sdfyyyyMMddHHmm.parse(this.realExecDate + dfsj).getTime();
+			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+			this.dfsjT = sdfyyyyMMddHHmm.parse(this.realExecDate + dfsj).getTime();
 			this.dfsj = dfsj;
 		} catch (ParseException e) {
 			e.printStackTrace();
@@ -525,10 +527,11 @@ public class ScheduleRealInfo {
  
 	public void calcEndTime(){
 		//计划终点时间
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 		if(this.getBcsj() != null){
 			Date zdDate = new Date(this.getDfsjT() + (this.getBcsj() * 60 * 1000));
 			this.setZdsjT(zdDate.getTime());
-			this.setZdsj(DateUtils.sdfHHmm.format(zdDate));
+			this.setZdsj(sdfHHmm.format(zdDate));
 		}
 	}
  
@@ -581,7 +584,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setFcsjAll(String fcsj){
 		try {
-			this.fcsjT = DateUtils.sdfyyyyMMddHHmm.parse(this.realExecDate + fcsj).getTime();
+			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+			this.fcsjT = sdfyyyyMMddHHmm.parse(this.realExecDate + fcsj).getTime();
 			this.fcsj = fcsj;
 		} catch (ParseException e) {
 			e.printStackTrace();
@@ -596,7 +600,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setFcsjAll(Long fcsjT){
 		this.fcsjT = fcsjT;
-		this.fcsj = DateUtils.sdfHHmm.format(new Date(fcsjT));
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+		this.fcsj = sdfHHmm.format(new Date(fcsjT));
 	}
  
 	/**
@@ -607,7 +612,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setFcsjActualAll(String fcsjActual){
 		try {
-			this.fcsjActualTime = DateUtils.sdfyyyyMMddHHmm.parse(this.realExecDate + fcsjActual).getTime();
+			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+			this.fcsjActualTime = sdfyyyyMMddHHmm.parse(this.realExecDate + fcsjActual).getTime();
 			this.fcsjActual = fcsjActual;
  
 			calcStatus();
@@ -624,7 +630,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setFcsjActualAll(Long t){
 		this.fcsjActualTime = t;
-		this.fcsjActual = DateUtils.sdfHHmm.format(new Date(t));
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+		this.fcsjActual = sdfHHmm.format(new Date(t));
  
 		//更新班次状态
 		calcStatus();
@@ -638,7 +645,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setZdsjActualAll(Long t){
 		this.zdsjActualTime = t;
-		this.zdsjActual = DateUtils.sdfHHmm.format(new Date(t));
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+		this.zdsjActual = sdfHHmm.format(new Date(t));
  
 		//更新班次状态
 		calcStatus();
@@ -653,7 +661,8 @@ public class ScheduleRealInfo {
 	 */
 	public void setZdsjActualAll(String zdsjActual){
 		try {
-			this.zdsjActualTime = DateUtils.sdfyyyyMMddHHmm.parse(this.realExecDate + zdsjActual).getTime();
+			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+			this.zdsjActualTime = sdfyyyyMMddHHmm.parse(this.realExecDate + zdsjActual).getTime();
 			this.zdsjActual = zdsjActual;
  
 			calcStatus();
@@ -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,8 +230,28 @@ 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")
+	List<StationRoute> findByLine(String lineCode, int updown);
+	
+	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+	@Query("select s from StationRoute s where s.destroy=0 and s.lineCode=?1")
+	List<StationRoute> findByLineCode(String lineCode);
 }
@@ -15,5 +15,5 @@ public interface SampleRepository extends BaseRepository&lt;Sample, Long&gt;{
 	@Transactional
     @Modifying
     @Query("delete Sample where lineCode=?1 and updown=?2")
-	void deleteByLineAndUpdown(Integer lineCode, int updown);
+	void deleteByLineAndUpdown(String lineCode, int updown);
 }
@@ -20,7 +20,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> findByLines(List<String> lines);
  
  
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.bcType = 'out' order by (lpName+1)")
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo(String line,String date);
  
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs")
@@ -29,7 +29,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,sum(addMileage) as ksgl,count(jName) as bcs) from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh")
 	List<Map<String, Object>> dailyInfo(String line,String date);
  
-	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,d.sender,d.timestamp,d.txt_content FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm = ?1 AND r.schedule_date = ?2 and r.cl_zbh = ?3",nativeQuery=true)
+	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,d.sender,d.timestamp,d.txt_content FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm = ?1 AND r.schedule_date = ?2 and r.cl_zbh = ?3 order by d.timestamp",nativeQuery=true)
 	List<Object[]> historyMessage(String line,String date,String code);
  
 	@Query(value = "select max(id) from ScheduleRealInfo")
@@ -54,7 +54,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') and s.scheduleDate <= str_to_date(?3,'%Y-%m-%d') and s.lpName = ?4 order by s.fcsj")
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName);
  
-	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate <= str_to_date(?4,'%Y-%m-%d') order by bcs")
+	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') order by bcs")
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date);
  
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
@@ -74,4 +74,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
  
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
+	
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where (s.xlBm = ?1 or s.xlBm is not null) and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh ORDER BY xlBm,clZbh,realExecDate,fcsjActual")
+	List<Map<String,Object>> yesterdayDataList(String line,String date);
 }
@@ -42,4 +42,7 @@ public interface CarConfigInfoRepository extends BaseRepository&lt;CarConfigInfo, L
  
     @Query("select new map(cc.cl.insideCode as nbbm, cc.id as id) from CarConfigInfo cc")
     List<Map<String, Object>> findCarConfigCars();
+
+    @Query("select new map(cc.cl.id as id, cc.cl.insideCode as insideCode) from CarConfigInfo cc")
+    List<Map<String, Object>> findCarsFromConfig();
 }
 \ No newline at end of file
@@ -5,6 +5,7 @@ import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.repository.BaseRepository;
  
 import java.util.List;
+import java.util.Map;
  
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -34,4 +35,18 @@ public interface EmployeeConfigInfoRepository extends BaseRepository&lt;EmployeeCon
     @EntityGraph(value = "employeeConfigInfo_jsy_spy_xl", type = EntityGraph.EntityGraphType.FETCH)
     @Query("select cc from EmployeeConfigInfo cc where cc.id=?1")
     EmployeeConfigInfo findOneExtend(Long aLong);
+
+    @Query("select new map(" +
+            "ec.jsy.id as jsyId, " +
+            "ec.jsy.jobCode as jsyGh, " +
+            "ec.jsy.personnelName as jsyName) " +
+            "from EmployeeConfigInfo ec ")
+    List<Map<String, Object>> findJsyFromConfig();
+
+    @Query("select new map(" +
+            "ec.spy.id as spyId, " +
+            "ec.spy.jobCode as spyGh, " +
+            "ec.spy.personnelName as spyName) " +
+            "from EmployeeConfigInfo ec ")
+    List<Map<String, Object>> findSpyFromConfig();
 }
@@ -9,7 +9,9 @@ import java.util.List;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
  
 /**
@@ -23,4 +25,97 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
  
     Long deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(Integer xlid, Date startDate, Date endDate);
  
+
+    @Query(value = " select " +
+            "xl as xlId, " +
+            "xl_name as xlName, " +
+            "schedule_date as scheduleDate, " +
+            "lp_name as lpName, " +
+            "cl as clId, " +
+            "cl_zbh as clZbh, " +
+            "group_concat(distinct fcsj) ccsj, " +
+            "group_concat(distinct j) jsyId, " +
+            "group_concat(distinct j_gh) jsyGh, " +
+            "group_concat(distinct j_name) jsyName, " +
+            "group_concat(distinct s) spyId, " +
+            "group_concat(distinct s_gh) spyGh, " +
+            "group_concat(distinct s_name) spyName, " +
+            "max(create_date) as createDate " +
+            "from bsth_c_s_sp_info " +
+            "where bc_type = 'out' and " +
+            "xl = ?1 and " +
+            "schedule_date = ?2 " +
+            "group by xl_name, schedule_date, lp_name " +
+            "order by xl_name, schedule_date, lp ", nativeQuery = true)
+    List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
+
+    @Modifying
+    @Query(value = "update " +
+            "SchedulePlanInfo scpinfo " +
+            "set scpinfo.cl = :p1, scpinfo.clZbh = :p2 " +
+            "where scpinfo.xl = :p3 and " +
+            "scpinfo.scheduleDate = :p4 and " +
+            "scpinfo.lpName = :p5 ")
+    int updateGroupInfo_type_1(
+            @Param("p1") Integer clid,
+            @Param("p2") String clZbh,
+            @Param("p3") Integer xlid,
+            @Param("p4") Date scheduleDate,
+            @Param("p5") String lpName);
+
+    @Modifying
+    @Query(value = "update " +
+            "SchedulePlanInfo scpinfo " +
+            "set scpinfo.fcsj = :p1 " +
+            "where scpinfo.xl = :p2 and " +
+            "scpinfo.scheduleDate = :p3 and " +
+            "scpinfo.lpName = :p4 and " +
+            "scpinfo.fcsj = :p5 and " +
+            "scpinfo.bcType = :p6 ")
+    int updateGroupInfo_type_2_4(
+            @Param("p1") String fcsj,
+            @Param("p2") Integer xlid,
+            @Param("p3") Date scheduleDate,
+            @Param("p4") String lpName,
+            @Param("p5") String fcsj_src,
+            @Param("p6") String bcType);
+
+    @Modifying
+    @Query(value = "update " +
+            "SchedulePlanInfo scpinfo " +
+            "set scpinfo.j = :p1, " +
+            "scpinfo.jGh = :p2, " +
+            "scpinfo.jName = :p3  " +
+            "where scpinfo.xl = :p4 and " +
+            "scpinfo.scheduleDate = :p5 and " +
+            "scpinfo.lpName = :p6 and " +
+            "scpinfo.j = :p7 ")
+    int updateGroupInfo_type_3_5_jsy(
+            @Param("p1") Integer jsyId,
+            @Param("p2") String jsyGh,
+            @Param("p3") String jsyName,
+            @Param("p4") Integer xlId,
+            @Param("p5") Date scheduleDate,
+            @Param("p6") String lpName,
+            @Param("p7") Integer jsyId_src);
+
+    @Modifying
+    @Query(value = "update " +
+            "SchedulePlanInfo scpinfo " +
+            "set scpinfo.s = :p1, " +
+            "scpinfo.sGh = :p2, " +
+            "scpinfo.sName = :p3  " +
+            "where scpinfo.xl = :p4 and " +
+            "scpinfo.scheduleDate = :p5 and " +
+            "scpinfo.lpName = :p6 and " +
+            "scpinfo.s = :p7 ")
+    int updateGroupInfo_type_3_5_spy(
+            @Param("p1") Integer spyId,
+            @Param("p2") String spyGh,
+            @Param("p3") String spyName,
+            @Param("p4") Integer xlId,
+            @Param("p5") Date scheduleDate,
+            @Param("p6") String lpName,
+            @Param("p7") Integer spyId_src);
+
 }
@@ -6,15 +6,8 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.EntityGraph;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
  
-import javax.persistence.SqlResultSetMapping;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Created by xu on 16/6/16.
  */
@@ -24,37 +17,4 @@ public interface SchedulePlanRepository extends BaseRepository&lt;SchedulePlan, Lon
     @Override
     Page<SchedulePlan> findAll(Specification<SchedulePlan> spec, Pageable pageable);
  
-    @Query(value = " select " +
-            "xl_name as xlName, " +
-            "schedule_date as scheduleDate, " +
-            "lp_name as lpName, " +
-            "cl_zbh as clZbh, " +
-            "group_concat(distinct fcsj) ccsj, " +
-            "group_concat(distinct j_gh) jsyGh, " +
-            "group_concat(distinct j_name) jsyName, " +
-            "group_concat(distinct s_gh) spyGh, " +
-            "group_concat(distinct s_name) spyName, " +
-            "max(create_date) as createDate " +
-            "from bsth_c_s_sp_info " +
-            "where bc_type = 'out' and " +
-            "xl = ?1 and " +
-            "schedule_date = ?2 " +
-            "group by xl_name, schedule_date, lp_name " +
-            "order by xl_name, schedule_date, lp ", nativeQuery = true)
-    List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
-
-    @Query(value = "update " +
-            "bsth_c_s_sp_info " +
-            "set cl = :p1, cl_zbh = :p2 " +
-            "where xl = :p3 and " +
-            "schedule_date = :p4 and " +
-            "lp_name = :p5 ",
-            nativeQuery = true)
-    int updateGroupInfo_clinfo(
-            @Param("p1") Integer clid,
-            @Param("p2") String clZbh,
-            @Param("p3") Integer xlid,
-            @Param("p4") Date scheduleDate,
-            @Param("p5") String lpName);
-
 }
@@ -13,12 +13,10 @@ import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.security.core.session.SessionRegistryImpl;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
-import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.security.web.session.HttpSessionEventPublisher;
  
 import com.bsth.common.Constants;
 import com.bsth.security.filter.LoginInterceptor;
-import com.bsth.security.handler.CustomLogoutHandler;
  
 @Configuration
 @EnableWebSecurity
@@ -59,7 +57,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 				//.failureUrl(Constants.LOGIN_PAGE + "?error=true")登录失败跳转的链接
 				//.successHandler(loginSuccessHandler())登录成功后处理
 				.and().logout()
-				.addLogoutHandler(logoutHandler())
+				//.addLogoutHandler(logoutHandler())
 				 //禁用CXRF
 				.and().csrf().disable() 
 				 //禁用匿名用户功能
@@ -92,10 +90,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 		return new LoginSuccessHandler();
 	}*/
  
-	@Bean
+/*	@Bean
 	public LogoutHandler logoutHandler(){
 		return new CustomLogoutHandler();
-	}
+	}*/
  
 	@Bean
 	public SessionRegistry sessionRegistry() {
-package com.bsth.security.handler;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
-
-import com.bsth.entity.sys.SysUser;
-
-public class CustomLogoutHandler extends SecurityContextLogoutHandler{
-
-	@Override
-	public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
-		SysUser user = (SysUser) authentication.getPrincipal();
-		System.out.println(user.getName() + "注销...");
-		//日志记录
-		
-		super.logout(request, response, authentication);
-	}
-}
+//package com.bsth.security.handler;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//
+//import org.springframework.security.core.Authentication;
+//import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
+//
+//import com.bsth.entity.sys.SysUser;
+//
+//public class CustomLogoutHandler extends SecurityContextLogoutHandler{
+//
+//	@Override
+//	public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
+//		SysUser user = (SysUser) authentication.getPrincipal();
+//		System.out.println(user.getName() + "注销...");
+//		//日志记录
+//		
+//		super.logout(request, response, authentication);
+//	}
+//}
@@ -78,4 +78,6 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	  * @return List<Map<String, Object>>
 	  */
 	 List<Map<String, Object>> findStationRouteInfo(Map<String, Object> map);
+
+	Map<String, Object> findByMultiLine(String lineIds);
 }
+package com.bsth.service;
+
+import com.bsth.entity.Line;
+
+/**
+ * 
+ * @Interface: LineService(线路service业务层实现接口)
+ * 
+ * @extends : BaseService
+ * 
+ * @Description: TODO(线路service业务层实现接口)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016年4月28日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+public interface TrafficManageService {
+	
+	/**
+	 * 获取线路编码
+	 * 
+	 * @return long <lineCode：线路编码>
+	 */
+	String setXL();
+	
+}
@@ -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);
@@ -234,13 +235,14 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64));
 		// 入库
 		d64.setHttpCode(code);
+		d64.getData().setTxtContent("切换线路[" + lineCode + "]");
 		dayOfDirectives.put64(d64);
  
 		// 通知设备刷新线路文件，忽略结果
 		if (code == 0)
-			GatewayHttpUtils.postJson(DirectiveCreator.createDeviceRefreshData(deviceId, lineCode));
+			GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
 		else
-			d64.setErrorText("[刷新线路文件] 网关通讯失败, code: " + code);
+			d64.setErrorText(" 网关通讯失败, code: " + code);
  
 		d64Repository.save(d64);
 		return code;
@@ -278,7 +280,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
@@ -397,16 +399,17 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
  
 		List<Directive> rs = list.subList(s, e);
  
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 		// 时间格式化，车辆自编号转换
 		for (Directive d : rs) {
 			if (d.getTimeHHmm() == null)
-				d.setTimeHHmm(DateUtils.sdfHHmm.format(new Date(d.getTimestamp())));
+				d.setTimeHHmm(sdfHHmm.format(new Date(d.getTimestamp())));
 			if (d.getNbbm() == null)
 				d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
 		}
  
 		rsMap.put("list", rs);
-		rsMap.put("totalPages", count % size == 0 ? count / size : count / size + 1);
+		rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);
 		rsMap.put("page", page);
 		return rsMap;
 	}
@@ -449,9 +452,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		if (e > count)
 			e = count;
  
+		SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 		List<D80> rs = d80s.subList(s, e);
 		for(D80 d80 : rs){
-			d80.setTimeStr(DateUtils.sdfHHmm.format(new Date(d80.getTimestamp())));
+			d80.setTimeStr(sdfHHmm.format(new Date(d80.getTimestamp())));
 		}
  
 		Map<String, Object> rsMap = new HashMap<>();
 package com.bsth.service.forecast;
  
+import java.util.Map;
+
+import com.bsth.controller.forecast.dto.CreateSampleParam;
 import com.bsth.entity.forecast.Sample;
 import com.bsth.service.BaseService;
  
 public interface SampleService extends BaseService<Sample, Long>{
  
-	int createDataByGps(String lineCode, Integer updown);
+	Map<String, Object> createDataByGps(CreateSampleParam param);
  
 }
 package com.bsth.service.forecast;
  
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
  
 import javax.transaction.Transactional;
  
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.forecast.dto.CreateSampleParam;
 import com.bsth.data.BasicData;
+import com.bsth.data.arrival.ArrivalEntity;
+import com.bsth.data.arrival.DataLoader;
 import com.bsth.entity.forecast.Sample;
 import com.bsth.repository.forecast.SampleRepository;
+import com.bsth.service.forecast.util.CreateByArrivalData;
 import com.bsth.service.impl.BaseServiceImpl;
  
 @Service
@@ -19,10 +32,16 @@ public class SampleServiceImpl extends BaseServiceImpl&lt;Sample, Long&gt; implements 
 	@Autowired
 	SampleRepository sampleRepository;
  
+	@Autowired
+	CreateByArrivalData createByArrivalData;
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
 	@Override
 	public Iterable<Sample> list(Map<String, Object> map) {
 		Iterable<Sample> rs = super.list(map);
  
+		List<Sample> rsList = new ArrayList<>();
 		//转换站点名称
 		Iterator<Sample> iterator = rs.iterator();
 		Sample s;
@@ -30,16 +49,63 @@ public class SampleServiceImpl extends BaseServiceImpl&lt;Sample, Long&gt; implements 
 			s = iterator.next();
 			s.setsName(BasicData.stationCode2NameMap.get(s.getsStation()));
 			s.seteName(BasicData.stationCode2NameMap.get(s.geteStation()));
+			
+			rsList.add(s);
 		}
-		return rs;
+		
+		//排序
+		Collections.sort(rsList, new Comparator<Sample>() {
+			@Override
+			public int compare(Sample arg0, Sample arg1) {
+				return arg0.geteDate().compareTo(arg1.geteDate());
+			}
+		});
+		
+		return rsList;
+	}
+	
+	@Override
+	public Map<String, Object> save(Sample t) {
+		if(null == t.getId())
+			t.setTag(t.getTag() + t.getsDate() + " - " + t.geteDate());
+		return super.save(t);
 	}
  
 	@Transactional
 	@Override
-	public int createDataByGps(String lineCode, Integer updown) {
-		//删除原有数据
-		sampleRepository.deleteByLineAndUpdown(Integer.parseInt(lineCode), updown);
+	public Map<String, Object> createDataByGps(CreateSampleParam param) {
+		Map<String, Object> rs = new HashMap<>(); 
+		try{
+			//删除原有数据
+			sampleRepository.deleteByLineAndUpdown(param.getLineCode(), param.getUpdown());
+			
+			//查询到离站数据
+			DataLoader loader = new DataLoader();
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			
+			long st = sdf.parse(param.getStartDate()).getTime()
+				,et = sdf.parse(param.getEndDate()).getTime()
+				,i = st
+				,range = 1000 * 60 * 60 * 24;
+			
+			logger.info("初始值：" + 1500 * (int)((et - st) / range));
+			List<ArrivalEntity> all = new ArrayList<>(1500 * (int)((et - st) / range));
+			for(; i < et; i += range)
+				all.addAll(loader.loadByLineAndTime(param.getLineCode(), param.getUpdown() , i, i + range));
+			
+			logger.info("实际数据量：" + all.size());
+			
+			List<Sample> resList = createByArrivalData.create(all, param);
+			
+			//入库
+			sampleRepository.save(resList);
+			
+			rs.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			logger.error("" , e);
+			rs.put("status", ResponseCode.ERROR);
+		}
  
-		return 0;
+		return rs;
 	}
 }
+package com.bsth.service.forecast.util;
+
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import com.bsth.controller.forecast.dto.CreateSampleParam;
+import com.bsth.controller.forecast.dto.CreateSampleParam.TimeRange;
+import com.bsth.data.arrival.ArrivalComparator;
+import com.bsth.data.arrival.ArrivalEntity;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.forecast.Sample;
+import com.bsth.repository.StationRouteRepository;
+import com.google.common.collect.ArrayListMultimap;
+
+/**
+ * 
+ * @ClassName: CreateByArrivalData
+ * @Description: TODO(根据到离站数据生成线路站点间耗时)
+ * @author PanZhao
+ * @date 2016年9月17日 下午2:33:20
+ *
+ */
+@Component
+@Scope("prototype")
+public class CreateByArrivalData {
+
+	@Autowired
+	StationRouteRepository routeRepository;
+	
+	SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd")
+			,sdfHHmm = new SimpleDateFormat("HH:mm")
+			,sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+
+	String rq = sdfyyyyMMdd.format(new Date());
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	/**
+	 * 
+	 * @Title: create 
+	 * @Description: TODO(到离站数据  生成站点耗时) 
+	 * @throws
+	 */
+	public List<Sample> create(List<ArrivalEntity> all, CreateSampleParam param) {
+		List<Sample> rs = new ArrayList<>();
+		try{
+			//路由
+			List<StationRoute> routes = routeRepository.findByLine(param.getLineCode(), param.getUpdown());
+			//按顺序索引路由
+			Map<String, Integer> rMap = new HashMap<>();
+			for(int i = 0; i < routes.size(); i ++){
+				//起点站不要
+				if(routes.get(i).getStationMark().equals("B"))
+					continue;
+				rMap.put(routes.get(i).getStationCode(), i);
+			}
+				
+			Collections.sort(all, new ArrivalComparator());
+			
+			//所有的站点耗时数据
+			List<Sample> sampleList = calcTimeArray(rMap, all);
+			//时区分组，取值
+			Set<TimeRange> rgs = param.getTimeRange();
+			
+			//生成数据
+			for(TimeRange rg : rgs)
+				rs.addAll(calcCenterVal(sampleList, rg, param.getUpdown()));
+		}catch(Exception e){
+			logger.error("", e);
+		}
+		
+		return rs;
+	}
+	
+	private List<Sample> calcTimeArray(Map<String, Integer> rMap, List<ArrivalEntity> arrs) throws ParseException {
+		
+		//车辆和所在站点对照
+		Map<String, ArrivalEntity> carMap = new HashMap<>();
+		
+		int size = arrs.size();
+		ArrivalEntity curr, old;
+		String device;
+		
+		List<Sample> sampleList = new ArrayList<>();
+		Sample sample;
+		for(int i = 0; i < size; i ++){
+			curr = arrs.get(i);
+			device = curr.getDeviceId();
+			old = carMap.get(device);
+			
+			carMap.put(device, curr);
+			
+			if(null == old || null == rMap.get(curr.getStopNo()) 
+					|| null == rMap.get(old.getStopNo())
+					//跨天的数据不要
+					|| !sdfyyyyMMdd.format(new Date(old.getTs())).equals(sdfyyyyMMdd.format(new Date(curr.getTs()))))
+				continue;
+			
+			//连续站点
+			if(rMap.get(curr.getStopNo()) 
+					- rMap.get(old.getStopNo()) == 1){
+				
+				sample = new Sample(old, curr);
+				//将日期全部拉到同一天
+				sample.setLineCode(old.getLineCode());
+				sample.setsTime(sdfyyyyMMddHHmm.parse(rq + sdfHHmm.format(sample.getsTime())).getTime());
+				sample.seteTime(sdfyyyyMMddHHmm.parse(rq + sdfHHmm.format(sample.geteTime())).getTime());
+				//sample.setsDate(sdfHHmm.format(new Date(sample.getsTime())));
+				//sample.seteDate(sdfHHmm.format(new Date(sample.geteTime())));
+				sampleList.add(sample);
+				
+			}
+			carMap.put(device, curr);
+		}
+		return sampleList;
+	}
+	
+	
+	private List<Sample> calcCenterVal(List<Sample> all, TimeRange rg, Integer updown){
+		List<Sample> subList = new ArrayList<>()
+					,rsList = new ArrayList<>();
+		
+		try{
+			Collections.sort(all, new SampleComp2());
+			//按时区分组数据
+			long st = sdfyyyyMMddHHmm.parse(rq + rg.getS()).getTime()
+					,et = sdfyyyyMMddHHmm.parse(rq + rg.getE()).getTime();
+			for(Sample s : all){
+				if(s.geteTime() > st && s.geteTime() < et)
+					subList.add(s);
+				else if(s.geteTime() > et)
+					break;
+			}
+			
+			//按站点分组数据
+			ArrayListMultimap<String, Sample> arrMap = ArrayListMultimap.create();
+			for(Sample s : subList)
+				arrMap.put(s.getsStation() + "_" + s.geteStation(), s);
+			
+			//每个站点间取出一个占比最大的数值
+			Set<String> keys = arrMap.keySet();
+			Sample sample;
+			for(String k : keys){
+				sample = maxRatioVal(arrMap.get(k));
+				
+				sample.setTag(rg.getTag() + rg.getS() + " - " + rg.getE());
+				sample.setsDate(rg.getS());
+				sample.seteDate(rg.getE());
+				sample.setUpdown(updown);
+				rsList.add(sample);
+			}
+			
+		}catch(Exception e){
+			logger.error("", e);
+		}
+		return rsList;
+	}
+	
+	/**
+	 * 
+	 * @Title: maxRatioVal 
+	 * @Description: TODO(从一组数值中取出占比最大的值) 
+	 */
+	public Sample maxRatioVal(List<Sample> list){
+		//StringBuilder valStr = new StringBuilder();
+		if(list.size() == 0)
+			return null;
+		//排序
+		Collections.sort(list, new SampleComp());
+		
+		ArrayListMultimap<String, Sample> arrMap = ArrayListMultimap.create();
+		//1.5分钟范围分组
+		int range = 15
+			,curr = (int)(list.get(0).getRunTime() * 10);
+		
+		for(Sample s : list){
+			if(s.getRunTime() * 10 > curr + range){
+				curr += range;
+			}
+			arrMap.put(curr + "_" + curr + range, s);
+			//valStr.append(s.getRunTime() + ",");
+		}
+		
+		//数值最多的分组，求个平均值
+		String maxKey = maxKey(arrMap);
+		float absVal = abs(arrMap.get(maxKey));
+		
+		Sample rs = list.get(0);
+		
+		DecimalFormat dformat=new DecimalFormat(".00");
+		rs.setRunTime(Float.parseFloat(dformat.format(absVal)));
+		
+		//logger.info("全部：[ " + valStr + "] ，计算的中间值：" + absVal);
+		return rs;
+	}
+	
+	private String maxKey(ArrayListMultimap<String, Sample> arrMap){
+		String maxKey = null;
+		int size = 0;
+		Set<String> kys = arrMap.keySet();
+		for(String k : kys){
+			if(null != maxKey && arrMap.get(k).size() < size)
+				continue;
+			
+			size = arrMap.get(k).size();
+			maxKey = k;
+		}
+		return maxKey;
+	}
+	
+	private float abs(List<Sample> list){
+		float sum = 0;
+		
+		for(Sample s : list)
+			sum += s.getRunTime();
+		
+		return sum / list.size();
+	}
+	
+	public static class SampleComp implements Comparator<Sample>{
+
+		@Override
+		public int compare(Sample arg0, Sample arg1) {
+			return (int)(arg0.getRunTime() * 10 - arg1.getRunTime() * 10);
+		}
+	}
+	
+	public static class SampleComp2 implements Comparator<Sample>{
+
+		@Override
+		public int compare(Sample arg0, Sample arg1) {
+			if(arg0.geteTime() == arg1.geteTime())
+				return 0;
+			
+			return (int)(arg0.geteTime() - arg1.geteTime());
+		}
+	}
+}
@@ -10,4 +10,6 @@ public interface GpsService {
 	List<Map<String, Object>> history(String[] nbbmArray, Long st, Long et);
  
 	Map<String, Object> findBuffAeraByCode(String code, String type);
+
+	Map<String, Object> search(Map<String, Object> map, int page, int size, String order, String direction);
 }
 package com.bsth.service.gps;
  
+import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -17,8 +19,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
+import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.arrival.ArrivalEntity;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.util.DateUtils;
@@ -37,6 +42,9 @@ public class GpsServiceImpl implements GpsService{
 	ResultSet rs = null;
  
 	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	@Autowired
+	GpsRealData gpsRealData;
  
 	// 历史gps查询
 	@Override
@@ -307,4 +315,89 @@ public class GpsServiceImpl implements GpsService{
  
 		return rs;
 	}
+
+	@Override
+	public Map<String, Object> search(Map<String, Object> map, int page, int size, String order, String direction) {
+		Map<String, Object> rsMap = new HashMap<>();
+		try{
+			//全量
+			Collection<GpsEntity> list = gpsRealData.all();
+			//过滤后的
+			List<GpsEntity> rs = new ArrayList<>();
+			Field[] fields = GpsEntity.class.getDeclaredFields();
+			//排序字段
+			Field orderField = null;
+			//参与过滤的字段
+			List<Field> fs = new ArrayList<>();
+			for(Field f : fields){
+				f.setAccessible(true);
+				if(map.containsKey(f.getName()))
+					fs.add(f);
+				
+				if(f.getName().equals(order))
+					orderField = f;
+			}
+			//过滤数据
+			for(GpsEntity gps : list){
+				if(fieldEquals(fs, gps, map))
+					rs.add(gps);
+			}
+			
+			//排序
+			if(null != orderField)
+				sortGpsList(orderField, rs);
+			
+			//分页
+			int count = rs.size()
+				,s = page * size, e = s + size;
+			if (e > count)
+				e = count;
+			
+			rsMap.put("list", rs.subList(s, e));
+			rsMap.put("totalPages", count % size == 0 ? count / size : count / size + 1);
+			rsMap.put("page", page);
+			rsMap.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			logger.error("", e);
+			rsMap.put("status", ResponseCode.ERROR);
+		}
+		return rsMap;
+	}
+	
+	private void sortGpsList(final Field f, List<GpsEntity> rs) {
+		Collections.sort(rs, new Comparator<GpsEntity>() {
+
+			@Override
+			public int compare(GpsEntity o1, GpsEntity o2) {
+				try {
+					if(f.get(o1) == f.get(o2))
+						return 0;
+					
+					if(null == f.get(o1))
+						return 1;
+					
+					if(null == f.get(o2))
+						return -1;
+					
+					return f.get(o1).toString().compareTo(f.get(o2).toString());
+				} catch (Exception e) {
+					logger.error("", e);
+					return -1;
+				}
+			}
+		});
+	}
+
+	public boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map){
+		try{
+			for(Field f : fs){
+				if(f.get(obj).toString().indexOf(map.get(f.getName()).toString()) == -1)
+					return false;
+			}
+		}catch(Exception e){
+			logger.error("", e);
+			return false;
+		}
+		return true;
+	}
 }
@@ -11,8 +11,12 @@ import java.util.Map;
 import java.util.Properties;
  
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.stereotype.Service;
  
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
@@ -25,6 +29,8 @@ import com.bsth.service.StationRouteService;
 import com.bsth.util.FTPClientUtils;
 import com.bsth.util.PackTarGZUtils;
 import com.bsth.util.db.DBUtils_MS;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
  
 /**
  * 
@@ -579,12 +585,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				File textFile = clientUtils.GetFtpFile(url, port, username, password, remotePath, textFileName);
  
 				/*File[] sources = new File[] {textFile};*/
-				File[] sources = new File[] {textFile};
+				//File[] sources = new File[] {textFile};
  
 				File target = new File(odlGzFileName);
  
 				// 将txt文件打包
-				File targetFile = packTarGZUtils.pack(sources, target);
+				File targetFile = PackTarGZUtils.compress(textFile, target);
  
 				/*clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());*/
  
@@ -971,4 +977,41 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 		return resultList;
 	}
+
+	@Override
+	public Map<String, Object> findByMultiLine(String lineIds) {
+		Map<String, Object> rs = new HashMap<>();
+		try{
+			List<String> idx = Splitter.on(',').splitToList(lineIds);
+			//路由
+			List<StationRoute> list = new ArrayList<>();
+			/**
+			 * in 查询符 无法和 @EntityGraph 同时配合使用，这可能是一个bug
+			 * 暂时只能循环单线路查询
+			 */
+			//repository.multiLine(idx)
+			for(String id : idx){
+				list.addAll(repository.findByLineCode(id));
+			}
+			
+			//过滤部分字段
+			String jsonStr = JSON.toJSONString(list, new PropertyFilter() {
+				
+				@Override
+				public boolean apply(Object object, String name, Object value) {
+					if(name.equals("line"))
+						return false;
+					return true;
+				}
+			});
+			
+			rs.put("status", ResponseCode.SUCCESS);
+			rs.put("list", jsonStr);
+		}catch(Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		
+		return rs;
+	}
 }
+package com.bsth.service.impl;
+
+import java.util.Iterator;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.bsth.entity.Line;
+import com.bsth.repository.LineRepository;
+import com.bsth.service.TrafficManageService;
+import com.bsth.webService.trafficManage.geotool.services.Internal;
+import com.bsth.webService.trafficManage.geotool.services.InternalPortType;
+
+/**
+ * 
+ * @ClassName: LineServiceImpl(线路service业务层实现类)
+ * 
+ * @Extends : BaseService
+ * 
+ * @Description: TODO(线路service业务层)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016年4月28日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Service
+public class TrafficManageServiceImpl  implements TrafficManageService{
+	
+	@Autowired
+	private LineRepository repository;
+	
+	// 运管处接口
+	private InternalPortType portType = new Internal().getInternalHttpSoap11Endpoint();
+	// 用户名
+	private final String userName = "pudong";
+	// 密码
+	private final String password = "pudong123";
+
+	/**
+	 * 获取线路编码
+	 * 
+	 * @return int <lineCode：线路编码>
+	 */
+	public String setXL() {
+		String result = "";
+		StringBuffer sbBuffer = new StringBuffer();
+		Iterator<Line> lines = repository.findAll().iterator();
+		if(lines.hasNext()){
+			Line line = lines.next();
+		}
+		System.out.println(portType.setXL(sbBuffer.toString(), userName, password));;
+		System.out.println("abdfedddddddddddddddddddddddddddd");
+		return result;
+	}
+
+}
@@ -80,7 +80,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
  
 	Map<String, Object>  outgoAdjustAll(String params);
  
-	Map<String, Object> findRouteByLine(Integer lineCode);
+	Map<String, Object> findRouteByLine(String lineCode);
  
 	List<Map<String,String>> findLine(String line);
  
@@ -110,4 +110,6 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String,Object> scheduleDaily(String line,String date);
  
 	List<ScheduleRealInfo> realScheduleList(String line,String date);
+	
+	List<Map<String,Object>> yesterdayDataList(String line);
 }
@@ -310,8 +310,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			SysUser user = SecurityUtils.getCurrentUser();
 			String schDate = DayOfSchedule.currSchDateMap.get(t.getXlBm());
  
+			SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
 			t.setScheduleDateStr(schDate);
-			t.setScheduleDate(DateUtils.sdfyyyyMMdd.parse(schDate));
+			t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
 			t.setRealExecDate(schDate);
 			t.setCreateBy(user);
 			t.setSflj(true);
@@ -467,37 +468,48 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
 		int jhbc = 0,cjbc = 0,ljbc = 0;
-		double jhlc = 0, yygl = 0, ksgl = 0;
+		double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0;
 		float addMileage = 0l,remMileage = 0l;
  
 		Map<String,Object> map;
 		for(ScheduleRealInfo scheduleRealInfo : scheduleRealInfos){
 			if(scheduleRealInfo != null){
 				//计算计划里程（主任务过滤掉临加班次），烂班里程，临加里程，计划班次，烂班班次，增加班次
-				if(scheduleRealInfo.isSflj()){
-					addMileage += addMileage += scheduleRealInfo.getAddMileage()==null?0:scheduleRealInfo.getAddMileage();
-					ljbc++;
-				}else{
-					jhlc += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-					if(scheduleRealInfo.getStatus() != -1){
-						remMileage += scheduleRealInfo.getRemMileage()==null?0:scheduleRealInfo.getRemMileage();						
+				if(scheduleRealInfo != null){
+					//计划里程（主任务过滤掉临加班次），
+					//烂班里程（主任务烂班），
+					//临加里程（主任务临加），
+					//计划班次，烂班班次，增加班次
+					tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+					if(scheduleRealInfo.isSflj()){
+						addMileage += tempJhlc;
+						ljbc++;
 					}else{
-						cjbc++;
+						jhlc += tempJhlc;
+						jhbc++;
+						if(scheduleRealInfo.getStatus() == -1){
+							remMileage += tempJhlc;
+							cjbc++;
+						}				
 					}
-					jhbc++;
-				}
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				//计算营运里程，空驶里程
-				if(childTaskPlans.isEmpty()){
-					yygl += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-				}else{
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-					while(it.hasNext()){
-						ChildTaskPlan childTaskPlan = it.next();
-						if(childTaskPlan.getMileageType().equals("empty")){
-							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+					//计算营运里程，空驶里程
+					if(childTaskPlans.isEmpty()){
+						if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+								|| scheduleRealInfo.getBcType().equals("venting")){
+							ksgl += tempJhlc;
 						}else{
-							yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							yygl += tempJhlc;
+						}	
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						while(it.hasNext()){
+							ChildTaskPlan childTaskPlan = it.next();
+							if(childTaskPlan.getMileageType().equals("empty")){
+								ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							}else{
+								yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							}
 						}
 					}
 				}
@@ -899,7 +911,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	}
  
 	@Override
-	public Map<String, Object> findRouteByLine(Integer lineCode) {
+	public Map<String, Object> findRouteByLine(String lineCode) {
 		Map<String, Object> map = new HashMap<>();
 		//上行
 		Integer lineId = BasicData.lineId2CodeMap.inverse().get(lineCode);
@@ -1122,39 +1134,164 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
 		List<Map<String,Object>> lMap = new ArrayList<Map<String,Object>>();
 		DecimalFormat format = new DecimalFormat("0.00");
-		double jhlc = 0.00;
-		float sjgl = 0l,ssgl = 0l;
+		double jhlc = 0, tempJhlc = 0,childMileage = 0;
+		float sjgl = 0f,ssgl = 0f,ssgl_lz = 0f,ssgl_dm = 0f,ssgl_gz = 0f,ssgl_jf = 0f,ssgl_zs = 0f,ssgl_qr = 0f
+				,ssgl_qc = 0f,ssgl_kx = 0f,ssgl_qh = 0f,ssgl_yw = 0f,ssgl_other = 0f,ljgl = 0f;
+		//班次
+		int sj_0 = 6*60+31,sj_1 = 8*60+30,sj_2 = 16*60+1,sj_3 = 18*60;
+		int jhbc = 0,jhbc_m = 0,jhbc_a = 0;
+		int sjbc = 0,sjbc_m = 0,sjbc_a = 0;
+		int ljbc = 0,ljbc_m = 0,ljbc_a = 0;
+		int fzbc = 0,fzbc_m = 0,fzbc_a = 0;
+		int dtbc = 0,dtbc_m = 0,dtbc_a = 0;
+		int djg = 0,djg_m = 0,djg_a = 0,djg_time = 0;
 		Map<String,Object> map = new HashMap<String, Object>();
 		for(ScheduleRealInfo scheduleRealInfo: list){
 			if(scheduleRealInfo != null){
-				if(!scheduleRealInfo.isSflj()){
-					jhlc += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-				}
-				if(scheduleRealInfo.isDestroy()){
-					ssgl += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-				}
-				
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				//计算实际里程，空驶里程
+				//计算实际里程，少驶里程，计划里程=实际里程+少驶里程
 				if(childTaskPlans.isEmpty()){
-					sjgl += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+					tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+					jhlc += tempJhlc;
+					if(scheduleRealInfo.getStatus() == 2){
+						sjgl += tempJhlc;
+					}else if(scheduleRealInfo.getStatus() == -1){
+						ssgl += tempJhlc;
+						if(scheduleRealInfo.getRemarks().indexOf("路阻") != -1){
+							ssgl_lz += tempJhlc;
+						}else if(scheduleRealInfo.getRemarks().indexOf("吊慢") != -1){
+							ssgl_dm += tempJhlc;
+						}else if(scheduleRealInfo.getRemarks().indexOf("故障") != -1){
+							ssgl_gz += tempJhlc;
+						}else if(scheduleRealInfo.getRemarks().indexOf("纠纷") != -1){
+							ssgl_jf += tempJhlc;
+						}else if(scheduleRealInfo.getRemarks().indexOf("肇事") != -1){
+							ssgl_zs += tempJhlc;
+						}else if(scheduleRealInfo.getRemarks().indexOf("缺人") != -1){
+							ssgl_qr += tempJhlc;
+						}else if(scheduleRealInfo.getRemarks().indexOf("缺车") != -1){
+							ssgl_qc += tempJhlc;
+						}else if(scheduleRealInfo.getRemarks().indexOf("客稀") != -1){
+							ssgl_kx += tempJhlc;
+						}else if(scheduleRealInfo.getRemarks().indexOf("气候") != -1){
+							ssgl_qh += tempJhlc;
+						}else if(scheduleRealInfo.getRemarks().indexOf("援外") != -1){
+							ssgl_yw += tempJhlc;
+						}else{
+							ssgl_other += tempJhlc;
+						}
+						
+						//临加公里
+						if(scheduleRealInfo.isSflj()){
+							ljgl += tempJhlc;
+						}
+					}
 				}else{
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 					while(it.hasNext()){
 						ChildTaskPlan childTaskPlan = it.next();
+						childMileage = childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						jhlc += childMileage;
 						if(childTaskPlan.isDestroy()){
-							ssgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							ssgl += childMileage;
+							if(childTaskPlan.getDestroyReason().equals("路阻")){
+								ssgl_lz += childTaskPlan.getMileage();
+							}else if(childTaskPlan.getDestroyReason().equals("吊慢")){
+								ssgl_dm += childTaskPlan.getMileage();
+							}else if(childTaskPlan.getDestroyReason().equals("故障")){
+								ssgl_gz += childTaskPlan.getMileage();
+							}else if(childTaskPlan.getDestroyReason().equals("纠纷")){
+								ssgl_jf += childTaskPlan.getMileage();
+							}else if(childTaskPlan.getDestroyReason().equals("肇事")){
+								ssgl_zs += childTaskPlan.getMileage();
+							}else if(childTaskPlan.getDestroyReason().equals("缺人")){
+								ssgl_qr += childTaskPlan.getMileage();
+							}else if(childTaskPlan.getDestroyReason().equals("缺车")){
+								ssgl_qc += childTaskPlan.getMileage();
+							}else if(childTaskPlan.getDestroyReason().equals("客稀")){
+								ssgl_kx += childTaskPlan.getMileage();
+							}else if(childTaskPlan.getDestroyReason().equals("气候")){
+								ssgl_qh += childTaskPlan.getMileage();
+							}else if(childTaskPlan.getDestroyReason().equals("援外")){
+								ssgl_yw += childTaskPlan.getMileage();
+							}else{
+								ssgl_other += childTaskPlan.getMileage();
+							}
 						}else{
-							sjgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							sjgl += childMileage;
 						}
 					}
 				}
+				
+				//班次
+				jhbc++;
+				String[] fcsj = scheduleRealInfo.getFcsj().split(":");
+				String[] fcsjActual = (scheduleRealInfo.getFcsjActual()==null?"0:00":scheduleRealInfo.getFcsjActual()).split(":");
+				if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_1){
+					jhbc_m++;
+				}else if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_3){
+					jhbc_a++;
+				}
+				if(scheduleRealInfo.getStatus() == 2){
+					sjbc++;
+					if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
+						sjbc_m++;
+					}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
+						sjbc_a++;
+					}
+				}
+				if(scheduleRealInfo.isSflj()){
+					ljbc++;
+					if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
+						ljbc_m++;
+					}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
+						ljbc_a++;
+					}
+				}
+				if(scheduleRealInfo.getBcType().equals("venting")){
+					fzbc++;
+					if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
+						fzbc_m++;
+					}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
+						fzbc_a++;
+					}
+				}
 			}	
 		}
 		map.put("xlName", xlName);
 		map.put("jhlc", format.format(jhlc));
 		map.put("sjgl", format.format(sjgl));
 		map.put("ssgl", format.format(ssgl));
+		map.put("ssgl_lz", ssgl_lz==0?0:format.format(ssgl_lz));
+		map.put("ssgl_dm", ssgl_dm==0?0:format.format(ssgl_dm));
+		map.put("ssgl_gz", ssgl_gz==0?0:format.format(ssgl_gz));
+		map.put("ssgl_jf", ssgl_jf==0?0:format.format(ssgl_jf));
+		map.put("ssgl_zs", ssgl_zs==0?0:format.format(ssgl_zs));
+		map.put("ssgl_qr", ssgl_qr==0?0:format.format(ssgl_qr));
+		map.put("ssgl_qc", ssgl_qc==0?0:format.format(ssgl_qc));
+		map.put("ssgl_kx", ssgl_kx==0?0:format.format(ssgl_kx));
+		map.put("ssgl_qh", ssgl_qh==0?0:format.format(ssgl_qh));
+		map.put("ssgl_yw", ssgl_yw==0?0:format.format(ssgl_yw));
+		map.put("ssgl_other", ssgl_other==0?0:format.format(ssgl_other));
+		map.put("ljgl", ljgl==0?0:format.format(ljgl));
+		map.put("jhbc_m", jhbc_m);
+		map.put("jhbc_a", jhbc_a);
+		map.put("sjbc", sjbc);
+		map.put("sjbc_m", sjbc_m);
+		map.put("sjbc_a", sjbc_a);
+		map.put("ljbc", ljbc);
+		map.put("ljbc_m", ljbc_m);
+		map.put("ljbc_a", ljbc_a);
+		map.put("fzbc", fzbc);
+		map.put("fzbc_m", fzbc_m);
+		map.put("fzbc_a", fzbc_a);
+		map.put("dtbc", dtbc);
+		map.put("dtbc_m", dtbc_m);
+		map.put("dtbc_a", dtbc_a);
+		map.put("djg", djg);
+		map.put("djg_m", djg_m);
+		map.put("djg_a", djg_a);
+		map.put("djg_time", djg_time);
 		lMap.add(map);
 		return lMap;
 	}
@@ -1259,6 +1396,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
 	@Override
 	public List<ScheduleRealInfo> realScheduleList(String line, String date) {
+		List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.queryUserInfo(line, date);
+		List<ScheduleRealInfo> listTotal = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+		for(ScheduleRealInfo info:listInfo){
+			for(ScheduleRealInfo total:listTotal){
+				if(info.getjGh().equals(total.getjGh()) && info.getLpName().equals(total.getLpName()) && info.getClZbh().equals(total.getClZbh())){
+					
+				}
+			}
+		}
 		return scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
 	}
  
@@ -1275,4 +1421,52 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
 		return rs;
 	}
+
+	public List<Map<String,Object>> yesterdayDataList(String line) {
+		//前一天日期
+		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
+		List<Map<String,Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date);
+		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+		for(ScheduleRealInfo scheduleRealInfo:list){
+			if(scheduleRealInfo != null){
+				for(int i=0;i<yesterdayDataList.size();i++){
+					if(scheduleRealInfo.getXlBm().equals(yesterdayDataList.get(i).get("xlBm")) && scheduleRealInfo.getClZbh().equals(yesterdayDataList.get(i).get("clZbh"))
+							&& scheduleRealInfo.getjGh().equals(yesterdayDataList.get(i).get("jGh"))){
+						//根据线路代码获取公司
+						Line li = lineRepository.findByLineCode(line);
+						yesterdayDataList.get(i).put("company", li.getCompany());
+						//计算总公里
+						Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+						//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
+						if(childTaskPlans.isEmpty()){
+							if(scheduleRealInfo.getStatus() == 2){
+								yesterdayDataList.get(i).put("totalKilometers", scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc()+(double)(yesterdayDataList.get(i).get("totalKilometers")==null?0.0:yesterdayDataList.get(i).get("totalKilometers")));
+							}
+						}else{
+							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+							while(it.hasNext()){
+								ChildTaskPlan childTaskPlan = it.next();
+								if(!childTaskPlan.isDestroy()){
+									yesterdayDataList.get(i).put("totalKilometers", childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage()+(double)(yesterdayDataList.get(i).get("totalKilometers")==null?0.0:yesterdayDataList.get(i).get("totalKilometers")));
+								}
+							}
+						}
+					}	
+				}
+			}
+		}
+		//增加顺序号
+		for(int i=0;i<yesterdayDataList.size();i++){
+			if(i == 0){
+				yesterdayDataList.get(i).put("seqNumber", 1);	
+			}else{
+				if(yesterdayDataList.get(i-1).get("clZbh").equals(yesterdayDataList.get(i).get("clZbh"))){
+					yesterdayDataList.get(i).put("seqNumber", 1+(int)yesterdayDataList.get(i-1).get("seqNumber"));
+				}else{
+					yesterdayDataList.get(i).put("seqNumber", 1);
+				}
+			}
+		}
+		return yesterdayDataList;
+	}
 }
@@ -2,9 +2,387 @@ package com.bsth.service.schedule;
  
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.BaseService;
+import org.joda.time.DateTime;
+
+import java.util.Date;
+import java.util.List;
  
 /**
  * Created by xu on 16/6/16.
  */
 public interface SchedulePlanInfoService extends BaseService<SchedulePlanInfo, Long> {
+    /**
+     * 查找分组排班信息。
+     * @param xlid 线路Id
+     * @param scheduleDate 排班日期
+     * @return
+     */
+    List<GroupInfo> findGroupInfo(Integer xlid, Date scheduleDate);
+
+    /**
+     * 更新分组信息。
+     * type=1，替换车辆
+     * type=2，修改出场班次1时间（首班车时间）
+     * type=3，替换分组人员（驾驶员1和售票员1）
+     * type=4，如果分班，修改出场班次2时间（分班后的第一个出场班次时间）
+     * type=5，如果分班，修改分组人员（驾驶员2和售票员2）
+     * @param groupInfoUpdate 分组更新信息，包含类型，更新前的信息，更新后的信息
+     * @return
+     */
+    int updateGroupInfo(GroupInfoUpdate groupInfoUpdate);
+
+    /**
+     * 分组更新信息。
+     */
+    static class GroupInfoUpdate {
+        /** 类型 */
+        private int type;
+        /** 原始分组值 */
+        private GroupInfo src;
+        /** 更新分组值 */
+        private GroupInfo update;
+
+        public int getType() {
+            return type;
+        }
+
+        public void setType(int type) {
+            this.type = type;
+        }
+
+        public GroupInfo getSrc() {
+            return src;
+        }
+
+        public void setSrc(GroupInfo src) {
+            this.src = src;
+        }
+
+        public GroupInfo getUpdate() {
+            return update;
+        }
+
+        public void setUpdate(GroupInfo update) {
+            this.update = update;
+        }
+    }
+
+    /**
+     * 分组信息。
+     */
+    static class GroupInfo {
+        /** 线路Id */
+        private Integer xlId;
+        /** 线路名称 */
+        private String xlName;
+        /** 排班时间 */
+        private Date scheduleDate;
+        /** 路牌名字 */
+        private String lpName;
+        /** 车辆Id */
+        private Integer clId;
+        /** 车辆自编号 */
+        private String clZbh;
+        /** 出场班次1时间 */
+        private String ccsj1;
+        /** 出场班次2时间 */
+        private String ccsj2;
+
+        /** 驾驶员1id */
+        private Integer jsy1Id;
+        /** 驾驶员1工号 */
+        private String jsy1Gh;
+        /** 驾驶员1姓名 */
+        private String jsy1Name;
+        /** 驾驶员1id */
+        private Integer jsy2Id;
+        /** 驾驶员1工号 */
+        private String jsy2Gh;
+        /** 驾驶员1姓名 */
+        private String jsy2Name;
+
+        /** 售票员1id */
+        private Integer spy1Id;
+        /** 售票员1工号 */
+        private String spy1Gh;
+        /** 售票员1姓名 */
+        private String spy1Name;
+        /** 售票员1id */
+        private Integer spy2Id;
+        /** 售票员1工号 */
+        private String spy2Gh;
+        /** 售票员1姓名 */
+        private String spy2Name;
+
+        /** 创建时间 */
+        private Date createDate;
+
+        public GroupInfo() {}
+
+        public GroupInfo(Object[] datas) {
+            // 线路Id
+            this.xlId = Integer.valueOf(String.valueOf(datas[0]));
+            // 线路名称
+            this.xlName = String.valueOf(datas[1]);
+            // 排班时间
+            this.scheduleDate = new DateTime(datas[2]).toDate();
+            // 路牌名字
+            this.lpName = String.valueOf(datas[3]);
+            // 车辆id
+            this.clId = Integer.valueOf(String.valueOf(datas[4]));
+            // 车辆自编号
+            this.clZbh = String.valueOf(datas[5]);
+            // 出场时间，如果有多个，需要分开
+            Object ccsj = datas[6];
+            if (ccsj != null) {
+                String[] ccsj_array = ((String) ccsj).split(",");
+                if (ccsj_array.length > 1) {
+                    this.ccsj1 = String.valueOf(ccsj_array[0]);
+                    this.ccsj2 = String.valueOf(ccsj_array[1]);
+                } else {
+                    this.ccsj1 = String.valueOf(ccsj_array[0]);
+                }
+            }
+            // 驾驶员id，如果有多个，需要分开
+            Object jsyId = datas[7];
+            if (jsyId != null) {
+                String[] jsyId_array = ((String) jsyId).split(",");
+                if (jsyId_array.length > 1) {
+                    this.jsy1Id = Integer.valueOf(String.valueOf(jsyId_array[0]));
+                    this.jsy2Id = Integer.valueOf(String.valueOf(jsyId_array[1]));
+                } else {
+                    this.jsy1Id = Integer.valueOf(String.valueOf(jsyId_array[0]));
+                }
+            }
+            // 驾驶员工号，如果有多个，需要分开
+            Object jsyGh = datas[8];
+            if (jsyGh != null) {
+                String[] jsyGh_array = ((String) jsyGh).split(",");
+                if (jsyGh_array.length > 1) {
+                    this.jsy1Gh = String.valueOf(jsyGh_array[0]);
+                    this.jsy2Gh = String.valueOf(jsyGh_array[1]);
+                } else {
+                    this.jsy1Gh = String.valueOf(jsyGh_array[0]);
+                }
+            }
+            // 驾驶员名字，如果有多个，需要分开
+            Object jsyName = datas[9];
+            if (jsyName != null) {
+                String[] jsyName_array = ((String) jsyName).split(",");
+                if (jsyName_array.length > 1) {
+                    this.jsy1Name = String.valueOf(jsyName_array[0]);
+                    this.jsy2Name = String.valueOf(jsyName_array[1]);
+                } else {
+                    this.jsy1Name = String.valueOf(jsyName_array[0]);
+                }
+            }
+
+            // 售票员id，如果有多个，需要分开
+            Object spyId = datas[10];
+            if (spyId != null) {
+                String[] spyId_array = ((String) spyId).split(",");
+                if (spyId_array.length > 1) {
+                    this.spy1Id = Integer.valueOf(String.valueOf(spyId_array[0]));
+                    this.spy2Id = Integer.valueOf(String.valueOf(spyId_array[1]));
+                } else {
+                    this.spy1Id = Integer.valueOf(String.valueOf(spyId_array[0]));
+                }
+            }
+
+            // 售票员工号，如果有多个，需要分开
+            Object spyGh = datas[11];
+            if (spyGh != null) {
+                String[] spyGh_array = ((String) spyGh).split(",");
+                if (spyGh_array.length > 1) {
+                    this.spy1Gh = String.valueOf(spyGh_array[0]);
+                    this.spy2Gh = String.valueOf(spyGh_array[1]);
+                } else {
+                    this.spy1Gh = String.valueOf(spyGh_array[0]);
+                }
+            }
+            // 售票员名字，如果有多个，需要分开
+            Object spyName = datas[12];
+            if (spyName != null) {
+                String[] spyName_array = ((String) spyName).split(",");
+                if (spyName_array.length > 1) {
+                    this.spy1Name = String.valueOf(spyName_array[0]);
+                    this.spy2Name = String.valueOf(spyName_array[1]);
+                } else {
+                    this.spy1Name = String.valueOf(spyName_array[0]);
+                }
+            }
+            // 创建时间
+            this.createDate = new DateTime(datas[13]).toDate();
+
+            // TODO：可能还有其他字段
+        }
+
+        public String getXlName() {
+            return xlName;
+        }
+
+        public void setXlName(String xlName) {
+            this.xlName = xlName;
+        }
+
+        public Date getScheduleDate() {
+            return scheduleDate;
+        }
+
+        public void setScheduleDate(Date scheduleDate) {
+            this.scheduleDate = scheduleDate;
+        }
+
+        public String getLpName() {
+            return lpName;
+        }
+
+        public void setLpName(String lpName) {
+            this.lpName = lpName;
+        }
+
+        public Integer getClId() {
+            return clId;
+        }
+
+        public void setClId(Integer clId) {
+            this.clId = clId;
+        }
+
+        public String getClZbh() {
+            return clZbh;
+        }
+
+        public void setClZbh(String clZbh) {
+            this.clZbh = clZbh;
+        }
+
+        public String getCcsj1() {
+            return ccsj1;
+        }
+
+        public void setCcsj1(String ccsj1) {
+            this.ccsj1 = ccsj1;
+        }
+
+        public String getCcsj2() {
+            return ccsj2;
+        }
+
+        public void setCcsj2(String ccsj2) {
+            this.ccsj2 = ccsj2;
+        }
+
+        public Integer getJsy1Id() {
+            return jsy1Id;
+        }
+
+        public void setJsy1Id(Integer jsy1Id) {
+            this.jsy1Id = jsy1Id;
+        }
+
+        public String getJsy1Gh() {
+            return jsy1Gh;
+        }
+
+        public void setJsy1Gh(String jsy1Gh) {
+            this.jsy1Gh = jsy1Gh;
+        }
+
+        public String getJsy1Name() {
+            return jsy1Name;
+        }
+
+        public void setJsy1Name(String jsy1Name) {
+            this.jsy1Name = jsy1Name;
+        }
+
+        public Integer getJsy2Id() {
+            return jsy2Id;
+        }
+
+        public void setJsy2Id(Integer jsy2Id) {
+            this.jsy2Id = jsy2Id;
+        }
+
+        public String getJsy2Gh() {
+            return jsy2Gh;
+        }
+
+        public void setJsy2Gh(String jsy2Gh) {
+            this.jsy2Gh = jsy2Gh;
+        }
+
+        public String getJsy2Name() {
+            return jsy2Name;
+        }
+
+        public void setJsy2Name(String jsy2Name) {
+            this.jsy2Name = jsy2Name;
+        }
+
+        public Integer getSpy1Id() {
+            return spy1Id;
+        }
+
+        public void setSpy1Id(Integer spy1Id) {
+            this.spy1Id = spy1Id;
+        }
+
+        public String getSpy1Gh() {
+            return spy1Gh;
+        }
+
+        public void setSpy1Gh(String spy1Gh) {
+            this.spy1Gh = spy1Gh;
+        }
+
+        public String getSpy1Name() {
+            return spy1Name;
+        }
+
+        public void setSpy1Name(String spy1Name) {
+            this.spy1Name = spy1Name;
+        }
+
+        public Integer getSpy2Id() {
+            return spy2Id;
+        }
+
+        public void setSpy2Id(Integer spy2Id) {
+            this.spy2Id = spy2Id;
+        }
+
+        public String getSpy2Gh() {
+            return spy2Gh;
+        }
+
+        public void setSpy2Gh(String spy2Gh) {
+            this.spy2Gh = spy2Gh;
+        }
+
+        public String getSpy2Name() {
+            return spy2Name;
+        }
+
+        public void setSpy2Name(String spy2Name) {
+            this.spy2Name = spy2Name;
+        }
+
+        public Date getCreateDate() {
+            return createDate;
+        }
+
+        public void setCreateDate(Date createDate) {
+            this.createDate = createDate;
+        }
+
+        public Integer getXlId() {
+            return xlId;
+        }
+
+        public void setXlId(Integer xlId) {
+            this.xlId = xlId;
+        }
+    }
 }
 package com.bsth.service.schedule;
  
 import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
  
 /**
  * Created by xu on 16/6/16.
  */
 @Service
 public class SchedulePlanInfoServiceImpl extends BaseServiceImpl<SchedulePlanInfo, Long> implements SchedulePlanInfoService {
+    @Autowired
+    private SchedulePlanInfoRepository schedulePlanInfoRepository;
+
+    @Override
+    public List<GroupInfo> findGroupInfo(Integer xlid, Date scheduleDate) {
+        List<Object[]> groupInfos = schedulePlanInfoRepository.findGroupInfo(xlid, scheduleDate);
+        List<GroupInfo> groupInfoList = new ArrayList<>();
+        for (Object[] groupInfo : groupInfos) {
+            groupInfoList.add(new GroupInfo(groupInfo));
+        }
+        return groupInfoList;
+    }
+
+    @Override
+    @Transactional
+    public int updateGroupInfo(GroupInfoUpdate groupInfoUpdate) {
+        int type = groupInfoUpdate.getType();
+        int result;
+        if (type == 1) {
+            // 换车
+            if (groupInfoUpdate.getUpdate().getClId() != groupInfoUpdate.getSrc().getClId()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_1(
+                        groupInfoUpdate.getUpdate().getClId(),
+                        groupInfoUpdate.getUpdate().getClZbh(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName()
+                );
+            }
+
+        } else if (type == 2) {
+            // 更改出场班次1的时间
+            if (!groupInfoUpdate.getUpdate().getCcsj1().equals(groupInfoUpdate.getSrc().getCcsj1())) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_2_4(
+                        groupInfoUpdate.getUpdate().getCcsj1(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getUpdate().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getCcsj1(),
+                        "out"
+                );
+            }
+
+        } else if (type == 3) {
+            // 更改驾驶员1
+            if (groupInfoUpdate.getUpdate().getJsy1Id() != groupInfoUpdate.getSrc().getJsy1Id()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_3_5_jsy(
+                        groupInfoUpdate.getUpdate().getJsy1Id(),
+                        groupInfoUpdate.getUpdate().getJsy1Gh(),
+                        groupInfoUpdate.getUpdate().getJsy1Name(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getJsy1Id()
+                );
+            }
+            // 更改售票员1
+            if (groupInfoUpdate.getUpdate().getSpy1Id() != groupInfoUpdate.getSrc().getSpy1Id()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_3_5_spy(
+                        groupInfoUpdate.getUpdate().getSpy1Id(),
+                        groupInfoUpdate.getUpdate().getSpy1Gh(),
+                        groupInfoUpdate.getUpdate().getSpy1Name(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getSpy1Id()
+                );
+            }
+
+        } else if (type == 4) {
+            // 更改出场班次2的时间
+            if (!groupInfoUpdate.getUpdate().getCcsj2().equals(groupInfoUpdate.getSrc().getCcsj2())) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_2_4(
+                        groupInfoUpdate.getUpdate().getCcsj2(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getUpdate().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getCcsj2(),
+                        "out"
+                );
+            }
+
+        } else if (type == 5) {
+            // 更改驾驶员2
+            if (groupInfoUpdate.getUpdate().getJsy2Id() != groupInfoUpdate.getSrc().getJsy2Id()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_3_5_jsy(
+                        groupInfoUpdate.getUpdate().getJsy2Id(),
+                        groupInfoUpdate.getUpdate().getJsy2Gh(),
+                        groupInfoUpdate.getUpdate().getJsy2Name(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getJsy2Id()
+                );
+            }
+            // 更改售票员2
+            if (groupInfoUpdate.getUpdate().getSpy2Id() != groupInfoUpdate.getSrc().getSpy2Id()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_3_5_spy(
+                        groupInfoUpdate.getUpdate().getSpy2Id(),
+                        groupInfoUpdate.getUpdate().getSpy2Gh(),
+                        groupInfoUpdate.getUpdate().getSpy2Name(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getSpy2Id()
+                );
+            }
+
+        } else {
+            throw new RuntimeException("未知的更新类型，type=" + type);
+        }
+
+        return 0;
+    }
 }
@@ -3,31 +3,13 @@ package com.bsth.service.schedule;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.service.BaseService;
  
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Created by xu on 16/6/16.
  */
 public interface SchedulePlanService extends BaseService<SchedulePlan, Long> {
-
-    /**
-     * 查找分组排班信息。
-     * @param xlid 线路Id
-     * @param scheduleDate 排班日期
-     * @return
-     */
-    List<Map<String, Object>> findGroupInfo(Integer xlid, Date scheduleDate);
-
     /**
-     * 更新分组排班信息。
-     * @param clid 车辆id
-     * @param clZbh 车辆自编号
-     * @param xlid 线路id
-     * @param scheduleDate 排班日期
-     * @param lpName 路牌名字
+     * 获取有明日排班的计划。
      * @return
      */
-    int updateGroupInfo_clinfo(Integer clid, String clZbh, Integer xlid, Date scheduleDate, String lpName);
+    SchedulePlan findSchedulePlanTommorw();
 }
@@ -12,6 +12,7 @@ import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
 import com.bsth.service.schedule.rules.strategy.IStrategy;
 import com.google.common.collect.Multimap;
+import org.joda.time.DateTime;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -122,90 +123,16 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
     }
  
     @Override
-    public List<Map<String, Object>> findGroupInfo(Integer xlid, Date scheduleDate) {
-        List<Object[]> groupInfos = schedulePlanRepository.findGroupInfo(xlid, scheduleDate);
-        List<Map<String, Object>> ret = new ArrayList<>();
-        for (Object[] datas : groupInfos) {
-            // TODO：貌似springdata没有优雅的方式把List<Object[]>转换成List<Map<String, Object>>方法，
-            // TODO：可能jpa有相关标注，以后找到，此方法就作废
-
-            Map<String, Object> map = new HashMap<>();
-
-            // 线路名称
-            map.put("xlName", datas[0]);
-            // 排班时间
-            map.put("scheduleDate", datas[1]);
-            // 路牌名字
-            map.put("lpName", datas[2]);
-            // 车辆自编号
-            map.put("clZbh", datas[3]);
-            // 出场时间，如果有多个，需要分开
-            Object ccsj = datas[4];
-            if (ccsj != null) {
-                String[] ccsj_array = ((String) ccsj).split(",");
-                if (ccsj_array.length > 1) {
-                    map.put("ccsj1", ccsj_array[0]);
-                    map.put("ccsj2", ccsj_array[1]);
-                } else {
-                    map.put("ccsj1", ccsj_array[0]);
-                }
-            }
-            // 驾驶员工号，如果有多个，需要分开
-            Object jsyGh = datas[5];
-            if (jsyGh != null) {
-                String[] jsyGh_array = ((String) jsyGh).split(",");
-                if (jsyGh_array.length > 1) {
-                    map.put("jsy1Gh", jsyGh_array[0]);
-                    map.put("jsy2Gh", jsyGh_array[1]);
-                } else {
-                    map.put("jsy1Gh", jsyGh_array[0]);
-                }
-            }
-            // 驾驶员名字，如果有多个，需要分开
-            Object jsyName = datas[6];
-            if (jsyName != null) {
-                String[] jsyName_array = ((String) jsyName).split(",");
-                if (jsyName_array.length > 1) {
-                    map.put("jsy1Name", jsyName_array[0]);
-                    map.put("jsy2Name", jsyName_array[1]);
-                } else {
-                    map.put("jsy1Name", jsyName_array[0]);
-                }
-            }
-            // 售票员工号，如果有多个，需要分开
-            Object spyGh = datas[7];
-            if (spyGh != null) {
-                String[] spyGh_array = ((String) spyGh).split(",");
-                if (spyGh_array.length > 1) {
-                    map.put("spy1Gh", spyGh_array[0]);
-                    map.put("spy2Gh", spyGh_array[1]);
-                } else {
-                    map.put("spy1Gh", spyGh_array[0]);
-                }
-            }
-            // 售票员名字，如果有多个，需要分开
-            Object spyName = datas[8];
-            if (spyName != null) {
-                String[] spyName_array = ((String) spyName).split(",");
-                if (spyName_array.length > 1) {
-                    map.put("spy1Name", spyName_array[0]);
-                    map.put("spy2Name", spyName_array[1]);
-                } else {
-                    map.put("spy1Name", spyName_array[0]);
-                }
-            }
-            // 创建时间
-            map.put("createDate", datas[9]);
-
-            // TODO：可能还有其他字段
-
-            ret.add(map);
+    public SchedulePlan findSchedulePlanTommorw() {
+        DateTime today = new DateTime(new Date());
+        DateTime tommorw = new DateTime(today.getYear(), today.getMonthOfYear(), today.getDayOfMonth(), 0, 0).plusDays(1);
+        Map<String, Object> param = new HashMap<>();
+        param.put("scheduleFromTime_le", tommorw);
+        param.put("scheduleToTime_ge", tommorw);
+        Iterator<SchedulePlan> schedulePlanIterator = this.list(param).iterator();
+        if (schedulePlanIterator.hasNext()) {
+            return schedulePlanIterator.next();
         }
-        return ret;
-    }
-
-    @Override
-    public int updateGroupInfo_clinfo(Integer clid, String clZbh, Integer xlid, Date scheduleDate, String lpName) {
-        return schedulePlanRepository.updateGroupInfo_clinfo(clid, clZbh, xlid, scheduleDate, lpName);
+        return null;
     }
 }