Merge branch 'minhang' into qingpu

# Conflicts: # src/main/java/com/bsth/data/BasicData.java # src/main/resources/application-dev.properties # src/main/resources/datatools/config-prod.properties # src/main/resources/static/pages/permission/user/list.html

Merge branch 'minhang' into qingpu
# Conflicts: # src/main/java/com/bsth/data/BasicData.java # src/main/resources/application-dev.properties # src/main/resources/datatools/config-prod.properties # src/main/resources/static/pages/permission/user/list.html
潘钊
2 parents 09c8d694 8c67a447
Showing 37 changed files with 3468 additions and 860 deletions
README.md
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/WebAppConfiguration.java
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/vehicle/UpstreamEntrance.java → src/main/java/com/bsth/controller/directive/UpstreamEntrance.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/sys/RoleController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/DirectiveData.java
src/main/java/com/bsth/data/GpsRealData.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/ScheduleData.java
src/main/java/com/bsth/data/arrival/AnalyseArrivalData.java
src/main/java/com/bsth/data/arrival/ArrivalComparator.java
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/vehicle/gpsdata/entity/ArrivalInfo.java → src/main/java/com/bsth/data/arrival/ArrivalEntity.java
-公交调度系统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
+======
+----------
+## 目录
+---------
+ * [字典表](#字典表)
+ * [动态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
+}
 ```
 \ No newline at end of file
@@ -2,6 +2,10 @@ package com.bsth;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -11,6 +15,8 @@ import org.springframework.context.annotation.Primary;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
+	
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(8);
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
 package com.bsth;
-import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.security.SecurityMetadataSourceService;
-import com.bsth.service.realcontrol.buffer.GetSchedulePlanThread;
-import com.bsth.service.realcontrol.buffer.SchedulePersistenceThread;
-import com.bsth.util.DateUtils;
-import com.bsth.vehicle.common.CommonRefreshThread;
-import com.bsth.vehicle.directive.buffer.DirectiveBuffer;
-import com.bsth.vehicle.directive.service.DirectiveService;
-import com.bsth.vehicle.directive.thread.DirectivePersistenceThread;
-import com.bsth.vehicle.directive.thread.FirstScheduleIssuedThread;
-import com.bsth.vehicle.gpsdata.ArrivalThread;
-import com.bsth.vehicle.gpsdata.GpsOfflineMonitorThread;
-import com.bsth.vehicle.gpsdata.GpsRealDataRefreshThread;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,9 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 /**
  * 随应用启动运行
@@ -38,9 +23,9 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
 	SecurityMetadataSourceService invocationSecurityMetadataSourceService;
-	public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(8);
+	//public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(8);
-	@Autowired
+	/*@Autowired
 	GpsRealDataRefreshThread gpsRefreshThread;
 	@Autowired
 	GetSchedulePlanThread getSchedulePlanThread;
@@ -63,11 +48,11 @@ public class StartCommand implements CommandLineRunner{
 	CarConfigInfoRepository carConfigInfoRepository;
 	@Autowired
-	GpsOfflineMonitorThread gpsOfflineMonitorThread;
+	GpsOfflineMonitorThread gpsOfflineMonitorThread;*/
-	final static Long HOUR_TIME = 1000 * 60 * 60L;
+	/*final static Long HOUR_TIME = 1000 * 60 * 60L;
-	final static int HOUR_SECOND = 60 * 60;
+	final static int HOUR_SECOND = 60 * 60;*/
 	@Override
 	public void run(String... arg0){
@@ -78,61 +63,61 @@ public class StartCommand implements CommandLineRunner{
 			/**
 			 * 车辆，设备，公司等常用的映射数据，每两小时刷新一次
-			 */
+			 *//*
 			commonRefreshThread.start();
 			scheduler.scheduleWithFixedDelay(commonRefreshThread, HOUR_SECOND * 2 , HOUR_SECOND * 2, TimeUnit.SECONDS);
 			//等映射数据加载完......睡一会吧
 			Thread.sleep(4000);
-			/**
+			*//**
 			 * GPS实时数据更新 线程
 			 * 每8秒和网关HTTP接口同步一次
-			 */
+			 *//*
 			scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 8, TimeUnit.SECONDS);
-			/**
+			*//**
 			 * GPS 监控设备掉线行为
 			 * 每分钟检测一次
-			 */
+			 *//*
 			scheduler.scheduleWithFixedDelay(gpsOfflineMonitorThread, 60, 60, TimeUnit.SECONDS);
-			/**
+			*//**
 			 * 每天 凌晨 2 点 抓取当天实际排班
-			 */
+			 *//*
 			//启动时先run一次
 			getSchedulePlanThread.start();
 			scheduler.scheduleAtFixedRate(getSchedulePlanThread
 					, ((DateUtils.getTimesnight2() + HOUR_TIME * 2) - System.currentTimeMillis()) / 1000
 					, 60 * 60 * 24, TimeUnit.SECONDS);
-			/**
+			*//**
 			 * 调度指令两分钟入库一次
 			 * 指令会缓存在内存，直到收到所有响应再入库
-			 */
+			 *//*
 			//从数据库恢复初始数据
 			directiveBuffer.recovery();
 			scheduler.scheduleWithFixedDelay(directivePersistenceThread, 20, 60 * 2, TimeUnit.SECONDS);
-			/**
+			*//**
 			 * 每分钟将有变更的班次入库（不包括子任务）
 			 * 单纯为了提高 线调操作 的响应速度
-			 */
+			 *//*
 			scheduler.scheduleWithFixedDelay(SchedulePersistenceThread, 60 * 1, 60 * 1, TimeUnit.SECONDS);
-			/**
+			*//**
 			 * 每15秒从数据库抓取到离站信息和班次匹配
 			 * （网关生成的到离站数据也是延迟批量入库，所以缩短该线程执行周期并不会提高 “实际到离站” 的实时性）
-			 */
+			 *//*
 			scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 35, 15, TimeUnit.SECONDS);
-			/**
+			*//**
 			 * 首个调度指令下发（2分钟运行一次）
 			 * 每辆车的第一个调度指令由该线程下发
 			 * 后续班次由 “实际终点到达” 事件触发指令下发
-			 */
+			 *//*
 			scheduler.scheduleWithFixedDelay(firstScheduleIssuedThread, 60 , 60 * 2, TimeUnit.SECONDS);
-			
+			*/
 /*			new Timer().schedule(new TimerTask() {
@@ -65,6 +65,6 @@ public class WebAppConfiguration extends WebMvcConfigurerAdapter implements WebS
 	public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
 		//线调webSocket
 		registry.addHandler(new RealControlSocketHandler(), "/sockjs/realcontrol").addInterceptors(new WebSocketHandshakeInterceptor())
-        .withSockJS();
+        	.withSockJS();
 	}
 }
-//package com.bsth.controller.directive;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.data.domain.Page;
-//import org.springframework.data.domain.PageRequest;
-//import org.springframework.data.domain.Sort;
-//import org.springframework.data.domain.Sort.Direction;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestMethod;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import com.bsth.entity.directive.D80;
-//import com.bsth.entity.sys.SysUser;
-//import com.bsth.security.util.SecurityUtils;
-//import com.bsth.service.directive.DirectiveService;
-//
-///**
-// * 
-// * @ClassName: DirectiveController 
-// * @Description: TODO(页面下发调度指令) .0
-// * @author PanZhao
-// * @date 2016年6月8日 上午9:34:51 
-// *
-// */
-//@RestController
-//@RequestMapping("/directive")
-//public class DirectiveController {
-//	
-//	@Autowired
-//	DirectiveService directiveService;
-//	
-//	/**
-//	 * 
-//	 * @Title: send60 
-//	 * @Description: TODO(60协议短语下发) 
-//	 * @throws
-//	 */
-//	@RequestMapping(value = "/phrase", method = RequestMethod.POST)
-//	public int send60Phrase(@RequestParam String nbbm, @RequestParam String text){
-//		SysUser user = SecurityUtils.getCurrentUser();
-//		return directiveService.send60Phrase(nbbm, text, user.getUserName());
-//	}
-//	
-//	/**
-//	 * 
-//	 * @Title: send60Dispatch 
-//	 * @Description: TODO(班次信息下发) 
-//	 * @param @param id
-//	 * @throws
-//	 */
-//	@RequestMapping(value = "/dispatch", method = RequestMethod.POST)
-//	public int send60Dispatch(@RequestParam Long id){
-//		SysUser user = SecurityUtils.getCurrentUser();
-//		return directiveService.send60Dispatch(id, user.getUserName());
-//	}
-//	
-//	/**
-//	 * 
-//	 * @Title: lineChange 
-//	 * @Description: TODO(切换线路) 
-//	 * @param @param nbbm 车辆内部编码
-//	 * @param @param lineId 新线路编码
-//	 * @throws
-//	 */
-//	@RequestMapping(value = "/lineChnage", method = RequestMethod.POST)
-//	public int lineChange(@RequestParam String nbbm, @RequestParam Integer lineId){
-//		SysUser user = SecurityUtils.getCurrentUser();
-//		return directiveService.lineChange(nbbm, lineId, user.getUserName());
-//	}
-//	
-//	/**
-//	 * 
-//	 * @Title: upDownChange 
-//	 * @Description: TODO(上下行切换) 
-//	 * @param @param nbbm 车辆内部编码
-//	 * @param @param upDon
-//	 * @throws
-//	 */
-//	@RequestMapping(value = "/upDownChange", method = RequestMethod.POST)
-//	public int upDownChange(@RequestParam String nbbm, @RequestParam Integer upDown){
-//		SysUser user = SecurityUtils.getCurrentUser();
-//		return directiveService.upDownChange(nbbm, upDown, user.getUserName());
-//	}
-//	
-//	/**
-//	 * 
-//	 * @Title: findNoCofm80 
-//	 * @Description: TODO(根据线路获取未确认的80驾驶员上报数据) 
-//	 * @throws
-//	 */
-//	@RequestMapping(value = "/findNoCofm80", method = RequestMethod.GET)
-//	public Map<String, List<D80>> findNoCofm80(@RequestParam String lineCodes){
-//		return directiveService.findNoCofm80(lineCodes);
-//	}
-//	
-//	@RequestMapping(value = "/findAll80", method = RequestMethod.GET)
-//	public Page<D80> findAll80(@RequestParam Map<String, Object> map,
-//			@RequestParam(defaultValue = "0") int page,
-//			@RequestParam(defaultValue = "12") int size){
-//		
-//		return directiveService.findAll80(map, new PageRequest(page, size, new Sort(Direction.DESC, "timestamp")));
-//	}
-//	
-//	/**
-//	 * 
-//	 * @Title: reply80 
-//	 * @Description: TODO(回复80) 
-//	 * @param @param reply 0：同意  -1：不同意
-//	 * @throws
-//	 */
-//	@RequestMapping(value = "/reply80", method = RequestMethod.POST)
-//	public Map<String, Object> reply80(@RequestParam int id, @RequestParam int reply){
-//		return directiveService.reply80(id, reply);
-//	}
-//	
-//	/**
-//	 * 
-//	 * @Title: findDirective 
-//	 * @Description: TODO(查询调度指令) 
-//	 * @param @param nbbm 车辆
-//	 * @param @param dType 类型
-//	 * @param @param page 页号
-//	 * @param @param size 每页数量
-//	 * @throws
-//	 */
-//	@RequestMapping(value = "/list", method = RequestMethod.GET)
-//	public Map<String, Object> findDirective(String nbbm,@RequestParam int dType
-//							, @RequestParam(defaultValue = "0") int page,
-//							@RequestParam(defaultValue = "10") int size){
-//		
-//		return directiveService.findDirective(nbbm, dType, page, size);
-//	}
-//}
+package com.bsth.controller.directive;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.entity.directive.D80;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.directive.DirectiveService;
+
+/**
+ * 
+ * @ClassName: DirectiveController 
+ * @Description: TODO(页面下发调度指令) .0
+ * @author PanZhao
+ * @date 2016年6月8日 上午9:34:51 
+ *
+ */
+@RestController
+@RequestMapping("/directive")
+public class DirectiveController {
+	
+	@Autowired
+	DirectiveService directiveService;
+	
+	/**
+	 * 
+	 * @Title: send60 
+	 * @Description: TODO(60协议短语下发) 
+	 * @throws
+	 */
+	@RequestMapping(value = "/phrase", method = RequestMethod.POST)
+	public int send60Phrase(@RequestParam String nbbm, @RequestParam String text){
+		SysUser user = SecurityUtils.getCurrentUser();
+		return directiveService.send60Phrase(nbbm, text, user.getUserName());
+	}
+	
+	/**
+	 * 
+	 * @Title: send60Dispatch 
+	 * @Description: TODO(班次信息下发) 
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value = "/dispatch", method = RequestMethod.POST)
+	public int send60Dispatch(@RequestParam Long id){
+		SysUser user = SecurityUtils.getCurrentUser();
+		return directiveService.send60Dispatch(id, user.getUserName());
+	}
+	
+	/**
+	 * 
+	 * @Title: lineChange 
+	 * @Description: TODO(切换线路) 
+	 * @param @param nbbm 车辆内部编码
+	 * @param @param lineId 新线路编码
+	 * @throws
+	 */
+	@RequestMapping(value = "/lineChnage", method = RequestMethod.POST)
+	public int lineChange(@RequestParam String nbbm, @RequestParam Integer lineId){
+		SysUser user = SecurityUtils.getCurrentUser();
+		return directiveService.lineChange(nbbm, lineId, user.getUserName());
+	}
+	
+	/**
+	 * 
+	 * @Title: upDownChange 
+	 * @Description: TODO(上下行切换) 
+	 * @param @param nbbm 车辆内部编码
+	 * @param @param upDon
+	 * @throws
+	 */
+	@RequestMapping(value = "/upDownChange", method = RequestMethod.POST)
+	public int upDownChange(@RequestParam String nbbm, @RequestParam Integer upDown){
+		SysUser user = SecurityUtils.getCurrentUser();
+		return directiveService.upDownChange(nbbm, upDown, user.getUserName());
+	}
+	
+	/**
+	 * 
+	 * @Title: findNoCofm80 
+	 * @Description: TODO(根据线路获取未确认的80驾驶员上报数据) 
+	 * @throws
+	 */
+	@RequestMapping(value = "/findNoCofm80", method = RequestMethod.GET)
+	public Map<String, List<D80>> findNoCofm80(@RequestParam String lineCodes){
+		return directiveService.findNoCofm80(lineCodes);
+	}
+	
+	@RequestMapping(value = "/findAll80", method = RequestMethod.GET)
+	public Map<String, Object> findAll80(@RequestParam Map<String, Object> map,
+			@RequestParam(defaultValue = "0") int page,
+			@RequestParam(defaultValue = "12") int size){
+		
+		return directiveService.findAll80(map, page,size);
+	}
+	
+	/**
+	 * 
+	 * @Title: reply80 
+	 * @Description: TODO(回复80) 
+	 * @param @param reply 0：同意  -1：不同意
+	 * @throws
+	 */
+	@RequestMapping(value = "/reply80", method = RequestMethod.POST)
+	public Map<String, Object> reply80(@RequestParam int id, @RequestParam int reply){
+		return directiveService.reply80(id, reply);
+	}
+	
+	/**
+	 * 
+	 * @Title: findDirective 
+	 * @Description: TODO(查询调度指令) 
+	 * @param @param nbbm 车辆
+	 * @param @param dType 类型
+	 * @param @param page 页号
+	 * @param @param size 每页数量
+	 * @throws
+	 */
+	@RequestMapping(value = "/list", method = RequestMethod.GET)
+	public Map<String, Object> findDirective(String nbbm,@RequestParam int dType
+							, @RequestParam(defaultValue = "0") int page,
+							@RequestParam(defaultValue = "10") int size){
+		
+		return directiveService.findDirective(nbbm, dType, page, size);
+	}
+}
-package com.bsth.vehicle;
+package com.bsth.controller.directive;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,9 +10,10 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.bsth.vehicle.directive.buffer.DirectiveBuffer;
-import com.bsth.vehicle.directive.entity.DirectiveReply;
-import com.bsth.vehicle.directive.entity.Directive80;
+import com.bsth.data.directive.DayOfDirectives;
+import com.bsth.data.pilot80.PilotReport;
+import com.bsth.entity.directive.D80;
+import com.bsth.entity.directive.DirectiveReponse;
 /**
  * 
@@ -29,7 +30,10 @@ public class UpstreamEntrance {
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Autowired
-	DirectiveBuffer directiveBuffer;
+	DayOfDirectives dayOfDirectives;
+	
+	@Autowired
+	PilotReport pilotReport;
 	@RequestMapping(value = "/upstream", method = RequestMethod.POST)
 	public String main(@RequestParam String json) {
@@ -37,29 +41,29 @@ public class UpstreamEntrance {
 		try {
 			JSONObject jsonParam = JSONObject.parseObject(json);
-			// 46和47 调度指令确认
+			// 60协议回复
 			if (jsonParam.getInteger("operCode") == null && jsonParam.getInteger("status") != null) {
 				try {
-					DirectiveReply reply = JSON.toJavaObject(jsonParam, DirectiveReply.class);
-					directiveBuffer.reply(reply);
+					DirectiveReponse reply = JSON.toJavaObject(jsonParam, DirectiveReponse.class);
+					dayOfDirectives.reply(reply);
 				} catch (NumberFormatException e) {
 					logger.error("NumberFormatException ,,,,一般是老数据，msgId太大");
 				}
 			}
-			// 80协议
+			// 80协议上报
 			else if (jsonParam.getInteger("operCode") == 0X80) {
 				try {
-					Directive80 report = JSON.toJavaObject(jsonParam, Directive80.class);
+					D80 d80 = JSON.toJavaObject(jsonParam, D80.class);
 					// 驾驶员上报
-					if (report.getData().getOperCode2() == 0x26)
-						directiveBuffer.jsyReport(report);
+					if (d80.getData().getOperCode2() == 0x26)
+						pilotReport.report(d80);
 				} catch (Exception e) {
 					logger.error("", e);
 				}
 			}
 			// 64协议 线路切换回复
 			else if (jsonParam.getInteger("operCode") == 0X64) {
-				directiveBuffer.reply64(jsonParam);
+				dayOfDirectives.reply64(jsonParam);
 			} else
 				logger.warn("未知的上行数据，p: " + json);
+package com.bsth.controller.gps;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.service.gps.GpsService;
+import com.google.common.base.Splitter;
+
+@RestController
+@RequestMapping("gps")
+public class GpsController {
+
+	@Autowired
+	GpsRealData gpsRealData;
+
+	@Autowired
+	GpsService gpsService;
+
+	@RequestMapping(value = "/real/line/{lineCode}")
+	public List<GpsEntity> findByLineCode(@PathVariable("lineCode") Integer lineCode) {
+		return gpsRealData.get(lineCode);
+	}
+
+	@RequestMapping(value = "/real/line")
+	public List<GpsEntity> findByLineCode(@RequestParam String lineCodes) {
+		return gpsRealData.get(Splitter.on(",").splitToList(lineCodes));
+	}
+
+	/**
+	 * 
+	 * @Title: history @Description: TODO(这个方法给测试页面用) @throws
+	 */
+	@RequestMapping(value = "/history/{device}")
+	public List<Map<String, Object>> history(@PathVariable("device") String device, @RequestParam Long startTime,
+			@RequestParam Long endTime, @RequestParam int directions) {
+
+		return gpsService.history(device, startTime, endTime, directions);
+	}
+
+	@RequestMapping(value = "/gpsHistory/multiple")
+	public List<Map<String, Object>> gpsHistory(@RequestParam String[] nbbmArray, @RequestParam Long st,
+			@RequestParam Long et) {
+		return gpsService.history(nbbmArray, st, et);
+	}
+
+	/*@RequestMapping(value = "/arrival/ram")
+	public List<ArrivalInfo> ramData(@RequestParam String nbbm) {
+		return ArrivalDataBuffer.allMap.get(nbbm);
+	}*/
+
+	@RequestMapping(value = "/Car2DeviceId")
+	public Map<String, String> findCarDeviceIdMap() {
+		return BasicData.deviceId2NbbmMap.inverse();
+	}
+	
+	@RequestMapping(value = "/buffAera")
+	public Map<String, Object> findBuffAeraByCode(@RequestParam String code,@RequestParam String type){
+		return gpsService.findBuffAeraByCode(code, type);
+	}
+}
+package com.bsth.controller.realcontrol;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.service.realcontrol.LineConfigService;
+
+@RestController
+@RequestMapping("/lineConfig")
+public class LineConfigController extends BaseController<LineConfig, Integer>{
+
+	@Autowired
+	LineConfigService lineConfigService;
+	
+	@RequestMapping("/check")
+	public Map<String, Object> check(@RequestParam Integer[] codeArray){
+		return lineConfigService.check(codeArray);
+	}
+	
+	@RequestMapping("/init/{lineCode}")
+	public Integer init(@PathVariable("lineCode") Integer lineCode) throws Exception{
+		return lineConfigService.inti(lineCode);
+	}
+	
+	@RequestMapping(value = "/editTime", method = RequestMethod.POST)
+	public Map<String, Object> editStartOptTime(@RequestParam String time,@RequestParam String lineCode){
+		return lineConfigService.editStartOptTime(time, lineCode);
+	}
+}
@@ -12,23 +12,25 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.bsth.controller.BaseController;
+import com.bsth.data.BasicData;
+import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import com.bsth.service.realcontrol.buffer.GetSchedulePlanThread;
-import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
-import com.bsth.vehicle.common.CommonMapped;
 import com.google.common.base.Splitter;
 @RestController
 @RequestMapping("/realSchedule")
 public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long> {
-	@Autowired
-	GetSchedulePlanThread getSchedulePlanThread;
+	/*@Autowired
+	GetSchedulePlanThread getSchedulePlanThread;*/
 	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
+	
+	@Autowired
+	DayOfSchedule dayOfSchedule;
 	@RequestMapping(value = "/lines")
 	public Map<String, Collection<ScheduleRealInfo>> findByLines(@RequestParam String lines) {
@@ -47,10 +49,10 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		String userName = SecurityUtils.getCurrentUser().getUserName();
 		// 注销之前的绑定
 		for (String line : list)
-			CommonMapped.lineUserMap.get(Integer.parseInt(line)).remove(userName);
+			BasicData.lineCode2SocketUserMap.get(line).remove(userName);
 		// 重新绑定
 		for (String line : list)
-			CommonMapped.lineUserMap.put(Integer.parseInt(line), userName);
+			BasicData.lineCode2SocketUserMap.put(line, userName);
 		return 0;
 	}
@@ -84,7 +86,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
 	public Map<String, String> carDeviceMapp() {
-		return CommonMapped.vehicDeviceBiMap.inverse();
+		return BasicData.deviceId2NbbmMap.inverse();
 	}
 	/**
@@ -231,7 +233,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value = "/trustStatus/change", method = RequestMethod.POST)
 	public int changeTrustStatus(@RequestParam Integer lineCode, @RequestParam Integer status) {
-		ScheduleBuffer.trustMap.put(lineCode, status);
+		//ScheduleBuffer.trustMap.put(lineCode, status);
 		return 200;
 	}
@@ -243,8 +245,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @param @param upDown
 	 */
 	@RequestMapping(value = "/findByLineAndUpDown")
-	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam Integer line,@RequestParam Integer upDown){
-		return ScheduleBuffer.findByLineAndUpDown(line, upDown);
+	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam String line,@RequestParam Integer upDown){
+		return dayOfSchedule.findByLineAndUpDown(line, upDown);
 	}
 	/**
@@ -261,7 +263,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/test/getSch")
 	public int getSch(){
-		getSchedulePlanThread.start();
+		//getSchedulePlanThread.start();
 		return 1;
 	}
@@ -285,7 +287,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value = "/lineCode/{lineCode}")
 	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
-		return ScheduleBuffer.realSchedulListMap.get(lineCode);
+		//return ScheduleBuffer.realSchedulListMap.get(lineCode);
+		return dayOfSchedule.findByLineCode(lineCode);
 	}
 	@RequestMapping(value = "/queryUserInfo")
@@ -362,7 +365,12 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @return 
 	 */
 	@RequestMapping(value="/scheduleDaily")
-	public List<Object> scheduleDaily(@RequestParam String line,@RequestParam String date){
+	public Map<String,Object> scheduleDaily(@RequestParam String line,@RequestParam String date){
 		return scheduleRealInfoService.scheduleDaily(line,date);
 	}
+	
+	@RequestMapping(value="/realScheduleList")
+	public List<ScheduleRealInfo> realScheduleList(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList(line,date);
+	}
 }
@@ -32,4 +32,16 @@ public class RoleController extends BaseController&lt;Role, Integer&gt;{
 	public Map<String, Object> settRoleModules(@RequestParam Integer roleId,@RequestParam String mIds){
 		return roleService.settRoleModules(roleId, mIds);
 	}
+	
+	/**
+	 * 
+	 * @Title: roleInfo 
+	 * @Description: TODO(角色信息) 
+	 * @param @param id 角色ID
+	 * @throws
+	 */
+	@RequestMapping(value = "/roleInfo")
+	public Map<String, Object> roleInfo(@RequestParam Integer id){
+		return roleService.roleInfo(id);
+	}
 }
 package com.bsth.controller.sys;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.security.web.authentication.session.SessionAuthenticationException;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.sys.SysUser;
@@ -51,23 +46,6 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt;{
 		return msg;
 	}
-	/**
-	 * 
-	 * @Title: logout 
-	 * @Description: TODO(注销吧皮卡丘) 
-	 * @param @param request
-	 * @return ModelAndView    返回类型 
-	 * @throws
-	 */
-	@RequestMapping("/logout")
-	public ModelAndView logout(HttpServletRequest request, HttpServletResponse response){
-		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-		if (auth != null){
-			new SecurityContextLogoutHandler().logout(request, response, auth);
-		}
-		return new ModelAndView("/");
-	}
-	
 	@RequestMapping("/currentUser")
 	public SysUser currentUser(){
 		return SecurityUtils.getCurrentUser();
-
 package com.bsth.data;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+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.entity.CarPark;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
+import com.bsth.entity.StationRoute;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.StationRepository;
+import com.bsth.repository.StationRouteRepository;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
@@ -33,7 +39,7 @@ import com.google.common.collect.TreeMultimap;
  *
  */
 @Component
-public class BasicData {
+public class BasicData implements CommandLineRunner{
 	//设备号和车辆自编号 （K: 设备编码 ，V：车辆自编号）
 	public static BiMap<String, String> deviceId2NbbmMap;
@@ -48,40 +54,34 @@ public class BasicData {
 	public static Map<String, Line> nbbm2LineMap;
 	//线路和用户对照 用于webSocket定向推送消息（用户进入线调时写入数据）
-	public static TreeMultimap<Integer, String> lineCode2SocketUserMap = TreeMultimap.create();
+	public static TreeMultimap<String, String> lineCode2SocketUserMap = TreeMultimap.create();
 	//线路ID和code 对照
 	public static BiMap<Integer, Integer> lineId2CodeMap;
-	@Autowired
-	BasicDataLoader basicDataLoader;
+	//线路编码和名称对照
+	public static Map<String, String> lineCode2NameMap;
-	Logger logger = LoggerFactory.getLogger(this.getClass());
+	//线路编码_站点编码 == 0|1  上下行
+	public static Map<String, Integer> lineStationUpDownMap;
-	/**
-	 * 
-	 * @Title: loadAllData 
-	 * @Description: TODO(加载所有数据) 
-	 * @throws
-	 */
-	public int loadAllData(){
-		try{
-			basicDataLoader.loadDeviceInfo();
-			basicDataLoader.loadStationInfo();
-			basicDataLoader.loadLineInfo();
-			basicDataLoader.loadNbbm2LineInfo();
-		}catch(Exception e){
-			logger.error("加载基础数据时出现异常，" , e);
-		}
-		return 0;
+	//停车场
+	public static List<String> parkCodeList;
+	
+	static Logger logger = LoggerFactory.getLogger(BasicData.class);
+	
+	@Autowired
+	BasicDataLoader dataLoader;
+	
+	@Override
+	public void run(String... arg0) throws Exception {
+		Application.mainServices.scheduleWithFixedDelay(dataLoader, 0, 2, TimeUnit.HOURS);
 	}
+	
 	@Component
-	public static class BasicDataLoader{
+	public static class BasicDataLoader extends Thread{
-		public BasicDataLoader() {
-		}
-
 		@Autowired
 		CarsRepository carsRepository;
@@ -97,11 +97,50 @@ public class BasicData {
 		@Autowired
 		LineRepository lineRepository;
+		@Autowired
+		StationRouteRepository stationRouteRepository;
+		
+		
+		@Override
+		public void run() {
+			loadAllData();
+		}
+
+		/**
+		 * @Title: loadAllData 
+		 * @Description: TODO(加载所有数据) 
+		 */
+		public int loadAllData(){
+			try{
+				loadDeviceInfo();
+				loadStationInfo();
+				loadLineInfo();
+				loadNbbm2LineInfo();
+				
+				loadStationRouteInfo();
+				logger.info("加载基础数据成功！，" );
+			}catch(Exception e){
+				logger.error("加载基础数据时出现异常，" , e);
+			}
+			return 0;
+		}
+		
+		
+		private void loadStationRouteInfo() {
+			Iterator<StationRoute> iterator = stationRouteRepository.findAll().iterator();
+			Map<String, Integer> map = new HashMap<>();
+			StationRoute route;
+			
+			while(iterator.hasNext()){
+				route = iterator.next();
+				map.put(route.getLineCode() + "_" + route.getStationCode(), route.getDirections());
+			}
+			lineStationUpDownMap = map;
+		}
+
 		/**
-		 * 
 		 * @Title: loadDeviceInfo 
 		 * @Description: TODO(加载设备相关信息) 
-		 * @throws
 		 */
 		public void loadDeviceInfo(){
 			BiMap<String, String> deviceId2Nbbm = HashBiMap.create();
@@ -120,10 +159,8 @@ public class BasicData {
 		}
 		/**
-		 * 
 		 * @Title: loadStationInfo 
 		 * @Description: TODO(加载站点信息) 
-		 * @throws
 		 */
 		public void loadStationInfo(){
 			Map<String, String> stationCode2Name = new HashMap<>();
@@ -136,20 +173,23 @@ public class BasicData {
 			}
 			//停车场
 			Iterator<CarPark> iterator2 = carParkRepository.findAll().iterator();
+			
+			List<String> parkCodes = new ArrayList<>(); 
+			
 			CarPark carPark;
 			while(iterator2.hasNext()){
 				carPark = iterator2.next();
 				stationCode2Name.put(carPark.getParkCode(), carPark.getParkName());
+				
+				parkCodes.add(carPark.getParkCode());
 			}
-			
+			parkCodeList = parkCodes;
 			stationCode2NameMap = stationCode2Name;
 		}
 		/**
-		 * 
 		 * @Title: loadNbbm2LineInfo 
 		 * @Description: TODO(车辆和线路对照) 
-		 * @throws
 		 */
 		public void loadNbbm2LineInfo(){
 			Iterator<CarConfigInfo> allIterator = carConfigInfoRepository.findAll().iterator();
@@ -164,23 +204,24 @@ public class BasicData {
 		}
 		/**
-		 * 
 		 * @Title: loadLineInfo 
 		 * @Description: TODO(加载线路相关信息) 
-		 * @throws
 		 */
 		public void loadLineInfo(){
 			Iterator<Line> iterator = lineRepository.findAll().iterator();
 			Line line;
 			BiMap<Integer, Integer> biMap = HashBiMap.create();
+			Map<String, String> code2name = new HashMap<>();
+			
 			while(iterator.hasNext()){
 				line = iterator.next();
 				biMap.put(line.getId(), Integer.parseInt(line.getLineCode()));
+				code2name.put(line.getLineCode(), line.getName());
 			}
 			lineId2CodeMap = biMap;
+			lineCode2NameMap = code2name;
 		}
 	}
 }
-
-package com.bsth.data;
-
-/**
- * 
- * @ClassName: DirectiveData 
- * @Description: TODO(指令数据) 
- * @author PanZhao
- * @date 2016年8月10日 下午3:50:05 
- *
- */
-public class DirectiveData {
-	
-	
-}
-package com.bsth.data;
-
-/**
- * 
- * @ClassName: GpsRealData 
- * @Description: TODO(GPS实时数据) 
- * @author PanZhao
- * @date 2016年8月10日 下午3:41:47 
- *
- */
-public class GpsRealData {
-	
-}
+package com.bsth.data;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+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.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import com.bsth.entity.Line;
+import com.bsth.entity.realcontrol.D80ReplyTemp;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.service.LineService;
+import com.bsth.service.realcontrol.LineConfigService;
+
+/**
+ * 
+ * @ClassName: LineConfigData
+ * @Description: TODO(线路配置数据管理)
+ * @author PanZhao
+ * @date 2016年8月15日 下午2:50:19
+ *
+ */
+@Component
+public class LineConfigData implements CommandLineRunner {
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	// 线路编码和配置
+	private Map<String, LineConfig> lineConfMap;
+
+	@Autowired
+	LineConfigService lineConfigService;
+	
+	@Autowired
+	LineService lineService;
+
+	@Override
+	public void run(String... arg0) throws Exception {
+		lineConfMap = new HashMap<>();
+
+		Iterator<LineConfig> itr = lineConfigService.findAll().iterator();
+		while (itr.hasNext()) 
+			setBuffer(itr.next());
+	}
+	
+	public LineConfig get(String lineCode){
+		return lineConfMap.get(lineCode);
+	}
+	
+	public Collection<LineConfig> getAll(){
+		return lineConfMap.values();
+	}
+	
+	public void set(LineConfig conf){
+		lineConfigService.save(conf);
+		setBuffer(conf);
+	}
+	
+	public void setBuffer(LineConfig conf){
+		lineConfMap.put(conf.getLine().getLineCode(), conf);
+	}
+
+	/**
+	 * 
+	 * @Title: init 
+	 * @Description: TODO(初始化配置信息) 
+	 */
+	public void init(Integer lineCode) throws Exception{
+		LineConfig conf = new LineConfig();
+		//线路
+		Line line = lineService.findByLineCode(lineCode);
+		if(null == line)
+			throw new NullPointerException("异常的lineCode");
+		
+		conf.setLine(line);
+		//开始运营时间
+		conf.setStartOpt("02:00");
+		//托管状态
+		conf.setTrust(true);
+		//出场时间类型
+		conf.setOutConfig(1);
+		//进场时间类型
+		conf.setInConfig(1);
+		//短语模板
+		conf.setPhraseTemps("");
+		//调度指令模板 
+		conf.setSchDirectiveTemp("");
+		
+		//80指令回复
+		D80ReplyTemp t50 = new D80ReplyTemp(conf, (short)0x50, "同意，回电详谈", "不同意，请回电")
+				,t60 =  new D80ReplyTemp(conf, (short)0x60, "同意，回电详谈", "不同意，请回电")
+				,tA2 = new D80ReplyTemp(conf, (short)0xA2, "同意，回电详谈", "不同意，请回电")
+				,t70 = new D80ReplyTemp(conf, (short)0x70, "同意，回电详谈", "不同意，请回电")
+				,t11 = new D80ReplyTemp(conf, (short)0x11, "同意，回电详谈", "不同意，请回电");
+		
+		Set<D80ReplyTemp> temps = conf.getD80Temps();
+		temps.add(t50);
+		temps.add(t60);
+		temps.add(tA2);
+		temps.add(t70);
+		temps.add(t11);
+		
+		set(conf);
+	}
+}
-package com.bsth.data;
-
-/**
- * 
- * @ClassName: ScheduleData 
- * @Description: TODO(排班数据) 
- * @author PanZhao
- * @date 2016年8月10日 下午3:42:31 
- *
- */
-public class ScheduleData {
-	
-}
+package com.bsth.data.arrival;
+
+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.stereotype.Component;
+
+import com.bsth.data.BasicData;
+
+/**
+ * 
+ * @ClassName: AnalyseArrivalData 
+ * @Description: TODO(分析一下进出站场数据) 
+ * @author PanZhao 
+ * @date 2016年8月24日 上午11:09:37 
+ *
+ */
+@Component
+public class AnalyseArrivalData {
+	
+	Logger logger = LoggerFactory.getLogger(AnalyseArrivalData.class);
+	
+	public void analyse(Set<String> cars){
+		try{
+			List<ArrivalEntity> list, clearList;
+			for(String car : cars){
+				list = ArrivalData_GPS.findByNbbm(car);
+				analyse(list);
+				
+				//清理掉无效的点
+				clearList = new ArrayList<>();
+				for(ArrivalEntity arr : list){
+					if(!arr.isEnable())
+						clearList.add(arr);
+				}
+				list.removeAll(clearList);
+			}
+		}catch(Exception e){
+			logger.error("", e);
+		}
+	}
+	
+	private final static int SHIFT_TIME = 1000 * 60 * 5,
+			SCH_TIME = 1000 * 60 * 10;
+	
+	static ArrivalComparator comp = new ArrivalComparator();
+	
+	public void analyse(List<ArrivalEntity> list){
+		if(list.size() <= 1)
+			return;
+		
+		//排序
+		Collections.sort(list, comp);
+		ArrivalEntity prve = list.get(0)
+					,curr;
+		for(int i = 1; i < list.size(); i ++){
+			curr = list.get(i);
+			//如果第一个点无效
+			if(!effective(prve)){
+				prve.setEnable(false);
+				prve = curr;
+				continue;
+			}
+			//如果第二个点无效
+			else if(!effective(curr)){
+				curr.setEnable(false);
+				continue;
+			}
+			else if(curr.getTs() - prve.getTs() < SCH_TIME){
+				if(prve.getUpDown() == curr.getUpDown()){
+					//信号漂移，出站无效
+					if(prve.getStopNo().equals(prve.getStopNo()) 
+							&& prve.getInOut() == 1 && curr.getInOut() == 0
+							&& curr.getTs() - prve.getTs() < SHIFT_TIME){
+						prve.setEnable(false);
+					}
+				}
+				else{
+					//上下行的同名站，新走向的第一个出站信号开始有效
+					if(prve.getStopName().equals(curr.getStopName())){
+						if(curr.getInOut() == 0)
+							curr.setEnable(false);
+						else
+							prve = curr;
+					}
+				}
+			}
+			else
+				prve = curr;
+		}
+	}
+	
+	private boolean effective(ArrivalEntity arr){
+		//停车场
+		if(BasicData.parkCodeList.contains(arr.getStopNo())){
+			arr.setTcc(true);
+			return true;
+		}
+		
+		Integer upDown = BasicData.lineStationUpDownMap.get(arr.getLineCode() + "_" + arr.getStopNo());
+		
+		return arr.getUpDown() == upDown || BasicData.parkCodeList.contains(arr.getStopNo());
+	}
+}
+package com.bsth.data.arrival;
+
+import java.util.Comparator;
+
+public class ArrivalComparator implements Comparator<ArrivalEntity>{
+
+	@Override
+	public int compare(ArrivalEntity a1, ArrivalEntity a2) {
+		return (int) (a1.getTs() - a2.getTs());
+	}
+}
+package com.bsth.data.arrival;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+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.match.Arrival2Schedule;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
+
+/**
+ * 
+ * @ClassName: ArrivalData_GPS 
+ * @Description: TODO(GPS到离站数据) 
+ * @author PanZhao 
+ * @date 2016年8月18日 下午10:05:27 
+ *
+ */
+@Component
+public class ArrivalData_GPS implements CommandLineRunner{
+	
+	// 起终点站进出数据  K：车辆编码 
+	private static ListMultimap<String, ArrivalEntity> startAndEndMaps;
+	
+	private static Map<String, Integer> carIndexMap;
+	
+	static{
+		startAndEndMaps = ArrayListMultimap.create();
+		
+		carIndexMap = new HashMap<>();
+	}
+	
+	@Autowired
+	DataLoaderThread dataLoaderThread;
+	
+	static Logger logger = LoggerFactory.getLogger(ArrivalData_GPS.class);
+	
+	@Override
+	public void run(String... arg0) throws Exception {
+		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 15, TimeUnit.SECONDS);
+	}
+	
+	@Component
+	public static class DataLoaderThread extends Thread {
+
+		@Autowired
+		DataLoader dataLoader;
+		
+		@Autowired
+		DayOfSchedule dayOfSchedule;
+		
+		@Autowired
+		AnalyseArrivalData analyseData;
+		
+		@Override
+		public void run() {
+			try{
+				List<ArrivalEntity> arrSets = dataLoader.load();
+				if(null == arrSets || arrSets.size() == 0)
+					return;
+					
+				//有起终点进出的车辆
+				Set<String> carSet = new TreeSet<>();
+				//按车辆起终点站过滤数据
+				String nbbm;
+				Set<String> seList;
+				for(ArrivalEntity arr : arrSets){
+					nbbm = arr.getNbbm();
+					
+					seList = dayOfSchedule.getSEStationList(nbbm);
+					if(seList.contains(arr.getStopNo())){
+						startAndEndMaps.put(nbbm, arr);
+						carSet.add(nbbm);
+					}
+				}
+				//从专业的角度分析一下数据
+				analyseData.analyse(carSet);
+				//开始匹配
+				Arrival2Schedule.start(carSet);
+			}catch(Exception e){
+				logger.error("", e);
+			}
+		}
+	}
+	
+	/**
+	 * 
+	 * @Title: clearRAMData 
+	 * @Description: TODO(清理内存数据) 
+	 */
+	public void clearRAMData(String lineCode){
+		
+		List<ArrivalEntity> remList = new ArrayList<>();
+		
+		//车辆映射的进出站数据，遍历删除对应线路数据。
+		Collection<ArrivalEntity> seList = startAndEndMaps.values();
+		for(ArrivalEntity arr : seList){
+			if(arr.getLineCode().equals(lineCode))
+				remList.add(arr);
+		}
+		
+		//删除数据
+		int count = 0;
+		for(ArrivalEntity arr : remList){
+			startAndEndMaps.remove(arr.getNbbm(), arr);
+			count ++;
+		}
+		
+		logger.info(lineCode + " 清除到离站数据 ，" + count);
+	}
+	
+	public static List<ArrivalEntity> findByNbbm(String nbbm){
+		return startAndEndMaps.get(nbbm);
+	}
+	
+	public static List<ArrivalEntity> getIncrement(String nbbm){
+		Integer mark = null;
+		if (!carIndexMap.containsKey(nbbm))
+			mark = 0;
+		else
+			mark = carIndexMap.get(nbbm);
+
+		List<ArrivalEntity> all = startAndEndMaps.get(nbbm);
+		int size = all.size();
+		if(size == 0)
+			return new ArrayList<>(0);
+		
+		List<ArrivalEntity> rs = all.subList(mark, size);
+		carIndexMap.put(nbbm, size);
+		return rs;
+	}
+}
-package com.bsth.vehicle.gpsdata.entity;
+package com.bsth.data.arrival;
-import com.bsth.vehicle.common.CommonMapped;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 /**
  * 
- * @ClassName: ArrivalInfo
- * @Description: TODO(到离站信息)
- * @author PanZhao
- * @date 2016年6月27日 上午9:53:19
+ * @ClassName: ArrivalEntity 
+ * @Description: TODO(进出站实体) 
+ * @author PanZhao 
+ * @date 2016年8月19日 上午9:32:20 
  *
  */
-public class ArrivalInfo {
+public class ArrivalEntity {
-	public ArrivalInfo(String deviceId, Long ts, String lineCode, Integer upDown, String stopNo, Integer inOut,
-			Long createDate, Integer weeksYear) {
-		this.deviceId = deviceId;
-		
-		this.ts = ts;
-		
-		this.lineCode = lineCode;
-		this.upDown = upDown;
-		this.stopNo = stopNo;
-		this.inOut = inOut;
-		this.createDate = createDate;
-		this.weeksYear = weeksYear;
-		this.stopName = CommonMapped.stationCodeMap.get(this.stopNo);
-	}
-	
-	public ArrivalInfo(String deviceId, Long ts, String lineCode, Integer upDown, String stopNo, Integer inOut,
-			Long createDate, Integer weeksYear, String stopName) {
-		this.deviceId = deviceId;
-		
-		this.ts = ts;
-		
-		this.lineCode = lineCode;
-		this.upDown = upDown;
-		this.stopNo = stopNo;
-		this.inOut = inOut;
-		this.createDate = createDate;
-		this.weeksYear = weeksYear;
-		this.stopName = stopName;
-	}
-
-	/**
-	 * 设备号
-	 */
+	/** 设备号*/
 	private String deviceId;
+	private String nbbm;
+	
 	/** 站点名称 */
 	private String stopName;
-	/**
-	 * 时间戳
-	 */
+	/** 时间戳*/
 	private Long ts;
-	/**
-	 * 线路编码
-	 */
+	/** 线路编码*/
 	private String lineCode;
-	/**
-	 * 上下行
-	 */
+	/** 上下行*/
 	private Integer upDown;
-	/**
-	 * 站点编码
-	 */
+	/**站点编码*/
 	private String stopNo;
-	/**
-	 * 0: 进 1：出
-	 */
+	/** 0: 进 1：出*/
 	private Integer inOut;
 	private Long createDate;
-
-	/**
-	 * 分区字段，当年的第几周
-	 */
+	
+	/** 是否有效 */
+	private boolean enable;
+	
+	/**分区字段，当年的第几周*/
 	private Integer weeksYear;
+	
+	private boolean tcc;
+	
+	public ArrivalEntity(){}
+	
+	public ArrivalEntity(String deviceId, long ts, String lineCode, int upDown, String stopNo, int inOut, long createDate,
+			int weeksYear, String stopName) {
+		
+		this.deviceId = deviceId;
+		this.ts = ts;
+		this.lineCode = lineCode;
+		this.upDown = upDown;
+		this.stopNo = stopNo;
+		this.stopName = stopName;
+		this.inOut = inOut;
+		this.createDate = createDate;
+	}
+
+/*	@Override
+	public boolean equals(Object obj) {
+		ArrivalEntity a2 = (ArrivalEntity)obj;
+		
+		return this.toString().equals(a2.toString())
+				&& Math.abs(this.ts - a2.ts) < EQ_RANGE;
+	}
+	
+	@Override
+	public int hashCode() {
+		return this.toString().hashCode();
+	}*/
+	
+static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	
+	@Override
+	public String toString() {
+		return sdf.format(new Date(this.ts)) + "_" + this.deviceId + "_" + this.inOut + "_" + this.stopName;
+	}
 	public String getLineCode() {
 		return lineCode;
@@ -157,4 +156,28 @@ public class ArrivalInfo {
 	public String getId(){
 		return this.deviceId + "_" + this.ts;
 	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public boolean isEnable() {
+		return enable;
+	}
+
+	public void setEnable(boolean enable) {
+		this.enable = enable;
+	}
+
+	public boolean isTcc() {
+		return tcc;
+	}
+
+	public void setTcc(boolean tcc) {
+		this.tcc = tcc;
+	}
 }
+package com.bsth.data.arrival;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.LineConfigData;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.util.db.DBUtils_MS;
+
+/**
+ * 
+ * @ClassName: DataLoader 
+ * @Description: TODO(从数据库加载进出站数据) 
+ * @author PanZhao 
+ * @date 2016年8月19日 上午9:59:21 
+ *
+ */
+@Component
+public class DataLoader {
+	
+	private static Long prveLoadTime;
+	
+	private final static long DAY_TIME = 1000 * 60 * 60 * 24;
+	
+	private Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	@Autowired
+	LineConfigData lineConfigData;
+	
+	/**
+	 * 
+	 * @Title: load 
+	 * @Description: TODO(根据上次加载时间，查询之后的增量数据) 
+	 */
+	public List<ArrivalEntity> load(){
+		List<ArrivalEntity> list = null;
+		
+		if(null == prveLoadTime)
+			list = recovery();
+		else{
+			Calendar cal = Calendar.getInstance();
+			//周数，表分区字段
+			int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
+			
+			Connection conn = null;
+			PreparedStatement ps = null;
+			ResultSet rs = null;
+			
+			String sql = "select * from bsth_c_arrival_info where weeks_year=? AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by ts";
+			try{
+				long t = System.currentTimeMillis();
+				
+				conn = DBUtils_MS.getConnection();
+				ps = conn.prepareStatement(sql);
+				ps.setInt(1, weeks_year);
+				ps.setLong(2, prveLoadTime);
+				ps.setLong(3, t);
+				rs = ps.executeQuery();
+				
+				list = resultSet2Set(rs);
+				
+				prveLoadTime = t;
+			}catch(Exception e){
+				logger.error("", e);
+			}finally {
+				DBUtils_MS.close(rs, ps, conn);
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * 
+	 * @Title: recovery 
+	 * @Description: TODO(从数据库恢复数据，按照线路的开始运营时间恢复) 
+	 */
+	public List<ArrivalEntity> recovery(){
+		Collection<LineConfig> confs = lineConfigData.getAll();
+		long t = System.currentTimeMillis()
+			,st;
+		
+		List<ArrivalEntity> all = new ArrayList<>();
+		for(LineConfig conf : confs){
+			st = conf.getCurrStartTime();
+			if(t < st)
+				st = st - DAY_TIME;
+			
+			all.addAll(loadByLineAndTime(conf.getLine().getLineCode(), st, t));
+		}
+		
+		prveLoadTime = t;
+		return all;
+	}
+	
+	/**
+	 * 
+	 * @Title: loadByLineAndStartTime 
+	 * @Description: TODO(根据线路和时间戳加载数据) 
+	 */
+	public List<ArrivalEntity> loadByLineAndTime(String lineCode, 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 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.setLong(3, st);
+			ps.setLong(4, 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<>();
+		
+		ArrivalEntity arr;
+		while(rs.next()){
+			arr = new ArrivalEntity();
+			arr.setDeviceId(rs.getString("device_id"));
+			arr.setNbbm(BasicData.deviceId2NbbmMap.get(arr.getDeviceId()));
+			if(null == arr.getNbbm()){
+				logger.warn("未注册的设备号，" + arr.getDeviceId());
+				continue;
+			}
+			
+			arr.setTs(rs.getLong("ts"));
+			arr.setLineCode(rs.getString("line_id"));
+			arr.setUpDown(rs.getInt("up_down"));
+			arr.setStopNo(rs.getString("stop_no"));
+			arr.setStopName(BasicData.stationCode2NameMap.get(arr.getStopNo()));
+			arr.setInOut(rs.getInt("in_out"));
+			arr.setCreateDate(rs.getLong("create_timestamp"));
+			arr.setWeeksYear(rs.getInt("weeks_year"));
+			arr.setEnable(true);
+			
+			list.add(arr);
+		}
+		return list;
+	}
+	
+	public static void setPrveLoadTime(long t){
+		prveLoadTime = t;
+	}
+}
+package com.bsth.data.directive;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.LineConfigData;
+import com.bsth.entity.directive.D60;
+import com.bsth.entity.directive.D64;
+import com.bsth.entity.directive.Directive;
+import com.bsth.entity.directive.DirectiveReponse;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.directive.DirectiveService;
+import com.bsth.websocket.handler.SendUtils;
+
+/**
+ * 
+ * @ClassName: CurrDayDirectives
+ * @Description: TODO(当天指令数据)
+ * @author PanZhao
+ * @date 2016年8月14日 下午5:23:59
+ *
+ */
+@Component
+public class DayOfDirectives {
+
+	// 当日60指令缓存
+	private static Map<Integer, D60> d60Map;
+
+	// 线路切换指令 64
+	public static Map<String, D64> d64Map;
+
+	@Autowired
+	DirectiveService directiveService;
+	
+	@Autowired
+	SendUtils sendUtils;
+	
+	@Autowired
+	LineConfigData lineConfigData;
+
+	static Logger logger = LoggerFactory.getLogger(DayOfDirectives.class);
+
+	
+	static{
+		d60Map = new HashMap<>();
+		d64Map = new HashMap<>();
+	}
+	
+	public void put60(D60 d60) {
+		d60Map.put(d60.getMsgId(), d60);
+	}
+
+	public void put64(D64 d64) {
+		d64Map.put(d64.getKey(), d64);
+	}
+
+	/**
+	 * 
+	 * @Title: reply @Description: TODO(指令 46，47 响应) @throws
+	 */
+	public void reply(DirectiveReponse res) {
+		Integer msgId = res.getMsgId();
+		if (msgId == null) {
+			logger.error("reply error , msgId is null.");
+			return;
+		}
+
+		D60 d60 = d60Map.get(msgId);
+
+		if (null == d60) {
+			logger.error("找不到msgId: " + msgId + " 对应的指令数据");
+			return;
+		}
+
+		switch (res.getStatus()) {
+		case 0:
+			d60.setReply46((short) -1);// 失败
+			break;
+		case 1:
+			d60.setReply46((short) 0);// 发送成功
+			break;
+		case 2:
+			d60.setReply47((short) 0);// 驾驶员阅读
+			break;
+		}
+		// 入库
+		saveD60(d60);
+
+		ScheduleRealInfo sch = d60.getSch();
+		if (null == sch)
+			return;
+
+		if (d60.isDispatch()) {
+			// 更新班次状态
+			sch.setDirectiveState(res.getStatus() * 100);
+			// 通知页面
+			sendUtils.sendDirectiveToPage(sch);
+		}
+	}
+
+	/**
+	 * 
+	 * @Title: reply64 @Description: TODO(64 协议响应) @throws
+	 */
+	public void reply64(JSONObject json) {
+		String key = json.getString("deviceId") + "_" + json.getString("timestamp");
+
+		D64 d64 = d64Map.get(key);
+
+		if (null == d64)
+			logger.warn("64响应 -找不到请求源，json： " + json);
+		else {
+			JSONObject data = json.getJSONObject("data");
+
+			if (null == data)
+				logger.warn("64响应 data is null ，json： " + json);
+			else {
+				d64.setRespAck(data.getShort("requestAck"));
+				// 响应入库
+				directiveService.save64(d64);
+			}
+		}
+	}
+
+	private void saveD60(D60 d60) {
+		// 等47再入库
+		if (d60.getReply47() == null)
+			return;
+
+		directiveService.save(d60);
+	}
+	
+	public void clear(String device){
+		int c60 = 0, c64 = 0;
+		//找到该设备的60数据
+		Collection<D60> d60s = d60Map.values();
+		List<D60> rem60List = new ArrayList<>();
+		for(D60 d60 : d60s){
+			if(d60.getDeviceId().equals(device))
+				rem60List.add(d60);
+		}
+		//清除60数据
+		for(D60 d60 : rem60List){
+			if(d60.getReply47() == null)
+				directiveService.save(d60);
+			if(null != d60Map.remove(d60.getMsgId()))
+				c60 ++;
+		}
+		logger.info("清除60数据 ，" + c60);
+		
+		//找到该设备的64数据
+		Collection<D64> d64s = d64Map.values();
+		List<D64> rem64List = new ArrayList<>();
+		for(D64 d64 : d64s){
+			if(d64.getDeviceId().equals(device))
+				rem64List.add(d64);
+		}
+		
+		//清除64数据
+		for(D64 d64 : rem64List){
+			if(d64.getRespAck() == null)
+				directiveService.save64(d64);
+			
+			if(null != d64Map.remove(d64.getKey()))
+				c64 ++;
+		}
+		
+		logger.info("清除64数据 ，" + c64);
+	}
+	
+	public Collection<D60> all60(){
+		return d60Map.values();
+	}
+	
+	public Collection<D64> all64(){
+		return d64Map.values();
+	}
+	
+	public Collection<Directive> all(){
+		List<Directive> all = new ArrayList<>();
+		all.addAll(d60Map.values());
+		all.addAll(d64Map.values());
+		
+		return all;
+	}
+	
+	public static class DComparator implements Comparator<Directive>{
+
+		@Override
+		public int compare(Directive d1, Directive d2) {
+			return (int) (d2.getTimestamp() - d1.getTimestamp());
+		}
+	}
+ }
-package com.bsth.vehicle.directive.util;
+package com.bsth.data.directive;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -9,30 +9,26 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.alibaba.fastjson.JSON;
-import com.bsth.vehicle.common.CommonMapped;
-import com.bsth.vehicle.directive.Consts;
-import com.bsth.vehicle.directive.MsgIdGenerator;
-import com.bsth.vehicle.directive.entity.Directive60;
-import com.bsth.vehicle.directive.entity.Directive64;
-import com.bsth.vehicle.directive.entity.Directive60.DirectiveData;
-import com.bsth.vehicle.directive.entity.Directive64.LineChangeData;
+import com.bsth.data.BasicData;
+import com.bsth.entity.directive.D60;
+import com.bsth.entity.directive.D60.D60Data;
+import com.bsth.entity.directive.D64;
+import com.bsth.entity.directive.D64.D64Data;
 /**
  * 
- * @ClassName: DirectiveDataFactory 
- * @Description: TODO(生成调度指令数据) 
+ * @ClassName: DirectiveCreator 
+ * @Description: TODO(指令数据生成) 
  * @author PanZhao
- * @date 2016年8月3日 下午3:32:27 
+ * @date 2016年8月14日 下午9:57:07 
  *
  */
-public class DirectiveDataFactory {
+public class DirectiveCreator {
-	private DirectiveDataFactory() {}
-	
 	// 城市代码
 	static final short cityCode = 22;
-	static Logger logger = LoggerFactory.getLogger(DirectiveDataFactory.class);
+	static Logger logger = LoggerFactory.getLogger(DirectiveCreator.class);
 	/**
 	 * 
@@ -47,16 +43,16 @@ public class DirectiveDataFactory {
 	 * @return Directive60    返回类型 
 	 * @throws
 	 */
-	public static Directive60 createDirective60(String nbbm, String text, Short dispatchInstruct, int upDown, int state) {
+	public static D60 createD60(String nbbm, String text, Short dispatchInstruct, int upDown, int state) {
 		Long timestamp = System.currentTimeMillis();
-		Short company = Short.parseShort(CommonMapped.vehicCompanyMap.get(nbbm));
-		String deviceId = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
+		Short company = Short.parseShort(BasicData.nbbm2CompanyCodeMap.get(nbbm));
+		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
 		int msgId = MsgIdGenerator.getMsgId();
-		Directive60 directive = new Directive60();
-		DirectiveData data = new DirectiveData();
+		D60 directive = new D60();
+		D60Data data = new D60Data();
 		// 一级协议
 		directive.setOperCode((short) 0x60);
 		// 设备号
@@ -86,16 +82,16 @@ public class DirectiveDataFactory {
 	static SimpleDateFormat sdfMMddHHmm = new SimpleDateFormat("MMddHHmm");
-	public static Directive60 createDirective6002(String nbbm, String text, Short dispatchInstruct, int upDown, int state, Date alarmTime){
+	public static D60 createD60_02(String nbbm, String text, int upDown, int state, Date alarmTime){
 		Long timestamp = System.currentTimeMillis();
-		Short company = Short.parseShort(CommonMapped.vehicCompanyMap.get(nbbm));
-		String deviceId = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
+		Short company = Short.parseShort(BasicData.nbbm2CompanyCodeMap.get(nbbm));
+		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
 		int msgId = MsgIdGenerator.getMsgId();
-		Directive60 directive = new Directive60();
-		DirectiveData data = new DirectiveData();
+		D60 directive = new D60();
+		D60Data data = new D60Data();
 		// 一级协议
 		directive.setOperCode((short) 0x60);
 		// 设备号
@@ -105,7 +101,7 @@ public class DirectiveDataFactory {
 		directive.setMsgId(msgId);
 		// 构造数据
 		data.setDeviceId(deviceId);
-		data.setDispatchInstruct(dispatchInstruct);
+		data.setDispatchInstruct((short) 0x02);
 		data.setTimestamp(timestamp);
 		data.setCompanyCode(company);
 		data.setMsgId(msgId);
@@ -132,19 +128,19 @@ public class DirectiveDataFactory {
 	 * @param @param t 时间戳
 	 * @throws
 	 */
-	public static Directive64 createDirective64(String nbbm, Integer lineCode, long t){
-		String deviceId = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
+	public static D64 createD64(String nbbm, Integer lineCode, long t){
+		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-		Directive64 change = new Directive64();
-		LineChangeData data = new LineChangeData();
+		D64 change = new D64();
+		D64Data data = new D64Data();
 		data.setCityCode(cityCode);
 		data.setDeviceId(deviceId);
 		//线路编码补满6位数
-		if(lineCode > 99999){
+		if(lineCode > 999999){
 			logger.error("线路编码不能超过6位，code：" + lineCode);
 			return null;
 		}
-		String lineCodeStr = String.format("%06d", lineCode.toString());
+		String lineCodeStr = String.format("%06d", lineCode);
 		data.setLineId(lineCodeStr);
 		change.setDeviceId(deviceId);
@@ -163,24 +159,36 @@ public class DirectiveDataFactory {
 	 * @param @param lineId  线路ID
 	 * @throws
 	 */
-	public static String createDeviceRefreshData(String deviceId, Integer lineId) {
+	public static String createDeviceRefreshData(String deviceId, Integer lineCode) {
 		Long t = System.currentTimeMillis();
-		Map<String, Object> param = new HashMap<String, Object>();
+		Map<String, Object> param = new HashMap<>();
 		param.put("deviceId", deviceId);
 		param.put("timestamp", t);
 		param.put("operCode", 0Xc0);
-		Map<String, Object> data = new HashMap<String, Object>();
+		Map<String, Object> data = new HashMap<>();
 		data.put("operCode2", 0xa1);
 		data.put("cityCode", cityCode);
 		data.put("deviceId", deviceId);
 		data.put("timestamp", t);
 		data.put("centerId", 1);
-		data.put("lineId", lineId);
+		
+		//线路编码补满6位数
+		if(lineCode > 999999){
+			logger.error("线路编码不能超过6位，code：" + lineCode);
+			return null;
+		}
+		String lineCodeStr = String.format("%06d", lineCode);
+		
+		data.put("lineId", lineCodeStr);
 		data.put("lineVersion", 0);
 		data.put("carparkDataVersion", 0);
 		param.put("data", data);
 		return JSON.toJSONString(param);
 	}
+	
+	public static void main(String[] args) {
+		System.out.println(String.format("%06d", "1025"));
+	}
 }
-package com.bsth.vehicle.directive.util;
+package com.bsth.data.directive;
 import java.io.IOException;
@@ -17,15 +17,14 @@ import com.bsth.util.ConfigUtil;
 /**
  * 
- * @ClassName: HttpUtils 
+ * @ClassName: GatewayHttpUtils 
  * @Description: TODO(和网关HTTP通讯工具类) 
  * @author PanZhao
- * @date 2016年7月8日 上午10:38:10 
+ * @date 2016年8月14日 下午9:50:46 
  *
  */
-public class HttpUtils {
-
-	static Logger logger = LoggerFactory.getLogger(HttpUtils.class);
+public class GatewayHttpUtils {
+	static Logger logger = LoggerFactory.getLogger(GatewayHttpUtils.class);
 	static String url;
@@ -8,7 +8,7 @@ package com.bsth.data.gpsdata;
  * @date 2016年5月11日 下午4:32:07
  *
  */
-public class GpsRealEntity {
+public class GpsEntity {
 	/** 公司代码 */
 	private Integer companyCode;
+package com.bsth.data.gpsdata;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+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.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.Application;
+import com.bsth.data.BasicData;
+import com.bsth.util.ConfigUtil;
+import com.google.common.collect.TreeMultimap;
+
+/**
+ * 
+ * @ClassName: GpsRealEntityBuffer
+ * @Description: TODO(实时GPS数据集合)
+ * @author PanZhao
+ * @date 2016年8月12日 下午2:04:41
+ *
+ */
+@Component
+public class GpsRealData implements CommandLineRunner{
+	
+	static Logger logger = LoggerFactory.getLogger(GpsRealData.class);
+	
+	private static Map<String, GpsEntity> gpsMap;
+	
+	//按线路分组设备号
+	private static TreeMultimap<Integer, String> lineCode2Devices;
+
+	// 网关数据接口地址
+	private static String url;
+	
+	@Autowired
+	GpsDataLoader gpsDataLoader;
+	
+	/**
+	 * 构造函数
+	 */
+	public GpsRealData(){
+		gpsMap = new HashMap<>();
+		lineCode2Devices = TreeMultimap.create();
+		url = ConfigUtil.get("http.gps.real.url");
+	}
+	
+	@Override
+	public void run(String... arg0) throws Exception {
+		logger.info("gpsDataLoader,20,8");
+		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 8, TimeUnit.SECONDS);
+	}
+
+	public static GpsEntity add(GpsEntity gps) {
+		String device = gps.getDeviceId();
+		gpsMap.put(device, gps);
+		lineCode2Devices.put(gps.getLineId(), device);
+		return gps;
+	}
+
+	/**
+	 * 
+	 * @Title: get @Description: TODO(设备号获取GPS)
+	 */
+	public GpsEntity get(String deviceId) {
+		return gpsMap.get(deviceId);
+	}
+	
+	/**
+	 * 
+	 * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
+	 */
+	public List<GpsEntity> get(Integer lineCode) {
+		NavigableSet<String> set = lineCode2Devices.get(lineCode);
+		
+		List<GpsEntity> rs = new ArrayList<>();
+		for(String device : set){
+			rs.add(gpsMap.get(device));
+		}
+		
+		return rs;
+	}
+	
+	public List<GpsEntity> get(List<String> pArray){
+		List<GpsEntity> list = new ArrayList<>();
+		
+		for(String code : pArray)
+			list.addAll(get(Integer.parseInt(code)));
+		return list;
+	}
+	
+	public GpsEntity findByDeviceId(String deviceId) {
+		return gpsMap.get(deviceId);
+	}
+	
+	@Component
+	public static class GpsDataLoader extends Thread{
+		
+		Logger logger = LoggerFactory.getLogger(GpsDataLoader.class);
+
+		@Override
+		public void run() {
+			try{
+				load();
+			}catch(Exception e){
+				logger.error("", e);
+			}
+		}
+		
+		public void load() throws Exception {
+			List<GpsEntity> list = new ArrayList<>();
+			CloseableHttpClient httpClient = null;
+			CloseableHttpResponse response = null;
+			try {
+				httpClient = HttpClients.createDefault();
+				HttpGet get = new HttpGet(url);
+
+				response = httpClient.execute(get);
+
+				HttpEntity entity = response.getEntity();
+				if (null != entity) {
+					// 返回数据量比较大，建议以流的形式读取
+					BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+					StringBuffer stringBuffer = new StringBuffer();
+					String str = "";
+					while ((str = br.readLine()) != null) 
+						stringBuffer.append(str);
+
+					JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
+
+					if (jsonObj != null) 
+						list = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
+					
+					//附加车辆内部编码
+					for(GpsEntity gps : list){
+						gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
+						gps.setStationName(BasicData.stationCode2NameMap.get(gps.getStopNo()));
+						add(gps);
+					}
+				} else
+					logger.error("result is null");
+			} finally {
+				if (null != httpClient)
+					httpClient.close();
+				if(null != response)
+					response.close();
+			}
+		}
+	}
+}
-//package com.bsth.data.gpsdata;
-//
-//import java.io.BufferedReader;
-//import java.io.InputStreamReader;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//import java.util.NavigableSet;
-//
-//import org.apache.http.HttpEntity;
-//import org.apache.http.client.methods.CloseableHttpResponse;
-//import org.apache.http.client.methods.HttpGet;
-//import org.apache.http.impl.client.CloseableHttpClient;
-//import org.apache.http.impl.client.HttpClients;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONObject;
-//import com.bsth.data.BasicData;
-//import com.bsth.util.ConfigUtil;
-//import com.bsth.vehicle.gpsdata.entity.GpsRealData;
-//import com.google.common.collect.TreeMultimap;
-//
-///**
-// * 
-// * @ClassName: GpsRealDataBuffer
-// * @Description: TODO(实时GPS数据集合)
-// * @author PanZhao
-// * @date 2016年8月12日 下午2:04:41
-// *
-// */
-//public class GpsRealDataList {
-//	
-//	private static Map<String, GpsRealData> gpsMap;
-//	
-//	private static TreeMultimap<Integer, String> lineCode2Devices;
-//
-//	// 网关数据接口地址
-//	private static String url;
-//	
-//	static{
-//		gpsMap = new HashMap<>();
-//		lineCode2Devices = TreeMultimap.create();
-//		url = ConfigUtil.get("http.gps.real.url");
-//	}
-//
-//	static Logger logger = LoggerFactory.getLogger(GpsRealDataList.class);
-//
-//	public static GpsRealData add(GpsRealData gps) {
-//		String device = gps.getDeviceId();
-//		gpsMap.put(device, gps);
-//		lineCode2Devices.put(gps.getLineId(), device);
-//		return gps;
-//	}
-//
-//	/**
-//	 * 
-//	 * @Title: get @Description: TODO(设备号获取GPS) @param @param deviceId @throws
-//	 */
-//	public static GpsRealData get(String deviceId) {
-//		return gpsMap.get(deviceId);
-//	}
-//
-//	/**
-//	 * 
-//	 * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
-//	 */
-//	public static List<GpsRealData> get(Integer lineCode) {
-//		NavigableSet<String> set = lineCode2Devices.get(lineCode);
-//		
-//		List<GpsRealData> rs = new ArrayList<>();
-//		for(String device : set){
-//			rs.add(gpsMap.get(device));
-//		}
-//		
-//		return rs;
-//	}
-//
-//	public static void LoadGpsRealData() throws Exception {
-//		List<GpsRealData> list = new ArrayList<>();
-//		CloseableHttpClient httpClient = null;
-//
-//		try {
-//			httpClient = HttpClients.createDefault();
-//			HttpGet get = new HttpGet(url);
-//
-//			CloseableHttpResponse response = httpClient.execute(get);
-//
-//			try {
-//				HttpEntity entity = response.getEntity();
-//				if (null != entity) {
-//					// 返回数据量比较大，建议以流的形式读取
-//					BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
-//					StringBuffer stringBuffer = new StringBuffer();
-//					String str = "";
-//					while ((str = br.readLine()) != null) 
-//						stringBuffer.append(str);
-//
-//					JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
-//
-//					if (jsonObj != null) 
-//						list = JSON.parseArray(jsonObj.getString("data"), GpsRealData.class);
-//					
-//					for(GpsRealData gps : list){
-//						gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps));
-//						add(gps);
-//					}
-//				} else
-//					logger.error("result is null");
-//			} finally {
-//				response.close();
-//			}
-//
-//		} finally {
-//			if (null != httpClient)
-//				httpClient.close();
-//		}
-//	}
-//}
+package com.bsth.data.match;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+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;
+
+@Component
+public class Arrival2Schedule implements ApplicationContextAware {
+	
+	private static DayOfSchedule dayOfSchedule;
+	
+	
+	private static ScheduleComparator.FCSJ schComparator;
+	private static ArrivalComparator arrComparator;
+	private static MatchResultComparator mrComparator;;
+	private static SendUtils sendUtils;
+	private static DirectiveService directiveService;
+	private final static int ONE_MINUTE = 1000 * 60;
+	//定一个4小时的范围，基本能对正常班次进行容错。主要防止早上停车场GPS飘导致完成晚上的进场班次
+	private final static int FOUR_HOURS = 1000 * 60 * 60 * 4;
+	
+	static{
+		schComparator = new ScheduleComparator.FCSJ();
+		arrComparator = new ArrivalComparator();
+		mrComparator = new MatchResultComparator();
+	}
+	
+	/**
+	 * 
+	 * @Title: start 
+	 * @Description: TODO(开始) 
+	 * @param @param cars    需要匹配的车辆集合
+	 */
+	public static void start(Set<String> cars){
+		
+		for(String car : cars){
+			new SchMatchThread(car).start();
+		}
+	}
+	
+	public static class SchMatchThread extends Thread{
+		String nbbm;
+		public SchMatchThread(String nbbm){
+			this.nbbm = nbbm;
+		}
+		@Override
+		public void run() {
+			//班次列表
+			List<ScheduleRealInfo> schList = dayOfSchedule.findByNbbm(nbbm);
+			//进出起终点数据
+			List<ArrivalEntity> arrList = ArrivalData_GPS.findByNbbm(nbbm);
+			//排序
+			Collections.sort(schList, schComparator);
+			Collections.sort(arrList, arrComparator);
+			
+			//用实际来匹配计划
+			for(ArrivalEntity arr : arrList){
+				match(arr, schList);
+			}
+		}
+		private void match(ArrivalEntity arr, List<ScheduleRealInfo> schList) {
+			schList = matchFilter(schList);
+			
+			if(arr.getInOut() == 1)
+				matchOut(arr, schList);
+			else if(arr.getInOut() == 0)
+				matchIn(arr, schList);
+		}
+		
+		private List<ScheduleRealInfo> matchFilter(List<ScheduleRealInfo> schList) {
+			List<ScheduleRealInfo> list = new ArrayList<>();
+			for(ScheduleRealInfo sch : schList){
+				//烂班不匹配
+				if(sch.isDestroy())
+					continue;
+				
+				//没有里程的不匹配
+				if(sch.getBcsj() == null && sch.getJhlc() == null)
+					continue;
+				
+				list.add(sch);
+			}
+			return list;
+		}
+		
+		private void matchOut(ArrivalEntity arr, List<ScheduleRealInfo> schList){
+			List<MatchResult> mrs = new ArrayList<>();
+			ScheduleRealInfo sch;
+			MatchResult mr;
+			for(int i = 0; i < schList.size(); i ++){
+				sch = schList.get(i);
+				if(!arr.isTcc() && arr.getUpDown() != Integer.parseInt(sch.getXlDir()))
+					continue;
+				
+				if(!arr.getStopNo().equals(sch.getQdzCode()))
+					continue;
+				
+				//班次有实发时间
+				if(sch.getFcsjActualTime() != null){
+					//实际发车已经被引用
+					if(Math.abs(arr.getTs() - sch.getFcsjActualTime()) < ONE_MINUTE)
+						return;
+					else
+						continue;
+				}
+				//添加一个匹配结果
+				mr = new MatchResult();
+				mr.sch = sch;
+				mr.ts = arr.getTs();
+				mr.diff = arr.getTs() - sch.getFcsjT();
+				mr.success = dayOfSchedule.validStartTime(sch, arr.getTs());
+				
+				if(Math.abs(mr.diff) < FOUR_HOURS && mr.success)
+					mrs.add(mr);
+			}
+			
+			if(mrs.size() > 0){
+				//排序后的第一个 就是最合适的匹配
+				Collections.sort(mrs, mrComparator);
+				mr = mrs.get(0);
+				
+				mr.sch.setFcsjActualAll(mr.ts);
+				//通知客户端
+				sendUtils.sendFcsj(mr.sch);
+				//持久化
+				dayOfSchedule.save(mr.sch);
+			}
+		}
+		
+		private void matchIn(ArrivalEntity inArr, List<ScheduleRealInfo> schList){
+			
+			List<MatchResult> mrs = new ArrayList<>();
+			ScheduleRealInfo sch;
+			MatchResult mr;
+			for(int i = 0; i < schList.size(); i ++){
+				sch = schList.get(i);
+				if(!inArr.isTcc() && inArr.getUpDown() != Integer.parseInt(sch.getXlDir()))
+					continue;
+				
+				if(!inArr.getStopNo().equals(sch.getZdzCode()))
+					continue;
+				
+				//班次有实达时间
+				if(sch.getZdsjActualTime() != null){
+					//实际到达已经被引用
+					if(Math.abs(inArr.getTs() - sch.getZdsjActualTime()) < ONE_MINUTE)
+						return;
+					else
+						continue;
+				}
+				
+				//添加一个匹配结果
+				mr = new MatchResult();
+				mr.sch = sch;
+				mr.ts = inArr.getTs();
+				mr.diff = inArr.getTs() - sch.getZdsjT();
+				mr.success = dayOfSchedule.validEndTime(sch, inArr.getTs());
+				if(Math.abs(mr.diff) < FOUR_HOURS && mr.success)
+					mrs.add(mr);
+			}
+			
+			if(mrs.size() > 0){
+				//排序后的第一个 就是最合适的匹配
+				Collections.sort(mrs, mrComparator);
+				mr = mrs.get(0);
+				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, "系统");
+				}
+				else//下发文本指令（已结束运营）
+					directiveService.send60Phrase(nbbm, "到达终点 " + mr.sch.getZdzName() + "，已完成当日所有排班。", "系统");
+				//通知客户端
+				sendUtils.sendZdsj(mr.sch, next, doneSum);
+				//持久化
+				dayOfSchedule.save(mr.sch);
+			}
+		}
+	}
+	
+	@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.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.match;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+/**
+ * 
+ * @ClassName: MatchResult 
+ * @Description: TODO(实际和计划匹配结果) 
+ * @author PanZhao 
+ * @date 2016年8月10日 下午3:55:48 
+ *
+ */
+public class MatchResult {
+
+	/** 班次 */
+	public ScheduleRealInfo sch;
+	
+	/** 时间差 */
+	public long diff;
+	
+	/** 0 进 1 出 */
+	public  int inOut;
+	
+	public long ts;
+	
+	/** 交配成功 */
+	public boolean success;
+}
+package com.bsth.data.match;
+
+import java.util.Comparator;
+
+public class MatchResultComparator implements Comparator<MatchResult>{
+
+	@Override
+	public int compare(MatchResult o1, MatchResult o2) {
+		return (int) (Math.abs(o1.diff) - Math.abs(o2.diff));
+	}
+}
+package com.bsth.data.pilot80;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.Line;
+import com.bsth.entity.directive.D80;
+import com.bsth.entity.realcontrol.D80ReplyTemp;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.directive.D80Repository;
+import com.bsth.service.directive.DirectiveService;
+import com.bsth.websocket.handler.SendUtils;
+import com.google.common.collect.ArrayListMultimap;
+
+/**
+ * 
+ * @ClassName: PilotReport 
+ * @Description: TODO(驾驶员上报) 
+ * @author PanZhao
+ * @date 2016年8月14日 下午11:37:51 
+ *
+ */
+@Component
+public class PilotReport {
+	
+	@Autowired
+	D80Repository d80Repository;
+	
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+	
+	@Autowired
+	LineConfigData lineConfigData;
+	
+	@Autowired
+	DirectiveService directiveService;
+	
+	@Autowired
+	GpsRealData gpsRealData;
+	
+	@Autowired
+	SendUtils sendUtils;
+	
+	//private static ScheduleComparator.FCNO schComp;
+	
+	private static ArrayListMultimap<Integer, D80> d80MultiMap;
+	
+	Logger logger = LoggerFactory.getLogger(PilotReport.class);
+	
+	static{
+		d80MultiMap = ArrayListMultimap.create();
+		//schComp = new ScheduleComparator.FCNO();
+	}
+	
+	public void report(D80 d80){
+		//入库
+		d80Repository.save(d80);
+		//入缓存
+		d80MultiMap.put(d80.getData().getLineId(), d80);
+		
+		String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
+		//处理
+		switch (d80.getData().getRequestCode()) {
+		case 0xA3:
+			//出场请求
+			ScheduleRealInfo outSch = dayOfSchedule.nextByBcType(nbbm, "out");
+			//如果有对应出场班次
+			if(outSch != null){
+				//下发调度指令
+				directiveService.send60Dispatch(outSch, dayOfSchedule.doneSum(nbbm), "系统");
+				d80.setRemarks("计划出场时间：" + outSch.getDfsj());
+				//当前GPS位置
+				GpsEntity gps = gpsRealData.get(d80.getDeviceId());
+				if(null != gps)
+					d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));
+				
+				sendUtils.refreshSch(outSch);
+			}else
+				d80.setRemarks("没有出场计划");
+			
+			break;
+		
+		case 0xA5:
+			//进场请求
+			ScheduleRealInfo inSch = dayOfSchedule.nextByBcType(nbbm, "in");
+			//如果有对应出场班次
+			if(inSch != null){
+				d80.setRemarks("计划进场时间：" + inSch.getDfsj());
+				//当前GPS位置
+				GpsEntity gps = gpsRealData.get(d80.getDeviceId());
+				if(null != gps)
+					d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));
+			}else
+				d80.setRemarks("没有进场计划");
+			break;
+		}
+		
+		//推送到页面
+		sendUtils.send80ToPage(d80);
+	}
+	
+	/**
+	 * 
+	 * @Title: reply 
+	 * @Description: TODO(调度员回复) 
+	 */
+	public void reply(D80 d80){
+		String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
+		Short reqCode = d80.getData().getRequestCode();
+		//默认短语回复
+		defaultReply(nbbm, reqCode, d80.getConfirmRs() == 0?true:false);
+		
+		switch (reqCode) {
+		case 0xA3:
+			//出场请求回复
+			applyOutReply(d80);
+			break;
+		case 0xA5:
+			//进场请求回复
+			applyInReply(d80);
+			break;
+		}
+	}
+	
+	/**
+	 * 
+	 * @Title: applyOutReply 
+	 * @Description: TODO(出场请求回复) 
+	 */
+	public void applyOutReply(D80 d80){
+		//同意
+		if(d80.getConfirmRs() == 0){
+			String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
+
+			ScheduleRealInfo sch = dayOfSchedule.nextByBcType(nbbm, "out");
+			if(null == sch)
+				return;
+			
+			LineConfig conf = lineConfigData.get(sch.getXlBm());
+			if(conf.getOutConfig() == 1){
+				//为相关班次写入请求出场时间
+				sch.setFcsjActualAll(d80.getTimestamp());
+				
+				dayOfSchedule.save(sch);
+				//通知页面
+				sendUtils.refreshSch(sch);
+			}
+		}
+	}
+	
+	/**
+	 * 
+	 * @Title: applyInReply 
+	 * @Description: TODO(进场请求回复) 
+	 */
+	public void applyInReply(D80 d80){
+		//同意
+		if(d80.getConfirmRs() == 0){
+			String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
+			
+			ScheduleRealInfo sch = dayOfSchedule.nextByBcType(nbbm, "in");
+			if(null == sch)
+				return;
+			
+			LineConfig conf = lineConfigData.get(sch.getXlBm());
+			if(conf.getInConfig() == 1){
+				//为相关班次写入进场时间
+				sch.setZdsjActualAll(d80.getTimestamp());
+				
+				//没有里程的进场班次
+				if(sch.getBcsj() == null && sch.getJhlc() == null)
+					sch.setFcsjActualAll(d80.getTimestamp());
+					
+				dayOfSchedule.save(sch);
+				//通知页面
+				sendUtils.refreshSch(sch);
+			}
+		}
+	}
+	
+	public void defaultReply(String nbbm, short requestCode, boolean agree){
+		Line line = BasicData.nbbm2LineMap.get(nbbm);
+		String lineCode = null;
+		
+		if(line != null)
+			lineCode = line.getLineCode();
+		else{
+			try{
+				lineCode = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm)).getLineId().toString();
+			}catch(Exception e){
+				logger.error("", e);
+			}
+		}
+		
+		if(null == lineCode)
+			return;
+		
+		LineConfig conf = lineConfigData.get(lineCode);
+		D80ReplyTemp temp = conf.findByCode(requestCode);
+		
+		if(null == temp)
+			return;
+		
+		String text;
+		if(agree)
+			text = temp.getAgreeText();
+		else
+			text = temp.getRejectText();
+		
+		directiveService.send60Phrase(nbbm, text, "系统");
+	}
+	
+	/**
+	 * 
+	 * @Title: resumeOperation 
+	 * @Description: TODO(恢复营运) 
+	 */
+	public void resumeOperation(D80 d80){
+		
+	}
+	
+	/**
+	 * 
+	 * @Title: applyTiaodang 
+	 * @Description: TODO(申请调档) 
+	 */
+	public void applyTiaodang(D80 d80){
+		
+	}
+	
+	/**
+	 * 
+	 * @Title: unconfirmed80 
+	 * @Description: TODO(根据lineCode 获取未处理的80数据) 
+	 */
+	public List<D80> unconfirmed80(Integer lineCode){
+		List<D80> lineAll = d80MultiMap.get(lineCode)
+				,rs = new ArrayList<>();
+		
+		for(D80 d80 : lineAll)
+			if(!d80.isConfirm())
+				rs.add(d80);
+		
+		return rs;
+	}
+	
+	public D80 findById(int id){
+		Collection<D80> all = d80MultiMap.values();
+		
+		for(D80 d80 : all){
+			if(d80.getId() == id)
+				return d80;
+		}
+		
+		return null;
+	}
+	
+	public String coordHtmlStr(GpsEntity gps){
+		
+		return "<span class=\"nt-coord\" data-lon=\""+gps.getLon()+"\" data-lat=\""+gps.getLat()+"\"></span>";
+	}
+	
+	public Collection<D80> findAll(){
+		return d80MultiMap.values();
+	}
+	
+	public void clear(String lineCode){
+		logger.info("清除 80数据 before: " + d80MultiMap.size());
+		d80MultiMap.removeAll(lineCode);
+		logger.info("清除 80数据 after: " + d80MultiMap.size());
+	}
+
+	public Collection<? extends D80> findByCar(String nbbm) {
+		List<D80> rs = new ArrayList<>();
+		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+		if(null == deviceId)
+			return rs;
+		
+		Collection<D80> all = findAll();
+		for(D80 d80 : all){
+			if(d80.getDeviceId().equals(deviceId))
+				rs.add(d80);
+		}
+		return rs;
+	}
+}
+package com.bsth.data.schedule;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+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.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.bsth.Application;
+import com.bsth.data.LineConfigData;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.schedule.SchedulePlanInfoService;
+import com.bsth.util.BatchSaveUtils;
+import com.bsth.util.DateUtils;
+import com.bsth.websocket.handler.SendUtils;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.TreeMultimap;
+
+/**
+ * 
+ * @ClassName: DayOfSchedule
+ * @Description: TODO(当日实际排班)
+ * @author PanZhao
+ * @date 2016年8月15日 上午10:16:12
+ *
+ */
+@Component
+public class DayOfSchedule implements CommandLineRunner {
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	// 按车辆分组的班次数据
+	private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
+
+	// 班次主键映射
+	private static Map<Long, ScheduleRealInfo> id2SchedulMap;
+
+	// 车辆和排班起终点站对照（包括进出的停车场，区间起终点）
+	private static TreeMultimap<String, String> nbbm2SEStationMap;
+
+	// 持久化缓冲区
+	public static LinkedList<ScheduleRealInfo> pstBuffer;
+
+	// 排序器
+	private static ScheduleComparator.FCNO schNoComparator;
+	//private static ScheduleComparator.FCSJ schFcsjComparator;
+
+	@Autowired
+	LineConfigData lineConfigData;
+
+	/*@Autowired
+	ScheduleRealInfoService scheduleRealService;*/
+	
+	@Autowired
+	ScheduleRealInfoRepository schRepository;
+
+	@Autowired
+	SchedulePlanInfoService schPlanService;
+
+	@Autowired
+	SchAttrCalculator schAttrCalculator;
+
+	@Autowired
+	SendUtils sendUtils;
+
+	/** 线路当前使用的排班的日期 */
+	public static Map<String, String> currSchDateMap;
+
+	static {
+		nbbmScheduleMap = ArrayListMultimap.create();
+		id2SchedulMap = new HashMap<>();
+		pstBuffer = new LinkedList<>();
+		schNoComparator = new ScheduleComparator.FCNO();
+		currSchDateMap = new HashMap<>();
+		nbbm2SEStationMap = TreeMultimap.create();
+	}
+
+	@Autowired
+	ScheduleRefreshThread scheduleRefreshThread;
+	
+	@Autowired
+	SchedulePstThread schedulePstThread;
+
+	@Override
+	public void run(String... arg0) throws Exception {
+		//翻班线程
+		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 20, 120, TimeUnit.SECONDS);
+		//入库
+		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+	}
+
+	public Map<String, String> getCurrSchDate() {
+		return currSchDateMap;
+	}
+
+	/**
+	 * 
+	 * @Title: calcSchDateB
+	 * @Description: TODO(计算线路当前应该使用的排班日期)
+	 */
+	public String calcSchDate(String lineCode) {
+		LineConfig conf = lineConfigData.get(lineCode);
+		long ct = System.currentTimeMillis();
+		String schDate = DateUtils.sdfyyyyMMdd.format(new Date(ct));
+		// 小于当天起始运营时间,则取前一天的排班
+		if (ct < conf.getCurrStartTime())
+			schDate = DateUtils.subtractDay(schDate, 1);
+
+		return schDate;
+	}
+
+	/**
+	 * @Title: reloadSch
+	 * @Title: reloadSch
+	 * @Description: TODO(重新载入排班)
+	 * @param @param
+	 *            lineCode 线路编码
+	 * @param @param
+	 *            schDate 班次日期 yyyy-MM-dd
+	 * @param @param
+	 *            forcePlan 强制从计划调度重新抓取
+	 */
+	public int reloadSch(String lineCode, String schDate, boolean forcePlan) {
+		try {
+			List<ScheduleRealInfo> list;
+
+			if (forcePlan)
+				removeRealSch(lineCode, schDate);
+			else
+				clearRAMData(lineCode);
+
+			if (existRealSch(lineCode, schDate))
+				list = loadRealSch(lineCode, schDate);// 从实际排班表加载
+			else {
+				list = loadPlanSch(lineCode, schDate);// 从计划排班表加载
+				// 写入数据库
+				batchSave(list);
+			}
+
+			//更新线路和班次日期对照
+			currSchDateMap.put(lineCode, schDate);
+			//添加到缓存
+			putAll(list);
+			
+			//计算“起点站应到”时间
+			Set<String> cars = searchAllCars(list);
+			for(String nbbm : cars)
+				schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
+			
+			// 页面 翻班通知
+			sendUtils.shiftSchedule(lineCode);
+		} catch (Exception e) {
+			logger.error("", e);
+			return -1;
+		}
+
+		return 0;
+	}
+
+	/**
+	 * 
+	 * @Title: searchAllCars 
+	 * @Description: TODO(搜索班次集合中的车辆) 
+	 */
+	private Set<String> searchAllCars(List<ScheduleRealInfo> list) {
+		Set<String> cars = new HashSet<>();
+		for(ScheduleRealInfo sch : list)
+			cars.add(sch.getClZbh());
+		
+		return cars;
+	}
+
+	private void putAll(List<ScheduleRealInfo> list) {
+		for (ScheduleRealInfo sch : list) 
+			put(sch);
+	}
+
+	/**
+	 * @Title: removeRealSch
+	 * @Description: TODO(清除实际排班，包括数据库和内存数据)
+	 * @param @param
+	 *            lineCode 线路编码
+	 * @param @param
+	 *            schDate 班次日期 yyyy-MM-dd
+	 */
+	public void removeRealSch(String lineCode, String schDate) throws Exception {
+		try {
+			// 清理数据库数据
+			schRepository.deleteByLineCodeAndDate(lineCode + "", schDate);
+
+			// 清理内存数据
+			clearRAMData(lineCode + "");
+		} catch (Exception e) {
+			logger.error("removeRealSch error, " + lineCode + " -" + schDate, e);
+			throw e;
+		}
+	}
+
+	/**
+	 * 
+	 * @Title: clearRAMData
+	 * @Description: TODO(清理内存数据)
+	 */
+	public void clearRAMData(String lineCode) {
+		int count = 0;
+		List<ScheduleRealInfo> remList = new ArrayList<>();
+		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+		for (ScheduleRealInfo sch : schs) {
+			if (sch.getXlBm().equals(lineCode))
+				remList.add(sch);
+		}
+		
+		for(ScheduleRealInfo sch : remList){
+			nbbmScheduleMap.remove(sch.getClZbh(), sch);
+			count ++;
+		}
+		
+		logger.info(lineCode + "排班清理 " + count);
+	}
+
+	/**
+	 * @Title: existRealSch
+	 * @Description: TODO(实际排班是否已存在)
+	 */
+	public boolean existRealSch(String lineCode, String schDate) {
+		int count = schRepository.countByLineCodeAndDate(lineCode, schDate);
+		return count > 0;
+	}
+
+	/**
+	 * @Title: loadRealSch
+	 * @Description: TODO(从实际排班表加载数据)
+	 */
+	public List<ScheduleRealInfo> loadRealSch(String lineCode, String schDate) {
+		return schRepository.findByLineCodeAndDate(lineCode, schDate);
+	}
+
+	/**
+	 * @Title: loadPlanSch
+	 * @Description: TODO(从计划排班表加载数据)
+	 */
+	public List<ScheduleRealInfo> loadPlanSch(String lineCode, String schDate) {
+		List<ScheduleRealInfo> realList = new ArrayList<>();
+
+		try {
+			Map<String, Object> data = new HashMap<>();
+			data.put("scheduleDate_eq", DateUtils.sdfyyyyMMdd.parse(schDate));
+			data.put("xlBm_eq", lineCode);
+
+			// 查询计划排班
+			List<SchedulePlanInfo> planItr = cleanSchPlanItr(schPlanService.list(data).iterator());
+
+			// 转换为实际排班
+			realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
+
+			for (ScheduleRealInfo sch : realList) {
+				sch.setScheduleDateStr(DateUtils.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()));
+					}catch(ParseException pe){
+						logger.error("loadPlanSch... 计算终点时间失败...");
+					}
+				}
+			}
+		} catch (Exception e) {
+			logger.error("", e);
+		}
+		return realList;
+	}
+
+	/**
+	 * @Title: batchSave
+	 * @Description: TODO(批量入库)
+	 */
+	private void batchSave(List<ScheduleRealInfo> list) {
+		// 查询数据库最大ID
+		Long id = schRepository.getMaxId();
+		if (null == id)
+			id = 0L;
+		id++;
+
+		for (ScheduleRealInfo item : list) {
+			item.setSpId(item.getId());// 保留原始的计划ID
+			item.setId(id++);// 设置ID
+			item.setScheduleDateStr(DateUtils.sdfyyyyMMdd.format(item.getScheduleDate()));
+		}
+
+		// 入库
+		new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
+	}
+
+	private List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
+		List<SchedulePlanInfo> list = new ArrayList<>();
+
+		SchedulePlanInfo sp;
+		while (itrab.hasNext()) {
+			sp = itrab.next();
+			sp.setSchedulePlan(null);
+			list.add(sp);
+		}
+		return list;
+	}
+
+	/**
+	 * 
+	 * @Title: findByLineCode
+	 * @Description: TODO(lineCode 获取班次)
+	 */
+	public List<ScheduleRealInfo> findByLineCode(String lineCode) {
+		List<ScheduleRealInfo> rs = new ArrayList<>();
+
+		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+		for (ScheduleRealInfo sch : schs) {
+			if (sch.getXlBm().equals(lineCode))
+				rs.add(sch);
+		}
+		return rs;
+	}
+	
+	/**
+	 * 
+	 * @Title: findCarByLineCode 
+	 * @Description: TODO(线路下运营的车辆) 
+	 */
+	public Set<String> findCarByLineCode(String lineCode){
+		Set<String> rs = new HashSet<>();
+
+		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+		for (ScheduleRealInfo sch : schs) {
+			if (sch.getXlBm().equals(lineCode))
+				rs.add(sch.getClZbh());
+		}
+		
+		return rs;
+	}
+
+	public List<ScheduleRealInfo> findByNbbm(String nbbm) {
+		return nbbmScheduleMap.get(nbbm);
+	}
+
+	/**
+	 * 
+	 * @Title: findByLineAndUpDown
+	 * @Description: TODO(lineCode 和走向获取班次)
+	 */
+	public List<ScheduleRealInfo> findByLineAndUpDown(String lineCode, Integer upDown) {
+		List<ScheduleRealInfo> list = findByLineCode(lineCode), rs = new ArrayList<>();
+
+		for (ScheduleRealInfo sch : list) {
+			if (sch.getXlDir().equals(upDown + ""))
+				rs.add(sch);
+		}
+		return rs;
+	}
+
+	public ScheduleRealInfo get(long id) {
+		return id2SchedulMap.get(id);
+	}
+
+	public Set<String> getSEStationList(String nbbm) {
+		return nbbm2SEStationMap.get(nbbm);
+	}
+
+	/**
+	 * 
+	 * @Title: next
+	 * @Description: TODO(下一个班次)
+	 */
+	public ScheduleRealInfo next(ScheduleRealInfo sch) {
+
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		
+		boolean flag = false;
+		ScheduleRealInfo next = null;
+		for(ScheduleRealInfo temp : list){
+			if(temp.getId() == sch.getId()){
+				flag = true;
+				continue;
+			}
+			//忽略烂班
+			if(temp.isDestroy())
+				continue;
+			
+			if(flag){
+				next = temp;
+				break;
+			}
+		}
+		return next;
+	}
+
+	/**
+	 * 
+	 * @Title: prveRealSch
+	 * @Description: TODO(获取上一个已实际发出的班次)
+	 */
+/*	public ScheduleRealInfo prveSjfc(ScheduleRealInfo sch) {
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		// 排序
+		Collections.sort(list, schNoComparator);
+
+		ScheduleRealInfo prve = null;
+
+		int i = list.indexOf(sch);
+		for (; i >= 0; i--){
+			if (list.get(i).getFcsjActual() != null){
+				prve = list.get(i);
+				break;
+			}
+		}
+		return prve;
+	}*/
+
+	public void put(ScheduleRealInfo sch) {
+		schAttrCalculator
+			.calcRealDate(sch)
+			.calcAllTimeByFcsj(sch);
+
+		String nbbm = sch.getClZbh();
+		nbbmScheduleMap.put(nbbm, sch);
+		nbbm2SEStationMap.put(nbbm, sch.getQdzCode());
+		nbbm2SEStationMap.put(nbbm, sch.getZdzCode());
+		
+		//主键索引
+		id2SchedulMap.put(sch.getId(), sch);
+	}
+	
+	public void calcQdzTimePlan(String nbbm){
+		schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
+	}
+
+	/**
+	 * 
+	 * @Title: nextAll
+	 * @Description: TODO(之后的所有班次)
+	 */
+	public List<ScheduleRealInfo> nextAll(ScheduleRealInfo sch) {
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		// 排序
+		Collections.sort(list, schNoComparator);
+
+		List<ScheduleRealInfo> rs = new ArrayList<>();
+		ScheduleRealInfo temp;
+		for (int i = 0; i < list.size() - 1; i++) {
+			temp = list.get(i);
+			if(temp.getFcsjT() > sch.getFcsjT())
+				rs.add(temp);
+
+		}
+		return rs;
+	}
+
+	/**
+	 * 
+	 * @Title: doneSum
+	 * @Description: TODO(已完成班次总数)
+	 */
+	public int doneSum(String clZbh) {
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(clZbh);
+		int rs = 0;
+		
+		for(ScheduleRealInfo sch : list){
+			if(sch.getZdsjActual() != null && !sch.isDestroy())
+				rs ++;
+		}
+		return rs;
+	}
+
+	/**
+	 * 
+	 * @Title: validEndTime
+	 * @Description: TODO(是否是有效的到达时间)
+	 */
+	public boolean validEndTime(ScheduleRealInfo sch, Long ts) {
+		if(sch.getFcsjActualTime() != null && sch.getFcsjActualTime() > ts)
+			return false;
+		
+		return validTime(sch, ts);
+	}
+
+	/**
+	 * 
+	 * @Title: validStartTime 
+	 * @Description: TODO(是否是合适的发车时间) 
+	 */
+	public boolean validStartTime(ScheduleRealInfo sch, Long ts) {
+		if(sch.getZdsjActualTime() != null && sch.getZdsjActualTime() < ts)
+			return false;
+		
+		return validTime(sch, ts);
+	}
+	
+	public boolean validTime(ScheduleRealInfo sch, Long ts){
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		int ci = list.indexOf(sch);
+		ScheduleRealInfo prve, next;
+		if(ci > 0){
+			//之前班次实际时间不能大于该时间
+			for(int i = ci - 1; i >= 0; i --){
+				prve = list.get(i);
+				if(prve.getZdsjActualTime() != null && prve.getZdsjActualTime() > ts )
+					return false;
+				
+				if(prve.getFcsjActualTime() != null && prve.getFcsjActualTime() > ts)
+					return false;
+			}
+		}
+		
+		if(ci < list.size() - 1){
+			//之后班次实际时间不能小于该时间
+			for(int i = ci + 1; i < list.size(); i ++){
+				next = list.get(i);
+				if(next.getFcsjActualTime() != null && next.getFcsjActualTime() < ts)
+					return false;
+				
+				if(next.getZdsjActualTime() != null && next.getZdsjActualTime() < ts)
+					return false;
+			}
+		}
+		return true;
+	}
+	
+	public void save(ScheduleRealInfo sch){
+		//schRepository.save(sch);
+		pstBuffer.add(sch);
+	}
+	
+	/**
+	 * 
+	 * @Title: outSch 
+	 * @Description: TODO(出场班次) 
+	 */
+/*	public List<ScheduleRealInfo> outSch(String nbbm){
+		List<ScheduleRealInfo> all = nbbmScheduleMap.get(nbbm)
+					,outList = new ArrayList<>();
+		
+		for(ScheduleRealInfo sch : all){
+			if(sch.getBcType().equals("out"))
+				outList.add(sch);
+		}
+		return outList;
+	}
+	
+	public ScheduleRealInfo nextOut(String nbbm){
+		List<ScheduleRealInfo> list = outSch(nbbm);
+		Collections.sort(list, schNoComparator);
+		ScheduleRealInfo sch = null;
+		for(ScheduleRealInfo temp : list){
+			if(temp.getFcsjActual() == null)
+				sch = temp;
+		}
+		
+		return sch;
+	}*/
+	
+	/**
+	 * 
+	 * @Title: nextByBcType 
+	 * @Description: TODO(获取下一个指定班次类型的班次) 
+	 */
+	public ScheduleRealInfo nextByBcType(String nbbm, String bcType){
+		List<ScheduleRealInfo> list = findByBcType(nbbm, bcType);
+		Collections.sort(list, schNoComparator);
+		ScheduleRealInfo sch = null;
+		for(ScheduleRealInfo temp : list){
+			if(temp.getFcsjActual() == null)
+				sch = temp;
+		}
+		
+		return sch;
+	}
+	
+	public List<ScheduleRealInfo> findByBcType(String nbbm, String bcType){
+		List<ScheduleRealInfo> all = nbbmScheduleMap.get(nbbm)
+				,outList = new ArrayList<>();
+	
+		for(ScheduleRealInfo sch : all){
+			if(sch.getBcType().equals(bcType))
+				outList.add(sch);
+		}
+		return outList;
+	}
+
+	public ScheduleRealInfo delete(Long id) {
+		ScheduleRealInfo sch = id2SchedulMap.get(id);
+		if(!sch.isSflj())
+			return null;
+		
+		nbbmScheduleMap.remove(sch.getClZbh(), sch);
+		return sch;
+	}
+}
+package com.bsth.data.schedule;
+
+import java.text.ParseException;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * 
+ * @ClassName: SchAttrCalculator
+ * @Description: TODO(班次相关属性计算器)
+ * @author PanZhao
+ * @date 2016年8月15日 下午4:40:26
+ *
+ */
+@Component
+public class SchAttrCalculator {
+
+	@Autowired
+	LineConfigData lineConfigData;
+
+	private final static long DAY_TIME = 1000 * 60 * 60 * 24L;
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	/**
+	 * @Title: calcRealDate
+	 * @Description: TODO(计算班次的真实执行日期)
+	 */
+	public SchAttrCalculator calcRealDate(ScheduleRealInfo sch) {
+		LineConfig conf = lineConfigData.get(sch.getXlBm());
+
+		try {
+			if (null == sch.getFcsjT())
+				calcFcsjTime(sch);
+
+			/*
+			 * 早于线路开始运营时间的，加一天
+			 * 如该线路 2点开始运营，2016-08-23的班次，则 2016-08-23 0:25 的班次应该调整成 2016-08-24 0:25
+			 */
+			long st = DateUtils.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())));
+		} catch (Exception e) {
+			logger.error("", e);
+		}
+		return this;
+	}
+
+	/**
+	 * 
+	 * @Title: calcAllTimeByFcsj
+	 * @Description: TODO(根据发车时间字符串计算 （计发时间，终点时间，待发时间）)
+	 */
+	public SchAttrCalculator calcAllTimeByFcsj(ScheduleRealInfo sch) {
+		try {
+			// 生成时间戳
+			calcTimestamp(sch);
+			
+			// 计划终点时间
+			if (sch.getBcsj() != null) {
+				Date zdDate = new Date(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
+				sch.setZdsjT(zdDate.getTime());
+				sch.setZdsj(DateUtils.sdfHHmm.format(zdDate));
+			}
+		} catch (ParseException e) {
+			logger.error("", e);
+		}
+		return this;
+	}
+	
+	/**
+	 * 
+	 * @Title: calcQdzTimePlan 
+	 * @Description: TODO(计算班次的起点应到时间，list 必须是同一辆车的班次) 
+	 */
+	public void calcQdzTimePlan(List<ScheduleRealInfo> list){
+		Collections.sort(list, new ScheduleComparator.FCNO());
+		
+		int len = list.size();
+		if(len == 0)
+			return;
+		
+		ScheduleRealInfo prve = list.get(0), curr;
+		for(int i = 1; i < len; i ++){
+			curr = list.get(i);
+			if(prve.getZdzName().equals(curr.getQdzName()))
+				curr.setQdzArrDateJH(prve.getZdsj());
+			
+			prve = curr;
+		}
+	}
+
+	public SchAttrCalculator calcFcsjTime(ScheduleRealInfo sch) throws ParseException {
+		sch.setFcsjT(DateUtils.sdfyyyyMMddHHmm.parse(sch.getRealExecDate() + sch.getFcsj()).getTime());
+		return this;
+	}
+	
+	public void calcTimestamp(ScheduleRealInfo sch) throws ParseException{
+		//计发时间
+		if(sch.getFcsjT() == null)
+			calcFcsjTime(sch);
+		
+		//待发时间
+		if(sch.getDfsj() == null)
+			sch.setDfsjAll(sch.getFcsjT());
+		if(sch.getDfsjT() == null)
+			sch.setDfsjAll(sch.getDfsj());
+		
+		//实发时间戳
+		if(sch.getFcsjActualTime() == null && sch.getFcsjActual() != null)
+			sch.setFcsjActualAll(sch.getFcsjActual());
+		
+		//实达时间戳
+		if(sch.getZdsjActualTime() == null && sch.getZdsjActual() != null)
+			sch.setZdsjActualAll(sch.getZdsjActual());
+	}
+}
+package com.bsth.data.schedule;
+
+import java.util.Comparator;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+/**
+ * 
+ * @ClassName: ScheduleComparator 
+ * @Description: TODO(实际班次排序器) 
+ * @author PanZhao
+ * @date 2016年8月15日 下午1:53:28 
+ *
+ */
+public class ScheduleComparator {
+	
+	public static class FCNO implements Comparator<ScheduleRealInfo>{
+		@Override
+		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
+			return s1.getFcno() - s2.getFcno();
+		}
+	}
+	
+	public static class FCSJ  implements Comparator<ScheduleRealInfo>{
+
+		@Override
+		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
+			return (int) (s1.getFcsjT() - s2.getFcsjT());
+		}
+	}
+}
+package com.bsth.data.schedule;
+
+import java.util.LinkedList;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+
+/**
+ * 
+ * @ClassName: SchedulePstThread 
+ * @Description: TODO(班次异步持久化) 
+ * @author PanZhao 
+ * @date 2016年8月24日 上午1:47:05 
+ *
+ */
+@Component
+public class SchedulePstThread extends Thread{
+
+	@Autowired
+	ScheduleRealInfoRepository scheduleRepository;
+	
+	@Override
+	public void run() {
+		LinkedList<ScheduleRealInfo> list = DayOfSchedule.pstBuffer;
+
+		ScheduleRealInfo schedule;
+		for (int i = 0; i < 1000; i++) {
+			schedule = list.poll();
+			if (null == schedule)
+				break;
+
+			scheduleRepository.save(schedule);
+		}
+	}
+}
+package com.bsth.data.schedule;
+
+import java.util.Collection;
+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.BasicData;
+import com.bsth.data.LineConfigData;
+import com.bsth.data.arrival.ArrivalData_GPS;
+import com.bsth.data.directive.DayOfDirectives;
+import com.bsth.data.pilot80.PilotReport;
+import com.bsth.entity.realcontrol.LineConfig;
+
+/**
+ * 
+ * @ClassName: refreshScheduleThread
+ * @Description: TODO(班次刷新线程，用于在营运开始时间切换到当日排班)
+ * @author PanZhao
+ * @date 2016年8月17日 下午1:23:34
+ *
+ */
+@Component
+public class ScheduleRefreshThread extends Thread{
+
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+	
+	@Autowired
+	ArrivalData_GPS arrivalData;
+	
+	@Autowired
+	LineConfigData lineConfs;
+	
+	@Autowired
+	DayOfDirectives dayOfDirectives;
+	
+	@Autowired
+	PilotReport pilotReport;
+	
+	Logger logger = LoggerFactory.getLogger(ScheduleRefreshThread.class);
+	
+	@Override
+	public void run() {
+		try {
+			Collection<LineConfig> confs = lineConfs.getAll();
+			
+			String currSchDate, oldSchDate;
+			String lineCode;
+			for(LineConfig conf : confs){
+				lineCode = conf.getLine().getLineCode();
+				oldSchDate = dayOfSchedule.getCurrSchDate().get(lineCode);
+				currSchDate = dayOfSchedule.calcSchDate(lineCode);
+				
+				if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
+					logger.info(lineCode + "开始翻班， " + currSchDate);
+					//清除进出站数据
+					arrivalData.clearRAMData(lineCode);
+					//清除指令数据
+					Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
+					for(String car : cars)
+						dayOfDirectives.clear(BasicData.deviceId2NbbmMap.inverse().get(car));
+					//清除驾驶员上报数据
+					pilotReport.clear(lineCode);
+					
+					//重载排班数据
+					dayOfSchedule.reloadSch(lineCode, currSchDate, false);
+					logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
+				}
+			}
+		} catch (Exception e) {
+			logger.error("", e);
+		}
+	}
+}