Merge branch 'minhang' into qingpu

# Conflicts: # README.md # src/main/java/com/bsth/data/gpsdata/GpsRealData.java # src/main/resources/ms-jdbc.properties

Merge branch 'minhang' into qingpu
# Conflicts: # README.md # src/main/java/com/bsth/data/gpsdata/GpsRealData.java # src/main/resources/ms-jdbc.properties
潘钊
2 parents 93ec3e87 3b0f5480
Showing 65 changed files with 2097 additions and 1320 deletions
README.md
pom.xml
src/main/java/com/bsth/Application.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/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/controller/sys/util/RSAUtils.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/arrival/ArrivalEntity.java
src/main/java/com/bsth/data/arrival/DataLoader.java
src/main/java/com/bsth/data/directive/DirectiveCreator.java
src/main/java/com/bsth/data/forecast/ForecastRealServer.java
src/main/java/com/bsth/data/forecast/SampleTimeDataLoader.java
src/main/java/com/bsth/data/forecast/entity/ForecastResult.java
src/main/java/com/bsth/data/forecast/entity/SimpleRoute.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
-<<<<<<< HEAD
-公交调度系统BS版 0.1
-======
-----------
-## 目录
----------
- * [字典表](#字典表)
- * [动态jpa查询实现](#动态jpa查询实现)
- * [车载 gps 相关数据](#gps)
-    * [实时gps数据接口 http](#实时gps接口)  
-    * [进出站数据表结构](#进站数据)
-    * [异常警报表结构](#异常警报)
-        * [大间隔](#大间隔)
-        * [超速](#超速)
-        * [越界](#越界)
-        * [越站](#越站)
-        * [聚集](#聚集)
-        * [掉线](#掉线)
-    * [调度消息下发接口HTTP](#调度消息下发接口)
-    * [调度消息上传接口HTTP](#调度消息上传接口)
-    
-----------
-
-##  字典表
-----------
-字典操作全部由前端负责，主要有2种。
-
-1、转换字典代码。
-    当pjax的`pjax:success`事件被触发（片段加载完成）
-    扫描容器内所有有 `$(".nt-dictionary")` 元素进行字典转换
-``` html
---dom标签为span div p h1 h2 h3 h4 h5 h6 等等文本元素时，如下写法，text为要转换的代码
-<span class="nt-dictionary" data-group="ScheduleType">out</span>
---to
-<span>出场</span>
-
-<!- dom标签为input时，如下 data-code为要转换的代码 -->
-<input class="nt-dictionary" data-group="ScheduleType" data-code="out">
---to
-<input value="出场">
-
-<!- dom标签为select时 如下 data-code为要选中的项 -->
-<select class="nt-dictionary" data-group="ScheduleType" data-code="out"></select>
---to
-<select>
-    <option value="normal">正常班次</option>
-    <option value="out" selected>出场</option>
-    <option value="in">进场</option>
-    <option value="oil">加油</option>
-    <option value="temp">临加</option>
-    <option value="region">区间</option>
-    <option value="venting">放空</option>
-    <option value="major">放大站</option>
-</select>
-```
-*原标签的class 除nt-dictionary 外，其余均会被保留*
-
-2、dictionary.js提供如下方法自行使用
-| 方法名 | 参数|返回|
-| ---- | ---- | ---- | ---- |
-| groups  （获取所有字典组） | 无| | {LineTrend: 线路走向, ScheduleType: 班次类型} |
-| getByGroup （获取字典组下的字典）| (group) |{0： 上行， 1： 下行}|
-| transformCode （转换字典代码）| (group, code) | 上行 |
-
-## 动态jpa查询实现
-----------
-*参考调度系统枚举com.bsth.entity.search.SearchOperator*
-
-
-##  gps
-----------
-### 实时gps接口
-
-所有在线GPS： [http://192.168.168.192:8080/transport_server/rtgps](http://192.168.168.192:8080/transport_server/rtgps/)
-根据设备号查询：[http://192.168.168.192:8080/transport_server/rtgps/05B01901](http://192.168.168.192:8080/transport_server/rtgps/05B01901)
-    
-<span style="color: red">Response</span>:
-```json
-{
-    "data":[
-    {
-        "companyCode":5,
-        "lineId":10329,
-        "deviceId":"05B01901",
-        "carparkNo":"00000000",
-        "stopNo":"7C890002",
-        "lon":121.549866,
-        "lat":31.238798,
-        "timestamp":1397104499000,
-        "speed":42.0,
-        "direction":245.9,
-        "state":0,
-        "upDown":0
-    }]
-}
-```
-
-| -- | --|--|
-| ---- | ---- | ---- |
-| companyCode | int | 公司代码 |
-| lineId | int | 线路编码 |
-| deviceId | String | 设备编号 |
-| carparkNo | String | 停车场编码 |
-| stopNo | String | 站点编码 |
-| lon | float | 经度 |
-| lat | float | 纬度 |
-| timestamp | long | 时间戳 |
-| speed | float | 速度|
-| direction | float | 方向（角度） |   
-| state | int | 营运状态（ 0 营运 ，1 非营运， -1 无效） |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效）|
-
-
-### 进站数据
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| deviceId | String | 设备号 |
-| lineId | int | 线路编码 |
-| stopNo | long | 站点编码 |
-| timestamp | long | 时间戳 |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
-| createDate | Date | 创建时间 |
-
-
-### 异常警报
-----------
-
-### 大间隔
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| line | int | 线路编码 |
-| station | String | 站点编码 |
-| cVehicle | String | 当前车辆编码 |
-| lastVehicle | String | 上一个车辆编码 | 
-| interval | long | 间隔时间（秒） |
-| timestamp | long | 时间戳 |
-| createDate | Date | 创建时间 |
-
-### 超速
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| vehicle | String | 车辆编码 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
-| lon | float | 经度 | 
-| lat | float | 纬度|
-| speed | float | 速度 |
-| timestamp | long | 时间戳 |
-| createDate | Date | 时间 |
-
-### 越界
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| vehicle | String | 车辆编码 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
-| lon | float | 经度 | 
-| lat | float | 纬度|
-| location | String | 越界位置（由线调页面进行初始转换）意思是该字段默认为空，页面第一次查看时会写入值|
-| timestamp | long | 时间戳 |
-| createDate | Date | 时间 |
-
-
-### 越站
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
-| station | String | 站点编码 |
-| vehicle | String | 车辆编码 |
-| inData | Date | 进站时间 |
-| outDate | Date | 出站时间 |
-
-
-### 聚集
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
-| stations | String | 站点（多个用 , 号分隔。应该是连续站点） |
-| vehicles | String | 车辆编码（多个用 , 号分隔） |
-| timestamp | long | 时间戳 |
-| createDate | Date | 时间 |
-
-
-### 掉线
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
-| vehicle | String | 车辆编码 |
-| lon | float | 经度 | 
-| lat | float | 纬度|
-| timestamp | long | 时间戳 |
-| createDate | Date | 时间 |
-
-
-### 调度消息下发接口
-----------
-[http://192.168.168.192:8080/transport_server/message](http://192.168.168.192:8080/transport_server/message/)
-    
-<span style="color: red">Request</span>:
-```json
-{
-    "deviceId":12345,
-    "timestamp":44324,
-    "operCode":0x60,
-    "data":{
-        "companyCode":22,
-	    "deviceId":"029L2222",
-    	"timestamp":134326,
-	    "instructType":00,
-	    "dispatchInstruct":0x00,
-	    "msgId":12345,
-	    "alarmTime":201606012000,
-	    "serviceState":00000000,
-	    "txtContent":"你好"
-    }
-}
-```
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| deviceId | string | 设备编号 |
-| timestamp | long | 时间戳(ms) |
-| operCode | short | 一级协议 |
-| data.companyCode | short | 公司代码 |
-| data.deviceId | string | 设备编号 |
-| data.timestamp | long | 时间戳 |
-| data.instructType | short | 保留 默认0 |
-| data.dispatchInstruct | short | 调度指令 调度指令。0X00表示信息短语，0X01表示取消上次指令+调度指令(闹钟有效)，0x02表示为调度指令(闹钟有效)； 0x03表示运营状态指令(闹钟无效)；0x04表示其他指令。|
-| data.msgId | long | 同上 |
-| data.alarmTime | long | 闹钟 MMddhhmm|
-| data.serviceState | long | 多状态字节 　　先由车载发起车辆故障、事故报告、扣证、纠纷、加油等审请，经调度确认后，下发调度指令与运营状态。当调度指令为0X00终端需要提示信息。当调度指令为0x01和0x02，终端需要收到后提示信息。并且必须在闹钟结束后进行终端相关状态更新。在闹钟时间前120秒开始提示。当调度指令为0x03，收到后进行终端相关状态更新，终端不需要提示信息。当调度指令为0x04，暂不需要提示信息。|
-| data.txtContent | string | 下发的消息文本 |
-```json
-{
-    "deviceId":12345,
-    "timestamp":44324,
-    "operCode":0x64,
-    "data":{
-        "cityCode":22,
-	    "deviceId":"029L2222",
-    	"lineId":"134326"
-    }
-}
-```
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| deviceId | string | 设备编号 |
-| timestamp | long | 时间戳(ms) |
-| operCode | short | 一级协议 |
-| data.cityCode | short | 城市区号 |
-| data.deviceId | string | 设备编号 |
-| data.lineId | string | 线路编号 6位 不足6位前面补0 如编号890 用000890表示 |
-
-```json
-{
-    "deviceId":12345,
-    "timestamp":44324,
-    "operCode":0xC0,
-    "data":{
-        "operCode":0x86,
-        "requestAck":0x06
-    }
-}
-```
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| deviceId | string | 设备编号 |
-| timestamp | long | 时间戳(ms) |
-| operCode | short | 一级协议 |
-| data.operCode | short | 二级协议 |
-| data.requestAck | short | 请求应答字 0x06同意 0x15不同意|
-
-<span style="color: red">Response</span>:
-```json
-{
-    "errCode":0
-}
-```
-
-
-### 调度消息上传接口
-----------
-上行POST地址：[http://192.168.168.120:9088/control/upstream](http://192.168.168.120:9088/control/upstream)
-<span style="color: red">Request</span>:
-```json
-{
-    "deviceId":12345,
-    "timestamp":44324,
-    "status":0,
-    "operCode":0x80,
-    "data":{
-        "operCode":0x26,
-        "requestCode":22
-    }
-}
-```
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| deviceId | string | 设备编号 |
-| timestamp | long | 时间戳(ms) |
-| status | int | 0x80时无数据 0表示失败 1表示成功或设备确认 2表示驾驶员阅读 |
-| operCode | short | 一级协议 消息确认将无数据 |
-| data.operCode | short | 二级协议 |
-| data.requestCode | short | 请求代码0xa1 恢复运营 0xa2 申请调档 0xa3 出场请求 0xa5 进场请求 0xa7 加油请求 0x50 车辆故障 0x70 路阻报告 0x60 事故报告 0x11 扣证纠纷 0x12 报警 |
-<span style="color: red">Response</span>:
-```json
-{
-    "errCode":0
-}
-```
-=======
-公交调度系统BS版 0.1
+公交调度系统BS版 0.1
 ======
 ----------
 ## 目录
@@ -704,5 +363,4 @@
 | direction | float | 角度0-359 |
 | inTemp | int | 车内温度 |
 | serviceState | long | 设备状态字 |
-| daysYear | int | 对应年中的天数 为分区字段 查询一定要用此字段过滤 |
->>>>>>> PSM-9
+| daysYear | int | 对应年中的天数 为分区字段 查询一定要用此字段过滤 |
 \ No newline at end of file
@@ -185,6 +185,18 @@
         	<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>    	
 	</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) {
@@ -62,8 +62,8 @@ public class DirectiveController {
 	 * @param @param lineId 新线路编码
 	 * @throws
 	 */
-	@RequestMapping(value = "/lineChnage", method = RequestMethod.GET)
-	public int lineChange(@RequestParam String nbbm, @RequestParam Integer lineId){
+	@RequestMapping(value = "/lineChnage", method = RequestMethod.POST)
+	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());
@@ -2,7 +2,11 @@ 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;
@@ -10,6 +14,7 @@ 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;
@@ -22,16 +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(@RequestParam String data){
-		
+	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);
-			System.out.println(param);
+			
+			rs = sampleService.createDataByGps(param);
 		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
+			loger.info("", e);
+			rs.put("status", ResponseCode.ERROR);
 		}
-		return 0;
+		return rs;
 	}
 }
@@ -26,12 +26,12 @@ public class GpsController {
 	GpsService gpsService;
  
 	@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.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);
 	}
  
@@ -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, 12, 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<>();
  
@@ -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,14 @@ 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;
  
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -69,14 +72,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 +151,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 +175,36 @@ 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;
+	}
 }
@@ -25,6 +25,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;
  
@@ -44,7 +47,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;
@@ -52,6 +55,11 @@ public class GpsRealData implements CommandLineRunner{
 	@Autowired
 	GpsDataLoader gpsDataLoader;
  
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+	
+	@Autowired
+	ForecastRealServer forecastRealServer;	
 	/**
 	 * 构造函数
 	 */
@@ -64,11 +72,25 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("gpsDataLoader,20,6");
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, 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;
@@ -86,12 +108,18 @@ 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);
+			sch = dayOfSchedule.execPlamMap().get(gps.getNbbm());
+			if(null != sch)
+				gps.setSchId(sch.getId());
+			rs.add(gps);
 		}
  
 		return rs;
@@ -101,7 +129,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;
 	}
  
@@ -113,6 +141,9 @@ public class GpsRealData implements CommandLineRunner{
 	public static class GpsDataLoader extends Thread{
  
 		Logger logger = LoggerFactory.getLogger(GpsDataLoader.class);
+		
+		@Autowired
+		GpsRealData gpsRealData;
  
 		@Override
 		public void run() {
@@ -130,7 +161,7 @@ public class GpsRealData implements CommandLineRunner{
 			try {
 				httpClient = HttpClients.createDefault();
 				HttpGet get = new HttpGet(url);
-
+				
 				response = httpClient.execute(get);
  
 				HttpEntity entity = response.getEntity();
@@ -156,7 +187,7 @@ public class GpsRealData implements CommandLineRunner{
  
 						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;
 	}
  
@@ -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 {
 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,24 @@ 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);
 }
@@ -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);
 }
@@ -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);
+//	}
+//}
@@ -53,7 +53,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	 * @param @param lineId 新线路编码
 	 * @throws
 	 */
-	int lineChange(String nbbm, Integer lineId, String sender);
+	int lineChange(String nbbm, String lineId, String sender);
  
 	/**
 	 * 
@@ -38,7 +38,6 @@ import com.bsth.repository.directive.D64Repository;
 import com.bsth.repository.directive.D80Repository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
-import com.bsth.util.DateUtils;
 import com.bsth.websocket.handler.RealControlSocketHandler;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -119,7 +118,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
  
 			//下发0x02指令  调度指令(闹钟有效)
 			Long alarmTime = System.currentTimeMillis() + 1000 * 30;
-			d60 = DirectiveCreator.createD60_02(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
+			d60 = new DirectiveCreator().createD60_02(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
 					, 0, new Date(alarmTime));
 		} catch (Exception e) {
 			logger.error("生成调度指令时出现异常", e);
@@ -193,7 +192,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
  
 		String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
-		D60 d60 = DirectiveCreator.createD60(nbbm, text, (short) 0x03, upDown, state);
+		D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state);
  
 		if (null == d60)
 			return -1;
@@ -220,10 +219,12 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 	 * 线路切换
 	 */
 	@Override
-	public int lineChange(String nbbm, Integer lineCode, String sender) {
+	public int lineChange(String nbbm, String lineCode, String sender) {
+		DirectiveCreator crt = new DirectiveCreator();
+		
 		Long t = System.currentTimeMillis();
 		//生成64数据包
-		D64 d64 = DirectiveCreator.createD64(nbbm, lineCode, t);
+		D64 d64 = crt.createD64(nbbm, lineCode, t);
  
 		if(null != sender)
 			d64.setSender(sender);
@@ -238,7 +239,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
  
 		// 通知设备刷新线路文件，忽略结果
 		if (code == 0)
-			GatewayHttpUtils.postJson(DirectiveCreator.createDeviceRefreshData(deviceId, lineCode));
+			GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
 		else
 			d64.setErrorText("[刷新线路文件] 网关通讯失败, code: " + code);
  
@@ -278,7 +279,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 			state = 0;
 		}
  
-		return DirectiveCreator.createD60(nbbm, text, dispatchInstruct, upDown, state);
+		return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state);
 	}
  
 	@Override
@@ -397,10 +398,11 @@ 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()));
 		}
@@ -449,9 +451,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) {
+			return (int)(arg0.geteTime() - arg1.geteTime());
+		}
+	}
+}
@@ -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);
  
@@ -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);
@@ -899,7 +900,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);
@@ -96,7 +96,7 @@ public class DateUtils {
 		return (int) (cal.getTimeInMillis() / 1000);
 	}
  
-	public static SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm") 
+	private static SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm") 
 				,sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd")
 				,sdfHHmm = new SimpleDateFormat("HH:mm"); 
 	public static long getTimesByHHmm(String str) throws ParseException{
@@ -26,6 +26,6 @@ spring.datasource.validation-query=select 1
 ##
 #222.66.0.204:5555
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://192.168.168.192:8080/transport_server/rtgps/
+http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.192:8080/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://192.168.168.201:9090/transport_server/message/
 \ No newline at end of file
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8
-ms.mysql.username= root
-ms.mysql.password= 123456
-
-#ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
+#ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8
 #ms.mysql.username= root
-#ms.mysql.password= panzhao
+#ms.mysql.password= 123456
+
+ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.username= root
+ms.mysql.password= panzhao
-"use strict";jQuery.base64=(function($){var _PADCHAR="=",_ALPHA="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",_VERSION="1.0";function _getbyte64(s,i){var idx=_ALPHA.indexOf(s.charAt(i));if(idx===-1){throw"Cannot decode base64"}return idx}function _decode(s){var pads=0,i,b10,imax=s.length,x=[];s=String(s);if(imax===0){return s}if(imax%4!==0){throw"Cannot decode base64"}if(s.charAt(imax-1)===_PADCHAR){pads=1;if(s.charAt(imax-2)===_PADCHAR){pads=2}imax-=4}for(i=0;i<imax;i+=4){b10=(_getbyte64(s,i)<<18)|(_getbyte64(s,i+1)<<12)|(_getbyte64(s,i+2)<<6)|_getbyte64(s,i+3);x.push(String.fromCharCode(b10>>16,(b10>>8)&255,b10&255))}switch(pads){case 1:b10=(_getbyte64(s,i)<<18)|(_getbyte64(s,i+1)<<12)|(_getbyte64(s,i+2)<<6);x.push(String.fromCharCode(b10>>16,(b10>>8)&255));break;case 2:b10=(_getbyte64(s,i)<<18)|(_getbyte64(s,i+1)<<12);x.push(String.fromCharCode(b10>>16));break}return x.join("")}function _getbyte(s,i){var x=s.charCodeAt(i);if(x>255){throw"INVALID_CHARACTER_ERR: DOM Exception 5"}return x}function _encode(s){if(arguments.length!==1){throw"SyntaxError: exactly one argument required"}s=String(s);var i,b10,x=[],imax=s.length-s.length%3;if(s.length===0){return s}for(i=0;i<imax;i+=3){b10=(_getbyte(s,i)<<16)|(_getbyte(s,i+1)<<8)|_getbyte(s,i+2);x.push(_ALPHA.charAt(b10>>18));x.push(_ALPHA.charAt((b10>>12)&63));x.push(_ALPHA.charAt((b10>>6)&63));x.push(_ALPHA.charAt(b10&63))}switch(s.length-imax){case 1:b10=_getbyte(s,i)<<16;x.push(_ALPHA.charAt(b10>>18)+_ALPHA.charAt((b10>>12)&63)+_PADCHAR+_PADCHAR);break;case 2:b10=(_getbyte(s,i)<<16)|(_getbyte(s,i+1)<<8);x.push(_ALPHA.charAt(b10>>18)+_ALPHA.charAt((b10>>12)&63)+_ALPHA.charAt((b10>>6)&63)+_PADCHAR);break}return x.join("")}return{decode:_decode,encode:_encode,VERSION:_VERSION}}(jQuery));
 \ No newline at end of file
+/*! JSEncrypt v2.3.1 | https://npmcdn.com/jsencrypt@2.3.1/LICENSE.txt */
+!function(t,e){"function"==typeof define&&define.amd?define(["exports"],e):e("object"==typeof exports&&"string"!=typeof exports.nodeName?module.exports:t)}(this,function(t){function e(t,e,i){null!=t&&("number"==typeof t?this.fromNumber(t,e,i):null==e&&"string"!=typeof t?this.fromString(t,256):this.fromString(t,e))}function i(){return new e(null)}function r(t,e,i,r,s,n){for(;--n>=0;){var o=e*this[t++]+i[r]+s;s=Math.floor(o/67108864),i[r++]=67108863&o}return s}function s(t,e,i,r,s,n){for(var o=32767&e,h=e>>15;--n>=0;){var a=32767&this[t],u=this[t++]>>15,c=h*a+u*o;a=o*a+((32767&c)<<15)+i[r]+(1073741823&s),s=(a>>>30)+(c>>>15)+h*u+(s>>>30),i[r++]=1073741823&a}return s}function n(t,e,i,r,s,n){for(var o=16383&e,h=e>>14;--n>=0;){var a=16383&this[t],u=this[t++]>>14,c=h*a+u*o;a=o*a+((16383&c)<<14)+i[r]+s,s=(a>>28)+(c>>14)+h*u,i[r++]=268435455&a}return s}function o(t){return Be.charAt(t)}function h(t,e){var i=Ke[t.charCodeAt(e)];return null==i?-1:i}function a(t){for(var e=this.t-1;e>=0;--e)t[e]=this[e];t.t=this.t,t.s=this.s}function u(t){this.t=1,this.s=0>t?-1:0,t>0?this[0]=t:-1>t?this[0]=t+this.DV:this.t=0}function c(t){var e=i();return e.fromInt(t),e}function f(t,i){var r;if(16==i)r=4;else if(8==i)r=3;else if(256==i)r=8;else if(2==i)r=1;else if(32==i)r=5;else{if(4!=i)return void this.fromRadix(t,i);r=2}this.t=0,this.s=0;for(var s=t.length,n=!1,o=0;--s>=0;){var a=8==r?255&t[s]:h(t,s);0>a?"-"==t.charAt(s)&&(n=!0):(n=!1,0==o?this[this.t++]=a:o+r>this.DB?(this[this.t-1]|=(a&(1<<this.DB-o)-1)<<o,this[this.t++]=a>>this.DB-o):this[this.t-1]|=a<<o,o+=r,o>=this.DB&&(o-=this.DB))}8==r&&0!=(128&t[0])&&(this.s=-1,o>0&&(this[this.t-1]|=(1<<this.DB-o)-1<<o)),this.clamp(),n&&e.ZERO.subTo(this,this)}function p(){for(var t=this.s&this.DM;this.t>0&&this[this.t-1]==t;)--this.t}function l(t){if(this.s<0)return"-"+this.negate().toString(t);var e;if(16==t)e=4;else if(8==t)e=3;else if(2==t)e=1;else if(32==t)e=5;else{if(4!=t)return this.toRadix(t);e=2}var i,r=(1<<e)-1,s=!1,n="",h=this.t,a=this.DB-h*this.DB%e;if(h-- >0)for(a<this.DB&&(i=this[h]>>a)>0&&(s=!0,n=o(i));h>=0;)e>a?(i=(this[h]&(1<<a)-1)<<e-a,i|=this[--h]>>(a+=this.DB-e)):(i=this[h]>>(a-=e)&r,0>=a&&(a+=this.DB,--h)),i>0&&(s=!0),s&&(n+=o(i));return s?n:"0"}function d(){var t=i();return e.ZERO.subTo(this,t),t}function g(){return this.s<0?this.negate():this}function m(t){var e=this.s-t.s;if(0!=e)return e;var i=this.t;if(e=i-t.t,0!=e)return this.s<0?-e:e;for(;--i>=0;)if(0!=(e=this[i]-t[i]))return e;return 0}function y(t){var e,i=1;return 0!=(e=t>>>16)&&(t=e,i+=16),0!=(e=t>>8)&&(t=e,i+=8),0!=(e=t>>4)&&(t=e,i+=4),0!=(e=t>>2)&&(t=e,i+=2),0!=(e=t>>1)&&(t=e,i+=1),i}function b(){return this.t<=0?0:this.DB*(this.t-1)+y(this[this.t-1]^this.s&this.DM)}function T(t,e){var i;for(i=this.t-1;i>=0;--i)e[i+t]=this[i];for(i=t-1;i>=0;--i)e[i]=0;e.t=this.t+t,e.s=this.s}function S(t,e){for(var i=t;i<this.t;++i)e[i-t]=this[i];e.t=Math.max(this.t-t,0),e.s=this.s}function R(t,e){var i,r=t%this.DB,s=this.DB-r,n=(1<<s)-1,o=Math.floor(t/this.DB),h=this.s<<r&this.DM;for(i=this.t-1;i>=0;--i)e[i+o+1]=this[i]>>s|h,h=(this[i]&n)<<r;for(i=o-1;i>=0;--i)e[i]=0;e[o]=h,e.t=this.t+o+1,e.s=this.s,e.clamp()}function E(t,e){e.s=this.s;var i=Math.floor(t/this.DB);if(i>=this.t)return void(e.t=0);var r=t%this.DB,s=this.DB-r,n=(1<<r)-1;e[0]=this[i]>>r;for(var o=i+1;o<this.t;++o)e[o-i-1]|=(this[o]&n)<<s,e[o-i]=this[o]>>r;r>0&&(e[this.t-i-1]|=(this.s&n)<<s),e.t=this.t-i,e.clamp()}function D(t,e){for(var i=0,r=0,s=Math.min(t.t,this.t);s>i;)r+=this[i]-t[i],e[i++]=r&this.DM,r>>=this.DB;if(t.t<this.t){for(r-=t.s;i<this.t;)r+=this[i],e[i++]=r&this.DM,r>>=this.DB;r+=this.s}else{for(r+=this.s;i<t.t;)r-=t[i],e[i++]=r&this.DM,r>>=this.DB;r-=t.s}e.s=0>r?-1:0,-1>r?e[i++]=this.DV+r:r>0&&(e[i++]=r),e.t=i,e.clamp()}function w(t,i){var r=this.abs(),s=t.abs(),n=r.t;for(i.t=n+s.t;--n>=0;)i[n]=0;for(n=0;n<s.t;++n)i[n+r.t]=r.am(0,s[n],i,n,0,r.t);i.s=0,i.clamp(),this.s!=t.s&&e.ZERO.subTo(i,i)}function x(t){for(var e=this.abs(),i=t.t=2*e.t;--i>=0;)t[i]=0;for(i=0;i<e.t-1;++i){var r=e.am(i,e[i],t,2*i,0,1);(t[i+e.t]+=e.am(i+1,2*e[i],t,2*i+1,r,e.t-i-1))>=e.DV&&(t[i+e.t]-=e.DV,t[i+e.t+1]=1)}t.t>0&&(t[t.t-1]+=e.am(i,e[i],t,2*i,0,1)),t.s=0,t.clamp()}function B(t,r,s){var n=t.abs();if(!(n.t<=0)){var o=this.abs();if(o.t<n.t)return null!=r&&r.fromInt(0),void(null!=s&&this.copyTo(s));null==s&&(s=i());var h=i(),a=this.s,u=t.s,c=this.DB-y(n[n.t-1]);c>0?(n.lShiftTo(c,h),o.lShiftTo(c,s)):(n.copyTo(h),o.copyTo(s));var f=h.t,p=h[f-1];if(0!=p){var l=p*(1<<this.F1)+(f>1?h[f-2]>>this.F2:0),d=this.FV/l,g=(1<<this.F1)/l,m=1<<this.F2,v=s.t,b=v-f,T=null==r?i():r;for(h.dlShiftTo(b,T),s.compareTo(T)>=0&&(s[s.t++]=1,s.subTo(T,s)),e.ONE.dlShiftTo(f,T),T.subTo(h,h);h.t<f;)h[h.t++]=0;for(;--b>=0;){var S=s[--v]==p?this.DM:Math.floor(s[v]*d+(s[v-1]+m)*g);if((s[v]+=h.am(0,S,s,b,0,f))<S)for(h.dlShiftTo(b,T),s.subTo(T,s);s[v]<--S;)s.subTo(T,s)}null!=r&&(s.drShiftTo(f,r),a!=u&&e.ZERO.subTo(r,r)),s.t=f,s.clamp(),c>0&&s.rShiftTo(c,s),0>a&&e.ZERO.subTo(s,s)}}}function K(t){var r=i();return this.abs().divRemTo(t,null,r),this.s<0&&r.compareTo(e.ZERO)>0&&t.subTo(r,r),r}function A(t){this.m=t}function U(t){return t.s<0||t.compareTo(this.m)>=0?t.mod(this.m):t}function O(t){return t}function V(t){t.divRemTo(this.m,null,t)}function N(t,e,i){t.multiplyTo(e,i),this.reduce(i)}function J(t,e){t.squareTo(e),this.reduce(e)}function I(){if(this.t<1)return 0;var t=this[0];if(0==(1&t))return 0;var e=3&t;return e=e*(2-(15&t)*e)&15,e=e*(2-(255&t)*e)&255,e=e*(2-((65535&t)*e&65535))&65535,e=e*(2-t*e%this.DV)%this.DV,e>0?this.DV-e:-e}function P(t){this.m=t,this.mp=t.invDigit(),this.mpl=32767&this.mp,this.mph=this.mp>>15,this.um=(1<<t.DB-15)-1,this.mt2=2*t.t}function M(t){var r=i();return t.abs().dlShiftTo(this.m.t,r),r.divRemTo(this.m,null,r),t.s<0&&r.compareTo(e.ZERO)>0&&this.m.subTo(r,r),r}function L(t){var e=i();return t.copyTo(e),this.reduce(e),e}function q(t){for(;t.t<=this.mt2;)t[t.t++]=0;for(var e=0;e<this.m.t;++e){var i=32767&t[e],r=i*this.mpl+((i*this.mph+(t[e]>>15)*this.mpl&this.um)<<15)&t.DM;for(i=e+this.m.t,t[i]+=this.m.am(0,r,t,e,0,this.m.t);t[i]>=t.DV;)t[i]-=t.DV,t[++i]++}t.clamp(),t.drShiftTo(this.m.t,t),t.compareTo(this.m)>=0&&t.subTo(this.m,t)}function C(t,e){t.squareTo(e),this.reduce(e)}function H(t,e,i){t.multiplyTo(e,i),this.reduce(i)}function j(){return 0==(this.t>0?1&this[0]:this.s)}function k(t,r){if(t>4294967295||1>t)return e.ONE;var s=i(),n=i(),o=r.convert(this),h=y(t)-1;for(o.copyTo(s);--h>=0;)if(r.sqrTo(s,n),(t&1<<h)>0)r.mulTo(n,o,s);else{var a=s;s=n,n=a}return r.revert(s)}function F(t,e){var i;return i=256>t||e.isEven()?new A(e):new P(e),this.exp(t,i)}
+// Copyright (c) 2005-2009  Tom Wu
+// All Rights Reserved.
+// See "LICENSE" for details.
+function _(){var t=i();return this.copyTo(t),t}function z(){if(this.s<0){if(1==this.t)return this[0]-this.DV;if(0==this.t)return-1}else{if(1==this.t)return this[0];if(0==this.t)return 0}return(this[1]&(1<<32-this.DB)-1)<<this.DB|this[0]}function Z(){return 0==this.t?this.s:this[0]<<24>>24}function G(){return 0==this.t?this.s:this[0]<<16>>16}function $(t){return Math.floor(Math.LN2*this.DB/Math.log(t))}function Y(){return this.s<0?-1:this.t<=0||1==this.t&&this[0]<=0?0:1}function W(t){if(null==t&&(t=10),0==this.signum()||2>t||t>36)return"0";var e=this.chunkSize(t),r=Math.pow(t,e),s=c(r),n=i(),o=i(),h="";for(this.divRemTo(s,n,o);n.signum()>0;)h=(r+o.intValue()).toString(t).substr(1)+h,n.divRemTo(s,n,o);return o.intValue().toString(t)+h}function Q(t,i){this.fromInt(0),null==i&&(i=10);for(var r=this.chunkSize(i),s=Math.pow(i,r),n=!1,o=0,a=0,u=0;u<t.length;++u){var c=h(t,u);0>c?"-"==t.charAt(u)&&0==this.signum()&&(n=!0):(a=i*a+c,++o>=r&&(this.dMultiply(s),this.dAddOffset(a,0),o=0,a=0))}o>0&&(this.dMultiply(Math.pow(i,o)),this.dAddOffset(a,0)),n&&e.ZERO.subTo(this,this)}function X(t,i,r){if("number"==typeof i)if(2>t)this.fromInt(1);else for(this.fromNumber(t,r),this.testBit(t-1)||this.bitwiseTo(e.ONE.shiftLeft(t-1),ht,this),this.isEven()&&this.dAddOffset(1,0);!this.isProbablePrime(i);)this.dAddOffset(2,0),this.bitLength()>t&&this.subTo(e.ONE.shiftLeft(t-1),this);else{var s=new Array,n=7&t;s.length=(t>>3)+1,i.nextBytes(s),n>0?s[0]&=(1<<n)-1:s[0]=0,this.fromString(s,256)}}function tt(){var t=this.t,e=new Array;e[0]=this.s;var i,r=this.DB-t*this.DB%8,s=0;if(t-- >0)for(r<this.DB&&(i=this[t]>>r)!=(this.s&this.DM)>>r&&(e[s++]=i|this.s<<this.DB-r);t>=0;)8>r?(i=(this[t]&(1<<r)-1)<<8-r,i|=this[--t]>>(r+=this.DB-8)):(i=this[t]>>(r-=8)&255,0>=r&&(r+=this.DB,--t)),0!=(128&i)&&(i|=-256),0==s&&(128&this.s)!=(128&i)&&++s,(s>0||i!=this.s)&&(e[s++]=i);return e}function et(t){return 0==this.compareTo(t)}function it(t){return this.compareTo(t)<0?this:t}function rt(t){return this.compareTo(t)>0?this:t}function st(t,e,i){var r,s,n=Math.min(t.t,this.t);for(r=0;n>r;++r)i[r]=e(this[r],t[r]);if(t.t<this.t){for(s=t.s&this.DM,r=n;r<this.t;++r)i[r]=e(this[r],s);i.t=this.t}else{for(s=this.s&this.DM,r=n;r<t.t;++r)i[r]=e(s,t[r]);i.t=t.t}i.s=e(this.s,t.s),i.clamp()}function nt(t,e){return t&e}function ot(t){var e=i();return this.bitwiseTo(t,nt,e),e}function ht(t,e){return t|e}function at(t){var e=i();return this.bitwiseTo(t,ht,e),e}function ut(t,e){return t^e}function ct(t){var e=i();return this.bitwiseTo(t,ut,e),e}function ft(t,e){return t&~e}function pt(t){var e=i();return this.bitwiseTo(t,ft,e),e}function lt(){for(var t=i(),e=0;e<this.t;++e)t[e]=this.DM&~this[e];return t.t=this.t,t.s=~this.s,t}function dt(t){var e=i();return 0>t?this.rShiftTo(-t,e):this.lShiftTo(t,e),e}function gt(t){var e=i();return 0>t?this.lShiftTo(-t,e):this.rShiftTo(t,e),e}function mt(t){if(0==t)return-1;var e=0;return 0==(65535&t)&&(t>>=16,e+=16),0==(255&t)&&(t>>=8,e+=8),0==(15&t)&&(t>>=4,e+=4),0==(3&t)&&(t>>=2,e+=2),0==(1&t)&&++e,e}function yt(){for(var t=0;t<this.t;++t)if(0!=this[t])return t*this.DB+mt(this[t]);return this.s<0?this.t*this.DB:-1}function vt(t){for(var e=0;0!=t;)t&=t-1,++e;return e}function bt(){for(var t=0,e=this.s&this.DM,i=0;i<this.t;++i)t+=vt(this[i]^e);return t}function Tt(t){var e=Math.floor(t/this.DB);return e>=this.t?0!=this.s:0!=(this[e]&1<<t%this.DB)}function St(t,i){var r=e.ONE.shiftLeft(t);return this.bitwiseTo(r,i,r),r}function Rt(t){return this.changeBit(t,ht)}function Et(t){return this.changeBit(t,ft)}function Dt(t){return this.changeBit(t,ut)}function wt(t,e){for(var i=0,r=0,s=Math.min(t.t,this.t);s>i;)r+=this[i]+t[i],e[i++]=r&this.DM,r>>=this.DB;if(t.t<this.t){for(r+=t.s;i<this.t;)r+=this[i],e[i++]=r&this.DM,r>>=this.DB;r+=this.s}else{for(r+=this.s;i<t.t;)r+=t[i],e[i++]=r&this.DM,r>>=this.DB;r+=t.s}e.s=0>r?-1:0,r>0?e[i++]=r:-1>r&&(e[i++]=this.DV+r),e.t=i,e.clamp()}function xt(t){var e=i();return this.addTo(t,e),e}function Bt(t){var e=i();return this.subTo(t,e),e}function Kt(t){var e=i();return this.multiplyTo(t,e),e}function At(){var t=i();return this.squareTo(t),t}function Ut(t){var e=i();return this.divRemTo(t,e,null),e}function Ot(t){var e=i();return this.divRemTo(t,null,e),e}function Vt(t){var e=i(),r=i();return this.divRemTo(t,e,r),new Array(e,r)}function Nt(t){this[this.t]=this.am(0,t-1,this,0,0,this.t),++this.t,this.clamp()}function Jt(t,e){if(0!=t){for(;this.t<=e;)this[this.t++]=0;for(this[e]+=t;this[e]>=this.DV;)this[e]-=this.DV,++e>=this.t&&(this[this.t++]=0),++this[e]}}function It(){}function Pt(t){return t}function Mt(t,e,i){t.multiplyTo(e,i)}function Lt(t,e){t.squareTo(e)}function qt(t){return this.exp(t,new It)}function Ct(t,e,i){var r=Math.min(this.t+t.t,e);for(i.s=0,i.t=r;r>0;)i[--r]=0;var s;for(s=i.t-this.t;s>r;++r)i[r+this.t]=this.am(0,t[r],i,r,0,this.t);for(s=Math.min(t.t,e);s>r;++r)this.am(0,t[r],i,r,0,e-r);i.clamp()}function Ht(t,e,i){--e;var r=i.t=this.t+t.t-e;for(i.s=0;--r>=0;)i[r]=0;for(r=Math.max(e-this.t,0);r<t.t;++r)i[this.t+r-e]=this.am(e-r,t[r],i,0,0,this.t+r-e);i.clamp(),i.drShiftTo(1,i)}function jt(t){this.r2=i(),this.q3=i(),e.ONE.dlShiftTo(2*t.t,this.r2),this.mu=this.r2.divide(t),this.m=t}function kt(t){if(t.s<0||t.t>2*this.m.t)return t.mod(this.m);if(t.compareTo(this.m)<0)return t;var e=i();return t.copyTo(e),this.reduce(e),e}function Ft(t){return t}function _t(t){for(t.drShiftTo(this.m.t-1,this.r2),t.t>this.m.t+1&&(t.t=this.m.t+1,t.clamp()),this.mu.multiplyUpperTo(this.r2,this.m.t+1,this.q3),this.m.multiplyLowerTo(this.q3,this.m.t+1,this.r2);t.compareTo(this.r2)<0;)t.dAddOffset(1,this.m.t+1);for(t.subTo(this.r2,t);t.compareTo(this.m)>=0;)t.subTo(this.m,t)}function zt(t,e){t.squareTo(e),this.reduce(e)}function Zt(t,e,i){t.multiplyTo(e,i),this.reduce(i)}function Gt(t,e){var r,s,n=t.bitLength(),o=c(1);if(0>=n)return o;r=18>n?1:48>n?3:144>n?4:768>n?5:6,s=8>n?new A(e):e.isEven()?new jt(e):new P(e);var h=new Array,a=3,u=r-1,f=(1<<r)-1;if(h[1]=s.convert(this),r>1){var p=i();for(s.sqrTo(h[1],p);f>=a;)h[a]=i(),s.mulTo(p,h[a-2],h[a]),a+=2}var l,d,g=t.t-1,m=!0,v=i();for(n=y(t[g])-1;g>=0;){for(n>=u?l=t[g]>>n-u&f:(l=(t[g]&(1<<n+1)-1)<<u-n,g>0&&(l|=t[g-1]>>this.DB+n-u)),a=r;0==(1&l);)l>>=1,--a;if((n-=a)<0&&(n+=this.DB,--g),m)h[l].copyTo(o),m=!1;else{for(;a>1;)s.sqrTo(o,v),s.sqrTo(v,o),a-=2;a>0?s.sqrTo(o,v):(d=o,o=v,v=d),s.mulTo(v,h[l],o)}for(;g>=0&&0==(t[g]&1<<n);)s.sqrTo(o,v),d=o,o=v,v=d,--n<0&&(n=this.DB-1,--g)}return s.revert(o)}function $t(t){var e=this.s<0?this.negate():this.clone(),i=t.s<0?t.negate():t.clone();if(e.compareTo(i)<0){var r=e;e=i,i=r}var s=e.getLowestSetBit(),n=i.getLowestSetBit();if(0>n)return e;for(n>s&&(n=s),n>0&&(e.rShiftTo(n,e),i.rShiftTo(n,i));e.signum()>0;)(s=e.getLowestSetBit())>0&&e.rShiftTo(s,e),(s=i.getLowestSetBit())>0&&i.rShiftTo(s,i),e.compareTo(i)>=0?(e.subTo(i,e),e.rShiftTo(1,e)):(i.subTo(e,i),i.rShiftTo(1,i));return n>0&&i.lShiftTo(n,i),i}function Yt(t){if(0>=t)return 0;var e=this.DV%t,i=this.s<0?t-1:0;if(this.t>0)if(0==e)i=this[0]%t;else for(var r=this.t-1;r>=0;--r)i=(e*i+this[r])%t;return i}function Wt(t){var i=t.isEven();if(this.isEven()&&i||0==t.signum())return e.ZERO;for(var r=t.clone(),s=this.clone(),n=c(1),o=c(0),h=c(0),a=c(1);0!=r.signum();){for(;r.isEven();)r.rShiftTo(1,r),i?(n.isEven()&&o.isEven()||(n.addTo(this,n),o.subTo(t,o)),n.rShiftTo(1,n)):o.isEven()||o.subTo(t,o),o.rShiftTo(1,o);for(;s.isEven();)s.rShiftTo(1,s),i?(h.isEven()&&a.isEven()||(h.addTo(this,h),a.subTo(t,a)),h.rShiftTo(1,h)):a.isEven()||a.subTo(t,a),a.rShiftTo(1,a);r.compareTo(s)>=0?(r.subTo(s,r),i&&n.subTo(h,n),o.subTo(a,o)):(s.subTo(r,s),i&&h.subTo(n,h),a.subTo(o,a))}return 0!=s.compareTo(e.ONE)?e.ZERO:a.compareTo(t)>=0?a.subtract(t):a.signum()<0?(a.addTo(t,a),a.signum()<0?a.add(t):a):a}function Qt(t){var e,i=this.abs();if(1==i.t&&i[0]<=Ae[Ae.length-1]){for(e=0;e<Ae.length;++e)if(i[0]==Ae[e])return!0;return!1}if(i.isEven())return!1;for(e=1;e<Ae.length;){for(var r=Ae[e],s=e+1;s<Ae.length&&Ue>r;)r*=Ae[s++];for(r=i.modInt(r);s>e;)if(r%Ae[e++]==0)return!1}return i.millerRabin(t)}function Xt(t){var r=this.subtract(e.ONE),s=r.getLowestSetBit();if(0>=s)return!1;var n=r.shiftRight(s);t=t+1>>1,t>Ae.length&&(t=Ae.length);for(var o=i(),h=0;t>h;++h){o.fromInt(Ae[Math.floor(Math.random()*Ae.length)]);var a=o.modPow(n,this);if(0!=a.compareTo(e.ONE)&&0!=a.compareTo(r)){for(var u=1;u++<s&&0!=a.compareTo(r);)if(a=a.modPowInt(2,this),0==a.compareTo(e.ONE))return!1;if(0!=a.compareTo(r))return!1}}return!0}function te(){this.i=0,this.j=0,this.S=new Array}function ee(t){var e,i,r;for(e=0;256>e;++e)this.S[e]=e;for(i=0,e=0;256>e;++e)i=i+this.S[e]+t[e%t.length]&255,r=this.S[e],this.S[e]=this.S[i],this.S[i]=r;this.i=0,this.j=0}function ie(){var t;return this.i=this.i+1&255,this.j=this.j+this.S[this.i]&255,t=this.S[this.i],this.S[this.i]=this.S[this.j],this.S[this.j]=t,this.S[t+this.S[this.i]&255]}function re(){return new te}function se(){if(null==Oe){for(Oe=re();Je>Ne;){var t=Math.floor(65536*Math.random());Ve[Ne++]=255&t}for(Oe.init(Ve),Ne=0;Ne<Ve.length;++Ne)Ve[Ne]=0;Ne=0}return Oe.next()}function ne(t){var e;for(e=0;e<t.length;++e)t[e]=se()}function oe(){}function he(t,i){return new e(t,i)}function ae(t,i){if(i<t.length+11)return console.error("Message too long for RSA"),null;for(var r=new Array,s=t.length-1;s>=0&&i>0;){var n=t.charCodeAt(s--);128>n?r[--i]=n:n>127&&2048>n?(r[--i]=63&n|128,r[--i]=n>>6|192):(r[--i]=63&n|128,r[--i]=n>>6&63|128,r[--i]=n>>12|224)}r[--i]=0;for(var o=new oe,h=new Array;i>2;){for(h[0]=0;0==h[0];)o.nextBytes(h);r[--i]=h[0]}return r[--i]=2,r[--i]=0,new e(r)}function ue(){this.n=null,this.e=0,this.d=null,this.p=null,this.q=null,this.dmp1=null,this.dmq1=null,this.coeff=null}function ce(t,e){null!=t&&null!=e&&t.length>0&&e.length>0?(this.n=he(t,16),this.e=parseInt(e,16)):console.error("Invalid RSA public key")}function fe(t){return t.modPowInt(this.e,this.n)}function pe(t){var e=ae(t,this.n.bitLength()+7>>3);if(null==e)return null;var i=this.doPublic(e);if(null==i)return null;var r=i.toString(16);return 0==(1&r.length)?r:"0"+r}function le(t,e){for(var i=t.toByteArray(),r=0;r<i.length&&0==i[r];)++r;if(i.length-r!=e-1||2!=i[r])return null;for(++r;0!=i[r];)if(++r>=i.length)return null;for(var s="";++r<i.length;){var n=255&i[r];128>n?s+=String.fromCharCode(n):n>191&&224>n?(s+=String.fromCharCode((31&n)<<6|63&i[r+1]),++r):(s+=String.fromCharCode((15&n)<<12|(63&i[r+1])<<6|63&i[r+2]),r+=2)}return s}function de(t,e,i){null!=t&&null!=e&&t.length>0&&e.length>0?(this.n=he(t,16),this.e=parseInt(e,16),this.d=he(i,16)):console.error("Invalid RSA private key")}function ge(t,e,i,r,s,n,o,h){null!=t&&null!=e&&t.length>0&&e.length>0?(this.n=he(t,16),this.e=parseInt(e,16),this.d=he(i,16),this.p=he(r,16),this.q=he(s,16),this.dmp1=he(n,16),this.dmq1=he(o,16),this.coeff=he(h,16)):console.error("Invalid RSA private key")}function me(t,i){var r=new oe,s=t>>1;this.e=parseInt(i,16);for(var n=new e(i,16);;){for(;this.p=new e(t-s,1,r),0!=this.p.subtract(e.ONE).gcd(n).compareTo(e.ONE)||!this.p.isProbablePrime(10););for(;this.q=new e(s,1,r),0!=this.q.subtract(e.ONE).gcd(n).compareTo(e.ONE)||!this.q.isProbablePrime(10););if(this.p.compareTo(this.q)<=0){var o=this.p;this.p=this.q,this.q=o}var h=this.p.subtract(e.ONE),a=this.q.subtract(e.ONE),u=h.multiply(a);if(0==u.gcd(n).compareTo(e.ONE)){this.n=this.p.multiply(this.q),this.d=n.modInverse(u),this.dmp1=this.d.mod(h),this.dmq1=this.d.mod(a),this.coeff=this.q.modInverse(this.p);break}}}function ye(t){if(null==this.p||null==this.q)return t.modPow(this.d,this.n);for(var e=t.mod(this.p).modPow(this.dmp1,this.p),i=t.mod(this.q).modPow(this.dmq1,this.q);e.compareTo(i)<0;)e=e.add(this.p);return e.subtract(i).multiply(this.coeff).mod(this.p).multiply(this.q).add(i)}function ve(t){var e=he(t,16),i=this.doPrivate(e);return null==i?null:le(i,this.n.bitLength()+7>>3)}function be(t){var e,i,r="";for(e=0;e+3<=t.length;e+=3)i=parseInt(t.substring(e,e+3),16),r+=Le.charAt(i>>6)+Le.charAt(63&i);for(e+1==t.length?(i=parseInt(t.substring(e,e+1),16),r+=Le.charAt(i<<2)):e+2==t.length&&(i=parseInt(t.substring(e,e+2),16),r+=Le.charAt(i>>2)+Le.charAt((3&i)<<4));(3&r.length)>0;)r+=qe;return r}function Te(t){var e,i,r="",s=0;for(e=0;e<t.length&&t.charAt(e)!=qe;++e)v=Le.indexOf(t.charAt(e)),v<0||(0==s?(r+=o(v>>2),i=3&v,s=1):1==s?(r+=o(i<<2|v>>4),i=15&v,s=2):2==s?(r+=o(i),r+=o(v>>2),i=3&v,s=3):(r+=o(i<<2|v>>4),r+=o(15&v),s=0));return 1==s&&(r+=o(i<<2)),r}
+// Copyright (c) 2005  Tom Wu
+// All Rights Reserved.
+// See "LICENSE" for details.
+var Se,Re=0xdeadbeefcafe,Ee=15715070==(16777215&Re);Ee&&"Microsoft Internet Explorer"==navigator.appName?(e.prototype.am=s,Se=30):Ee&&"Netscape"!=navigator.appName?(e.prototype.am=r,Se=26):(e.prototype.am=n,Se=28),e.prototype.DB=Se,e.prototype.DM=(1<<Se)-1,e.prototype.DV=1<<Se;var De=52;e.prototype.FV=Math.pow(2,De),e.prototype.F1=De-Se,e.prototype.F2=2*Se-De;var we,xe,Be="0123456789abcdefghijklmnopqrstuvwxyz",Ke=new Array;for(we="0".charCodeAt(0),xe=0;9>=xe;++xe)Ke[we++]=xe;for(we="a".charCodeAt(0),xe=10;36>xe;++xe)Ke[we++]=xe;for(we="A".charCodeAt(0),xe=10;36>xe;++xe)Ke[we++]=xe;A.prototype.convert=U,A.prototype.revert=O,A.prototype.reduce=V,A.prototype.mulTo=N,A.prototype.sqrTo=J,P.prototype.convert=M,P.prototype.revert=L,P.prototype.reduce=q,P.prototype.mulTo=H,P.prototype.sqrTo=C,e.prototype.copyTo=a,e.prototype.fromInt=u,e.prototype.fromString=f,e.prototype.clamp=p,e.prototype.dlShiftTo=T,e.prototype.drShiftTo=S,e.prototype.lShiftTo=R,e.prototype.rShiftTo=E,e.prototype.subTo=D,e.prototype.multiplyTo=w,e.prototype.squareTo=x,e.prototype.divRemTo=B,e.prototype.invDigit=I,e.prototype.isEven=j,e.prototype.exp=k,e.prototype.toString=l,e.prototype.negate=d,e.prototype.abs=g,e.prototype.compareTo=m,e.prototype.bitLength=b,e.prototype.mod=K,e.prototype.modPowInt=F,e.ZERO=c(0),e.ONE=c(1),It.prototype.convert=Pt,It.prototype.revert=Pt,It.prototype.mulTo=Mt,It.prototype.sqrTo=Lt,jt.prototype.convert=kt,jt.prototype.revert=Ft,jt.prototype.reduce=_t,jt.prototype.mulTo=Zt,jt.prototype.sqrTo=zt;var Ae=[2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311,313,317,331,337,347,349,353,359,367,373,379,383,389,397,401,409,419,421,431,433,439,443,449,457,461,463,467,479,487,491,499,503,509,521,523,541,547,557,563,569,571,577,587,593,599,601,607,613,617,619,631,641,643,647,653,659,661,673,677,683,691,701,709,719,727,733,739,743,751,757,761,769,773,787,797,809,811,821,823,827,829,839,853,857,859,863,877,881,883,887,907,911,919,929,937,941,947,953,967,971,977,983,991,997],Ue=(1<<26)/Ae[Ae.length-1];e.prototype.chunkSize=$,e.prototype.toRadix=W,e.prototype.fromRadix=Q,e.prototype.fromNumber=X,e.prototype.bitwiseTo=st,e.prototype.changeBit=St,e.prototype.addTo=wt,e.prototype.dMultiply=Nt,e.prototype.dAddOffset=Jt,e.prototype.multiplyLowerTo=Ct,e.prototype.multiplyUpperTo=Ht,e.prototype.modInt=Yt,e.prototype.millerRabin=Xt,e.prototype.clone=_,e.prototype.intValue=z,e.prototype.byteValue=Z,e.prototype.shortValue=G,e.prototype.signum=Y,e.prototype.toByteArray=tt,e.prototype.equals=et,e.prototype.min=it,e.prototype.max=rt,e.prototype.and=ot,e.prototype.or=at,e.prototype.xor=ct,e.prototype.andNot=pt,e.prototype.not=lt,e.prototype.shiftLeft=dt,e.prototype.shiftRight=gt,e.prototype.getLowestSetBit=yt,e.prototype.bitCount=bt,e.prototype.testBit=Tt,e.prototype.setBit=Rt,e.prototype.clearBit=Et,e.prototype.flipBit=Dt,e.prototype.add=xt,e.prototype.subtract=Bt,e.prototype.multiply=Kt,e.prototype.divide=Ut,e.prototype.remainder=Ot,e.prototype.divideAndRemainder=Vt,e.prototype.modPow=Gt,e.prototype.modInverse=Wt,e.prototype.pow=qt,e.prototype.gcd=$t,e.prototype.isProbablePrime=Qt,e.prototype.square=At,te.prototype.init=ee,te.prototype.next=ie;var Oe,Ve,Ne,Je=256;if(null==Ve){Ve=new Array,Ne=0;var Ie;if(window.crypto&&window.crypto.getRandomValues){var Pe=new Uint32Array(256);for(window.crypto.getRandomValues(Pe),Ie=0;Ie<Pe.length;++Ie)Ve[Ne++]=255&Pe[Ie]}var Me=function(t){if(this.count=this.count||0,this.count>=256||Ne>=Je)return void(window.removeEventListener?window.removeEventListener("mousemove",Me,!1):window.detachEvent&&window.detachEvent("onmousemove",Me));try{var e=t.x+t.y;Ve[Ne++]=255&e,this.count+=1}catch(i){}};window.addEventListener?window.addEventListener("mousemove",Me,!1):window.attachEvent&&window.attachEvent("onmousemove",Me)}oe.prototype.nextBytes=ne,ue.prototype.doPublic=fe,ue.prototype.setPublic=ce,ue.prototype.encrypt=pe,ue.prototype.doPrivate=ye,ue.prototype.setPrivate=de,ue.prototype.setPrivateEx=ge,ue.prototype.generate=me,ue.prototype.decrypt=ve,
+// Copyright (c) 2011  Kevin M Burns Jr.
+// All Rights Reserved.
+// See "LICENSE" for details.
+//
+// Extension to jsbn which adds facilities for asynchronous RSA key generation
+// Primarily created to avoid execution timeout on mobile devices
+//
+// http://www-cs-students.stanford.edu/~tjw/jsbn/
+//
+// ---
+function(){var t=function(t,r,s){var n=new oe,o=t>>1;this.e=parseInt(r,16);var h=new e(r,16),a=this,u=function(){var r=function(){if(a.p.compareTo(a.q)<=0){var t=a.p;a.p=a.q,a.q=t}var i=a.p.subtract(e.ONE),r=a.q.subtract(e.ONE),n=i.multiply(r);0==n.gcd(h).compareTo(e.ONE)?(a.n=a.p.multiply(a.q),a.d=h.modInverse(n),a.dmp1=a.d.mod(i),a.dmq1=a.d.mod(r),a.coeff=a.q.modInverse(a.p),setTimeout(function(){s()},0)):setTimeout(u,0)},c=function(){a.q=i(),a.q.fromNumberAsync(o,1,n,function(){a.q.subtract(e.ONE).gcda(h,function(t){0==t.compareTo(e.ONE)&&a.q.isProbablePrime(10)?setTimeout(r,0):setTimeout(c,0)})})},f=function(){a.p=i(),a.p.fromNumberAsync(t-o,1,n,function(){a.p.subtract(e.ONE).gcda(h,function(t){0==t.compareTo(e.ONE)&&a.p.isProbablePrime(10)?setTimeout(c,0):setTimeout(f,0)})})};setTimeout(f,0)};setTimeout(u,0)};ue.prototype.generateAsync=t;var r=function(t,e){var i=this.s<0?this.negate():this.clone(),r=t.s<0?t.negate():t.clone();if(i.compareTo(r)<0){var s=i;i=r,r=s}var n=i.getLowestSetBit(),o=r.getLowestSetBit();if(0>o)return void e(i);o>n&&(o=n),o>0&&(i.rShiftTo(o,i),r.rShiftTo(o,r));var h=function(){(n=i.getLowestSetBit())>0&&i.rShiftTo(n,i),(n=r.getLowestSetBit())>0&&r.rShiftTo(n,r),i.compareTo(r)>=0?(i.subTo(r,i),i.rShiftTo(1,i)):(r.subTo(i,r),r.rShiftTo(1,r)),i.signum()>0?setTimeout(h,0):(o>0&&r.lShiftTo(o,r),setTimeout(function(){e(r)},0))};setTimeout(h,10)};e.prototype.gcda=r;var s=function(t,i,r,s){if("number"==typeof i)if(2>t)this.fromInt(1);else{this.fromNumber(t,r),this.testBit(t-1)||this.bitwiseTo(e.ONE.shiftLeft(t-1),ht,this),this.isEven()&&this.dAddOffset(1,0);var n=this,o=function(){n.dAddOffset(2,0),n.bitLength()>t&&n.subTo(e.ONE.shiftLeft(t-1),n),n.isProbablePrime(i)?setTimeout(function(){s()},0):setTimeout(o,0)};setTimeout(o,0)}else{var h=new Array,a=7&t;h.length=(t>>3)+1,i.nextBytes(h),a>0?h[0]&=(1<<a)-1:h[0]=0,this.fromString(h,256)}};e.prototype.fromNumberAsync=s}();var Le="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",qe="=",Ce=Ce||{};Ce.env=Ce.env||{};var He=Ce,je=Object.prototype,ke="[object Function]",Fe=["toString","valueOf"];Ce.env.parseUA=function(t){var e,i=function(t){var e=0;return parseFloat(t.replace(/\./g,function(){return 1==e++?"":"."}))},r=navigator,s={ie:0,opera:0,gecko:0,webkit:0,chrome:0,mobile:null,air:0,ipad:0,iphone:0,ipod:0,ios:null,android:0,webos:0,caja:r&&r.cajaVersion,secure:!1,os:null},n=t||navigator&&navigator.userAgent,o=window&&window.location,h=o&&o.href;return s.secure=h&&0===h.toLowerCase().indexOf("https"),n&&(/windows|win32/i.test(n)?s.os="windows":/macintosh/i.test(n)?s.os="macintosh":/rhino/i.test(n)&&(s.os="rhino"),/KHTML/.test(n)&&(s.webkit=1),e=n.match(/AppleWebKit\/([^\s]*)/),e&&e[1]&&(s.webkit=i(e[1]),/ Mobile\//.test(n)?(s.mobile="Apple",e=n.match(/OS ([^\s]*)/),e&&e[1]&&(e=i(e[1].replace("_","."))),s.ios=e,s.ipad=s.ipod=s.iphone=0,e=n.match(/iPad|iPod|iPhone/),e&&e[0]&&(s[e[0].toLowerCase()]=s.ios)):(e=n.match(/NokiaN[^\/]*|Android \d\.\d|webOS\/\d\.\d/),e&&(s.mobile=e[0]),/webOS/.test(n)&&(s.mobile="WebOS",e=n.match(/webOS\/([^\s]*);/),e&&e[1]&&(s.webos=i(e[1]))),/ Android/.test(n)&&(s.mobile="Android",e=n.match(/Android ([^\s]*);/),e&&e[1]&&(s.android=i(e[1])))),e=n.match(/Chrome\/([^\s]*)/),e&&e[1]?s.chrome=i(e[1]):(e=n.match(/AdobeAIR\/([^\s]*)/),e&&(s.air=e[0]))),s.webkit||(e=n.match(/Opera[\s\/]([^\s]*)/),e&&e[1]?(s.opera=i(e[1]),e=n.match(/Version\/([^\s]*)/),e&&e[1]&&(s.opera=i(e[1])),e=n.match(/Opera Mini[^;]*/),e&&(s.mobile=e[0])):(e=n.match(/MSIE\s([^;]*)/),e&&e[1]?s.ie=i(e[1]):(e=n.match(/Gecko\/([^\s]*)/),e&&(s.gecko=1,e=n.match(/rv:([^\s\)]*)/),e&&e[1]&&(s.gecko=i(e[1]))))))),s},Ce.env.ua=Ce.env.parseUA(),Ce.isFunction=function(t){return"function"==typeof t||je.toString.apply(t)===ke},Ce._IEEnumFix=Ce.env.ua.ie?function(t,e){var i,r,s;for(i=0;i<Fe.length;i+=1)r=Fe[i],s=e[r],He.isFunction(s)&&s!=je[r]&&(t[r]=s)}:function(){},Ce.extend=function(t,e,i){if(!e||!t)throw new Error("extend failed, please check that all dependencies are included.");var r,s=function(){};if(s.prototype=e.prototype,t.prototype=new s,t.prototype.constructor=t,t.superclass=e.prototype,e.prototype.constructor==je.constructor&&(e.prototype.constructor=e),i){for(r in i)He.hasOwnProperty(i,r)&&(t.prototype[r]=i[r]);He._IEEnumFix(t.prototype,i)}},/*
+ * asn1.js - ASN.1 DER encoder classes
+ *
+ * Copyright (c) 2013 Kenji Urushima (kenji.urushima@gmail.com)
+ *
+ * This software is licensed under the terms of the MIT License.
+ * http://kjur.github.com/jsrsasign/license
+ *
+ * The above copyright and license notice shall be 
+ * included in all copies or substantial portions of the Software.
+ */
+/**
+ * @fileOverview
+ * @name asn1-1.0.js
+ * @author Kenji Urushima kenji.urushima@gmail.com
+ * @version 1.0.2 (2013-May-30)
+ * @since 2.1
+ * @license <a href="http://kjur.github.io/jsrsasign/license/">MIT License</a>
+ */
+"undefined"!=typeof KJUR&&KJUR||(KJUR={}),"undefined"!=typeof KJUR.asn1&&KJUR.asn1||(KJUR.asn1={}),KJUR.asn1.ASN1Util=new function(){this.integerToByteHex=function(t){var e=t.toString(16);return e.length%2==1&&(e="0"+e),e},this.bigIntToMinTwosComplementsHex=function(t){var i=t.toString(16);if("-"!=i.substr(0,1))i.length%2==1?i="0"+i:i.match(/^[0-7]/)||(i="00"+i);else{var r=i.substr(1),s=r.length;s%2==1?s+=1:i.match(/^[0-7]/)||(s+=2);for(var n="",o=0;s>o;o++)n+="f";var h=new e(n,16),a=h.xor(t).add(e.ONE);i=a.toString(16).replace(/^-/,"")}return i},this.getPEMStringFromHex=function(t,e){var i=CryptoJS.enc.Hex.parse(t),r=CryptoJS.enc.Base64.stringify(i),s=r.replace(/(.{64})/g,"$1\r\n");return s=s.replace(/\r\n$/,""),"-----BEGIN "+e+"-----\r\n"+s+"\r\n-----END "+e+"-----\r\n"}},KJUR.asn1.ASN1Object=function(){var t="";this.getLengthHexFromValue=function(){if("undefined"==typeof this.hV||null==this.hV)throw"this.hV is null or undefined.";if(this.hV.length%2==1)throw"value hex must be even length: n="+t.length+",v="+this.hV;var e=this.hV.length/2,i=e.toString(16);if(i.length%2==1&&(i="0"+i),128>e)return i;var r=i.length/2;if(r>15)throw"ASN.1 length too long to represent by 8x: n = "+e.toString(16);var s=128+r;return s.toString(16)+i},this.getEncodedHex=function(){return(null==this.hTLV||this.isModified)&&(this.hV=this.getFreshValueHex(),this.hL=this.getLengthHexFromValue(),this.hTLV=this.hT+this.hL+this.hV,this.isModified=!1),this.hTLV},this.getValueHex=function(){return this.getEncodedHex(),this.hV},this.getFreshValueHex=function(){return""}},KJUR.asn1.DERAbstractString=function(t){KJUR.asn1.DERAbstractString.superclass.constructor.call(this);this.getString=function(){return this.s},this.setString=function(t){this.hTLV=null,this.isModified=!0,this.s=t,this.hV=stohex(this.s)},this.setStringHex=function(t){this.hTLV=null,this.isModified=!0,this.s=null,this.hV=t},this.getFreshValueHex=function(){return this.hV},"undefined"!=typeof t&&("undefined"!=typeof t.str?this.setString(t.str):"undefined"!=typeof t.hex&&this.setStringHex(t.hex))},Ce.extend(KJUR.asn1.DERAbstractString,KJUR.asn1.ASN1Object),KJUR.asn1.DERAbstractTime=function(t){KJUR.asn1.DERAbstractTime.superclass.constructor.call(this);this.localDateToUTC=function(t){utc=t.getTime()+6e4*t.getTimezoneOffset();var e=new Date(utc);return e},this.formatDate=function(t,e){var i=this.zeroPadding,r=this.localDateToUTC(t),s=String(r.getFullYear());"utc"==e&&(s=s.substr(2,2));var n=i(String(r.getMonth()+1),2),o=i(String(r.getDate()),2),h=i(String(r.getHours()),2),a=i(String(r.getMinutes()),2),u=i(String(r.getSeconds()),2);return s+n+o+h+a+u+"Z"},this.zeroPadding=function(t,e){return t.length>=e?t:new Array(e-t.length+1).join("0")+t},this.getString=function(){return this.s},this.setString=function(t){this.hTLV=null,this.isModified=!0,this.s=t,this.hV=stohex(this.s)},this.setByDateValue=function(t,e,i,r,s,n){var o=new Date(Date.UTC(t,e-1,i,r,s,n,0));this.setByDate(o)},this.getFreshValueHex=function(){return this.hV}},Ce.extend(KJUR.asn1.DERAbstractTime,KJUR.asn1.ASN1Object),KJUR.asn1.DERAbstractStructured=function(t){KJUR.asn1.DERAbstractString.superclass.constructor.call(this);this.setByASN1ObjectArray=function(t){this.hTLV=null,this.isModified=!0,this.asn1Array=t},this.appendASN1Object=function(t){this.hTLV=null,this.isModified=!0,this.asn1Array.push(t)},this.asn1Array=new Array,"undefined"!=typeof t&&"undefined"!=typeof t.array&&(this.asn1Array=t.array)},Ce.extend(KJUR.asn1.DERAbstractStructured,KJUR.asn1.ASN1Object),KJUR.asn1.DERBoolean=function(){KJUR.asn1.DERBoolean.superclass.constructor.call(this),this.hT="01",this.hTLV="0101ff"},Ce.extend(KJUR.asn1.DERBoolean,KJUR.asn1.ASN1Object),KJUR.asn1.DERInteger=function(t){KJUR.asn1.DERInteger.superclass.constructor.call(this),this.hT="02",this.setByBigInteger=function(t){this.hTLV=null,this.isModified=!0,this.hV=KJUR.asn1.ASN1Util.bigIntToMinTwosComplementsHex(t)},this.setByInteger=function(t){var i=new e(String(t),10);this.setByBigInteger(i)},this.setValueHex=function(t){this.hV=t},this.getFreshValueHex=function(){return this.hV},"undefined"!=typeof t&&("undefined"!=typeof t.bigint?this.setByBigInteger(t.bigint):"undefined"!=typeof t["int"]?this.setByInteger(t["int"]):"undefined"!=typeof t.hex&&this.setValueHex(t.hex))},Ce.extend(KJUR.asn1.DERInteger,KJUR.asn1.ASN1Object),KJUR.asn1.DERBitString=function(t){KJUR.asn1.DERBitString.superclass.constructor.call(this),this.hT="03",this.setHexValueIncludingUnusedBits=function(t){this.hTLV=null,this.isModified=!0,this.hV=t},this.setUnusedBitsAndHexValue=function(t,e){if(0>t||t>7)throw"unused bits shall be from 0 to 7: u = "+t;var i="0"+t;this.hTLV=null,this.isModified=!0,this.hV=i+e},this.setByBinaryString=function(t){t=t.replace(/0+$/,"");var e=8-t.length%8;8==e&&(e=0);for(var i=0;e>=i;i++)t+="0";for(var r="",i=0;i<t.length-1;i+=8){var s=t.substr(i,8),n=parseInt(s,2).toString(16);1==n.length&&(n="0"+n),r+=n}this.hTLV=null,this.isModified=!0,this.hV="0"+e+r},this.setByBooleanArray=function(t){for(var e="",i=0;i<t.length;i++)e+=1==t[i]?"1":"0";this.setByBinaryString(e)},this.newFalseArray=function(t){for(var e=new Array(t),i=0;t>i;i++)e[i]=!1;return e},this.getFreshValueHex=function(){return this.hV},"undefined"!=typeof t&&("undefined"!=typeof t.hex?this.setHexValueIncludingUnusedBits(t.hex):"undefined"!=typeof t.bin?this.setByBinaryString(t.bin):"undefined"!=typeof t.array&&this.setByBooleanArray(t.array))},Ce.extend(KJUR.asn1.DERBitString,KJUR.asn1.ASN1Object),KJUR.asn1.DEROctetString=function(t){KJUR.asn1.DEROctetString.superclass.constructor.call(this,t),this.hT="04"},Ce.extend(KJUR.asn1.DEROctetString,KJUR.asn1.DERAbstractString),KJUR.asn1.DERNull=function(){KJUR.asn1.DERNull.superclass.constructor.call(this),this.hT="05",this.hTLV="0500"},Ce.extend(KJUR.asn1.DERNull,KJUR.asn1.ASN1Object),KJUR.asn1.DERObjectIdentifier=function(t){var i=function(t){var e=t.toString(16);return 1==e.length&&(e="0"+e),e},r=function(t){var r="",s=new e(t,10),n=s.toString(2),o=7-n.length%7;7==o&&(o=0);for(var h="",a=0;o>a;a++)h+="0";n=h+n;for(var a=0;a<n.length-1;a+=7){var u=n.substr(a,7);a!=n.length-7&&(u="1"+u),r+=i(parseInt(u,2))}return r};KJUR.asn1.DERObjectIdentifier.superclass.constructor.call(this),this.hT="06",this.setValueHex=function(t){this.hTLV=null,this.isModified=!0,this.s=null,this.hV=t},this.setValueOidString=function(t){if(!t.match(/^[0-9.]+$/))throw"malformed oid string: "+t;var e="",s=t.split("."),n=40*parseInt(s[0])+parseInt(s[1]);e+=i(n),s.splice(0,2);for(var o=0;o<s.length;o++)e+=r(s[o]);this.hTLV=null,this.isModified=!0,this.s=null,this.hV=e},this.setValueName=function(t){if("undefined"==typeof KJUR.asn1.x509.OID.name2oidList[t])throw"DERObjectIdentifier oidName undefined: "+t;var e=KJUR.asn1.x509.OID.name2oidList[t];this.setValueOidString(e)},this.getFreshValueHex=function(){return this.hV},"undefined"!=typeof t&&("undefined"!=typeof t.oid?this.setValueOidString(t.oid):"undefined"!=typeof t.hex?this.setValueHex(t.hex):"undefined"!=typeof t.name&&this.setValueName(t.name))},Ce.extend(KJUR.asn1.DERObjectIdentifier,KJUR.asn1.ASN1Object),KJUR.asn1.DERUTF8String=function(t){KJUR.asn1.DERUTF8String.superclass.constructor.call(this,t),this.hT="0c"},Ce.extend(KJUR.asn1.DERUTF8String,KJUR.asn1.DERAbstractString),KJUR.asn1.DERNumericString=function(t){KJUR.asn1.DERNumericString.superclass.constructor.call(this,t),this.hT="12"},Ce.extend(KJUR.asn1.DERNumericString,KJUR.asn1.DERAbstractString),KJUR.asn1.DERPrintableString=function(t){KJUR.asn1.DERPrintableString.superclass.constructor.call(this,t),this.hT="13"},Ce.extend(KJUR.asn1.DERPrintableString,KJUR.asn1.DERAbstractString),KJUR.asn1.DERTeletexString=function(t){KJUR.asn1.DERTeletexString.superclass.constructor.call(this,t),this.hT="14"},Ce.extend(KJUR.asn1.DERTeletexString,KJUR.asn1.DERAbstractString),KJUR.asn1.DERIA5String=function(t){KJUR.asn1.DERIA5String.superclass.constructor.call(this,t),this.hT="16"},Ce.extend(KJUR.asn1.DERIA5String,KJUR.asn1.DERAbstractString),KJUR.asn1.DERUTCTime=function(t){KJUR.asn1.DERUTCTime.superclass.constructor.call(this,t),this.hT="17",this.setByDate=function(t){this.hTLV=null,this.isModified=!0,this.date=t,this.s=this.formatDate(this.date,"utc"),this.hV=stohex(this.s)},"undefined"!=typeof t&&("undefined"!=typeof t.str?this.setString(t.str):"undefined"!=typeof t.hex?this.setStringHex(t.hex):"undefined"!=typeof t.date&&this.setByDate(t.date))},Ce.extend(KJUR.asn1.DERUTCTime,KJUR.asn1.DERAbstractTime),KJUR.asn1.DERGeneralizedTime=function(t){KJUR.asn1.DERGeneralizedTime.superclass.constructor.call(this,t),this.hT="18",this.setByDate=function(t){this.hTLV=null,this.isModified=!0,this.date=t,this.s=this.formatDate(this.date,"gen"),this.hV=stohex(this.s)},"undefined"!=typeof t&&("undefined"!=typeof t.str?this.setString(t.str):"undefined"!=typeof t.hex?this.setStringHex(t.hex):"undefined"!=typeof t.date&&this.setByDate(t.date))},Ce.extend(KJUR.asn1.DERGeneralizedTime,KJUR.asn1.DERAbstractTime),KJUR.asn1.DERSequence=function(t){KJUR.asn1.DERSequence.superclass.constructor.call(this,t),this.hT="30",this.getFreshValueHex=function(){for(var t="",e=0;e<this.asn1Array.length;e++){var i=this.asn1Array[e];t+=i.getEncodedHex()}return this.hV=t,this.hV}},Ce.extend(KJUR.asn1.DERSequence,KJUR.asn1.DERAbstractStructured),KJUR.asn1.DERSet=function(t){KJUR.asn1.DERSet.superclass.constructor.call(this,t),this.hT="31",this.getFreshValueHex=function(){for(var t=new Array,e=0;e<this.asn1Array.length;e++){var i=this.asn1Array[e];t.push(i.getEncodedHex())}return t.sort(),this.hV=t.join(""),this.hV}},Ce.extend(KJUR.asn1.DERSet,KJUR.asn1.DERAbstractStructured),KJUR.asn1.DERTaggedObject=function(t){KJUR.asn1.DERTaggedObject.superclass.constructor.call(this),this.hT="a0",this.hV="",this.isExplicit=!0,this.asn1Object=null,this.setASN1Object=function(t,e,i){this.hT=e,this.isExplicit=t,this.asn1Object=i,this.isExplicit?(this.hV=this.asn1Object.getEncodedHex(),this.hTLV=null,this.isModified=!0):(this.hV=null,this.hTLV=i.getEncodedHex(),this.hTLV=this.hTLV.replace(/^../,e),this.isModified=!1)},this.getFreshValueHex=function(){return this.hV},"undefined"!=typeof t&&("undefined"!=typeof t.tag&&(this.hT=t.tag),"undefined"!=typeof t.explicit&&(this.isExplicit=t.explicit),"undefined"!=typeof t.obj&&(this.asn1Object=t.obj,this.setASN1Object(this.isExplicit,this.hT,this.asn1Object)))},Ce.extend(KJUR.asn1.DERTaggedObject,KJUR.asn1.ASN1Object),
+// Copyright (c) 2008-2013 Lapo Luchini <lapo@lapo.it>
+// copyright notice and this permission notice appear in all copies.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+function(t){"use strict";var e,i={};i.decode=function(i){var r;if(e===t){var s="0123456789ABCDEF",n=" \f\n\r	 \u2028\u2029";for(e=[],r=0;16>r;++r)e[s.charAt(r)]=r;for(s=s.toLowerCase(),r=10;16>r;++r)e[s.charAt(r)]=r;for(r=0;r<n.length;++r)e[n.charAt(r)]=-1}var o=[],h=0,a=0;for(r=0;r<i.length;++r){var u=i.charAt(r);if("="==u)break;if(u=e[u],-1!=u){if(u===t)throw"Illegal character at offset "+r;h|=u,++a>=2?(o[o.length]=h,h=0,a=0):h<<=4}}if(a)throw"Hex encoding incomplete: 4 bits missing";return o},window.Hex=i}(),
+// Copyright (c) 2008-2013 Lapo Luchini <lapo@lapo.it>
+// copyright notice and this permission notice appear in all copies.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+function(t){"use strict";var e,i={};i.decode=function(i){var r;if(e===t){var s="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",n="= \f\n\r	 \u2028\u2029";for(e=[],r=0;64>r;++r)e[s.charAt(r)]=r;for(r=0;r<n.length;++r)e[n.charAt(r)]=-1}var o=[],h=0,a=0;for(r=0;r<i.length;++r){var u=i.charAt(r);if("="==u)break;if(u=e[u],-1!=u){if(u===t)throw"Illegal character at offset "+r;h|=u,++a>=4?(o[o.length]=h>>16,o[o.length]=h>>8&255,o[o.length]=255&h,h=0,a=0):h<<=6}}switch(a){case 1:throw"Base64 encoding incomplete: at least 2 bits missing";case 2:o[o.length]=h>>10;break;case 3:o[o.length]=h>>16,o[o.length]=h>>8&255}return o},i.re=/-----BEGIN [^-]+-----([A-Za-z0-9+\/=\s]+)-----END [^-]+-----|begin-base64[^\n]+\n([A-Za-z0-9+\/=\s]+)====/,i.unarmor=function(t){var e=i.re.exec(t);if(e)if(e[1])t=e[1];else{if(!e[2])throw"RegExp out of sync";t=e[2]}return i.decode(t)},window.Base64=i}(),
+// Copyright (c) 2008-2013 Lapo Luchini <lapo@lapo.it>
+// copyright notice and this permission notice appear in all copies.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+function(t){"use strict";function e(t,i){t instanceof e?(this.enc=t.enc,this.pos=t.pos):(this.enc=t,this.pos=i)}function i(t,e,i,r,s){this.stream=t,this.header=e,this.length=i,this.tag=r,this.sub=s}var r=100,s="…",n={tag:function(t,e){var i=document.createElement(t);return i.className=e,i},text:function(t){return document.createTextNode(t)}};e.prototype.get=function(e){if(e===t&&(e=this.pos++),e>=this.enc.length)throw"Requesting byte offset "+e+" on a stream of length "+this.enc.length;return this.enc[e]},e.prototype.hexDigits="0123456789ABCDEF",e.prototype.hexByte=function(t){return this.hexDigits.charAt(t>>4&15)+this.hexDigits.charAt(15&t)},e.prototype.hexDump=function(t,e,i){for(var r="",s=t;e>s;++s)if(r+=this.hexByte(this.get(s)),i!==!0)switch(15&s){case 7:r+="  ";break;case 15:r+="\n";break;default:r+=" "}return r},e.prototype.parseStringISO=function(t,e){for(var i="",r=t;e>r;++r)i+=String.fromCharCode(this.get(r));return i},e.prototype.parseStringUTF=function(t,e){for(var i="",r=t;e>r;){var s=this.get(r++);i+=128>s?String.fromCharCode(s):s>191&&224>s?String.fromCharCode((31&s)<<6|63&this.get(r++)):String.fromCharCode((15&s)<<12|(63&this.get(r++))<<6|63&this.get(r++))}return i},e.prototype.parseStringBMP=function(t,e){for(var i="",r=t;e>r;r+=2){var s=this.get(r),n=this.get(r+1);i+=String.fromCharCode((s<<8)+n)}return i},e.prototype.reTime=/^((?:1[89]|2\d)?\d\d)(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])([01]\d|2[0-3])(?:([0-5]\d)(?:([0-5]\d)(?:[.,](\d{1,3}))?)?)?(Z|[-+](?:[0]\d|1[0-2])([0-5]\d)?)?$/,e.prototype.parseTime=function(t,e){var i=this.parseStringISO(t,e),r=this.reTime.exec(i);return r?(i=r[1]+"-"+r[2]+"-"+r[3]+" "+r[4],r[5]&&(i+=":"+r[5],r[6]&&(i+=":"+r[6],r[7]&&(i+="."+r[7]))),r[8]&&(i+=" UTC","Z"!=r[8]&&(i+=r[8],r[9]&&(i+=":"+r[9]))),i):"Unrecognized time: "+i},e.prototype.parseInteger=function(t,e){var i=e-t;if(i>4){i<<=3;var r=this.get(t);if(0===r)i-=8;else for(;128>r;)r<<=1,--i;return"("+i+" bit)"}for(var s=0,n=t;e>n;++n)s=s<<8|this.get(n);return s},e.prototype.parseBitString=function(t,e){var i=this.get(t),r=(e-t-1<<3)-i,s="("+r+" bit)";if(20>=r){var n=i;s+=" ";for(var o=e-1;o>t;--o){for(var h=this.get(o),a=n;8>a;++a)s+=h>>a&1?"1":"0";n=0}}return s},e.prototype.parseOctetString=function(t,e){var i=e-t,n="("+i+" byte) ";i>r&&(e=t+r);for(var o=t;e>o;++o)n+=this.hexByte(this.get(o));return i>r&&(n+=s),n},e.prototype.parseOID=function(t,e){for(var i="",r=0,s=0,n=t;e>n;++n){var o=this.get(n);if(r=r<<7|127&o,s+=7,!(128&o)){if(""===i){var h=80>r?40>r?0:1:2;i=h+"."+(r-40*h)}else i+="."+(s>=31?"bigint":r);r=s=0}}return i},i.prototype.typeName=function(){if(this.tag===t)return"unknown";var e=this.tag>>6,i=(this.tag>>5&1,31&this.tag);switch(e){case 0:switch(i){case 0:return"EOC";case 1:return"BOOLEAN";case 2:return"INTEGER";case 3:return"BIT_STRING";case 4:return"OCTET_STRING";case 5:return"NULL";case 6:return"OBJECT_IDENTIFIER";case 7:return"ObjectDescriptor";case 8:return"EXTERNAL";case 9:return"REAL";case 10:return"ENUMERATED";case 11:return"EMBEDDED_PDV";case 12:return"UTF8String";case 16:return"SEQUENCE";case 17:return"SET";case 18:return"NumericString";case 19:return"PrintableString";case 20:return"TeletexString";case 21:return"VideotexString";case 22:return"IA5String";case 23:return"UTCTime";case 24:return"GeneralizedTime";case 25:return"GraphicString";case 26:return"VisibleString";case 27:return"GeneralString";case 28:return"UniversalString";case 30:return"BMPString";default:return"Universal_"+i.toString(16)}case 1:return"Application_"+i.toString(16);case 2:return"["+i+"]";case 3:return"Private_"+i.toString(16)}},i.prototype.reSeemsASCII=/^[ -~]+$/,i.prototype.content=function(){if(this.tag===t)return null;var e=this.tag>>6,i=31&this.tag,n=this.posContent(),o=Math.abs(this.length);if(0!==e){if(null!==this.sub)return"("+this.sub.length+" elem)";var h=this.stream.parseStringISO(n,n+Math.min(o,r));return this.reSeemsASCII.test(h)?h.substring(0,2*r)+(h.length>2*r?s:""):this.stream.parseOctetString(n,n+o)}switch(i){case 1:return 0===this.stream.get(n)?"false":"true";case 2:return this.stream.parseInteger(n,n+o);case 3:return this.sub?"("+this.sub.length+" elem)":this.stream.parseBitString(n,n+o);case 4:return this.sub?"("+this.sub.length+" elem)":this.stream.parseOctetString(n,n+o);case 6:return this.stream.parseOID(n,n+o);case 16:case 17:return"("+this.sub.length+" elem)";case 12:return this.stream.parseStringUTF(n,n+o);case 18:case 19:case 20:case 21:case 22:case 26:return this.stream.parseStringISO(n,n+o);case 30:return this.stream.parseStringBMP(n,n+o);case 23:case 24:return this.stream.parseTime(n,n+o)}return null},i.prototype.toString=function(){return this.typeName()+"@"+this.stream.pos+"[header:"+this.header+",length:"+this.length+",sub:"+(null===this.sub?"null":this.sub.length)+"]"},i.prototype.print=function(e){if(e===t&&(e=""),document.writeln(e+this),null!==this.sub){e+="  ";for(var i=0,r=this.sub.length;r>i;++i)this.sub[i].print(e)}},i.prototype.toPrettyString=function(e){e===t&&(e="");var i=e+this.typeName()+" @"+this.stream.pos;if(this.length>=0&&(i+="+"),i+=this.length,32&this.tag?i+=" (constructed)":3!=this.tag&&4!=this.tag||null===this.sub||(i+=" (encapsulates)"),i+="\n",null!==this.sub){e+="  ";for(var r=0,s=this.sub.length;s>r;++r)i+=this.sub[r].toPrettyString(e)}return i},i.prototype.toDOM=function(){var t=n.tag("div","node");t.asn1=this;var e=n.tag("div","head"),i=this.typeName().replace(/_/g," ");e.innerHTML=i;var r=this.content();if(null!==r){r=String(r).replace(/</g,"&lt;");var s=n.tag("span","preview");s.appendChild(n.text(r)),e.appendChild(s)}t.appendChild(e),this.node=t,this.head=e;var o=n.tag("div","value");if(i="Offset: "+this.stream.pos+"<br/>",i+="Length: "+this.header+"+",i+=this.length>=0?this.length:-this.length+" (undefined)",32&this.tag?i+="<br/>(constructed)":3!=this.tag&&4!=this.tag||null===this.sub||(i+="<br/>(encapsulates)"),null!==r&&(i+="<br/>Value:<br/><b>"+r+"</b>","object"==typeof oids&&6==this.tag)){var h=oids[r];h&&(h.d&&(i+="<br/>"+h.d),h.c&&(i+="<br/>"+h.c),h.w&&(i+="<br/>(warning!)"))}o.innerHTML=i,t.appendChild(o);var a=n.tag("div","sub");if(null!==this.sub)for(var u=0,c=this.sub.length;c>u;++u)a.appendChild(this.sub[u].toDOM());return t.appendChild(a),e.onclick=function(){t.className="node collapsed"==t.className?"node":"node collapsed"},t},i.prototype.posStart=function(){return this.stream.pos},i.prototype.posContent=function(){return this.stream.pos+this.header},i.prototype.posEnd=function(){return this.stream.pos+this.header+Math.abs(this.length)},i.prototype.fakeHover=function(t){this.node.className+=" hover",t&&(this.head.className+=" hover")},i.prototype.fakeOut=function(t){var e=/ ?hover/;this.node.className=this.node.className.replace(e,""),t&&(this.head.className=this.head.className.replace(e,""))},i.prototype.toHexDOM_sub=function(t,e,i,r,s){if(!(r>=s)){var o=n.tag("span",e);o.appendChild(n.text(i.hexDump(r,s))),t.appendChild(o)}},i.prototype.toHexDOM=function(e){var i=n.tag("span","hex");if(e===t&&(e=i),this.head.hexNode=i,this.head.onmouseover=function(){this.hexNode.className="hexCurrent"},this.head.onmouseout=function(){this.hexNode.className="hex"},i.asn1=this,i.onmouseover=function(){var t=!e.selected;t&&(e.selected=this.asn1,this.className="hexCurrent"),this.asn1.fakeHover(t)},i.onmouseout=function(){var t=e.selected==this.asn1;this.asn1.fakeOut(t),t&&(e.selected=null,this.className="hex")},this.toHexDOM_sub(i,"tag",this.stream,this.posStart(),this.posStart()+1),this.toHexDOM_sub(i,this.length>=0?"dlen":"ulen",this.stream,this.posStart()+1,this.posContent()),null===this.sub)i.appendChild(n.text(this.stream.hexDump(this.posContent(),this.posEnd())));else if(this.sub.length>0){var r=this.sub[0],s=this.sub[this.sub.length-1];this.toHexDOM_sub(i,"intro",this.stream,this.posContent(),r.posStart());for(var o=0,h=this.sub.length;h>o;++o)i.appendChild(this.sub[o].toHexDOM(e));this.toHexDOM_sub(i,"outro",this.stream,s.posEnd(),this.posEnd())}return i},i.prototype.toHexString=function(t){return this.stream.hexDump(this.posStart(),this.posEnd(),!0)},i.decodeLength=function(t){var e=t.get(),i=127&e;if(i==e)return i;if(i>3)throw"Length over 24 bits not supported at position "+(t.pos-1);if(0===i)return-1;e=0;for(var r=0;i>r;++r)e=e<<8|t.get();return e},i.hasContent=function(t,r,s){if(32&t)return!0;if(3>t||t>4)return!1;var n=new e(s);3==t&&n.get();var o=n.get();if(o>>6&1)return!1;try{var h=i.decodeLength(n);return n.pos-s.pos+h==r}catch(a){return!1}},i.decode=function(t){t instanceof e||(t=new e(t,0));var r=new e(t),s=t.get(),n=i.decodeLength(t),o=t.pos-r.pos,h=null;if(i.hasContent(s,n,t)){var a=t.pos;if(3==s&&t.get(),h=[],n>=0){for(var u=a+n;t.pos<u;)h[h.length]=i.decode(t);if(t.pos!=u)throw"Content size is not correct for container starting at offset "+a}else try{for(;;){var c=i.decode(t);if(0===c.tag)break;h[h.length]=c}n=a-t.pos}catch(f){throw"Exception while decoding undefined length content: "+f}}else t.pos+=n;return new i(r,o,n,s,h)},i.test=function(){for(var t=[{value:[39],expected:39},{value:[129,201],expected:201},{value:[131,254,220,186],expected:16702650}],r=0,s=t.length;s>r;++r){var n=new e(t[r].value,0),o=i.decodeLength(n);o!=t[r].expected&&document.write("In test["+r+"] expected "+t[r].expected+" got "+o+"\n")}},window.ASN1=i}(),ASN1.prototype.getHexStringValue=function(){var t=this.toHexString(),e=2*this.header,i=2*this.length;return t.substr(e,i)},ue.prototype.parseKey=function(t){try{var e=0,i=0,r=/^\s*(?:[0-9A-Fa-f][0-9A-Fa-f]\s*)+$/,s=r.test(t)?Hex.decode(t):Base64.unarmor(t),n=ASN1.decode(s);if(3===n.sub.length&&(n=n.sub[2].sub[0]),9===n.sub.length){e=n.sub[1].getHexStringValue(),this.n=he(e,16),i=n.sub[2].getHexStringValue(),this.e=parseInt(i,16);var o=n.sub[3].getHexStringValue();this.d=he(o,16);var h=n.sub[4].getHexStringValue();this.p=he(h,16);var a=n.sub[5].getHexStringValue();this.q=he(a,16);var u=n.sub[6].getHexStringValue();this.dmp1=he(u,16);var c=n.sub[7].getHexStringValue();this.dmq1=he(c,16);var f=n.sub[8].getHexStringValue();this.coeff=he(f,16)}else{if(2!==n.sub.length)return!1;var p=n.sub[1],l=p.sub[0];e=l.sub[0].getHexStringValue(),this.n=he(e,16),i=l.sub[1].getHexStringValue(),this.e=parseInt(i,16)}return!0}catch(d){return!1}},ue.prototype.getPrivateBaseKey=function(){var t={array:[new KJUR.asn1.DERInteger({"int":0}),new KJUR.asn1.DERInteger({bigint:this.n}),new KJUR.asn1.DERInteger({"int":this.e}),new KJUR.asn1.DERInteger({bigint:this.d}),new KJUR.asn1.DERInteger({bigint:this.p}),new KJUR.asn1.DERInteger({bigint:this.q}),new KJUR.asn1.DERInteger({bigint:this.dmp1}),new KJUR.asn1.DERInteger({bigint:this.dmq1}),new KJUR.asn1.DERInteger({bigint:this.coeff})]},e=new KJUR.asn1.DERSequence(t);return e.getEncodedHex()},ue.prototype.getPrivateBaseKeyB64=function(){return be(this.getPrivateBaseKey())},ue.prototype.getPublicBaseKey=function(){var t={array:[new KJUR.asn1.DERObjectIdentifier({oid:"1.2.840.113549.1.1.1"}),new KJUR.asn1.DERNull]},e=new KJUR.asn1.DERSequence(t);t={array:[new KJUR.asn1.DERInteger({bigint:this.n}),new KJUR.asn1.DERInteger({"int":this.e})]};var i=new KJUR.asn1.DERSequence(t);t={hex:"00"+i.getEncodedHex()};var r=new KJUR.asn1.DERBitString(t);t={array:[e,r]};var s=new KJUR.asn1.DERSequence(t);return s.getEncodedHex()},ue.prototype.getPublicBaseKeyB64=function(){return be(this.getPublicBaseKey())},ue.prototype.wordwrap=function(t,e){if(e=e||64,!t)return t;var i="(.{1,"+e+"})( +|$\n?)|(.{1,"+e+"})";return t.match(RegExp(i,"g")).join("\n")},ue.prototype.getPrivateKey=function(){var t="-----BEGIN RSA PRIVATE KEY-----\n";return t+=this.wordwrap(this.getPrivateBaseKeyB64())+"\n",t+="-----END RSA PRIVATE KEY-----"},ue.prototype.getPublicKey=function(){var t="-----BEGIN PUBLIC KEY-----\n";return t+=this.wordwrap(this.getPublicBaseKeyB64())+"\n",t+="-----END PUBLIC KEY-----"},ue.prototype.hasPublicKeyProperty=function(t){return t=t||{},t.hasOwnProperty("n")&&t.hasOwnProperty("e")},ue.prototype.hasPrivateKeyProperty=function(t){return t=t||{},t.hasOwnProperty("n")&&t.hasOwnProperty("e")&&t.hasOwnProperty("d")&&t.hasOwnProperty("p")&&t.hasOwnProperty("q")&&t.hasOwnProperty("dmp1")&&t.hasOwnProperty("dmq1")&&t.hasOwnProperty("coeff")},ue.prototype.parsePropertiesFrom=function(t){this.n=t.n,this.e=t.e,t.hasOwnProperty("d")&&(this.d=t.d,this.p=t.p,this.q=t.q,this.dmp1=t.dmp1,this.dmq1=t.dmq1,this.coeff=t.coeff)};var _e=function(t){ue.call(this),t&&("string"==typeof t?this.parseKey(t):(this.hasPrivateKeyProperty(t)||this.hasPublicKeyProperty(t))&&this.parsePropertiesFrom(t))};_e.prototype=new ue,_e.prototype.constructor=_e;var ze=function(t){t=t||{},this.default_key_size=parseInt(t.default_key_size)||1024,this.default_public_exponent=t.default_public_exponent||"010001",this.log=t.log||!1,this.key=null};ze.prototype.setKey=function(t){this.log&&this.key&&console.warn("A key was already set, overriding existing."),this.key=new _e(t)},ze.prototype.setPrivateKey=function(t){this.setKey(t)},ze.prototype.setPublicKey=function(t){this.setKey(t)},ze.prototype.decrypt=function(t){try{return this.getKey().decrypt(Te(t))}catch(e){return!1}},ze.prototype.encrypt=function(t){try{return be(this.getKey().encrypt(t))}catch(e){return!1}},ze.prototype.getKey=function(t){if(!this.key){if(this.key=new _e,t&&"[object Function]"==={}.toString.call(t))return void this.key.generateAsync(this.default_key_size,this.default_public_exponent,t);this.key.generate(this.default_key_size,this.default_public_exponent)}return this.key},ze.prototype.getPrivateKey=function(){return this.getKey().getPrivateKey()},ze.prototype.getPrivateKeyB64=function(){return this.getKey().getPrivateBaseKeyB64()},ze.prototype.getPublicKey=function(){return this.getKey().getPublicKey()},ze.prototype.getPublicKeyB64=function(){return this.getKey().getPublicBaseKeyB64()},ze.version="2.3.1",t.JSEncrypt=ze});
 \ No newline at end of file
 <!DOCTYPE html>
-<html>
+<html lang="zh">
 <head>
+<meta name="renderer" content="webkit" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 <meta charset="UTF-8">
 <title>调度系统</title>
-<meta name=”renderer” content=”webkit”>
-<meta http-equiv=”X-UA-Compatible” content=”IE=Edge,chrome=1″ >
  
 <meta http-equiv="Pragma" content="no-cache">
 <meta http-equiv="Cache-control" content="no-cache">
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh">
 <head>
+<meta name="renderer" content="webkit" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 <meta charset="utf-8" />
 <title>登录</title>
 <link
@@ -158,10 +160,23 @@ h3.logo-text{
 	font-family: 华文楷体,华文细黑;
 	font-size: 28px;
 }
+
+.warn-note{
+    width: 100%;
+    position: absolute;
+    top: 0;
+    z-index: 2;
+    text-align: center;
+    background: #ff4646;
+    color: white;
+    padding: 12px;
+    display: none;
+}
 </style>
 </head>
  
 <body>
+	<div class="warn-note">警告！系统目前仅在 WebKit 内核下完成兼容性测试，请使用 Google Chrome 浏览器进入系统。</div>
 	<div class="wrapper ng-scope">
 		<div id="loginPanel" class="dialog dialog-shadow">
 			<br>
@@ -196,7 +211,7 @@ h3.logo-text{
 			</form>
 			<br><br>
 			<div class="form-actions" >
-                    <button type="button" class="btn blue-steel" id="loginBtn" disabled="disabled">登录</button>
+                    <button class="btn blue-steel" id="loginBtn" disabled="disabled">登录</button>
             </div>
  
             <div class="alert alert-danger"></div>
@@ -207,9 +222,13 @@ h3.logo-text{
  
 <!-- jQuery -->
 <script src="/metronic_v4.5.4/plugins/jquery.min.js" ></script>
-<script src="/assets/plugins/jquery.base64.min.js" ></script>
-
+<script src="/assets/plugins/jsencrypt.min.js" ></script>
 <script>
+window.onload=function(){
+    var body=document.getElementsByTagName("body")[0];
+    if(typeof body.style.WebkitAnimation=="undefined")
+    	$('.warn-note').fadeIn();
+}
 !function(){
 	var form = $('#loginPanel form')
 		,nameInput = $('input[name=userName]', form)
@@ -217,6 +236,13 @@ h3.logo-text{
 		,msgAlert = $('#loginPanel .alert-danger');
  
 	$('input', form).on('keyup', checkBtnStatus);
+
+	var keys;
+	$.get('/user/login/jCryptionKey', function(data){
+		keys = data.publickey;
+	});
+	
+	
  
 	function checkBtnStatus(){
 		var es = $('input:visible', form);
@@ -257,8 +283,14 @@ h3.logo-text{
 	$('#loginBtn').on('click', function(){
 		if(lock || $(this).attr('disabled')) return;
 		var userName = nameInput.val()
-			,pwd = fourBase64(pwdInput.val());
+			,pwd = pwdInput.val();
  
+		//RSA加密
+		var encrypt = new JSEncrypt();
+		encrypt.setPublicKey(keys);
+		userName = encrypt.encrypt(userName);
+		pwd = encrypt.encrypt(pwd);
+		//登录
 		login(userName, pwd);
 	});
  
@@ -266,6 +298,7 @@ h3.logo-text{
 	function login(userName, pwd){
 		lock = true;
 		$('#loginBtn').attr('disabled', 'disabled');
+
 		var params = {
 				userName: userName, 
 				password: pwd, 
@@ -340,11 +373,6 @@ h3.logo-text{
 		$(this).attr('src', '/captcha.jpg?t=' + Math.random());
 	});
  
-	function fourBase64(t){
-		var ed = $.base64.encode;
-		return ed(ed(ed(ed(t))));
-	}
-	
 	function error(rs){
 		return rs.status == 'ERROR' || rs.status == 500;
 	}
@@ -176,7 +176,7 @@ $(function(){
 	var scheduleIdMap;
  
 	//滚动时固定表头
-	$('.custom-table-panel').on('scroll', function(){
+	$('#childTaskDiv .custom-table-panel').on('scroll', function(){
 		var top = $(this).scrollTop()
 		,$header = $(this).find('.custom-table-header');
 		$header.css('top', top);
@@ -267,8 +267,8 @@ body{
 }
  
 .portlet-fullscreen .nav-tabs > li > a:hover
-,.portlet-fullscreen .nav-tabs > li > a:active{
-	border: none;
+/* ,.portlet-fullscreen .nav-tabs > li > a:active */{
+ 	 border: none;
 	background: #0E5384;
 }
  
@@ -279,10 +279,11 @@ body{
 .portlet-fullscreen  .nav-tabs>li.active>a{
     background: #FFFFFF;
     color: #0A3F64;
-    border: 1px solid #FFFFFF;
+    border: none;
     border-radius: 5px 5px 0 0 !important;
 }
  
+
 .portlet-fullscreen .nav-tabs {
     /* border-bottom: 1px solid #337AB7; */
 }
@@ -397,7 +398,7 @@ body{
 .card_wrap .line_chart .top .center{
     height: 100%;
     font-size: 15px;
-    color: #5E96D2;
+    color: #babdbd;
     padding: 10px 0px;
     width: auto;
     float: left;
@@ -644,16 +645,24 @@ body{
     height: 25px;
     fill: rgba(253, 253, 253, 0.17);
     rx: 5px;
-    stroke: #26c281;
 }
  
 .vehci-g.up text,
 .vehci-g.down text{
-    stroke: #26c281;
     font-size: 12px;
     cursor: default;
 }
  
+.vehci-g.up text,
+.vehci-g.up rect{
+	stroke: #337ac4;
+}
+
+.vehci-g.down text,
+.vehci-g.down rect{
+	stroke: #e43a45;
+}
+
 .vehci-g.updown-error rect,
 .vehci-g.updown-error text{
 	stroke: #CACA17;
@@ -1035,7 +1044,8 @@ height: 400px;
 	}
  
 	.station_text {
-	    letter-spacing: -2.6px;
+	    /* letter-spacing: -2.6px; */
+	    font-family: 华文细黑,华文黑体,宋体;
 	}
 }
  
@@ -1577,7 +1587,11 @@ height: 400px;
 ::-webkit-scrollbar {  
     width: 15px;
     height: 16px;  
-}  
+} 
+
+#tab_home .custom-table-panel::-webkit-scrollbar{
+    border-top: 1px solid #e7ecf1;
+}
  
 ::-webkit-scrollbar-track,  
 ::-webkit-scrollbar-thumb {  
@@ -2588,4 +2602,65 @@ tr.child_task td:nth-child(1):AFTER{
     font-size: 10px;
     color: #bdbdbd;
     margin-left: 3px;
+}
+
+.card_wrap .custom-table-panel{
+	height: calc(100% - 40px);
+}
+
+#tab_home .card_wrap table tr td{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    cursor: pointer;
+}
+.sm-text{
+	font-size: 12px;
+	color: #9a9a9a;
+}
+
+td.lt-no-data{
+    text-align: left;
+    font-size: 12px !important;
+    color: #ff7676;
+    text-indent: 8px;
+}
+
+tr._home_tr_active td.lt-no-data{
+    color: #ffffff;
+}
+
+tr._home_tr_active {
+    background: #6a96c5;
+    color: #ffffff;
+}
+
+tr._home_tr_active .sm-text{
+	color: #ded8d8;
+}
+
+abbr.abnormal{
+	color: red;
+}
+
+tr._home_tr_active abbr.abnormal{
+	color: #ffffff;
+}
+
+.line_chart:BEFORE {
+	content: "\f178";
+	font: normal normal normal 14px/1 FontAwesome;
+	position: absolute;
+	top: 20px;
+	left: 20px;
+	color: #d0d0d0;
+}
+
+.line_chart:AFTER {
+    content: "\f177";
+	font: normal normal normal 14px/1 FontAwesome;
+	position: absolute;
+	bottom: 20px;
+	right: 20px;
+	color: #d0d0d0;
 }
 \ No newline at end of file
@@ -25,11 +25,39 @@
 		</div>
         <div class="actions col_hide_1280" >
 	        <div class="btn-group">
-	              <button type="button" class="btn btn-default" id="deviceReport">
-	                  <i class="fa fa-code-fork"></i> 设备上报</button>
-	                  
-	              <button type="button" class="btn btn-default" id="msgAndDirect">
-	                  <i class="fa fa-bell"></i> 调度指令</button>
+	              
+	              <div class="btn-group">
+	                  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" >
+	                      <i class="fa fa-database"></i> &nbsp;基础数据
+	                      <i class="fa fa-angle-down"></i>
+	                  </button>
+	                  <ul class="dropdown-menu">
+	                      <li>
+	                          <a href="javascript:;" id=""> 车辆配置 </a>
+	                      </li>
+	                      <li>
+	                          <a href="javascript:;" id=""> 人员配置 </a>
+	                      </li>
+	                  </ul>
+	              </div>
+	              
+	              <div class="btn-group">
+	                  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" >
+	                      <i class="fa fa-bus"></i> &nbsp;车载设备
+	                      <i class="fa fa-angle-down"></i>
+	                  </button>
+	                  <ul class="dropdown-menu">
+	                  	  <li>
+	                          <a href="javascript:;" id="deviceConfig"> 设备管理 </a>
+	                      </li>
+	                      <li>
+	                          <a href="javascript:;" id="deviceReport"> 设备上报记录 </a>
+	                      </li>
+	                      <li>
+	                          <a href="javascript:;" id="msgAndDirect"> 指令下发记录 </a>
+	                      </li>
+	                  </ul>
+	              </div>
  
 	              <div class="btn-group">
 	                  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" >
@@ -174,7 +202,7 @@
     </li>
     <li class="menu-item submenu">
         <button type="button" class="menu-btn">
-            <span class="menu-text">车辆状态发送</span>
+            <span class="menu-text">车辆状态切换</span>
         </button>
         <menu class="menu">
             <li class="menu-item">
@@ -9,7 +9,7 @@ var _data = (function(){
 	//实时GPS数据
 	var allGps = {};
 	//10秒刷新一次实时GPS
-	var realGpsT = 1000 * 10;
+	var realGpsT = 1000 * 8;
  
 	var dateStr = moment().format('YYYY-MM-DD');
 	//实际排班
@@ -33,26 +33,6 @@ var _data = (function(){
 	}
  
 	var dataObject = {
-		/*//班次发车
-		setFcsj: function(schId, fcsj, fcsjT){
-			schedules[schId].fcsjActual = fcsj;
-			schedules[schId].fcsjActualTime = fcsjT;
-		},*/
-		//根据线路编码获取上行和下行班次
-		/*findByLineAll: function(xlbm){
-			var array = [],sch;
-			for(var id in schedules){
-				sch = schedules[id];
-				if(sch.xlBm == xlbm)
-					array.push(e);
-			}
-			//排序
-			array.sort(function(a, b){
-				return a.fcsjT - b.fcsjT;
-			});
-			
-			return array;
-		},*/
 		//根据线路和上下行获取计划排班
 		findSchByLine: function(xlbm, upDown){
 			var array = [];
@@ -160,14 +140,10 @@ var _data = (function(){
 		attachSchedulInfo: function(gpsArray){
 			$.each(gpsArray, function(){
 				gps = this;
-				if(gps.currSchId)
-					gps.currSch = schedules[gps.currSchId];
-				if(gps.nextSchId)
-					gps.nextSch = schedules[gps.nextSchId];
+				if(gps.schId)
+					gps.sch = schedules[gps.schId];
  
 			});
-			
-			return gpsArray;
 		}
 		//查询站点路由
 		,queryStationRoute : function(lineId,container, cb, width){
@@ -273,8 +249,9 @@ var _data = (function(){
 	}
  
 	function refreshGpsProxy(){
-		refreshGps(function(add, up){
-			$('#tab_home,#tab_map #mapContainer').trigger('gps_refresh', [add, up]);
+		refreshGps(function(all){
+			//触发元素刷新事件
+			$('#tab_home,#tab_map #mapContainer').trigger('gps_refresh', [all]);
 		});
 	}
 	var upSort = function(a, b){
@@ -316,22 +293,49 @@ var _data = (function(){
 			if(!gpsList || gpsList.length == 0)
 				return;
  
-			var prve = allGps
-				,addArray = []
-				,upArray = []
-				,oldGps;
+			//var prve = allGps
+				//,addArray = []
+				//,upArray = []
+			//	,oldGps;
 			for(var i = 0, gps; gps=gpsList[i++];){
-				oldGps = prve[gps.deviceId];
+				/*oldGps = prve[gps.deviceId];
 				if(!oldGps){
 					addArray.push(gps);
 				}
 				else if(gps.timestamp > oldGps.timestamp){
 					//更新
 					upArray.push(gps);
-				}
+				}*/
+				//addArray.push(gps);
+/*				if(prve[gps.deviceId] && 
+						gps.timestamp == prve[gps.deviceId].timestamp)
+					continue;*/
+				//异常状态检查
+				abnormalCheck(gps);
+				//关联班次信息
+				if(gps.schId)
+					gps.sch = schedules[gps.schId];
+				
 				allGps[gps.deviceId] = gps;
 			}
-			cb && cb(addArray, upArray);
+			//cb && cb(addArray, upArray);
+			cb && cb(allGps);
+		}
+		
+		function abnormalCheck(gps){
+			var routes = stationRoute[gps.lineId][gps.upDown]
+				,rs;
+			$.each(routes , function(){
+				if(this.stationCode == gps.stopNo){
+					rs = 1;
+					return false;
+				}
+			});
+			
+			if(!rs){
+				gps.abnormal = true;
+				gps.abnormalText = '走向异常？';
+			}
 		}
  
 		function getGpsError(jqXHR, textStatus){
@@ -5,7 +5,7 @@
 var drawSvg = (function(){
  
 	var mt = 44//顶部距离
-		,p = 112//上下行之间的间隔  132
+		,p = 116//上下行之间的间隔 
 		,x = d3.scale.linear()
 		,w
 		,homeSvgMapp = {}
@@ -69,12 +69,14 @@ var drawSvg = (function(){
 		init: function(lineId, data, container, w, mtop){
 			if(!data || data.length == 0)
 				return;
-				
+			
 			mt = mtop;
-			//起终点站
+			//索引起终点站
 			$.each(data, function(){
-				if(this.stationMark == 'B' || this.stationMark == 'E' )
+				if(this.stationMark == 'B' || this.stationMark == 'E' ){
 					seGps[lineId + '_' + this.id[0]] = [];
+					seGps[lineId + '_' + this.id[1]] = [];
+				}
 			});
  
 			var svg = d3.select('#' + container).append('svg')
@@ -94,22 +96,6 @@ var drawSvg = (function(){
 			//下行线条
 			drawPath(svg, data, 'down', 10);
  
-/*			//左弧线 path
-			svg.append('path')
-				.attr('d', function(){
-					var cx = x(0) - 8;
-					return arcPath(cx , mt + 5,cx - 20);
-				})
-				.attr('class', 'up_path arc');
-			
-			//右弧线 path
-			svg.append('path')
-				.attr('d', function(){
-					var cx = x(dLen - 1) + 8;
-					return arcPath(cx , mt + 5,cx + 20);
-				})
-				.attr('class', 'down_path arc');*/
-			
 			var g = svg.append('g').selectAll('g')
 					.data(data)
 					.enter()
@@ -183,12 +169,11 @@ var drawSvg = (function(){
 			if(!gpsArray || gpsArray.length == 0)
 				return;
  
-			//console.log('len', gpsArray.length);
 			//暂时先清空重新画
 			var fGps = gpsArray[0];
 			var hSvg = homeSvgMapp[fGps.lineId]
 				,aSvg = aloneSvgMapp[fGps.lineId];
-			//svg.selectAll('.vehci-g').remove();
+			
 			if(fGps.upDown == 0){
 				hSvg.selectAll('.vehci-g.up').remove();
 				hSvg.selectAll('.start.park').remove();
@@ -205,8 +190,9 @@ var drawSvg = (function(){
 			}
  
 			for(var i = 0, gps; gps = gpsArray[i ++];){
+				//首页svg
 				drawGpsToSvg(gps, hSvg);
-				
+				//单线路svg
 				drawGpsToSvg(gps, aSvg, true);
 			}
  
@@ -215,25 +201,28 @@ var drawSvg = (function(){
 			for(var eid in seGps){
 				len = seGps[eid].length;
 				if(len > 0){
-					var a_e = $('#' + eid, aSvg[0])
-						,a_x = parseInt(a_e.attr('cx'))
-						,a_y = parseInt(a_e.attr('cy'));
-					tempStartAndStop(aSvg, eid, a_e, a_x, a_y);
-					
+					//首页svg
 					var h_e = $('#' + eid, hSvg[0])
 						,h_x = parseInt(h_e.attr('cx'))
 						,h_y = parseInt(h_e.attr('cy'));
 					tempStartAndStop(hSvg, eid ,h_e , h_x, h_y);
+					//单线路svg
+					var a_e = $('#' + eid, aSvg[0])
+						,a_x = parseInt(a_e.attr('cx'))
+						,a_y = parseInt(a_e.attr('cy'));
+						tempStartAndStop(aSvg, eid, a_e, a_x, a_y);
 				}
 			}
  
 			function tempStartAndStop(svg, eid, e, x, y){
+				var se = e.attr('class').indexOf('start') != -1?'start':'end';
  
-				var gs = svg.append('g').classed({'start': e.attr('class').indexOf('start') != -1, 'park': true})
+				var gs = svg.append('g').attr('class', se + ' park')
 						.selectAll('g').data(seGps[eid]).enter().append('g');
  
+				
 				//Y轴居中
-				y = (y + 66) - len * 13;
+				//y = (y + 66) - len * 13;
 				gs.append('rect')
 					.attr('x', x + 15)
 					.attr('y', function(d, i){
@@ -297,6 +286,7 @@ var drawSvg = (function(){
 		}
 	};
  
+	//flag 2张svg ， 起终点只画一次
 	function drawGpsToSvg(gps, svg, flag){
 		var stionId = gps.lineId + '_' + gps.stopNo
 		,station = $('#' + stionId, svg[0])/*
@@ -35,10 +35,17 @@ var _home = (function() {
 			$('.card_wrap').css('height', ah / 3);
  
 			// 滚动条
-			$('.card_wrap .table_wrap').slimscroll({
+			/*$('.card_wrap .table_wrap').slimscroll({
 				height : '187px',
 				alwaysVisible : true,
 				opacity : .8
+			});*/
+			
+			//table 滚动时固定表头
+			$('#tab_home .custom-table-panel').on('scroll', function(){
+				var top = $(this).scrollTop()
+				,$header = $(this).find('.custom-table-header');
+				$header.css('top', top);
 			});
  
 			// SVG线路图
@@ -54,19 +61,20 @@ var _home = (function() {
 			// 模拟图GPS刷新事件
 			$('#tab_home').on(
 					'gps_refresh',
-					function(e, add, up) {
+					function(e, allGps) {
 						// 现在先每次全量画
-						var list = _data.findAllGps();
-						_data.attachSchedulInfo(list);
+						//var list = _data.findAllGps();
+						//allGps = _data.attachSchedulInfo(allGps);
  
 						// drawSvg.drawVehicle(list);
 						// 按线路分组
-						var listMap = groupByLine(list);
-
+						var listMap = groupByLine(allGps);
+						
 						for ( var key in listMap) {
 							var htmlStr = template('home_table_temp', {
 								list : listMap[key]
 							});
+							//表格
 							$('#tab_' + key).find('tbody').html(htmlStr);
 							// 更新badge
 							$('#' + key + '_badge').text(
@@ -84,7 +92,7 @@ var _home = (function() {
 				$('.load-anim').fadeOut(800);
 				$('menu.menu').show();
 			}, 400);
-			
+/*			
 			setTimeout(function() {
 				// 提示文本
 				var promptFlag = storage.getItem('promptFlag_0913');
@@ -97,7 +105,7 @@ var _home = (function() {
 					storage.setItem('promptFlag_0913', 1);
 				}
 			}, 1500);
-		}
+*/		}
 	}
  
 	function gpslistToMap(gpslist){
@@ -117,10 +125,23 @@ var _home = (function() {
  
 			rs[key].push(this);
 		});
+		
+		//排序
+		for(var k in rs){
+			rs[k].sort(gpsSort);
+		}
 		return rs;
 	}
  
-
+	function gpsSort(a, b){
+		if(!a.expectStopTime)
+			return 1;
+		if(!b.expectStopTime)
+			return 0;
+		
+		return a.expectStopTime - b.expectStopTime;
+	}
+	
 	countDown('home.js');
 	return homeObject;
 })();
 \ No newline at end of file
@@ -34,7 +34,12 @@ var _home_menu = (function(){
 				$('#homeMenu').removeClass('show-menu');
 			});
 	});
-	
+	//点击选中
+	$('.portlet-fullscreen').on('click', '.vehicDataTable tr td', function(e){
+		e.preventDefault();
+		$('.vehicDataTable tr._home_tr_active').removeClass('_home_tr_active');
+		$(this).parent().addClass('_home_tr_active');
+	});
  
     function showMenu(x, y) {
 		var menu = $('#homeMenu'),
 var _main = (function(){
-	
-/*setTimeout(function(){
-	//生成头部选项卡
-	var topTabs = '', tabPanels = '';
-	$.each(_data.getLines(), function(i, line){
-		topTabs += '<li ><a data-id="'+line.lineCode+'" href="#tab_line_'+line.lineCode+'" data-toggle="tab" '+
-					'aria-expanded="false"> '+line.name+'<span>（<zz>0</zz>,<zz>0</zz> <zz>托管</zz>）</span> </a></li>';
-		
-		tabPanels += '<div class="tab-pane fade tab_line" data-id="'+line.lineCode+'" id="tab_line_'+line.lineCode+'"></div>';
-		
-	});
-	$('#top-tabs-wrap .nav-tabs').append(topTabs);
-	$('#top-tabs-wrap .tab-content').append(tabPanels);
-	
-	//加载地图页数据
-	$('#tab_map').load('/pages/mapmonitor/real/real.html');
-	
-	//初始化单线路调度页面
-	_alone.init(function(){
-		//初始化信使
-		_messenger.init();
-		//初始化主页
-		homeObject.init();
-		
-		$.each(_data.getLines(), function(){
-			//计算应发未发数量
-			_messenger.setYFWFNum(this.lineCode);
-		});
-	});
-	
-	//监控模式下，拦截post请求
-	if(operationMode == 0){
-		$(document).on('ajaxSend', interceptPOST);
-	}
-	
-}, 200)*/
  
-	
-	/*var startEp = EventProxy.create("template", function (template, data, l10n) {
-		_.template(template, data, l10n);
-	});*/
 	var initEp;
 	var mainInstance = {
 		start: function(){
@@ -27,26 +27,42 @@
  
 			</div>
 		</div>
-		<table class="table table-striped table-bordered table-advance"
-			style="table-layout: fixed;">
-			<thead>
-				<tr>
-					<th style="width: 22%;">车辆编码</th>
-					<th style="width: 17%;">路牌</th>
-					<th style="width: 17%;">速度</th>
-					<th style="width: 22%;">终点时间</th>
-					<th style="width: 22%;" class="col_hide_1680">下一班</th>
-				</tr>
-			</thead>
-		</table>
-		<div class="table_wrap">
-			<table
-				class="table table-striped table-bordered table-advance table-hover vehicDataTable"
-				style="table-layout: fixed;" id="tab_{{lineObj.lineCode}}_0">
-				<tbody>
-				</tbody>
-			</table>
+		<div class="custom-table-panel">
+			<div style="height: 33px;position: relative;">
+				 <div class="custom-table-header" style="min-width: 700px;">
+					<table class="table table-bordered table-advance" >
+						<thead>
+							<tr>
+								<th width="14%">车辆编码</th>
+								<th width="8%">速度</th>
+								<th width="14%">终点时间</th>
+								<th width="16%">当前站点</th>
+								<th width="16%">终点站</th>
+								<th width="11%">计划终点</th>
+								<th width="10%">驾驶员</th>
+								<th width="10%">售票员</th>
+							</tr>
+						</thead>
+					</table>
+				 </div>
+			</div>
+			<div class="custom-table-body" style="min-width: 700px;">
+				<table class="table table-bordered vehicDataTable" id="tab_{{lineObj.lineCode}}_0">
+					<colgroup>
+						<col width="14%"></col>
+						<col width="8%"></col>
+						<col width="14%"></col>
+						<col width="16%"></col>
+						<col width="16%"></col>
+						<col width="11%"></col>
+						<col width="10%"></col>
+						<col width="10%"></col>
+					</colgroup>
+					<tbody></tbody>
+				</table>
+			</div>
 		</div>
+		
 	</div>
 	<div class="col-lg-8 line_chart" id="line_chart_{{lineObj.lineCode}}"> 
 		<div class="top">
@@ -74,25 +90,40 @@
 				</ul>-->
 			</div>
 		</div>
-		<table class="table table-striped table-bordered table-advance"
-			style="table-layout: fixed;">
-			<thead>
-				<tr>
-					<th style="width: 22%;">车辆编码</th>
-					<th style="width: 17%;">路牌</th>
-					<th style="width: 17%;">速度</th>
-					<th style="width: 22%;">终点时间</th>
-					<th style="width: 22%;" class="col_hide_1680">下一班</th>
-				</tr>
-			</thead>
-		</table>
-		<div class="table_wrap">
-			<table
-				class="table table-striped table-bordered table-advance table-hover vehicDataTable"
-				style="table-layout: fixed;" id="tab_{{lineObj.lineCode}}_1">
-				<tbody>
-				</tbody>
-			</table>
+		<div class="custom-table-panel">
+			<div style="height: 33px;position: relative;">
+				 <div class="custom-table-header" style="min-width: 700px;">
+					<table class="table table-bordered table-advance" >
+						<thead>
+							<tr>
+								<th width="14%">车辆编码</th>
+								<th width="8%">速度</th>
+								<th width="14%">终点时间</th>
+								<th width="16%">当前站点</th>
+								<th width="16%">终点站</th>
+								<th width="11%">计划终点</th>
+								<th width="10%">驾驶员</th>
+								<th width="10%">售票员</th>
+							</tr>
+						</thead>
+					</table>
+				 </div>
+			</div>
+			<div class="custom-table-body" style="min-width: 700px;">
+				<table class="table table-bordered vehicDataTable" id="tab_{{lineObj.lineCode}}_1">
+					<colgroup>
+						<col width="14%"></col>
+						<col width="8%"></col>
+						<col width="14%"></col>
+						<col width="16%"></col>
+						<col width="16%"></col>
+						<col width="11%"></col>
+						<col width="10%"></col>
+						<col width="10%"></col>
+					</colgroup>
+					<tbody></tbody>
+				</table>
+			</div>
 		</div>
 	</div>
 </div>
@@ -122,23 +153,30 @@
 <script id="home_table_temp" type="text/html">
 {{each list as obj i}}
 <tr data-nbbm="{{obj.nbbm}}" data-device="{{obj.deviceId}}">
-   <td style="width: 22%;"> {{obj.nbbm}} </td>
-   <td style="width: 17%;"> 
-	{{if obj.currSch != null}}
-		{{obj.currSch.lpName}}
+   <td title="{{obj.nbbm}}"> 
+	{{if !obj.abnormal}}
+		{{obj.nbbm}} 
+	{{else}}
+		<abbr class="abnormal" title="{{obj.abnormalText}}">{{obj.nbbm}}</abbr>
+	{{/if}}
+   </td>
+   <td> {{obj.speed}} </td>
+   <td>
+	{{if obj.expectStopTime != null}}
+		{{obj.expectStopTime}} <span class="sm-text">分钟</span>
 	{{else}}
-		无
+		<span class="sm-text">无</span>
 	{{/if}}
    </td>
-   <td  style="width: 17%;"> {{obj.speed}} </td>
-   <td style="width: 22%;" > 暂无 </td>
-   <td style="width: 22%;" class="col_hide_1680">
-{{if obj.nextSch != null}}
-	{{obj.nextSch.dfsj}}
-{{else}}
-	无
-{{/if}}
-	</td>
+   <td title="{{obj.stationName}}"> {{obj.stationName}} </td>
+   {{if obj.sch != null}}
+	 <td title="{{obj.sch.zdzName}}"> {{obj.sch.zdzName}} </td>
+	 <td>{{obj.sch.zdsj}}</td>
+	 <td> {{obj.sch.jName}} </td>
+	 <td> {{obj.sch.sName}} </td>
+    {{else}}
+	   <td colspan=4 class="lt-no-data">无班次信息</td>
+   {{/if}}
 </tr>
 {{/each}}
 </script>
@@ -9,14 +9,7 @@
 	<div><a href="javascript:;" data-for="station" class="tip_modal">{{stationName}}</a></div>
 	<div>速度：{{speed}}</div>
 	<hr >
-	<div>预计 ? 分钟后到达<a href="javascript:;" data-for="station" class="tip_modal">下一站</a></div>
-	<div>终点站：
-		<a href="javascript:;" data-for="station" > 
-		{{if currSch != null}}
-			{{currSch.zdzName}}
-		{{/if}}
-
-		</a></div>
+	<div>预计 {{expectStopTime}} 分钟到达终点</div>
 	<hr >
 	<div class="subtitle">{{fromNow}}更新（在线）</div>
 	<div class="subtitle" style="margin-top: 8px;">
@@ -311,4 +311,16 @@ rect.f_rect{
     overflow-x: hidden;
     padding-right: 15px;
     margin: 15px 0px;
-}
 \ No newline at end of file
+}
+
+#forecast_sample_modal ul.tabs-left li{
+}
+
+#forecast_sample_modal span.desc {
+    color: #5580a5;
+    text-align: left;
+    font-size: 12px;
+}
+#forecast_sample_modal ul.tabs-left li.active span.desc{
+	color: #989292;	
+}
@@ -7,7 +7,8 @@ var sampleSvg = (function(){
 		, margin
 		, _opt
 		, svg
-		, _data;
+		, _data
+		,defaultTag;
  
 	var stationMapp = {};
 	//路由
@@ -70,7 +71,7 @@ var sampleSvg = (function(){
 		});
  
 		var h = rts[rts.length - 1].cy + 50;
-		svg.style('height', h).style('opacity', 0);
+		svg.style('height', h)/*.style('opacity', 0)*/;
 		$('#svgWrap').css('height', h + 6);
  
 		//画线
@@ -97,7 +98,7 @@ var sampleSvg = (function(){
 		showTags();
  
 		//d3 anim
-		svg.transition().delay(100).style('opacity', 1);
+		//svg.transition().delay(100).style('opacity', 1);
 	}
  
 	//tag 点击事件
@@ -141,7 +142,7 @@ var sampleSvg = (function(){
 			.attr('x', function(d){return d.cp[0]})
 			.attr('y', function(d){return d.cp[1]})
 			.attr('class', 'f_text')
-			.text(function(d){return d.runTime + 'm'});
+			.text(function(d){return d.runTime + '分'});
 	}
  
  
@@ -151,24 +152,35 @@ var sampleSvg = (function(){
 	}
  
 	function showTags(){
+		var index = layer.msg('加载中', {icon: 16, time: 0,shade:0.3});
 		//查询 耗时信息
 		$.get('/sample/all', {'lineCode_eq': _opt.lineCode, 'updown_eq': _opt.updown}, function(rs){
 			//按tag分组数据
 			_data = {};
-			var tags = '';//
+			var tags = '', ct;//
 			$.each(rs, function(i, d){
-				if(!_data[d.tag]){
-					_data[d.tag] = [];
-					tags += '<a class="tag" title="'+d.tag+'">'+(d.tag + ' ' + d.sDate + ' - ' + d.eDate)+'</a>';
+				ct = cutTag(d.tag);
+				if(!_data[ct]){
+					_data[ct] = [];
+					tags += '<a class="tag" title="'+ct+'">'+ d.tag +'</a>';
 				}
-				_data[d.tag].push(d);
+				_data[ct].push(d);
 			});
  
 			var wrap = $('#trafficChart .sample_tags');
 			wrap.find('a.tag').remove();
 			wrap.append(tags);
-			//选中第一个tag
-			$('#trafficChart .sample_tags a.tag:eq(0)').click();
+			
+			if(defaultTag){
+				$(defaultTag).click();
+				defaultTag = null;
+			}
+			else{
+				//选中第一个tag
+				$('#trafficChart .sample_tags a.tag:eq(0)').click();
+			}
+			
+			layer.close(index);
 		});
 	}
  
@@ -185,7 +197,7 @@ var sampleSvg = (function(){
 		$.get('/pages/forecast/sample/modal.html', function(rs){
 			var index = layer.open({
 				  type: 1,
-				  area: '550px',
+				  area: '560px',
 				  content: rs,
 				  shift: 5,
 				  title: '人工编辑',
@@ -200,7 +212,8 @@ var sampleSvg = (function(){
  
 	var drawObject = {
 		draw: draw ,
-		popAddModal: popAddModal
+		popAddModal: popAddModal,
+		setDefaultTag: function(tag){defaultTag = tag; return drawObject;}
 	}
  
 	//分析path d 路径中间点
@@ -230,5 +243,9 @@ var sampleSvg = (function(){
 		return cp;
 	}
  
+	function cutTag(tag){
+		return tag.replace(new RegExp(/:/g),'').replace(new RegExp(/ /g),'').replace(new RegExp(/-/g) ,'');
+	}
+	
 	return drawObject;
 })();
 \ No newline at end of file
@@ -264,8 +264,10 @@
 						  delete param.dr_etime;
 						  param.timeRange = timeRange;
  
-						  $.post('/sample/create/gps', {data: encodeURI(JSON.stringify(param))}, function(rs){
-							 console.log(rs); 
+						  layer.msg('服务器正在处理数据，请稍等...', {icon: 16, shade: 0.3});
+						  $post('/sample/create/gps', {data: encodeURI(JSON.stringify(param))}, function(rs){
+							 layer.closeAll();
+							 drawSvg();
 						  });
 					  }
 				  }catch (e){
@@ -8,7 +8,7 @@
  <ul class="nav nav-tabs tabs-left">
 {{each data as obj i}}
 	<li >
-      <a href="#tab_sample_{{i}}" data-toggle="tab" title="{{obj.t}}"> {{obj.t}}  </a>
+      <a href="#tab_sample_{{i}}" data-toggle="tab" title="{{obj.t}}"> {{#obj.escapeTag}}  </a>
     </li>
 {{/each}}
 <li ><a href="#tab_sample_add" data-toggle="tab" style="font-size: 12px;color: red;"> <i class="fa fa-plus"></i> 新增 </a></li>
@@ -89,9 +89,9 @@
             		<label class="col-md-3 control-label">时区：</label>
             		<div class="col-md-9">
 						<select class="form-control" name="tag" style="width:100%;" multiple required>
-							<option value="早高峰">早高峰</option>
-							<option value="平峰">平峰</option>
-							<option value="晚高峰">晚高峰</option>
+							{{each tsArray as t i}}
+								<option value="{{t}}">{{t}}</option>
+							{{/each}}
 						</select>
             		</div>
         		</div>
@@ -129,9 +129,12 @@
 <script>
 !function(){
 	var _data,_opt,id, currentData, layero, drawObject;
-	var tagRange = {'早高峰': {s: '06:31', e: '08:30'}, '平峰': {s: '08:31', e: '16:00'}, '晚高峰': {s: '16:01', e: '18:00'}};
+	var tagRange = {};
  
 	$('#forecast_sample_modal').on('init', function(e, rs){
+		//提取出tag Range
+		var tsArray = extractTag(rs._data);
+		
 		_data = rs._data;
 		_opt = rs._opt;
 		drawObject = rs.drawObject;
@@ -147,8 +150,14 @@
 		var eid = id, sid = _prve.stationCode;
 		var sampData = searchData(sid, eid);
 		var baseData = {sid: sid, eid: eid, sName: toName(sid), eName: toName(eid)};
-		console.log('baseData', baseData);
-		var html = template('forecast_sample_tab_detail_temp', {data: sampData, base: baseData});
+		
+		//tag加换行符
+		$.each(sampData, function(){
+			var t = this.d.tag.replace(new RegExp(/ /g),'');
+			this.escapeTag = t.substr(0, t.length - 11) + '<br>' + '<span class="desc">' + t.substr(t.length - 11, 11) + '</span>';
+		});
+		
+		var html = template('forecast_sample_tab_detail_temp', {data: sampData, base: baseData, tsArray: tsArray});
 		$('#forecast_sample_modal .row').html(html);
 		//默认选中tab
 		defaultSelect(rs.tag);
@@ -180,6 +189,10 @@
 				$post('/sample', param, function(){
 					layer.closeAll();
 					layer.msg('保存成功！');
+					
+					if(rs.tag)
+						drawObject.setDefaultTag('#trafficChart .sample_tags a.tag[title='+rs.tag+']');
+					
 					drawObject.draw(_opt);
 				});
 			}
@@ -294,5 +307,23 @@
 		}
 		return rs;
 	}
+	
+	function extractTag(_data){
+		var rs = [];
+		var len, t, s, e;
+		for(var key in _data){
+			len = key.length;
+			t = key.substring(0, len - 8);
+			s = key.substring(len - 8, len - 4);
+			e = key.substring(len - 4, len);
+			
+			s = s.substr(0, 2) + ':' + s.substr(2);
+			e = e.substr(0, 2) + ':' + e.substr(2);
+			tagRange[t] = {s: s, e: e};
+			rs.push(t);
+		}
+		
+		return rs;
+	}
 }();
 </script>
 \ No newline at end of file
@@ -32,8 +32,8 @@
 	}
  
 	function refreshGpsProxy(){
-		refreshGps(function(add, up){
-			$('#tab_map #mapContainer').trigger('gps_refresh', [add, up]);
+		refreshGps(function(all){
+			$('#tab_map #mapContainer').trigger('gps_refresh', [all]);
 		});
 	}
 	function refreshGps(cb){
@@ -48,23 +48,11 @@
 		function getGpsSuccess(gpsList){
 			if(!gpsList || gpsList.length == 0)
 				return;
-			
-			var prve = allGps
-				,addArray = []
-				,upArray = []
-				,oldGps;
+
 			for(var i = 0, gps; gps=gpsList[i++];){
-				oldGps = prve[gps.deviceId];
-				if(!oldGps){
-					addArray.push(gps);
-				}
-				else if(gps.timestamp > oldGps.timestamp){
-					//更新
-					upArray.push(gps);
-				}
 				allGps[gps.deviceId] = gps;
 			}
-			cb && cb(addArray, upArray);
+			cb && cb(allGps);
 		}
  
 		function getGpsError(jqXHR, textStatus){
@@ -124,19 +124,18 @@ CanvasRenderingContext2D.prototype.roundRect = function (x, y, w, h, r) {
 }
  
 //GPS刷新事件
-$('#mapContainer').on('gps_refresh', function(e, add, up){
+$('#mapContainer').on('gps_refresh', function(e, all){
 	if($(this).is(":hidden"))
 		return;
-	var all = add ,gps;
+/* 	var all = add ,gps;
 	if(up)
-		all = all.concat(up);
+		all = all.concat(up); */
  
 	$.each(all, function(){
 		consts.allGps[this.deviceId] = this;
 	});
  
 	var type = $('.mapTools .item.active').data('click');
-	console.log(type);
 	switch (type) {
 	case 'vehicle':
 		lineGroup.gpsRefresh();
-<div name="{{$saEmployeegroupCtrl.$name_attr}}"
-     ng-model="$saEmployeegroupCtrl.$$internalmodel">
-
-    <style>
-        .employee-select {
-            min-height: 180px;
-            border: 1px solid #ddd;
-        }
-        .employee-select .employee-input {
-            margin: 5px 5px 0px 5px;
-            padding-left: 0;
-        }
-        .employee-select .employee-select-cont {
-            text-align: left;
-            min-height: 60px;
-            padding-right: 0px;
-        }
-        .employee-select .employee-select-body {
-            margin-top: 5px;
-            overflow: auto;
-            width: auto;
-            min-height: 5px;
-        }
-        .employee-select .employee {
-            display: inline-block;
-            padding: 8px;
-            min-width: 50px;
-            text-align: center;
-            border: 1px solid #C1C1C1;
-            color: #666;
-            border-radius: 5px !important;
-            margin: 5px;
-        }
-        .employee-select .employee.active {
-            color: white;
-            background: #5A81A7;
-            border: 1px solid #5A81A7;
-        }
-        .employee-select .employee.start {
-            color: white;
-            background: #32C5D2;
-            border: 1px solid #32C5D2;
-        }
-
-        .employee-select .employeeGroup {
-            display: inline-block;
-            padding: 8px;
-            min-width: 50px;
-            text-align: center;
-            border: 1px solid #C1C1C1;
-            color: #666;
-            border-radius: 5px !important;
-            margin: 5px;
-        }
-        .employee-select .employeeGroup.active {
-            color: white;
-            background: #8DA29F;
-            border: 1px solid #8DA29F;
-            min-width: 100px;
-            max-width: 200px;
-        }
-        .employee-select .employeeGroup.start {
-            color: white;
-            background: #32C5D2;
-            border: 1px solid #32C5D2;
-            min-width: 100px;
-            max-width: 200px;
-        }
-
-
-    </style>
-
-    <div class="col-md-12 employee-select">
-        <div class="col-md-12 employee-input">
-            <div class="col-md-9">
-                人员列表，共{{$saEmployeegroupCtrl.$$data.length}}组
-
-            </div>
-            <div class="checkbox col-md-3" style="min-height: 19px; color: black;">
-                <label>
-                    <input type="checkbox" ng-model="$saEmployeegroupCtrl.$$isFB"/>
-                    是否分班
-                </label>
-            </div>
-
-        </div>
-        <div class="col-md-12 employee-select-cont">
-            <div class="employee-select-body">
-                <div class="employee active"
-                     ng-repeat="$d in $saEmployeegroupCtrl.$$data track by $index"
-                     ng-click="$saEmployeegroupCtrl.$$internal_rylist_click($index)">
-                    <span ng-if="$d.spy">
-                        {{$d.jsy}}-{{$d.spy}}
-                        <i class="fa fa-ticket" aria-hidden="true"></i>
-                    </span>
-                    <span ng-if="!$d.spy">
-                        <i class="fa fa-bus" aria-hidden="true"></i>
-                        {{$d.jsy}}
-                    </span>
-                </div>
-            </div>
-        </div>
-
-        <!-- 不分班 -->
-        <div class="col-md-12 employee-input" ng-if="!$saEmployeegroupCtrl.$$isFB">
-            <div class="col-md-12">
-                已经选中的人员列表，共{{$saEmployeegroupCtrl.$$dataSelected.length}}组，
-                初始人员，{{$saEmployeegroupCtrl.$$dataSelectedStart == undefined ? "未选择" : "第" + ($saEmployeegroupCtrl.$$dataSelectedStart + 1) + "组"}}
-            </div>
-        </div>
-        <div class="col-md-12 employee-select-cont" ng-if="!$saEmployeegroupCtrl.$$isFB">
-            <div class="employee-select-body">
-                <div ng-class="{employee: true, active: true, start: $d.isstart}"
-                     ng-repeat="$d in $saEmployeegroupCtrl.$$dataSelected track by $index"
-                     ng-click="$saEmployeegroupCtrl.$$internal_selrylist_click($index)"
-                     ng-dblclick="$saEmployeegroupCtrl.$$internal_selrylist_dbclick($index)">
-                    <span ng-if="$d.spy">
-                        {{$d.jsy}}-{{$d.spy}}
-                        <i class="fa fa-ticket" aria-hidden="true"></i>
-                    </span>
-                    <span ng-if="!$d.spy">
-                        <i class="fa fa-bus" aria-hidden="true"></i>
-                        {{$d.jsy}}
-                    </span>
-
-                </div>
-            </div>
-        </div>
-
-        <!-- 分班 -->
-        <div class="col-md-12 employee-input" ng-if="$saEmployeegroupCtrl.$$isFB">
-            <div class="col-md-12">
-                已经选中的分班人员列表，共{{$saEmployeegroupCtrl.$$dataFBSelected.length}}组，
-                初始分班人员，{{$saEmployeegroupCtrl.$$dataFBSelectedStart == undefined ? "未选择" : "第" + ($saEmployeegroupCtrl.$$dataFBSelectedStart + 1) + "组"}}
-            </div>
-        </div>
-        <div class="col-md-12 employee-select-cont" ng-if="$saEmployeegroupCtrl.$$isFB">
-            <div class="employee-select-body">
-                <div ng-class="{employeeGroup: true, active: true, start: $d.isstart}"
-                     ng-repeat="$d in $saEmployeegroupCtrl.$$dataFBSelected track by $index"
-                     ng-click="$saEmployeegroupCtrl.$$internal_selrygrouplist_click($index)"
-                     ng-dblclick="$saEmployeegroupCtrl.$$internal_selrygrouplist_dbclick($index)">
-
-                    <div>
-                        <i class="fa fa-sun-o" aria-hidden="true"></i>
-                        <div ng-class="{employee: true, active: true, start: $d.group[0].isselected}"
-                             ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 0, $event)"
-                             ng-if="$d.group[0].spy">
-                            <i class="fa fa-bus" aria-hidden="true"></i>
-                            {{$d.group[0].jsy}}
-                            -
-                            <i class="fa fa-ticket" aria-hidden="true"></i>
-                            {{$d.group[0].spy}}
-                        </div>
-                        <div ng-class="{employee: true, active: true, start: $d.group[0].isselected}"
-                             ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 0, $event)"
-                             ng-if="!$d.group[0].spy">
-                            <i class="fa fa-bus" aria-hidden="true"></i>
-                            {{$d.group[0].jsy}}
-                        </div>
-                    </div>
-
-                    <div>
-                        <i class="fa fa-moon-o" aria-hidden="true"></i>
-                        <div ng-class="{employee: true, active: true, start: $d.group[1].isselected}"
-                             ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 1, $event)"
-                             ng-if="$d.group[1].spy">
-                            <i class="fa fa-bus" aria-hidden="true"></i>
-                            {{$d.group[1].jsy}}
-                            -
-                            <i class="fa fa-ticket" aria-hidden="true"></i>
-                            {{$d.group[1].spy}}
-                        </div>
-                        <div ng-class="{employee: true, active: true, start: $d.group[1].isselected}"
-                             ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 1, $event)"
-                             ng-if="!$d.group[1].spy">
-                            <i class="fa fa-bus" aria-hidden="true"></i>
-                            {{$d.group[1].jsy}}
-                        </div>
-                    </div>
-
-
-                </div>
-
-            </div>
-        </div>
-
-
-
-    </div>
-
+<div name="{{$saEmployeegroupCtrl.$name_attr}}"
+     ng-model="$saEmployeegroupCtrl.$$internalmodel">
+
+    <style>
+        .employee-select {
+            min-height: 180px;
+            border: 1px solid #ddd;
+        }
+        .employee-select .employee-input {
+            margin: 5px 5px 0px 5px;
+            padding-left: 0;
+        }
+        .employee-select .employee-select-cont {
+            text-align: left;
+            min-height: 60px;
+            padding-right: 0px;
+        }
+        .employee-select .employee-select-body {
+            margin-top: 5px;
+            overflow: auto;
+            width: auto;
+            min-height: 5px;
+        }
+        .employee-select .employee {
+            display: inline-block;
+            padding: 8px;
+            min-width: 50px;
+            text-align: center;
+            border: 1px solid #C1C1C1;
+            color: #666;
+            border-radius: 5px !important;
+            margin: 5px;
+        }
+        .employee-select .employee.active {
+            color: white;
+            background: #5A81A7;
+            border: 1px solid #5A81A7;
+        }
+        .employee-select .employee.start {
+            color: white;
+            background: #32C5D2;
+            border: 1px solid #32C5D2;
+        }
+
+        .employee-select .employeeGroup {
+            display: inline-block;
+            padding: 8px;
+            min-width: 50px;
+            text-align: center;
+            border: 1px solid #C1C1C1;
+            color: #666;
+            border-radius: 5px !important;
+            margin: 5px;
+        }
+        .employee-select .employeeGroup.active {
+            color: white;
+            background: #8DA29F;
+            border: 1px solid #8DA29F;
+            min-width: 100px;
+            max-width: 200px;
+        }
+        .employee-select .employeeGroup.start {
+            color: white;
+            background: #32C5D2;
+            border: 1px solid #32C5D2;
+            min-width: 100px;
+            max-width: 200px;
+        }
+
+
+    </style>
+
+    <div class="col-md-12 employee-select">
+        <div class="col-md-12 employee-input">
+            <div class="col-md-9">
+                人员列表，共{{$saEmployeegroupCtrl.$$data.length}}组
+
+            </div>
+            <div class="checkbox col-md-3" style="min-height: 19px; color: black;">
+                <label>
+                    <input type="checkbox" ng-model="$saEmployeegroupCtrl.$$isFB"/>
+                    是否分班
+                </label>
+            </div>
+
+        </div>
+        <div class="col-md-12 employee-select-cont">
+            <div class="employee-select-body">
+                <div class="employee active"
+                     ng-repeat="$d in $saEmployeegroupCtrl.$$data track by $index"
+                     ng-click="$saEmployeegroupCtrl.$$internal_rylist_click($index)">
+                    <span ng-if="$d.spy">
+                        {{$d.jsy}}-{{$d.spy}}
+                        <i class="fa fa-ticket" aria-hidden="true"></i>
+                    </span>
+                    <span ng-if="!$d.spy">
+                        <i class="fa fa-bus" aria-hidden="true"></i>
+                        {{$d.jsy}}
+                    </span>
+                </div>
+            </div>
+        </div>
+
+        <!-- 不分班 -->
+        <div class="col-md-12 employee-input" ng-if="!$saEmployeegroupCtrl.$$isFB">
+            <div class="col-md-12">
+                已经选中的人员列表，共{{$saEmployeegroupCtrl.$$dataSelected.length}}组，
+                初始人员，{{$saEmployeegroupCtrl.$$dataSelectedStart == undefined ? "未选择" : "第" + ($saEmployeegroupCtrl.$$dataSelectedStart + 1) + "组"}}
+            </div>
+        </div>
+        <div class="col-md-12 employee-select-cont" ng-if="!$saEmployeegroupCtrl.$$isFB">
+            <div class="employee-select-body">
+                <div ng-class="{employee: true, active: true, start: $d.isstart}"
+                     ng-repeat="$d in $saEmployeegroupCtrl.$$dataSelected track by $index"
+                     ng-click="$saEmployeegroupCtrl.$$internal_selrylist_click($index)"
+                     ng-dblclick="$saEmployeegroupCtrl.$$internal_selrylist_dbclick($index)">
+                    <span ng-if="$d.spy">
+                        {{$d.jsy}}-{{$d.spy}}
+                        <i class="fa fa-ticket" aria-hidden="true"></i>
+                    </span>
+                    <span ng-if="!$d.spy">
+                        <i class="fa fa-bus" aria-hidden="true"></i>
+                        {{$d.jsy}}
+                    </span>
+
+                </div>
+            </div>
+        </div>
+
+        <!-- 分班 -->
+        <div class="col-md-12 employee-input" ng-if="$saEmployeegroupCtrl.$$isFB">
+            <div class="col-md-12">
+                已经选中的分班人员列表，共{{$saEmployeegroupCtrl.$$dataFBSelected.length}}组，
+                初始分班人员，{{$saEmployeegroupCtrl.$$dataFBSelectedStart == undefined ? "未选择" : "第" + ($saEmployeegroupCtrl.$$dataFBSelectedStart + 1) + "组"}}
+            </div>
+        </div>
+        <div class="col-md-12 employee-select-cont" ng-if="$saEmployeegroupCtrl.$$isFB">
+            <div class="employee-select-body">
+                <div ng-class="{employeeGroup: true, active: true, start: $d.isstart}"
+                     ng-repeat="$d in $saEmployeegroupCtrl.$$dataFBSelected track by $index"
+                     ng-click="$saEmployeegroupCtrl.$$internal_selrygrouplist_click($index)"
+                     ng-dblclick="$saEmployeegroupCtrl.$$internal_selrygrouplist_dbclick($index)">
+
+                    <div>
+                        <i class="fa fa-sun-o" aria-hidden="true"></i>
+                        <div ng-class="{employee: true, active: true, start: $d.group[0].isselected}"
+                             ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 0, $event)"
+                             ng-if="$d.group[0].spy">
+                            <i class="fa fa-bus" aria-hidden="true"></i>
+                            {{$d.group[0].jsy}}
+                            -
+                            <i class="fa fa-ticket" aria-hidden="true"></i>
+                            {{$d.group[0].spy}}
+                        </div>
+                        <div ng-class="{employee: true, active: true, start: $d.group[0].isselected}"
+                             ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 0, $event)"
+                             ng-if="!$d.group[0].spy">
+                            <i class="fa fa-bus" aria-hidden="true"></i>
+                            {{$d.group[0].jsy}}
+                        </div>
+                    </div>
+
+                    <div>
+                        <i class="fa fa-moon-o" aria-hidden="true"></i>
+                        <div ng-class="{employee: true, active: true, start: $d.group[1].isselected}"
+                             ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 1, $event)"
+                             ng-if="$d.group[1].spy">
+                            <i class="fa fa-bus" aria-hidden="true"></i>
+                            {{$d.group[1].jsy}}
+                            -
+                            <i class="fa fa-ticket" aria-hidden="true"></i>
+                            {{$d.group[1].spy}}
+                        </div>
+                        <div ng-class="{employee: true, active: true, start: $d.group[1].isselected}"
+                             ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 1, $event)"
+                             ng-if="!$d.group[1].spy">
+                            <i class="fa fa-bus" aria-hidden="true"></i>
+                            {{$d.group[1].jsy}}
+                        </div>
+                    </div>
+
+
+                </div>
+
+            </div>
+        </div>
+
+
+
+    </div>
+
 </div>
 \ No newline at end of file
-<div name="{{$saGuideboardgroupCtrl.$name_attr}}"
-        ng-model="$saGuideboardgroupCtrl.$$internalmodel">
-
-    <style>
-        .guideboard-select {
-            min-height: 180px;
-            border: 1px solid #ddd;
-        }
-        .guideboard-select .guideboard-input {
-            margin: 5px 5px 0px 5px;
-            padding-left: 0;
-        }
-        .guideboard-select .guideboard-select-cont {
-            text-align: left;
-            min-height: 60px;
-            padding-right: 0px;
-        }
-        .guideboard-select .guideboard-select-body {
-            margin-top: 5px;
-            overflow: auto;
-            width: auto;
-            min-height: 5px;
-        }
-        .guideboard-select .guideboard {
-            display: inline-block;
-            padding: 8px;
-            min-width: 50px;
-            text-align: center;
-            border: 1px solid #C1C1C1;
-            color: #666;
-            border-radius: 5px !important;
-            margin: 5px;
-        }
-        .guideboard-select .guideboard.active {
-            color: white;
-            background: #4095E8;
-            border: 1px solid #4095E8;
-        }
-        .guideboard-select .guideboard.start {
-            color: white;
-            background: #32C5D2;
-            border: 1px solid #32C5D2;
-        }
-
-    </style>
-
-    <div class="col-md-12 guideboard-select">
-        <div class="col-md-12 guideboard-input">
-            <div class="col-md-9">
-                路牌列表，共{{$saGuideboardgroupCtrl.$$data.length}}个
-            </div>
-        </div>
-        <div class="col-md-12 guideboard-select-cont">
-            <div class="guideboard-select-body">
-                <div class="guideboard active"
-                     ng-repeat="$d in $saGuideboardgroupCtrl.$$data track by $index"
-                     ng-click="$saGuideboardgroupCtrl.$$internal_lplist_click($index)">
-                    <i class="fa fa-map-signs" aria-hidden="true"></i>
-                    {{$d.lpname}}
-                </div>
-            </div>
-        </div>
-        <div class="col-md-12 guideboard-input">
-            <div class="col-md-12">
-                已经选中的路牌列表，共{{$saGuideboardgroupCtrl.$$dataSelected.length}}个，
-                初始路牌，{{$saGuideboardgroupCtrl.$$dataSelectedStart == undefined ? "未选择" : "第" + ($saGuideboardgroupCtrl.$$dataSelectedStart + 1) + "个"}}
-            </div>
-        </div>
-        <div class="col-md-12 guideboard-select-cont">
-            <div class="guideboard-select-body">
-                <div ng-class="{guideboard: true, active: true, start: $d.isstart}"
-                     ng-repeat="$d in $saGuideboardgroupCtrl.$$dataSelected track by $index"
-                     ng-click="$saGuideboardgroupCtrl.$$internal_sellplist_click($index)"
-                     ng-dblclick="$saGuideboardgroupCtrl.$$internal_sellplist_dbclick($index)">
-                    <i class="fa fa-map-signs" aria-hidden="true"></i>
-                    {{$d.lpname}}
-                </div>
-            </div>
-        </div>
-    </div>
-
+<div name="{{$saGuideboardgroupCtrl.$name_attr}}"
+        ng-model="$saGuideboardgroupCtrl.$$internalmodel">
+
+    <style>
+        .guideboard-select {
+            min-height: 180px;
+            border: 1px solid #ddd;
+        }
+        .guideboard-select .guideboard-input {
+            margin: 5px 5px 0px 5px;
+            padding-left: 0;
+        }
+        .guideboard-select .guideboard-select-cont {
+            text-align: left;
+            min-height: 60px;
+            padding-right: 0px;
+        }
+        .guideboard-select .guideboard-select-body {
+            margin-top: 5px;
+            overflow: auto;
+            width: auto;
+            min-height: 5px;
+        }
+        .guideboard-select .guideboard {
+            display: inline-block;
+            padding: 8px;
+            min-width: 50px;
+            text-align: center;
+            border: 1px solid #C1C1C1;
+            color: #666;
+            border-radius: 5px !important;
+            margin: 5px;
+        }
+        .guideboard-select .guideboard.active {
+            color: white;
+            background: #4095E8;
+            border: 1px solid #4095E8;
+        }
+        .guideboard-select .guideboard.start {
+            color: white;
+            background: #32C5D2;
+            border: 1px solid #32C5D2;
+        }
+
+    </style>
+
+    <div class="col-md-12 guideboard-select">
+        <div class="col-md-12 guideboard-input">
+            <div class="col-md-9">
+                路牌列表，共{{$saGuideboardgroupCtrl.$$data.length}}个
+            </div>
+        </div>
+        <div class="col-md-12 guideboard-select-cont">
+            <div class="guideboard-select-body">
+                <div class="guideboard active"
+                     ng-repeat="$d in $saGuideboardgroupCtrl.$$data track by $index"
+                     ng-click="$saGuideboardgroupCtrl.$$internal_lplist_click($index)">
+                    <i class="fa fa-map-signs" aria-hidden="true"></i>
+                    {{$d.lpname}}
+                </div>
+            </div>
+        </div>
+        <div class="col-md-12 guideboard-input">
+            <div class="col-md-12">
+                已经选中的路牌列表，共{{$saGuideboardgroupCtrl.$$dataSelected.length}}个，
+                初始路牌，{{$saGuideboardgroupCtrl.$$dataSelectedStart == undefined ? "未选择" : "第" + ($saGuideboardgroupCtrl.$$dataSelectedStart + 1) + "个"}}
+            </div>
+        </div>
+        <div class="col-md-12 guideboard-select-cont">
+            <div class="guideboard-select-body">
+                <div ng-class="{guideboard: true, active: true, start: $d.isstart}"
+                     ng-repeat="$d in $saGuideboardgroupCtrl.$$dataSelected track by $index"
+                     ng-click="$saGuideboardgroupCtrl.$$internal_sellplist_click($index)"
+                     ng-dblclick="$saGuideboardgroupCtrl.$$internal_sellplist_dbclick($index)">
+                    <i class="fa fa-map-signs" aria-hidden="true"></i>
+                    {{$d.lpname}}
+                </div>
+            </div>
+        </div>
+    </div>
+
 </div>
 \ No newline at end of file