Merge remote-tracking branch 'remotes/origin/pudong' into pudong_20190314

游瑞烽
2 parents e01f1b93 a65a6883
Showing 23 changed files with 2278 additions and 1954 deletions
README.md
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
src/main/java/com/bsth/entity/traffic/SKBUploadLogger.java
src/main/java/com/bsth/service/calc/impl/CalcMixServiceImpl.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/realcontrol/RealMapService.java
src/main/java/com/bsth/service/realcontrol/dto/SectionRouteCoords.java
src/main/java/com/bsth/service/realcontrol/impl/RealMapServiceImpl.java
src/main/java/com/bsth/service/report/impl/CalcSheetServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/static/pages/base/line/js/line-list-table.js
src/main/resources/static/pages/base/timesmodel/js/gantt.js
src/main/resources/static/pages/base/timesmodel/js/v2_2/main_v2_2.js
src/main/resources/static/pages/control/lineallot_v2/main.html
src/main/resources/static/pages/forms/calc/calcjsyspy.html
src/main/resources/static/pages/forms/calc/calcsingledata.html
src/main/resources/static/pages/forms/mould/calcjsyspy.xls
-公交调度系统BS版 0.1
-======
-----------
-## 目录
----------
- * [字典表](#字典表)
- * [动态jpa查询实现](#动态jpa查询实现)
- * [车载 gps 相关数据](#gps)
-    * [实时gps数据接口 http](#实时gps接口)  
-    * [进出站数据表结构](#进站数据)
-    * [异常警报表结构](#异常警报)
-        * [大间隔](#大间隔)
-        * [超速](#超速)
-        * [越界](#越界)
-        * [越站](#越站)
-        * [聚集](#聚集)
-        * [掉线](#掉线)
-    * [调度消息下发接口HTTP](#调度消息下发接口)
-    * [调度消息上传接口HTTP](#调度消息上传接口)
-    * [车辆历史GPS数据](#车辆历史GPS)
-    
-----------
-
-##  字典表
-----------
-字典操作全部由前端负责，主要有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不同意|
-
-```json
-{
-    "deviceId":12345,
-    "timestamp":44324,
-    "operCode":0xC0,
-    "data":{
-        "operCode":0xa3,
-        "deviceId":12345,
-        "ipAddress":222.66.0.204,
-        "port":8899,
-        "reportMode":0,
-        "interval":0,
-        "distance":0,
-        "speedingThreshold":0,
-        "alarmThreshold":0,
-        "posIpAddress":0,
-        "posPort":0,
-        "delay":0,
-        "speedThreshold1":0,
-        "speedThreshold2":0,
-        "contrast":0,
-        "brightness":0,
-        "saturation":0
-    }
-}
-```
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| deviceId | string | 设备编号 |
-| timestamp | long | 时间戳(ms) |
-| operCode | short | 一级协议 |
-| data.operCode | short | 二级协议 |
-| data.deviceId | string | 设备编号|
-| data.ipAddress | string | 网关IP地址|
-| data.port | string | 网关端口|
-| data.reportMode | short | 定时定距上报模式|
-| data.interval | int | 定时上报时间间隔|
-| data.distance | string | 定距上报距离间隔|
-| data.speedingThreshold | short | 非线路状态超速阀门|
-| data.alarmThreshold | short | 预警阀门|
-| data.posIpAddress | string | pos机IP地址|
-| data.posPort | string | pos机端口|
-| data.delay | int | 延迟机关时间|
-| data.deviceId | short | 中门视频切换到码表界面速度阀门 默认45|
-| data.deviceId | short | 码表界面切换到中门视频速度阀门 默认35|
-| data.deviceId | short | 对比度|
-| data.deviceId | short | 亮度|
-| data.deviceId | short | 饱和度|
-
-```json
-{
-    "deviceId":12345,
-    "timestamp":44324,
-    "operCode":0xC0,
-    "data":{
-        "operCode":0xa4
-    }
-}
-```
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| deviceId | string | 设备编号 |
-| timestamp | long | 时间戳(ms) |
-| operCode | short | 一级协议 |
-| data.operCode | short | 二级协议 |
-
-```json
-{
-    "deviceId":12345,
-    "timestamp":44324,
-    "operCode":0xC0,
-    "data":{
-        "operCode":0xa5
-        "programVersion":2
-    }
-}
-```
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| deviceId | string | 设备编号 |
-| timestamp | long | 时间戳(ms) |
-| operCode | short | 一级协议 |
-| data.operCode | short | 二级协议 |
-| data.programVersion | short | 程序版本 |
-
-<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
-}
-```
-
-### 车辆历史GPS
-----------
-表名:BSTH_C_GPS_INFO
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| cityCode | int | 城市代码 |
-| industryCode | int | 行业代码 |
-| companyCode | int | 企业代码 |
-| lineId | int | 线路编号 |
-| deviceId | string | 设备编号 |
-| driverNo | int | 驾驶员工号 |
-| carparkSerialNo | int | 停车场序列号 |
-| carparkNo | string | 停车场编号 |
-| stopSerialNo | int | 站点序列号 |
-| stopNo | string | 停车场编号 |
-| lon | float | 经度 |
-| lat | float | 维度 |
-| ts | long | 时间戳 |
-| speedSensor | float | 发动机速度 |
-| speedGps | float | gps速度 |
-| direction | float | 角度0-359 |
-| inTemp | int | 车内温度 |
-| serviceState | long | 设备状态字 |
-| daysYear | int | 对应年中的天数 为分区字段 查询一定要用此字段过滤 |
-
+公交调度系统BS版 0.1
+======
+----------
+## 目录
+---------
+ * [字典表](#字典表)
+ * [动态jpa查询实现](#动态jpa查询实现)
+ * [车载 gps 相关数据](#gps)
+    * [实时gps数据接口 http](#实时gps接口)  
+    * [进出站数据表结构](#进站数据)
+    * [异常警报表结构](#异常警报)
+        * [大间隔](#大间隔)
+        * [超速](#超速)
+        * [越界](#越界)
+        * [越站](#越站)
+        * [聚集](#聚集)
+        * [掉线](#掉线)
+    * [调度消息下发接口HTTP](#调度消息下发接口)
+    * [调度消息上传接口HTTP](#调度消息上传接口)
+    * [车辆历史GPS数据](#车辆历史GPS)
+    
+----------
+
+##  字典表
+----------
+字典操作全部由前端负责，主要有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不同意|
+
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "operCode":0xC0,
+    "data":{
+        "operCode":0xa3,
+        "deviceId":12345,
+        "ipAddress":222.66.0.204,
+        "port":8899,
+        "reportMode":0,
+        "interval":0,
+        "distance":0,
+        "speedingThreshold":0,
+        "alarmThreshold":0,
+        "posIpAddress":0,
+        "posPort":0,
+        "delay":0,
+        "speedThreshold1":0,
+        "speedThreshold2":0,
+        "contrast":0,
+        "brightness":0,
+        "saturation":0
+    }
+}
+```
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| deviceId | string | 设备编号 |
+| timestamp | long | 时间戳(ms) |
+| operCode | short | 一级协议 |
+| data.operCode | short | 二级协议 |
+| data.deviceId | string | 设备编号|
+| data.ipAddress | string | 网关IP地址|
+| data.port | string | 网关端口|
+| data.reportMode | short | 定时定距上报模式|
+| data.interval | int | 定时上报时间间隔|
+| data.distance | string | 定距上报距离间隔|
+| data.speedingThreshold | short | 非线路状态超速阀门|
+| data.alarmThreshold | short | 预警阀门|
+| data.posIpAddress | string | pos机IP地址|
+| data.posPort | string | pos机端口|
+| data.delay | int | 延迟机关时间|
+| data.deviceId | short | 中门视频切换到码表界面速度阀门 默认45|
+| data.deviceId | short | 码表界面切换到中门视频速度阀门 默认35|
+| data.deviceId | short | 对比度|
+| data.deviceId | short | 亮度|
+| data.deviceId | short | 饱和度|
+
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "operCode":0xC0,
+    "data":{
+        "operCode":0xa4
+    }
+}
+```
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| deviceId | string | 设备编号 |
+| timestamp | long | 时间戳(ms) |
+| operCode | short | 一级协议 |
+| data.operCode | short | 二级协议 |
+
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "operCode":0xC0,
+    "data":{
+        "operCode":0xa5
+        "programVersion":2
+    }
+}
+```
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| deviceId | string | 设备编号 |
+| timestamp | long | 时间戳(ms) |
+| operCode | short | 一级协议 |
+| data.operCode | short | 二级协议 |
+| data.programVersion | short | 程序版本 |
+
+<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
+}
+```
+
+### 车辆历史GPS
+----------
+表名:BSTH_C_GPS_INFO
+
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| cityCode | int | 城市代码 |
+| industryCode | int | 行业代码 |
+| companyCode | int | 企业代码 |
+| lineId | int | 线路编号 |
+| deviceId | string | 设备编号 |
+| driverNo | int | 驾驶员工号 |
+| carparkSerialNo | int | 停车场序列号 |
+| carparkNo | string | 停车场编号 |
+| stopSerialNo | int | 站点序列号 |
+| stopNo | string | 停车场编号 |
+| lon | float | 经度 |
+| lat | float | 维度 |
+| ts | long | 时间戳 |
+| speedSensor | float | 发动机速度 |
+| speedGps | float | gps速度 |
+| direction | float | 角度0-359 |
+| inTemp | int | 车内温度 |
+| serviceState | long | 设备状态字 |
+| daysYear | int | 对应年中的天数 为分区字段 查询一定要用此字段过滤 |
+
@@ -49,6 +49,12 @@ public class RealMapController {
         return realMapService.findRouteByLine(idx);
     }
+
+    @RequestMapping(value = "/findRouteAndVersionByLine")
+    public Map<String, Object> findRouteByLineAndVersion(@RequestParam String idx) {
+        return realMapService.findRouteAndVersionByLine(idx);
+    }
+
     @RequestMapping(value = "/multiRouteByLine")
     public Map<String, Object> multiRouteByLine(@RequestParam String codeStr) {
         return realMapService.multiRouteByLine(codeStr);
-package com.bsth.controller.realcontrol;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-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.alibaba.fastjson.JSONArray;
-import com.bsth.common.ResponseCode;
-import com.bsth.controller.BaseController;
-import com.bsth.controller.realcontrol.dto.ChangePersonCar;
-import com.bsth.controller.realcontrol.dto.DfsjChange;
-import com.bsth.data.BasicData;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import com.bsth.util.ConfigUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@RestController
-@RequestMapping("/realSchedule")
-public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long> {
-
-	@Autowired
-	ScheduleRealInfoService scheduleRealInfoService;
-
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-
-	@RequestMapping(value = "check_fgs_ascription", method = RequestMethod.POST)
-	public Map<String, Object> checkPCFgsAscription(@RequestParam Long schId, String jGh, String sGh, String nbbm){
-		return scheduleRealInfoService.checkPCFgsAscription(schId, jGh, sGh, nbbm);
-	}
-
-	@RequestMapping(value = "/lines")
-	public Map<String, Collection<ScheduleRealInfo>> findByLines(@RequestParam String lines) {
-		return scheduleRealInfoService.findByLines(lines);
-	}
-
-	@RequestMapping(value = "/car")
-	public List<ScheduleRealInfo> findByCar(String nbbm){
-		return dayOfSchedule.findByNbbm(nbbm);
-	}
-
-	/**
-	 *
-	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
-	 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
-	 */
-	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
-	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
-										   @RequestParam String dfsj,String bcType,
-										   @RequestParam(defaultValue = "") String opType) {
-		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType, null);
-	}
-
-	/**
-	 *
-	 * @Title: destroy @Description: TODO(销毁，烂班) @param @param idsStr 要烂掉的班次ID ,分隔 
-	 */
-	@RequestMapping(value = "/destroy", method = RequestMethod.POST)
-	public Map<String, Object> destroy(@RequestParam String idsStr
-			/*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
-									   @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
-		return scheduleRealInfoService.destroy(idsStr, remarks, adjustExps, null);
-	}
-
-	/**
-	 *
-	 * @Title: carDeviceMapp @Description: TODO(获取车辆自编号和设备号对照，从缓存取) @throws
-	 */
-	@RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
-	public Map<String, String> carDeviceMapp() {
-		return BasicData.deviceId2NbbmMap.inverse();
-	}
-
-	/**
-	 *
-	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取驾驶员) @param @param
-	 * lineId @throws
-	 */
-	@RequestMapping(value = "/driver", method = RequestMethod.GET)
-	public List<Map<String, String>> findDriverByLine(@RequestParam String lineCode) {
-		return scheduleRealInfoService.findDriverByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取售票员) @param @param
-	 * lineId @throws
-	 */
-	@RequestMapping(value = "/conductor", method = RequestMethod.GET)
-	public List<Map<String, String>> findConductorByLine(@RequestParam String lineCode) {
-		return scheduleRealInfoService.findConductorByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取车辆) @param @param
-	 * lineId @throws
-	 */
-	@RequestMapping(value = "/cars", method = RequestMethod.GET)
-	public List<Map<String, String>> findCarByLine(@RequestParam String lineCode) {
-		return scheduleRealInfoService.findCarByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: sreachNbbm @Description: TODO(搜索车辆内部编码) @throws
-	 */
-	@RequestMapping(value = "/sreachVehic", method = RequestMethod.GET)
-	public List<Map<String, String>> sreachVehic(@RequestParam String nbbm) {
-		return scheduleRealInfoService.sreachVehic(nbbm);
-	}
-	/**
-	 *
-	 * @Title: realOutAdjust
-	 * @Description: TODO(实发调整)
-	 * @param @param id 班次ID
-	 * @param @param fcsjActual 实际发车时间 HH:mm
-	 * @param @param remarks 备注
-	 * @throws
-	 */
-	@RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
-	public Map<String, Object> realOutAdjust(@RequestParam Long id, @RequestParam String fcsjActual,
-											 @RequestParam String remarks) {
-		return scheduleRealInfoService.realOutAdjust(id, fcsjActual, remarks);
-	}
-
-	/**
-	 *
-	 * @Title: revokeDestroy
-	 * @Description: TODO(撤销烂班)
-	 * @param @param id
-	 * @throws
-	 */
-	@RequestMapping(value = "/revokeDestroy", method = RequestMethod.POST)
-	public Map<String, Object> revokeDestroy(@RequestParam Long id){
-		return scheduleRealInfoService.revokeDestroy(id);
-	}
-
-	/**
-	 *
-	 * @Title: revokeRealOutgo
-	 * @Description: TODO(撤销实发)
-	 * @param @param id
-	 * @throws
-	 */
-	@RequestMapping(value = "/revokeRealOutgo", method = RequestMethod.POST)
-	public Map<String, Object> revokeRealOutgo(@RequestParam Long id){
-		return scheduleRealInfoService.revokeRealOutgo(id);
-	}
-
-	/**
-	 * 撤销执行
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/revokeRealArrive", method = RequestMethod.POST)
-	public Map<String, Object> revokeRealArrive(@RequestParam Long id){
-		return scheduleRealInfoService.revokeRealArrive(id);
-	}
-
-	/**
-	 *
-	 * @Title: spaceAdjust
-	 * @Description: TODO(间隔调整)
-	 * @param @param ids 要调整的班次数组ID
-	 * @param @param space 间隔
-	 * @throws
-	 */
-	@RequestMapping(value = "/spaceAdjust", method = RequestMethod.POST)
-	public Map<String, Object> spaceAdjust(Long[] ids, Integer space){
-		return scheduleRealInfoService.spaceAdjust(ids, space);
-	}
-
-	/**
-	 *
-	 * @Title: schInfoFineTune
-	 * @Description: TODO(发车信息微调)
-	 * @param @param map
-	 * @throws
-	 */
-	@RequestMapping(value = "/schInfoFineTune", method = RequestMethod.POST)
-	public Map<String, Object> schInfoFineTune(@RequestParam Map<String, String> map){
-		return scheduleRealInfoService.schInfoFineTune(map);
-	}
-
-	/**
-	 *
-	 * @Title: outgoAdjustAll
-	 * @Description: TODO(批量待发调整)
-	 * @param @param list
-	 * @throws
-	 */
-	@RequestMapping(value = "/outgoAdjustAll", method = RequestMethod.POST)
-	public Map<String, Object> outgoAdjustAll(@RequestParam String params){
-		//反转义
-		params = StringEscapeUtils.unescapeHtml4(params);
-		return scheduleRealInfoService.outgoAdjustAll(params);
-	}
-
-	/**
-	 *
-	 * @Title: findByLineAndUpDown
-	 * @Description: TODO(根据线路和走向获取班次)
-	 * @param @param line
-	 * @param @param upDown
-	 */
-	@RequestMapping(value = "/findByLineAndUpDown")
-	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam String line,@RequestParam Integer upDown){
-		return dayOfSchedule.findByLineAndUpDown(line, upDown);
-	}
-
-	/**
-	 *
-	 * @Title: findRouteByLine
-	 * @Description: TODO(获取线路的站点，路段路由)
-	 * @param @param lineCode
-	 * @throws
-	 */
-	@RequestMapping(value = "/findRouteByLine")
-	public Map<String, Object> findRouteByLine(@RequestParam String lineCode){
-		return scheduleRealInfoService.findRouteByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: removeChildTask
-	 * @Description: TODO(删除子任务)
-	 * @param @param taskId 子任务ID
-	 * @throws
-	 */
-	@RequestMapping(value = "/childTask/{taskId}", method = RequestMethod.DELETE)
-	public Map<String, Object> removeChildTask(@PathVariable("taskId") Long taskId){
-		return scheduleRealInfoService.removeChildTask(taskId);
-	}
-
-	/**
-	 *
-	 * @Title: findByLineCode
-	 * @Description: TODO(根据线路获取班次信息)
-	 * @param @param lineCode
-	 */
-	@RequestMapping(value = "/lineCode/{lineCode}")
-	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
-		return dayOfSchedule.findByLineCode(lineCode);
-	}
-
-	@RequestMapping(value = "/queryUserInfo")
-	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
-												@RequestParam String date,@RequestParam String state) {
-		return scheduleRealInfoService.queryUserInfo(line, date,state);
-	}
-
-	@RequestMapping(value = "/queryUserInfoPx")
-	public List<ScheduleRealInfo> queryUserInfoPx(@RequestParam String line,
-												  @RequestParam String date,@RequestParam String state,@RequestParam String type) {
-		return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
-	}
-
-	@RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
-												@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
-		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line);
-	}
-
-	@RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
-			,@RequestParam String date,@RequestParam String line) {
-		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
-	}
-
-
-	@RequestMapping(value = "/dailyInfo")
-	public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) {
-		return scheduleRealInfoService.dailyInfo(line, date, type);
-	}
-
-	@RequestMapping(value = "/historyMessage")
-	public List<Object[]> historyMessage(@RequestParam String line, @RequestParam String date,
-										 @RequestParam String code, @RequestParam String type) {
-		return scheduleRealInfoService.historyMessage(line, date, code, type);
-	}
-
-	@RequestMapping(value="/findLine")
-	public List<Map<String,String>> findLine(@RequestParam String line){
-		return scheduleRealInfoService.findLine(line);
-	}
-
-	@RequestMapping(value="/findKMBC",method = RequestMethod.GET)
-	public Map<String,Object> findKMBC(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
-	}
-
-	/**
-	 * 路单公里统计 （闵行审计专用）
-	 * @param jGh
-	 * @param clZbh
-	 * @param lpName
-	 * @param date
-	 * @param line
-	 * @return
-	 */
-	@RequestMapping(value="/findKMBC_mh_2",method = RequestMethod.GET)
-	public Map<String,Object> findKMBC_mh_2(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.findKMBC_mh_2(jGh, clZbh,lpName,date,line);
-	}
-
-	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
-	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
-	}
-
-	@RequestMapping(value="/findLpName")
-	public List<Map<String,String>> findLpName(@RequestParam String lpName){
-		return scheduleRealInfoService.findLpName(lpName);
-	}
-
-	@RequestMapping(value = "/account")
-	public List<Map<String,Object>> account(@RequestParam String line, @RequestParam String date,
-											@RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
-		return scheduleRealInfoService.account(line, date, code, xlName, type);
-	}
-	
-	@RequestMapping(value = "/accountPx")
-	public List<Map<String,Object>> accountPx(@RequestParam String line, @RequestParam String date,
-											@RequestParam String code,@RequestParam String xlName, @RequestParam String px) {
-		return scheduleRealInfoService.accountPx(line, date, code, xlName, px);
-	}
-
-	@RequestMapping(value = "/correctForm")
-	public List<SchEditInfoDto> correctForm(@RequestParam String line, @RequestParam String date,
-											@RequestParam String endDate,
-											 @RequestParam String lpName, @RequestParam String code, 
-											 @RequestParam String type,@RequestParam String changType) {
-		return scheduleRealInfoService.correctForm(line, date, endDate, lpName, code, type,changType);
-	}
-	/**
-	 * @Title queryListWaybill
-	 * @Description 查询行车路单列表
-	 * @param jName 驾驶员名字
-	 * @param clZbh 车辆自编号（内部编号）
-	 * @param lpName 路牌
-	 * @return
-	 */
-	@RequestMapping(value="/queryListWaybill",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
-	}
-
-	/**
-	 * @Title queryListWaybill
-	 * @Description 查询行车路单列表（闵行审计专用路单）
-	 * @param jName 驾驶员名字
-	 * @param clZbh 车辆自编号（内部编号）
-	 * @param lpName 路牌
-	 * @return
-	 */
-	@RequestMapping(value="/queryListWaybill_mh_2",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> queryListWaybill_mh_2(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.queryListWaybill2(jName, clZbh,lpName,date,line);
-	}
-
-	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
-													 @RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
-	}
-
-	@RequestMapping(value="/statisticsDaily")
-	public List<Map<String,Object>> statisticsDaily(@RequestParam String line, @RequestParam String date,
-													@RequestParam String xlName, @RequestParam String type){
-		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
-	}
-
-	@RequestMapping(value="/statisticsDaily_mh_2")
-	public List<Map<String,Object>> statisticsDaily_mh_2(@RequestParam String line, @RequestParam String date,
-													@RequestParam String xlName, @RequestParam String type){
-		return scheduleRealInfoService.statisticsDaily_mh_2(line, date, xlName, type);
-	}
-
-	@RequestMapping(value="/statisticsDailyTj")
-	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
-		String gsdm="";
-		if(map.get("gsdm")!=null){
-			gsdm=map.get("gsdm").toString();
-		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString();
-		}
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
-		String date2="";
-		if(map.get("date2")!=null){
-			date2=map.get("date2").toString();
-		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString();
-		}
-		String type="";
-		if(map.get("type")!=null){
-			type=map.get("type").toString();
-		}
-		String nature="0";
-		if(map.get("nature")!=null){
-			nature=map.get("nature").toString();
-		}
-		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type,nature);
-	}
-	
-	/*
-	 * 公里修正报表
-	 */
-	@RequestMapping(value="/mileageReportTj")
-	public List<Map<String,Object>> mileageReport(@RequestParam Map<String, Object> map){
-		String gsdm="";
-		if(map.get("gsdm")!=null){
-			gsdm=map.get("gsdm").toString();
-		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString();
-		}
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
-		String date2="";
-		if(map.get("date2")!=null){
-			date2=map.get("date2").toString();
-		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString();
-		}
-		return scheduleRealInfoService.mileageReport(gsdm,fgsdm,line, date,date2);
-	}
-	
-	/*
-	 * 班次修正报表
-	 */
-	@RequestMapping(value="/scheduleCorrectionReport")
-	public List<Map<String,Object>> scheduleCorrectionReport(@RequestParam Map<String, Object> map){
-		String gsdm="";
-		if(map.get("gsdm")!=null){
-			gsdm=map.get("gsdm").toString();
-		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString();
-		}
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
-		String date2="";
-		if(map.get("date2")!=null){
-			date2=map.get("date2").toString();
-		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString();
-		}
-		return scheduleRealInfoService.scheduleCorrectionReport(gsdm,fgsdm,line, date,date2);
-	}
-
-	@RequestMapping(value="/MapById",method = RequestMethod.GET)
-	public Map<String, Object> MapById(@RequestParam("id") Long id){
-		return scheduleRealInfoService.MapById(id);
-	}
-	
-	@RequestMapping(value="/MapByIdQp",method = RequestMethod.GET)
-	public Map<String, Object> MapByIdQp(@RequestParam("id") Long id){
-		return scheduleRealInfoService.MapByIdQp(id);
-	}
-
-	/**
-	 * @Title: scheduleDaily
-	 * @Description: TODO(调度日报表)
-	 * @param line 线路
-	 * @param date 时间
-	 * @return
-	 */
-	@RequestMapping(value="/scheduleDaily")
-	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);
-	}
-
-	@RequestMapping(value="/realScheduleList_zrw")
-	public List<ScheduleRealInfo> realScheduleList_zrw(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleList_zrw(line,date);
-	}
-	
-	@RequestMapping(value="/realScheduleList_mh_2")
-	public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleList_mh_2(line,date);
-	}
-
-	@RequestMapping(value="/realScheduleListQp")
-	public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleListQp(line,date);
-	}
-
-	@RequestMapping(value="/multi_tzrc", method=RequestMethod.POST)
-	public Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
-		cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
-		List<ChangePersonCar> cpcs = JSONArray.parseArray(cpcsJson, ChangePersonCar.class);
-		return scheduleRealInfoService.multi_tzrc(cpcs, null);
-	}
-
-	@RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
-	public Map<String, Object> multi_dftz(@RequestParam String dcsJson){
-		dcsJson = StringEscapeUtils.unescapeHtml4(dcsJson);
-		List<DfsjChange> dfsjcs = JSONArray.parseArray(dcsJson, DfsjChange.class);
-		return scheduleRealInfoService.multi_dftz(dfsjcs);
-	}
-
-	@RequestMapping(value="/changeBcType/{id}", method=RequestMethod.POST)
-	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks, String majorStationName){
-		return scheduleRealInfoService.changeBcType(id, bcType, remarks, majorStationName);
-	}
-
-	@RequestMapping(value="/history", method=RequestMethod.POST)
-	public Map<String,Object> historySave(ScheduleRealInfo sch){
-		return scheduleRealInfoService.historySave(sch);
-	}
-
-
-	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
-	private final static long ONE_DAY = 1000 * 60 * 60 * 24;
-	/**
-	 * 获取可编辑的历史班次日期
-	 * @return
-	 */
-	@RequestMapping("dateArray")
-	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
-		List<String> rs = new ArrayList<>();
-
-		long t = System.currentTimeMillis();
-		if(c != 1)
-			t -= (ONE_DAY + (1000 * 60 * 60 * 6));
-		for(int i = 0; i < 3; i ++){
-			rs.add(fmtyyyyMMdd.print(t));
-			t -= ONE_DAY;
-		}
-		return rs;
-	}
-
-	@RequestMapping(value = "svgAttr", method = RequestMethod.POST)
-	public Map<String, Object> svgAttr(@RequestParam String jsonStr){
-		return scheduleRealInfoService.svgAttr(jsonStr);
-	}
-
-	@RequestMapping(value = "svgAttr", method = RequestMethod.GET)
-	public Map<String, Object> findSvgAttr(@RequestParam  String idx){
-		return scheduleRealInfoService.findSvgAttr(idx);
-	}
-
-	@RequestMapping(value = "addRemarks", method = RequestMethod.POST)
-	public Map<String, Object> addRemarks(@RequestParam Long id, @RequestParam String remarks){
-		return scheduleRealInfoService.addRemarks(id, remarks);
-	}
-
-	@RequestMapping(value = "scheduleDailyQp", method = RequestMethod.GET)
-	public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.scheduleDailyQp(line,date);
-	}
-
-	@RequestMapping(value = "scheduleDailyExport", method = RequestMethod.GET)
-	public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){
-		return scheduleRealInfoService.scheduleDailyExport(map);
-	}
-
-	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
-	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
-		return scheduleRealInfoService.exportWaybillMore(map);
-	}
-
-	/**
-	 * 获取当日计划排班 ， 从计划表抓取数据
-	 * @return
-	 */
-	@RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET)
-	public List<SchedulePlanInfo> currentSchedulePlan(@RequestParam String lineCode){
-		return scheduleRealInfoService.currentSchedulePlan(lineCode);
-	}
-
-	@RequestMapping(value = "lpChangeMulti", method = RequestMethod.POST)
-	public Map<String, Object> lpChangeMulti(@RequestParam String leftIdx, @RequestParam String rightIdx,@RequestParam int type){
-		return scheduleRealInfoService.lpChangeMulti(leftIdx, rightIdx, type);
-	}
-
-	/**
-	 * 删除当日实际排班
-	 * @return
-	 */
-	@RequestMapping(value = "deleteRealSchedule", method = RequestMethod.POST)
-	public Map<String, Object> deleteRealSchedule(@RequestParam String lineCode){
-		return dayOfSchedule.deleteRealSchedule(lineCode);
-	}
-
-	/**
-	 * 从计划表重新加载当日排班
-	 * @param lineCode
-	 * @return
-	 */
-	@RequestMapping(value = "reLoadRealSchedule", method = RequestMethod.POST)
-	public Map<String, Object> reLoadRealSchedule(@RequestParam String lineCode){
-		Map<String, Object> rs = new HashMap<>();
-		List<ScheduleRealInfo> list = dayOfSchedule.findByLineCode(lineCode);
-		if(list != null && list.size() > 0){
-			rs.put("status", ResponseCode.ERROR);
-			rs.put("msg", "失败，" + list.get(0).getXlName() + "当日存在实际排班，无法重新加载。");
-			return rs;
-		}
-
-		int code = dayOfSchedule.reloadSch(lineCode);
-
-		//重新按公司编码索引数据
-		dayOfSchedule.groupByGsbm();
-		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
-		return rs;
-	}
-
-	/**
-	 * 误点调整
-	 * @param idx
-	 * @param minute
-	 * @return
-	 */
-	@RequestMapping(value = "lateAdjust", method = RequestMethod.POST)
-	public Map<String, Object> lateAdjust(@RequestParam String idx,@RequestParam float minute ){
-		return scheduleRealInfoService.lateAdjust(idx, minute);
-	}
-
-	/**
-	 * 获取所有应发未到的班次
-	 * @param idx
-	 * @return
-	 */
-	@RequestMapping(value = "allLate2")
-	public List<ScheduleRealInfo> allLate2(@RequestParam String idx){
-		return scheduleRealInfoService.allLate2(idx);
-	}
-
-	/**
-	 * 添加一个临加到历史库
-	 * @param sch
-	 * @return
-	 */
-	@RequestMapping(value = "history/add", method = RequestMethod.POST)
-	public Map<String, Object> addToHistory(ScheduleRealInfo sch){
-		return scheduleRealInfoService.addToHistory(sch);
-	}
-
-	/**
-	 * 从历史库里删除临加班次
-	 * @param sch
-	 * @return
-	 */
-	@RequestMapping(value = "history/{id}", method = RequestMethod.DELETE)
-	public Map<String, Object> deleteToHistory(@PathVariable("id") Long id){
-		return scheduleRealInfoService.deleteToHistory(id);
-	}
-
-    @RequestMapping(value = "isCircleQdz", method = RequestMethod.POST)
-    public Map<String, Object> isCircleQdz(@RequestParam String line,  String nbbm, String ts, String qdzCode){
-        Map<String, Object> map =new HashMap<>();
-        map.put("isExist",scheduleRealInfoService.isCircleQdz(nbbm, ts, line, qdzCode));
-	    return map;
-    }
-	
-	/**
-	 * 从历史库里删除临加班次
-	 * @param sch
-	 * @return
-	 */
-	@RequestMapping(value = "wxsb", method = RequestMethod.POST)
-	public Map<String, Object> deleteToHistory(@RequestParam Map<String, Object> param){
-		SysUser user = SecurityUtils.getCurrentUser();
-		String uname = user.getUserName();
-		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url"));
-		url.append("?nbbm=").append(param.get("nbbm")).append("&bxy=").append(uname).append("&bxbm=").append(param.get("bxType"));
-		// 分公司保存格式 分公司编码_公司编码
-		String val = BasicData.nbbm2FgsCompanyCodeMap.get(param.get("nbbm"));
-		String[] arr = val.split("_");
-		if (!"22".equals(arr[1])) {
-			Map<String, Object> res = new HashMap<String, Object>();
-			res.put("status", ResponseCode.ERROR);
-			res.put("msg", "除金高公司外暂未开通此功能");
-			
-			return res;
-		}
-		url.append("&fgs=").append(arr[0]);
-		
-		return request(url.toString());
-	}
-	
-	@SuppressWarnings("unchecked")
-	private static Map<String, Object> request(String url) {
-		Map<String, Object> res = new HashMap<String, Object>();
-		res.put("status", ResponseCode.SUCCESS);
-		InputStream in = null;
-		HttpURLConnection con = null;
-		try {
-			con = (HttpURLConnection)new URL(url).openConnection();
-			con.setRequestMethod("POST");
-			con.setRequestProperty("keep-alive", "true");
-			con.setRequestProperty("accept", "application/json");
-			con.setRequestProperty("content-type", "application/json");
-			con.setDoInput(true);
-			con.setReadTimeout(2500);
-			con.setConnectTimeout(2500);
-			
-			con.connect();
-			if (con.getResponseCode() == 200) {
-				in = con.getInputStream();
-				ByteArrayOutputStream bout = new ByteArrayOutputStream();
-				IOUtils.copy(in, bout); bout.close();
-				Map<String, Object> response = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
-				if (!"报修成功".equals(response.get("msg"))) {
-					res.put("status", ResponseCode.ERROR);
-					res.putAll(response);
-				}
-			}
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			res.put("status", ResponseCode.ERROR);
-			res.put("msg", "调用上报接口异常");
-		} finally {
-			try {
-				if (in != null) in.close();
-				if (con != null) con.disconnect();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		
-		return res;
-	}
-}
+package com.bsth.controller.realcontrol;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+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.alibaba.fastjson.JSONArray;
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.BaseController;
+import com.bsth.controller.realcontrol.dto.ChangePersonCar;
+import com.bsth.controller.realcontrol.dto.DfsjChange;
+import com.bsth.data.BasicData;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.util.ConfigUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@RestController
+@RequestMapping("/realSchedule")
+public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long> {
+
+	@Autowired
+	ScheduleRealInfoService scheduleRealInfoService;
+
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+
+	@RequestMapping(value = "check_fgs_ascription", method = RequestMethod.POST)
+	public Map<String, Object> checkPCFgsAscription(@RequestParam Long schId, String jGh, String sGh, String nbbm){
+		return scheduleRealInfoService.checkPCFgsAscription(schId, jGh, sGh, nbbm);
+	}
+
+	@RequestMapping(value = "/lines")
+	public Map<String, Collection<ScheduleRealInfo>> findByLines(@RequestParam String lines) {
+		return scheduleRealInfoService.findByLines(lines);
+	}
+
+	@RequestMapping(value = "/car")
+	public List<ScheduleRealInfo> findByCar(String nbbm){
+		return dayOfSchedule.findByNbbm(nbbm);
+	}
+
+	/**
+	 *
+	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
+	 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
+	 */
+	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
+	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
+										   @RequestParam String dfsj,String bcType,
+										   @RequestParam(defaultValue = "") String opType) {
+		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType, null);
+	}
+
+	/**
+	 *
+	 * @Title: destroy @Description: TODO(销毁，烂班) @param @param idsStr 要烂掉的班次ID ,分隔 
+	 */
+	@RequestMapping(value = "/destroy", method = RequestMethod.POST)
+	public Map<String, Object> destroy(@RequestParam String idsStr
+			/*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
+									   @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
+		return scheduleRealInfoService.destroy(idsStr, remarks, adjustExps, null);
+	}
+
+	/**
+	 *
+	 * @Title: carDeviceMapp @Description: TODO(获取车辆自编号和设备号对照，从缓存取) @throws
+	 */
+	@RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
+	public Map<String, String> carDeviceMapp() {
+		return BasicData.deviceId2NbbmMap.inverse();
+	}
+
+	/**
+	 *
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取驾驶员) @param @param
+	 * lineId @throws
+	 */
+	@RequestMapping(value = "/driver", method = RequestMethod.GET)
+	public List<Map<String, String>> findDriverByLine(@RequestParam String lineCode) {
+		return scheduleRealInfoService.findDriverByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取售票员) @param @param
+	 * lineId @throws
+	 */
+	@RequestMapping(value = "/conductor", method = RequestMethod.GET)
+	public List<Map<String, String>> findConductorByLine(@RequestParam String lineCode) {
+		return scheduleRealInfoService.findConductorByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取车辆) @param @param
+	 * lineId @throws
+	 */
+	@RequestMapping(value = "/cars", method = RequestMethod.GET)
+	public List<Map<String, String>> findCarByLine(@RequestParam String lineCode) {
+		return scheduleRealInfoService.findCarByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: sreachNbbm @Description: TODO(搜索车辆内部编码) @throws
+	 */
+	@RequestMapping(value = "/sreachVehic", method = RequestMethod.GET)
+	public List<Map<String, String>> sreachVehic(@RequestParam String nbbm) {
+		return scheduleRealInfoService.sreachVehic(nbbm);
+	}
+	/**
+	 *
+	 * @Title: realOutAdjust
+	 * @Description: TODO(实发调整)
+	 * @param @param id 班次ID
+	 * @param @param fcsjActual 实际发车时间 HH:mm
+	 * @param @param remarks 备注
+	 * @throws
+	 */
+	@RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
+	public Map<String, Object> realOutAdjust(@RequestParam Long id, @RequestParam String fcsjActual,
+											 @RequestParam String remarks) {
+		return scheduleRealInfoService.realOutAdjust(id, fcsjActual, remarks);
+	}
+
+	/**
+	 *
+	 * @Title: revokeDestroy
+	 * @Description: TODO(撤销烂班)
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value = "/revokeDestroy", method = RequestMethod.POST)
+	public Map<String, Object> revokeDestroy(@RequestParam Long id){
+		return scheduleRealInfoService.revokeDestroy(id);
+	}
+
+	/**
+	 *
+	 * @Title: revokeRealOutgo
+	 * @Description: TODO(撤销实发)
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value = "/revokeRealOutgo", method = RequestMethod.POST)
+	public Map<String, Object> revokeRealOutgo(@RequestParam Long id){
+		return scheduleRealInfoService.revokeRealOutgo(id);
+	}
+
+	/**
+	 * 撤销执行
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/revokeRealArrive", method = RequestMethod.POST)
+	public Map<String, Object> revokeRealArrive(@RequestParam Long id){
+		return scheduleRealInfoService.revokeRealArrive(id);
+	}
+
+	/**
+	 *
+	 * @Title: spaceAdjust
+	 * @Description: TODO(间隔调整)
+	 * @param @param ids 要调整的班次数组ID
+	 * @param @param space 间隔
+	 * @throws
+	 */
+	@RequestMapping(value = "/spaceAdjust", method = RequestMethod.POST)
+	public Map<String, Object> spaceAdjust(Long[] ids, Integer space){
+		return scheduleRealInfoService.spaceAdjust(ids, space);
+	}
+
+	/**
+	 *
+	 * @Title: schInfoFineTune
+	 * @Description: TODO(发车信息微调)
+	 * @param @param map
+	 * @throws
+	 */
+	@RequestMapping(value = "/schInfoFineTune", method = RequestMethod.POST)
+	public Map<String, Object> schInfoFineTune(@RequestParam Map<String, String> map){
+		return scheduleRealInfoService.schInfoFineTune(map);
+	}
+
+	/**
+	 *
+	 * @Title: outgoAdjustAll
+	 * @Description: TODO(批量待发调整)
+	 * @param @param list
+	 * @throws
+	 */
+	@RequestMapping(value = "/outgoAdjustAll", method = RequestMethod.POST)
+	public Map<String, Object> outgoAdjustAll(@RequestParam String params){
+		//反转义
+		params = StringEscapeUtils.unescapeHtml4(params);
+		return scheduleRealInfoService.outgoAdjustAll(params);
+	}
+
+	/**
+	 *
+	 * @Title: findByLineAndUpDown
+	 * @Description: TODO(根据线路和走向获取班次)
+	 * @param @param line
+	 * @param @param upDown
+	 */
+	@RequestMapping(value = "/findByLineAndUpDown")
+	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam String line,@RequestParam Integer upDown){
+		return dayOfSchedule.findByLineAndUpDown(line, upDown);
+	}
+
+	/**
+	 *
+	 * @Title: findRouteByLine
+	 * @Description: TODO(获取线路的站点，路段路由)
+	 * @param @param lineCode
+	 * @throws
+	 */
+	@RequestMapping(value = "/findRouteByLine")
+	public Map<String, Object> findRouteByLine(@RequestParam String lineCode){
+		return scheduleRealInfoService.findRouteByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: removeChildTask
+	 * @Description: TODO(删除子任务)
+	 * @param @param taskId 子任务ID
+	 * @throws
+	 */
+	@RequestMapping(value = "/childTask/{taskId}", method = RequestMethod.DELETE)
+	public Map<String, Object> removeChildTask(@PathVariable("taskId") Long taskId){
+		return scheduleRealInfoService.removeChildTask(taskId);
+	}
+
+	/**
+	 *
+	 * @Title: findByLineCode
+	 * @Description: TODO(根据线路获取班次信息)
+	 * @param @param lineCode
+	 */
+	@RequestMapping(value = "/lineCode/{lineCode}")
+	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
+		return dayOfSchedule.findByLineCode(lineCode);
+	}
+
+	@RequestMapping(value = "/queryUserInfo")
+	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
+												@RequestParam String date,@RequestParam String state) {
+		return scheduleRealInfoService.queryUserInfo(line, date,state);
+	}
+
+	@RequestMapping(value = "/queryUserInfoPx")
+	public List<ScheduleRealInfo> queryUserInfoPx(@RequestParam String line,
+												  @RequestParam String date,@RequestParam String state,@RequestParam String type) {
+		return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
+	}
+
+	@RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
+												@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
+		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line);
+	}
+
+	@RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
+			,@RequestParam String date,@RequestParam String line) {
+		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
+	}
+
+
+	@RequestMapping(value = "/dailyInfo")
+	public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) {
+		return scheduleRealInfoService.dailyInfo(line, date, type);
+	}
+
+	@RequestMapping(value = "/historyMessage")
+	public List<Object[]> historyMessage(@RequestParam String line, @RequestParam String date,
+										 @RequestParam String code, @RequestParam String type) {
+		return scheduleRealInfoService.historyMessage(line, date, code, type);
+	}
+
+	@RequestMapping(value="/findLine")
+	public List<Map<String,String>> findLine(@RequestParam String line){
+		return scheduleRealInfoService.findLine(line);
+	}
+
+	@RequestMapping(value="/findKMBC",method = RequestMethod.GET)
+	public Map<String,Object> findKMBC(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
+	}
+
+	/**
+	 * 路单公里统计 （闵行审计专用）
+	 * @param jGh
+	 * @param clZbh
+	 * @param lpName
+	 * @param date
+	 * @param line
+	 * @return
+	 */
+	@RequestMapping(value="/findKMBC_mh_2",method = RequestMethod.GET)
+	public Map<String,Object> findKMBC_mh_2(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBC_mh_2(jGh, clZbh,lpName,date,line);
+	}
+
+	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
+	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
+	}
+
+	@RequestMapping(value="/findLpName")
+	public List<Map<String,String>> findLpName(@RequestParam String lpName){
+		return scheduleRealInfoService.findLpName(lpName);
+	}
+
+	@RequestMapping(value = "/account")
+	public List<Map<String,Object>> account(@RequestParam String line, @RequestParam String date,
+											@RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
+		return scheduleRealInfoService.account(line, date, code, xlName, type);
+	}
+	
+	@RequestMapping(value = "/accountPx")
+	public List<Map<String,Object>> accountPx(@RequestParam String line, @RequestParam String date,
+											@RequestParam String code,@RequestParam String xlName, @RequestParam String px) {
+		return scheduleRealInfoService.accountPx(line, date, code, xlName, px);
+	}
+
+	@RequestMapping(value = "/correctForm")
+	public List<SchEditInfoDto> correctForm(@RequestParam String line, @RequestParam String date,
+											@RequestParam String endDate,
+											 @RequestParam String lpName, @RequestParam String code, 
+											 @RequestParam String type,@RequestParam String changType) {
+		return scheduleRealInfoService.correctForm(line, date, endDate, lpName, code, type,changType);
+	}
+	/**
+	 * @Title queryListWaybill
+	 * @Description 查询行车路单列表
+	 * @param jName 驾驶员名字
+	 * @param clZbh 车辆自编号（内部编号）
+	 * @param lpName 路牌
+	 * @return
+	 */
+	@RequestMapping(value="/queryListWaybill",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
+	}
+
+	/**
+	 * @Title queryListWaybill
+	 * @Description 查询行车路单列表（闵行审计专用路单）
+	 * @param jName 驾驶员名字
+	 * @param clZbh 车辆自编号（内部编号）
+	 * @param lpName 路牌
+	 * @return
+	 */
+	@RequestMapping(value="/queryListWaybill_mh_2",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybill_mh_2(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybill2(jName, clZbh,lpName,date,line);
+	}
+
+	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
+													 @RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
+	}
+
+	@RequestMapping(value="/statisticsDaily")
+	public List<Map<String,Object>> statisticsDaily(@RequestParam String line, @RequestParam String date,
+													@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
+	}
+
+	@RequestMapping(value="/statisticsDaily_mh_2")
+	public List<Map<String,Object>> statisticsDaily_mh_2(@RequestParam String line, @RequestParam String date,
+													@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDaily_mh_2(line, date, xlName, type);
+	}
+
+	@RequestMapping(value="/statisticsDailyTj")
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type,nature);
+	}
+	
+	/*
+	 * 公里修正报表
+	 */
+	@RequestMapping(value="/mileageReportTj")
+	public List<Map<String,Object>> mileageReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.mileageReport(gsdm,fgsdm,line, date,date2);
+	}
+	
+	/*
+	 * 班次修正报表
+	 */
+	@RequestMapping(value="/scheduleCorrectionReport")
+	public List<Map<String,Object>> scheduleCorrectionReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.scheduleCorrectionReport(gsdm,fgsdm,line, date,date2);
+	}
+
+	@RequestMapping(value="/MapById",method = RequestMethod.GET)
+	public Map<String, Object> MapById(@RequestParam("id") Long id){
+		return scheduleRealInfoService.MapById(id);
+	}
+	
+	@RequestMapping(value="/MapByIdQp",method = RequestMethod.GET)
+	public Map<String, Object> MapByIdQp(@RequestParam("id") Long id){
+		return scheduleRealInfoService.MapByIdQp(id);
+	}
+
+	/**
+	 * @Title: scheduleDaily
+	 * @Description: TODO(调度日报表)
+	 * @param line 线路
+	 * @param date 时间
+	 * @return
+	 */
+	@RequestMapping(value="/scheduleDaily")
+	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);
+	}
+
+	@RequestMapping(value="/realScheduleList_zrw")
+	public List<ScheduleRealInfo> realScheduleList_zrw(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList_zrw(line,date);
+	}
+	
+	@RequestMapping(value="/realScheduleList_mh_2")
+	public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList_mh_2(line,date);
+	}
+
+	@RequestMapping(value="/realScheduleListQp")
+	public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleListQp(line,date);
+	}
+
+	@RequestMapping(value="/multi_tzrc", method=RequestMethod.POST)
+	public Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
+		cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
+		List<ChangePersonCar> cpcs = JSONArray.parseArray(cpcsJson, ChangePersonCar.class);
+		return scheduleRealInfoService.multi_tzrc(cpcs, null);
+	}
+
+	@RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
+	public Map<String, Object> multi_dftz(@RequestParam String dcsJson){
+		dcsJson = StringEscapeUtils.unescapeHtml4(dcsJson);
+		List<DfsjChange> dfsjcs = JSONArray.parseArray(dcsJson, DfsjChange.class);
+		return scheduleRealInfoService.multi_dftz(dfsjcs);
+	}
+
+	@RequestMapping(value="/changeBcType/{id}", method=RequestMethod.POST)
+	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks, String majorStationName){
+		return scheduleRealInfoService.changeBcType(id, bcType, remarks, majorStationName);
+	}
+
+	@RequestMapping(value="/history", method=RequestMethod.POST)
+	public Map<String,Object> historySave(ScheduleRealInfo sch){
+		return scheduleRealInfoService.historySave(sch);
+	}
+
+
+	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+	private final static long ONE_DAY = 1000 * 60 * 60 * 24;
+	/**
+	 * 获取可编辑的历史班次日期
+	 * @return
+	 */
+	@RequestMapping("dateArray")
+	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
+		List<String> rs = new ArrayList<>();
+
+		long t = System.currentTimeMillis();
+		if(c != 1)
+			t -= (ONE_DAY + (1000 * 60 * 60 * 6));
+		for(int i = 0; i < 3; i ++){
+			rs.add(fmtyyyyMMdd.print(t));
+			t -= ONE_DAY;
+		}
+		return rs;
+	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.POST)
+	public Map<String, Object> svgAttr(@RequestParam String jsonStr){
+		return scheduleRealInfoService.svgAttr(jsonStr);
+	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.GET)
+	public Map<String, Object> findSvgAttr(@RequestParam  String idx){
+		return scheduleRealInfoService.findSvgAttr(idx);
+	}
+
+	@RequestMapping(value = "addRemarks", method = RequestMethod.POST)
+	public Map<String, Object> addRemarks(@RequestParam Long id, @RequestParam String remarks){
+		return scheduleRealInfoService.addRemarks(id, remarks);
+	}
+
+	@RequestMapping(value = "scheduleDailyQp", method = RequestMethod.GET)
+	public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.scheduleDailyQp(line,date);
+	}
+
+	@RequestMapping(value = "scheduleDailyExport", method = RequestMethod.GET)
+	public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){
+		return scheduleRealInfoService.scheduleDailyExport(map);
+	}
+
+	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
+	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
+		return scheduleRealInfoService.exportWaybillMore(map);
+	}
+
+	/**
+	 * 获取当日计划排班 ， 从计划表抓取数据
+	 * @return
+	 */
+	@RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET)
+	public List<SchedulePlanInfo> currentSchedulePlan(@RequestParam String lineCode){
+		return scheduleRealInfoService.currentSchedulePlan(lineCode);
+	}
+
+	@RequestMapping(value = "lpChangeMulti", method = RequestMethod.POST)
+	public Map<String, Object> lpChangeMulti(@RequestParam String leftIdx, @RequestParam String rightIdx,@RequestParam int type){
+		return scheduleRealInfoService.lpChangeMulti(leftIdx, rightIdx, type);
+	}
+
+	/**
+	 * 删除当日实际排班
+	 * @return
+	 */
+	@RequestMapping(value = "deleteRealSchedule", method = RequestMethod.POST)
+	public Map<String, Object> deleteRealSchedule(@RequestParam String lineCode){
+		return dayOfSchedule.deleteRealSchedule(lineCode);
+	}
+
+	/**
+	 * 从计划表重新加载当日排班
+	 * @param lineCode
+	 * @return
+	 */
+	@RequestMapping(value = "reLoadRealSchedule", method = RequestMethod.POST)
+	public Map<String, Object> reLoadRealSchedule(@RequestParam String lineCode){
+		Map<String, Object> rs = new HashMap<>();
+		List<ScheduleRealInfo> list = dayOfSchedule.findByLineCode(lineCode);
+		if(list != null && list.size() > 0){
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", "失败，" + list.get(0).getXlName() + "当日存在实际排班，无法重新加载。");
+			return rs;
+		}
+
+		int code = dayOfSchedule.reloadSch(lineCode);
+
+		//重新按公司编码索引数据
+		dayOfSchedule.groupByGsbm();
+		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
+		return rs;
+	}
+
+	/**
+	 * 误点调整
+	 * @param idx
+	 * @param minute
+	 * @return
+	 */
+	@RequestMapping(value = "lateAdjust", method = RequestMethod.POST)
+	public Map<String, Object> lateAdjust(@RequestParam String idx,@RequestParam float minute ){
+		return scheduleRealInfoService.lateAdjust(idx, minute);
+	}
+
+	/**
+	 * 获取所有应发未到的班次
+	 * @param idx
+	 * @return
+	 */
+	@RequestMapping(value = "allLate2")
+	public List<ScheduleRealInfo> allLate2(@RequestParam String idx){
+		return scheduleRealInfoService.allLate2(idx);
+	}
+
+	/**
+	 * 添加一个临加到历史库
+	 * @param sch
+	 * @return
+	 */
+	@RequestMapping(value = "history/add", method = RequestMethod.POST)
+	public Map<String, Object> addToHistory(ScheduleRealInfo sch){
+		return scheduleRealInfoService.addToHistory(sch);
+	}
+
+	/**
+	 * 从历史库里删除临加班次
+	 * @param sch
+	 * @return
+	 */
+	@RequestMapping(value = "history/{id}", method = RequestMethod.DELETE)
+	public Map<String, Object> deleteToHistory(@PathVariable("id") Long id){
+		return scheduleRealInfoService.deleteToHistory(id);
+	}
+
+    @RequestMapping(value = "isCircleQdz", method = RequestMethod.POST)
+    public Map<String, Object> isCircleQdz(@RequestParam String line,  String nbbm, String ts, String qdzCode){
+        Map<String, Object> map =new HashMap<>();
+        map.put("isExist",scheduleRealInfoService.isCircleQdz(nbbm, ts, line, qdzCode));
+	    return map;
+    }
+	
+	/**
+	 * 从历史库里删除临加班次
+	 * @param sch
+	 * @return
+	 */
+	@RequestMapping(value = "wxsb", method = RequestMethod.POST)
+	public Map<String, Object> deleteToHistory(@RequestParam Map<String, Object> param){
+		SysUser user = SecurityUtils.getCurrentUser();
+		String uname = user.getUserName();
+		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url"));
+		url.append("?nbbm=").append(param.get("nbbm")).append("&bxy=").append(uname).append("&bxbm=").append(param.get("bxType"));
+		// 分公司保存格式 分公司编码_公司编码
+		String val = BasicData.nbbm2FgsCompanyCodeMap.get(param.get("nbbm"));
+		String[] arr = val.split("_");
+		if (!"22".equals(arr[1])) {
+			Map<String, Object> res = new HashMap<String, Object>();
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", "除金高公司外暂未开通此功能");
+			
+			return res;
+		}
+		url.append("&fgs=").append(arr[0]);
+		
+		return request(url.toString());
+	}
+	
+	@SuppressWarnings("unchecked")
+	private static Map<String, Object> request(String url) {
+		Map<String, Object> res = new HashMap<String, Object>();
+		res.put("status", ResponseCode.SUCCESS);
+		InputStream in = null;
+		HttpURLConnection con = null;
+		try {
+			con = (HttpURLConnection)new URL(url).openConnection();
+			con.setRequestMethod("POST");
+			con.setRequestProperty("keep-alive", "true");
+			con.setRequestProperty("accept", "application/json");
+			con.setRequestProperty("content-type", "application/json");
+			con.setDoInput(true);
+			con.setReadTimeout(2500);
+			con.setConnectTimeout(2500);
+			
+			con.connect();
+			if (con.getResponseCode() == 200) {
+				in = con.getInputStream();
+				ByteArrayOutputStream bout = new ByteArrayOutputStream();
+				IOUtils.copy(in, bout); bout.close();
+				Map<String, Object> response = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
+				if (!"报修成功".equals(response.get("msg"))) {
+					res.put("status", ResponseCode.ERROR);
+					res.putAll(response);
+				}
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", "调用上报接口异常");
+		} finally {
+			try {
+				if (in != null) in.close();
+				if (con != null) con.disconnect();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
+		return res;
+	}
+}
@@ -9,6 +9,7 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -37,7 +38,13 @@ public class PredicatesBuilder {
 		if(Date.class.isAssignableFrom(leftType) &&
 				String.class.isAssignableFrom(rightType)){
 			DateTime dateTime = new DateTime(object);
-			return cb.equal(expression, dateTime.toDate());
+			Date startTime = dateTime.toDate();//设置起始时间
+			Calendar c = Calendar.getInstance();
+			c.setTime(startTime);
+			c.add(Calendar.DAY_OF_MONTH, 1);
+			// 设置结束时间，起始时间为结束时间加1天
+			Date endTime = c.getTime();
+			return cb.between((Path<Date>) expression,startTime,endTime);
 		}
 		else {
 			return cb.equal(expression, object);
 package com.bsth.entity.traffic;
-import com.bsth.entity.schedule.TTInfo;
+import com.bsth.entity.Line;
 import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -33,7 +33,7 @@ public class SKBUploadLogger {
 	/** 时刻表信息 */
 	@ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
-	private TTInfo ttInfo;
+	private Line line;
 	/** 用户 关联 */
 	@ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
@@ -43,6 +43,23 @@ public class SKBUploadLogger {
 	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
 	private Date createDate;
+	// 上传的参数
+	@Column( name = "upload_xml" , columnDefinition="TEXT")
+	private String uploadXml;
+
+	// 上传的参数2
+	@Column( name = "upload_xml_sub" , columnDefinition="TEXT")
+	private String uploadXmlSub;
+
+	// 日志类型 1：时刻表；2：上传线路；3：上传路单
+	private String type;
+
+	// 模板名称
+	private String name;
+
+	// 上传状态：是否成功 1:成功;0:失败
+	private String state;
+
 	public Integer getId() {
 		return id;
 	}
@@ -51,14 +68,6 @@ public class SKBUploadLogger {
 		this.id = id;
 	}
-	public TTInfo getTtInfo() {
-		return ttInfo;
-	}
-
-	public void setTtInfo(TTInfo ttInfo) {
-		this.ttInfo = ttInfo;
-	}
-
 	public SysUser getUser() {
 		return user;
 	}
@@ -71,7 +80,29 @@ public class SKBUploadLogger {
 		return createDate;
 	}
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
+	public void setCreateDate(Date createDate) { this.createDate = createDate; }
+
+	public String getUploadXml() { return uploadXml; }
+
+	public void setUploadXml(String uploadXml) { this.uploadXml = uploadXml; }
+
+	public String getState() { return state; }
+
+	public void setState(String state) { this.state = state; }
+
+	public Line getLine() {	return line;}
+
+	public void setLine(Line line) { this.line = line; }
+
+	public String getType() { return type; }
+
+	public void setType(String type) {	this.type = type; }
+
+	public String getName() { return name;	}
+
+	public void setName(String name) {	this.name = name; }
+
+	public String getUploadXmlSub() {return uploadXmlSub;}
+
+	public void setUploadXmlSub(String uploadXmlSub) {this.uploadXmlSub = uploadXmlSub;	}
 }
@@ -306,9 +306,9 @@ public class CalcMixServiceImpl implements CalcMixService {
 					m.put("hyl", Arith.add(m.get("hyl"), sin_.getHyl()!=null?sin_.getHyl():0));
 					m.put("jzl", Arith.add(m.get("jzl"), sin_.getJzl()!=null?sin_.getJzl():0));
 					m.put("sh", Arith.add(m.get("sh"), sin_.getUnyyyl()!=null?sin_.getUnyyyl():0));
-					last.put("hyl", Arith.add(last.get("hyl"), m.get("hyl")));
-					last.put("jzl", Arith.add(last.get("jzl"), m.get("jzl")));
-					last.put("sh", Arith.add(last.get("sh"), m.get("sh")));
+					last.put("hyl", Arith.add(last.get("hyl"), sin_.getHyl()!=null?sin_.getHyl():0));
+					last.put("jzl", Arith.add(last.get("jzl"), sin_.getJzl()!=null?sin_.getJzl():0));
+					last.put("sh", Arith.add(last.get("sh"), sin_.getUnyyyl()!=null?sin_.getUnyyyl():0));
 				} else {
 					Map<String, Object> m = new HashMap<String, Object>();
 					m.put("gS", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
@@ -12,9 +12,11 @@ import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.safe_driv.SafeDriv;
 import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.LineVersions;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.CarParkRepository;
+import com.bsth.repository.LineVersionsRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.gps.entity.*;
@@ -81,6 +83,10 @@ public class GpsServiceImpl implements GpsService {
     @Autowired
     ScheduleRealInfoRepository scheduleRealInfoRepository;
+
+    @Autowired
+    LineVersionsRepository lineVersionsRepository;
+
     // 历史gps查询
     @Override
     public List<Map<String, Object>> history(String device, Long startTime, Long endTime, int directions) {
@@ -222,7 +228,35 @@ public class GpsServiceImpl implements GpsService {
         //查询GPS数据
         JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<Map<String, Object>> dataList = jdbcTemplate_ms.queryForList(sql.toString());
-
+        if (!dataList.isEmpty()){
+
+            int lineId=Integer.parseInt(map_get_str(dataList.get(0), "LINE_ID"));
+            List<LineVersions> lvs=lineVersionsRepository.findBylineId(lineId);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            List<Map<String,Object>> vlist=new ArrayList<>();
+            Map<String,Object> vMap;
+            if (lvs!=null&&!lvs.isEmpty()){
+                for (LineVersions lv : lvs) {
+                    vMap=new HashMap();
+                    Long sd=lv.getStartDate().getTime();
+                    Long ed=lv.getEndDate().getTime();
+                    if (sd<st&&et<ed){
+                        vMap.put("version",lv.getVersions());
+                        vMap.put("vtime","all");
+                        vlist.add(vMap);
+                    }else if(sd<st&&et>ed&&st<ed){
+                        vMap.put("version",lv.getVersions());
+                        vMap.put("endTime",lv.getEndDate().getTime());
+                        vlist.add(vMap);
+                    }else if(st<sd&&et<ed&&sd<et){
+                        vMap.put("version",lv.getVersions());
+                        vMap.put("startTime",lv.getStartDate().getTime());
+                        vlist.add(vMap);
+                    }
+                }
+            }
+            rsMap.put("lineVerson",vlist);
+        }
         Float lon, lat;
         Location bdLoc, gdLoc;
         int inOutStop;
@@ -714,6 +748,7 @@ public class GpsServiceImpl implements GpsService {
             rs.put("outboundList", outboundList);
             rs.put("sumMileage", new DecimalFormat(".##").format(sum / 1000));
             rs.put("dcs", gpsMap.get("dcs"));
+            rs.put("lineVerson",gpsMap.get("lineVerson"));
         } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import java.io.*;
@@ -65,6 +66,10 @@ import java.util.regex.Pattern;
 public class TrafficManageServiceImpl  implements TrafficManageService{
 	Logger logger = LoggerFactory.getLogger(this.getClass());
+	// 运管处上传日志类型
+	public static final String UPLOAD_TYPE_SKB = "1";
+	public static final String UPLOAD_TYPE_XL = "2";
+	public static final String UPLOAD_TYPE_LD = "3";
 	// 线路repository
 	@Autowired
@@ -170,7 +175,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Override
 	public String setXL(String ids) {
 		String result = "failure";
-		StringBuffer sBuffer = new StringBuffer();
+		String xml ;
 		String[] idArray = ids.split(",");
 		try {
 			for (String id : idArray) {
@@ -185,12 +190,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				if(line == null){
 					continue;
 				}
-				List<StationRoute> upStationsList ;// 上行站点路由集
-				List<StationRoute> downStationsList;// 下行站点路由集
-				List<Object[]> downPointList;// 下行站点集
-				List<Object[]> upPointList;// 上行站点集
-				sBuffer.append("<XLs>");
-				sBuffer.append("<XL>");
 				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null){
 					return result;
 				}
@@ -200,56 +199,25 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				if(lineInformation == null){
 					continue;
 				}
-				sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</XLBM>");
-				sBuffer.append("<XLMC>").append(line.getName()).append("</XLMC>");
-				sBuffer.append("<QDZ>").append(line.getStartStationName()).append("</QDZ>");
-				sBuffer.append("<ZDZ>").append(line.getEndStationName()).append("</ZDZ>");
-				sBuffer.append("<QZLC>").append(lineInformation.getUpMileage()).append("</QZLC>");
-				sBuffer.append("<ZQLC>").append(lineInformation.getDownMileage()).append("</ZQLC>");
-				sBuffer.append("<XLGH>").append(line.getLinePlayType()).append("</XLGH>");
-				sBuffer.append("<UPDATE_DATE>").append(sdfnyr.format(new Date())).append("</UPDATE_DATE>");
-
-				// 循环添加站点信息
-				sBuffer.append("<StationList>");
-
-				// 先查上行
-				upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
-				Map<String, Integer> stationNumMap = getStationName2YgcNumberMap(line.getLineCode());
-				int startId = 1;
-				startId = packagStationXml(upStationsList, sBuffer, startId,stationNumMap);
-				// 环线不查下行
-				if(line.getLinePlayType() != 1){
-					// 再查下行
-					downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
-					packagStationXml(downStationsList, sBuffer, startId,stationNumMap);
-				}
-				sBuffer.append("</StationList>");
-
-				// 循环添加站点点位信息
-				sBuffer.append("<LinePointList>");
-				upPointList = sectionRepository.getSectionDirByLineId(line.getId(),0);
-				startId = 1;
-				startId = packagStationPointXml(upPointList, sBuffer, startId);
-				// 环线不查下行
-				if(line.getLinePlayType() != 1){
-					downPointList = sectionRepository.getSectionDirByLineId(line.getId(),1);
-					packagStationPointXml(downPointList, sBuffer, startId);
-				}
-				sBuffer.append("</LinePointList>");
-				sBuffer.append("</XL>");
-				sBuffer.append("</XLs>");
-				// 临时添加，后面删除
-				if(sBuffer.indexOf("<ZDXH>0</ZDXH>") != -1){
+				// 取得封装好的xml
+				xml = getSetXlXml(line,lineInformation);
+				// 站点序号不能为0，如果为0，则返回错误
+				if(xml.indexOf("<ZDXH>0</ZDXH>") != -1){
 					return "0";
 				}
+				String state;// 是否上传成功
 				// 调用上传方法
-				if(getWebServiceSoapUp().setXL(userNameUp,passwordUp,sBuffer.toString()).isSuccess()){
+				if(getWebServiceSoapUp().setXL(userNameUp,passwordUp,xml).isSuccess()){
 					result = "success";
+					state = "1";
 				}else{
 					result = "failure";
+					state = "0";
 				}
-				logger.info("setXL:"+sBuffer.toString());
+				logger.info("setXL:"+xml);
 				logger.info("setXL:"+result);
+				// 保存运管处上传记录
+				saveYgcUploadLog(line,xml,TrafficManageServiceImpl.UPLOAD_TYPE_XL,state);
 			}
 		} catch (Exception e) {
 			logger.error("setXL:",e);
@@ -422,10 +390,11 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		HashMap logXlbmMap = new HashMap();
 		Results results = null;
 		String str = "",xlbm;
+		// 保存线路（运管处日志用）
+		Map<String , Line> logLineMap = null;
 		try {
 			int counter = 0; // 计数器
 			int per = 10; // 每几条线路上传一次路单
-
 			List<ScheduleRealInfo> list = scheduleRealInfoRepository.setLD(date);
 			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setLDGroup(date);
 			Map<String,Object> map = new HashMap();
@@ -444,13 +413,15 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					if(counter % per == 0){
 						sf = new StringBuffer();
 						sf.append("<DLDS>");
+						logLineMap = new HashMap<>();
 					}
 					counter ++;
 					xlbm = BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm")+"");
-					// 保存一次路单的线路编码，用于发送邮箱
-					if(logXlbmMap.get(xlbm) == null){
+					// 保存一线次路单的路编码，用于发送邮箱
+					if(xlbm != null && !xlbm.equals("null") && logXlbmMap.get(xlbm) == null){
 						logXlbmMap.put(xlbm,xlbm);
 					}
+					logLineMap.put(line.getLineCode(),line);
 					sf.append("<DLD>");
 					sf.append("<RQ>"+date+"</RQ>");
 					sf.append("<XLBM>"+xlbm+"</XLBM>");
@@ -513,7 +484,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					str = sf.toString().replace("'","");// 去掉'号
 					results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str));
 					// 记录日志
-					result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str);
+					result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str,logLineMap);
 				}
 			}
 			// 每per条线路上传后剩下的数据再上传
@@ -521,9 +492,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				sf.append("</DLDS>");
 				str = sf.toString().replace("'","");// 去掉'号
 				results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str));
+				// 记录日志
+				result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str,logLineMap);
 			}
-			// 记录日志
-			result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str);
 		} catch (Exception e) {
 			logger.error("setLD:",e);
 			logFailure.append(e).append("<br/>");
@@ -558,21 +529,26 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 * @param str
 	 */
 	private String logRecord(Results results,HashMap logXlbmMap,HashMap logXlbmSuccessMap,HashMap logXlbmFailureMap,StringBuffer logSuccess,
-						   StringBuffer logFailure,String str){
+						   StringBuffer logFailure,String str,Map<String ,Line> logLineMap){
 		String result = "failure";
+		String state;
 		// 记录日志
 		if(results != null){
 			if(results.isSuccess()){// 上传成功
 				// 把上线成功的线路编码放入 logXlbmSuccessMap，并记录logSuccess
 				countSuccess += fillMailXlbmMap(logXlbmMap,logXlbmSuccessMap,logSuccess);
 				result = "success";
+				state = "1";
 			}else{// 上传失败
 				// 把上线失败的线路编码放入 logXlbmFailureMap，并记录logFailure
 				countFailure += fillMailXlbmMap(logXlbmMap,logXlbmFailureMap,logFailure);
 				result = "failure";
+				state = "0";
 			}
 			logger.info("setLD:"+str);
 			logger.info("setLD:"+result);
+			// 保存运管处上传记录
+			saveYgcUploadLog(logLineMap,str,TrafficManageServiceImpl.UPLOAD_TYPE_LD,state);
 			results = null;
 			logXlbmMap = new HashMap();
 		}
@@ -946,7 +922,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Override
 	public String setSKB(String ids) {
 		String result = "上传失败，";
-		StringBuffer sBuffer = new StringBuffer();
+		StringBuffer sBuffer = new StringBuffer("<SKBs>");
 		DecimalFormat df = new DecimalFormat("######0.000");
 		Map<String,String> lsStationCode2NameMap = null;
 		Map<String, Integer> lsStationName2YgcNumber = null;
@@ -962,7 +938,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			LineInformation lineInformation;
 			Iterator<TTInfoDetail> ttInfoDetailIterator;
 			HashMap<String,Object> param ;
-			sBuffer.append("<SKBs>");
 			HashMap<String,String> paramMap;
 			HashMap<String,String> otherMap = new HashMap<>();
 			// 线路编码、周几执行、发车站点名称、发车站点序号、到达站点名称、到达站点序号
@@ -1113,29 +1088,103 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				logger.info("setSKB:"+"ttinfoId:"+ttinfoId+";当前站点版本号："+lineVersion+"；查询历史站点路由:"+lsStationCode2NameMap+";查询历史站点编号:"+lsStationName2YgcNumber);
 			}
 			sBuffer.append("</SKBs>");
-			if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
-				result = "上传成功";
-				SKBUploadLogger skbUploadLogger ;
-				SysUser user = SecurityUtils.getCurrentUser();
-				// 保存时刻表上传记录
-				for(TTInfo ttInfo1 : ttinfoList){
-					skbUploadLogger = new SKBUploadLogger();
-					skbUploadLogger.setTtInfo(ttInfo1);
-					skbUploadLogger.setUser(user);
-					skbUploadLoggerRepository.save(skbUploadLogger);
-				}
-			}
+            String state;// 是否上传成功
+            if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
+                result = "上传成功";
+                state = "1";
+            }else{// 上传失败
+                result = "上传失败";
+                state = "0";
+            }
+            // 保存运管处上传记录
+            saveYgcUploadLog(ttinfoList,sBuffer.toString(),TrafficManageServiceImpl.UPLOAD_TYPE_SKB,state);
 		} catch (Exception e) {
 			logger.error("setSKB:", e);
 			e.printStackTrace();
 		}finally{
-			logger.info("setSKB:"+sBuffer.toString());
-			logger.info("setSKB:"+result);
+            logger.info("setSKB:"+sBuffer.toString());
+            logger.info("setSKB:"+result);
 		}
 		return result;
 	}
 	/**
+	 * 保存上传运管处的日志
+	 * @param obj 参数
+	 * @param type 日志类型
+	 * @param xml 上传参数
+	 */
+	private void saveYgcUploadLog(Object obj,String xml,String type,String state){
+		SKBUploadLogger skbUploadLogger  = new SKBUploadLogger();
+		SysUser user;
+		// 如果不是人为上传，SysUser则为空，设置上传人员为管理员
+		if(SecurityContextHolder.getContext() == null || SecurityContextHolder.getContext().getAuthentication() == null){
+			user = new SysUser();
+			user.setId(1);
+		}else{// 获取上传人员
+			user = SecurityUtils.getCurrentUser();
+		}
+		// 最大的字符长度
+		int maxLength = 60000;
+		int cutLength = 50000;// 需要截取的字符长度
+		String xml_sub = null;
+		skbUploadLogger.setType(type);// 设置类型
+		// 判断xml是否超长，如果超长，则截取
+		if(xml != null && xml.length() > maxLength){
+			int xmlLength = xml.length();
+			int cutCount = xmlLength / cutLength + (xmlLength % cutLength > 0 ? 1 : 0);
+			if(cutCount > 2){
+				xml = "由于上传参数内容超长，请查看服务器的系统日志";
+			}else if(cutCount == 2){
+				xml_sub =xml.substring(cutLength);
+				xml = xml.substring(0,cutLength);
+			}else{
+				// 不做处理
+			}
+		}
+		skbUploadLogger.setUploadXml(xml);// 上传的参数
+		skbUploadLogger.setUploadXmlSub(xml_sub);
+		skbUploadLogger.setState(state);// 状态：是否成功
+		skbUploadLogger.setUser(user);
+		// 时刻表
+		if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_SKB)){
+			List<TTInfo> ttInfoList = (List<TTInfo>)obj;
+			String name = "";
+			Line line = null;
+			for(TTInfo ttInfo : ttInfoList){
+				name += ttInfo.getName() + " ";
+				line = ttInfo.getXl();
+			}
+			skbUploadLogger.setLine(line);
+			skbUploadLogger.setUser(user);
+			skbUploadLogger.setName(name);
+			skbUploadLoggerRepository.save(skbUploadLogger);
+		}else{
+			if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_XL)){
+				Line line = (Line) obj;
+				String name = line.getName() + "线路停靠站上传";
+				skbUploadLogger.setLine(line);
+				skbUploadLogger.setName(name);
+				skbUploadLoggerRepository.save(skbUploadLogger);
+			}else if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_LD)){
+				Map<String ,Line>  logLineMap = (Map<String ,Line> )obj;
+				for (String key : logLineMap.keySet()) {
+					Line line = logLineMap.get(key);
+					String name = line.getName() + "路单上传";
+					skbUploadLogger  = new SKBUploadLogger();
+					skbUploadLogger.setType(type);// 设置类型
+					skbUploadLogger.setUploadXml(xml);// 上传的参数
+					skbUploadLogger.setUploadXmlSub(xml_sub);
+					skbUploadLogger.setState(state);// 状态：是否成功
+					skbUploadLogger.setUser(user);
+					skbUploadLogger.setLine(line);
+					skbUploadLogger.setName(name);
+					skbUploadLoggerRepository.save(skbUploadLogger);
+				}
+			}
+		}
+	}
+	/**
 	 * 上传线路人员车辆配置信息
 	 */
 	@Override
@@ -1640,4 +1689,50 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		}
 		return tempStationName2YgcNumber;
 	}
+
+	private String getSetXlXml(Line line,LineInformation lineInformation){
+		StringBuffer sBuffer = new StringBuffer();
+		List<StationRoute> upStationsList ;// 上行站点路由集
+		List<StationRoute> downStationsList;// 下行站点路由集
+		List<Object[]> downPointList;// 下行站点集
+		List<Object[]> upPointList;// 上行站点集
+		sBuffer.append("<XLs>");
+		sBuffer.append("<XL>");
+		sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</XLBM>");
+		sBuffer.append("<XLMC>").append(line.getName()).append("</XLMC>");
+		sBuffer.append("<QDZ>").append(line.getStartStationName()).append("</QDZ>");
+		sBuffer.append("<ZDZ>").append(line.getEndStationName()).append("</ZDZ>");
+		sBuffer.append("<QZLC>").append(lineInformation.getUpMileage()).append("</QZLC>");
+		sBuffer.append("<ZQLC>").append(lineInformation.getDownMileage()).append("</ZQLC>");
+		sBuffer.append("<XLGH>").append(line.getLinePlayType()).append("</XLGH>");
+		sBuffer.append("<UPDATE_DATE>").append(sdfnyr.format(new Date())).append("</UPDATE_DATE>");
+		// 循环添加站点信息
+		sBuffer.append("<StationList>");
+		// 先查上行
+		upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
+		Map<String, Integer> stationNumMap = getStationName2YgcNumberMap(line.getLineCode());
+		int startId = 1;
+		startId = packagStationXml(upStationsList, sBuffer, startId,stationNumMap);
+		// 环线不查下行
+		if(line.getLinePlayType() != 1){
+			// 再查下行
+			downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
+			packagStationXml(downStationsList, sBuffer, startId,stationNumMap);
+		}
+		sBuffer.append("</StationList>");
+		// 循环添加站点点位信息
+		sBuffer.append("<LinePointList>");
+		upPointList = sectionRepository.getSectionDirByLineId(line.getId(),0);
+		startId = 1;
+		startId = packagStationPointXml(upPointList, sBuffer, startId);
+		// 环线不查下行
+		if(line.getLinePlayType() != 1){
+			downPointList = sectionRepository.getSectionDirByLineId(line.getId(),1);
+			packagStationPointXml(downPointList, sBuffer, startId);
+		}
+		sBuffer.append("</LinePointList>");
+		sBuffer.append("</XL>");
+		sBuffer.append("</XLs>");
+		return sBuffer.toString();
+	}
 }
@@ -12,6 +12,8 @@ public interface RealMapService {
     Map<String, Object> findRouteByLine(String idx);
+    Map<String, Object> findRouteAndVersionByLine(String idx);
+
     Map<String,Object> findRouteAndStationByLine(String lineCode);
     Map<String,Object> multiSectionRoute(String codeIdx);
@@ -24,6 +24,16 @@ public class SectionRouteCoords {
     private Float sectionTime;
+    private Integer versions;
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+
     public int getId() {
         return id;
     }
@@ -42,7 +42,7 @@ public class RealMapServiceImpl implements RealMapService {
             }
             inStr = " (" + inStr.substring(1) + ")";
-            String sql = "select r.LINE_CODE,r.STATION_NAME,r.STATION_CODE,r.STATION_MARK,r.DIRECTIONS,r.DISTANCES,r.TO_TIME, r.VERSIONS,s.G_LONX,s.G_LATY,s.RADIUS,s.SHAPES_TYPE,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID, r.STATION_ROUTE_CODE from bsth_c_stationroute r inner join bsth_c_station s on r.station=s.id where r.line_code in " + inStr + " and r.destroy=0";
+            String sql = "select r.LINE_CODE,r.STATION_NAME,r.STATION_CODE,r.STATION_MARK,r.DIRECTIONS,r.DISTANCES,r.TO_TIME, r.VERSIONS,s.G_LONX,s.G_LATY,s.RADIUS,s.SHAPES_TYPE,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID, r.STATION_ROUTE_CODE,r.versions from bsth_c_stationroute r inner join bsth_c_station s on r.station=s.id where r.line_code in " + inStr + " and r.destroy=0";
             List<StationSpatialData> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(StationSpatialData.class));
             rs.put("status", ResponseCode.SUCCESS);
@@ -84,7 +84,7 @@ public class RealMapServiceImpl implements RealMapService {
         }
         inCond.deleteCharAt(inCond.length() - 1).append(")");
-        String sql = "SELECT r.ID,r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,r.DIRECTIONS,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) GSECTION_VECTOR,s.SECTION_DISTANCE,s.SECTION_TIME FROM bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section_code=s.section_code WHERE r.line_code in "+inCond.toString()+" and r.destroy=0 order by sectionroute_code";
+        String sql = "SELECT r.ID,r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,r.DIRECTIONS,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) GSECTION_VECTOR,s.SECTION_DISTANCE,s.SECTION_TIME,r.versions FROM bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section_code=s.section_code WHERE r.line_code in "+inCond.toString()+" and r.destroy=0 order by sectionroute_code";
         List<SectionRouteCoords> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(SectionRouteCoords.class));
         //排序
@@ -133,6 +133,64 @@ public class RealMapServiceImpl implements RealMapService {
     }
     @Override
+    public Map<String, Object> findRouteAndVersionByLine(String idx) {
+        Map<String, Object> rs = new HashMap<>();
+        StringBuilder inCond = new StringBuilder("(");
+        List<String> codeList = Splitter.on(",").splitToList(idx);
+        for(String lineCode : codeList){
+            inCond.append("'" + lineCode + "',");
+        }
+        inCond.deleteCharAt(inCond.length() - 1).append(")");
+
+        String sql = "SELECT r.ID,r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,r.DIRECTIONS,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) GSECTION_VECTOR,s.SECTION_DISTANCE,s.SECTION_TIME,r.versions FROM bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section_code=s.section_code WHERE r.line_code in "+inCond.toString()+" and r.destroy=0 order by sectionroute_code";
+        List<SectionRouteCoords> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(SectionRouteCoords.class));
+
+        //排序
+        Collections.sort(list, new Comparator<SectionRouteCoords>() {
+            @Override
+            public int compare(SectionRouteCoords o1, SectionRouteCoords o2) {
+                return Integer.parseInt(o1.getSectionrouteCode()) - Integer.parseInt(o2.getSectionrouteCode());
+            }
+        });
+
+        ArrayListMultimap<String, SectionRouteCoords> listMultimap = ArrayListMultimap.create();
+        for (SectionRouteCoords sr : list) {
+            //按lineCode 分组
+            listMultimap.put(sr.getLineCode()+"_"+sr.getVersions(), sr);
+        }
+        //坐标转换
+        Map<String, Object> subMap;
+        Set<String> ks = listMultimap.keySet();
+        List<SectionRouteCoords> sublist;
+        List<String> upList,downList;
+        String vectorStr = "";
+        for(String k : ks){
+            subMap = new HashMap<>();
+            sublist = listMultimap.get(k);
+            upList = new ArrayList<>();
+            downList = new ArrayList<>();
+            for(SectionRouteCoords sr : sublist){
+                vectorStr = sr.getGsectionVector();
+                vectorStr = vectorStr.substring(11, vectorStr.length() - 2);
+                if (sr.getDirections() == 0)
+                    upList.add(vectorStr);
+                else
+                    downList.add(vectorStr);
+            }
+            subMap.put("up", upList);
+            //subMap.put("upJoins", jointCoords(upList));
+            subMap.put("down", downList);
+            subMap.put("up_bd", multiWgsToBd(upList));
+            subMap.put("down_bd", multiWgsToBd(downList));
+            subMap.put("up_gcj", multiWgsToGcj(upList));
+            subMap.put("down_gcj", multiWgsToGcj(downList));
+
+            rs.put(k, subMap);
+        }
+        return rs;
+    }
+
+    @Override
     public Map<String, Object> findRouteAndStationByLine(String lineCode) {
         Map<String, Object> rs = new HashMap<>();
         try {
@@ -790,11 +790,11 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		if(map.get("fgsdmTurn")!=null){
 			fgs=map.get("fgsdmTurn").toString().trim();
 		}
-//		String nature="0";
-//		if(map.get("nature")!=null){
-//			nature=map.get("nature").toString();
-//		}
-//    	Map<String, Boolean> lineMap=lineService.lineNature();
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+    	Map<String, Boolean> lineMap=lineService.lineNature();
 		String startDate=map.get("startDate").toString();
 		String endDate=map.get("endDate").toString();
@@ -847,16 +847,82 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 				 return s;
 			 }
 		});
+		
+		
+		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
+		int jhcc = 0, sjcc = 0;
+		int jhcczgf = 0, sjcczgf = 0;
+		int count=0;
+		Map<String, String> xlMap=new HashMap<String,String>();
+		for(Map<String, Object> m : lists){
+			if(nature.equals("0")){
+				list.add(m);
+				jhcc += Integer.valueOf(m.get("jhcc").toString());
+				sjcc += Integer.valueOf(m.get("sjcc").toString());
+				jhcczgf += Integer.valueOf(m.get("jhcczgf").toString());
+				sjcczgf +=Integer.valueOf(m.get("sjcczgf").toString());
+				if(xlMap.get(m.get("xl").toString())==null){
+					count++;
+					xlMap.put(m.get("xl").toString(), m.get("xl").toString());
+				}
+			}else if(nature.equals("1")){
+				if(lineMap.get(m.get("xl").toString())){
+					list.add(m);
+					jhcc += Integer.valueOf(m.get("jhcc").toString());
+					sjcc += Integer.valueOf(m.get("sjcc").toString());
+					jhcczgf += Integer.valueOf(m.get("jhcczgf").toString());
+					sjcczgf +=Integer.valueOf(m.get("sjcczgf").toString());
+					if(xlMap.get(m.get("xl").toString())==null){
+						count++;
+						xlMap.put(m.get("xl").toString(), m.get("xl").toString());
+					}
+				}
+			}else{
+				if(!lineMap.get(m.get("xl").toString())){
+					list.add(m);
+					jhcc += Integer.valueOf(m.get("jhcc").toString());
+					sjcc += Integer.valueOf(m.get("sjcc").toString());
+					jhcczgf += Integer.valueOf(m.get("jhcczgf").toString());
+					sjcczgf +=Integer.valueOf(m.get("sjcczgf").toString());
+					if(xlMap.get(m.get("xl").toString())==null){
+						count++;
+						xlMap.put(m.get("xl").toString(), m.get("xl").toString());
+					}
+				}
+			}
+			
+		}
+		
+		Map<String, Object> tempMap=new HashMap<String,Object>();
+		tempMap.put("rq", "分类汇总");
+		tempMap.put("line_", "共" + list.size() + "条线路");
+		tempMap.put("xlName", "共" +count + "条线路");
+		tempMap.put("jhcc", jhcc);
+		tempMap.put("sjcc", sjcc);
+		tempMap.put("sjcczgf", sjcczgf);
+		tempMap.put("jhcczgf", jhcczgf);
+		tempMap.put("sm", "");
+		list.add(tempMap);
+		if(jhcc != 0 && sjcc != 0){
+			tempMap.put("ccl", df.format(((float)sjcc / jhcc)*100)+"%");
+		}else{
+			tempMap.put("ccl", "0.00%");
+		}
+		if(jhcczgf != 0 && sjcczgf != 0){
+			tempMap.put("cclzgf", df.format(((float)sjcczgf / jhcczgf)*100)+"%");
+		}else{
+			tempMap.put("cclzgf", "0.00%");
+		}
 		if (type.equals("export")) {
 			String lineName=map.get("lineName").toString();
 			ReportUtils ee = new ReportUtils();
 			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-			listI.add(lists.iterator());
+			listI.add(list.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
 			ee.excelReplace(listI, new Object[] { map }, path + "mould/calcTurnoutrateZgf.xls", path + "export/"
 					+ dates + "-" + lineName + "-营运线路出车率统计表.xls");
 		}
-		return lists;
+		return list;
 	}
 	@Override
@@ -31,4 +31,4 @@ http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
 http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
 ## gateway send directive
-http.send.directive = http://192.168.168.201:9090/transport_server/message/
+http.send.directive = http://192.168.168.201:9090/transport_server/message/
 \ No newline at end of file
@@ -201,6 +201,7 @@
 			}
 			// 异步请求获取表格数据
 			$.get('/line',params,function(result){
+				debugger;
 				// 添加序号
 				result.content.page =  page;
                 $.each(result.content, function(i, data) {
@@ -339,8 +340,6 @@
 			return ;
     	}else {
             layer.open({
-                id:1,
-                type: 1,
                 title: "线路文件版本号",
                 // skin:'layui-layer-rim',
                 area:['450px', 'auto'],
@@ -77,6 +77,7 @@
             CSMap = getMaxCarAndStopSpace1(map);
         } else if (map.baseRes == '3') { // 主站停站使用v2_2版本
             _paramObj = Main_v2.getFactory().createParameterObj(map, dataMap); // TODO：暂时使用v2_1版本的方法，通用的，后续再放到v2_2版本中
+            console.log(_paramObj);
             map.clzs = InternalScheduleObj_v2_2.calcuClzx(_paramObj);
             CSMap = getMaxCarAndStopSpace1(map);
         }
@@ -186,7 +187,7 @@
                 return _rtnBcArray;
             };
-            // Main_v2_2.exportExcelConfig(_dfun);
+            Main_v2_2.exportExcelConfig(_paramObj, _dfun);
         }
         // 关闭弹出层
-/**
- * 主类（v2_2版本）。
- */
-var Main_v2_2 = function() {
-
-    var _paramObj; // 参数对象
-
-    return {
-        /**
-         * 使用发车间隔策略生成时刻表。
-         * @param paramObj 参数对象
-         * @param lpArray 路牌数组
-         * @constructor
-         */
-        BXPplaceClassesTime03 : function(paramObj, lpArray) {
-            // 参数对象
-            _paramObj = paramObj;
-
-            // // 测试行驶时间
-            // var _fcsj = paramObj.toTimeObj("16:20");
-            // var _bcsj = StrategyUtils_v2_2.sFn("CALCU_RUNTIME")(false, _fcsj, paramObj); // 使用策略计算班次行驶时间
-            // console.log("发车时间=" + _fcsj.format("HH:mm") + ",行驶时间=" + _bcsj);
-            //
-
-            // // 测试停站时间
-            // var _fcsj = paramObj.toTimeObj("05:30");
-            // var _layovertime = StrategyUtils_v2_2.sFn("CALCU_LAYOVER_TIME")(
-            //     _fcsj, false, StrategyUtils_v2_2.sFn("CALCU_RUNTIME"), paramObj);
-            // console.log("发车时间=" + _fcsj.format("HH:mm") + ",停站layover时间=" + _layovertime);
-            //
-            // var schedule = {};
-
-            // // 测试间隔时间
-            // var _fcsj = paramObj.toTimeObj("07:30");
-            // var _headway = StrategyUtils_v2_2.sFn("CALCU_HEADWAY_2")(true, _fcsj, _paramObj);
-            // console.log("发车时间=" + _fcsj.format("HH:mm") + ",发车间隔=" + _headway);
-
-            // 1、初始化行车计划
-            var schedule = new InternalScheduleObj_v2_2(paramObj, lpArray);
-            // 2、生成班次（从第2圈开始）
-            schedule.fnCreateBclistWithMasterBc(2, 20);
-            // 3、调整发车间隔
-            schedule.fnAdjustHeadway();
-            // 4、计算吃饭班次
-            schedule.fnCalcuEatBc();
-            // // 6、计算末班车
-            // schedule.fnCalcuLastBc();
-            // 7、重新设置停站时间
-            schedule.fnReSetLayoverTime();
-            // 8、补进出场例保班次
-            schedule.fnCalcuOtherBc();
-
-            //-------------------- 输出ganut图上的班次，班型描述 ----------------------//
-            // TODO：班型再议
-            return {
-                'json':schedule.fnToGanttBcArray(),'bxrcgs':null,
-                'aInternalLpObj': schedule.fnGetLpArray()
-            };
-        },
-
-        //----------------------------------- 导入导出配置 -----------------------------------//
-
-        /**
-         * 导出时刻表配置。
-         * @param fnGetGanttBc 获取gantt班次方法
-         */
-        exportExcelConfig: function(fnGetGanttBc) {
-            var oExcel = new Main_v2_2_ExcelObj(_paramObj, fnGetGanttBc);
-
-            $('.exportAddXls').off('click');
-            $('.exportAddXlsx').off('click');
-
-            $('.exportAddXls').on('click', function() {
-
-                var aInfos = {
-                    "lpObjList": oExcel.fnGetLpBcInfoList(), // 路牌班次信息列表
-                    "statInfoList": oExcel.fnGetStatInfoList(), // 统计项目列表
-                    "parameterInfoList" : oExcel.fnGetParamInfoList() // 参数对象
-                };
-
-                console.log(aInfos);
-
-                $(".exportAdd").addClass("disabled");
-                $(".exportAddSpan").html("正在导出...");
-
-                // 提交
-                $.ajax({
-                    type: 'POST',
-                    url: "/tidc/exportDTDFile/xls",
-                    dataType: 'binary',
-                    contentType: "application/json",
-                    data: JSON.stringify(aInfos),
-                    success: function(data){
-                        oExcel.downloadFile(data, "application/octet-stream", "时刻表信息.xls");
-
-                        $(".exportAdd").removeClass("disabled");
-                        $(".exportAddSpan").html(" 导出数据");
-                    },
-                    error: function(xhr, type){
-                        alert('错误：TODO');
-
-                        $(".exportAdd").removeClass("disabled");
-                        $(".exportAddSpan").html(" 导出数据");
-                    }
-                });
-            });
-
-            $('.exportAddXlsx').on('click', function() {
-                var aInfos = {
-                    "lpObjList": oExcel.fnGetLpBcInfoList(), // 路牌班次信息列表
-                    "statInfoList": oExcel.fnGetStatInfoList(), // 统计项目列表
-                    "parameterInfoList" : oExcel.fnGetParamInfoList() // 参数对象
-                };
-
-                console.log(aInfos);
-
-                $(".exportAdd").addClass("disabled");
-                $(".exportAddSpan").html("正在导出...");
-
-                // 提交
-                $.ajax({
-                    type: 'POST',
-                    url: "/tidc/exportDTDFile/xlsx",
-                    dataType: 'binary',
-                    contentType: "application/json",
-                    data: JSON.stringify(aInfos),
-                    success: function(data){
-                        oExcel.downloadFile(data, "application/octet-stream", "时刻表信息.xlsx");
-
-                        $(".exportAdd").removeClass("disabled");
-                        $(".exportAddSpan").html(" 导出数据");
-                    },
-                    error: function(xhr, type){
-                        alert('错误：TODO');
-
-                        $(".exportAdd").removeClass("disabled");
-                        $(".exportAddSpan").html(" 导出数据");
-                    }
-                });
-            });
-        }
-
-
-    }
+/**
+ * 主类（v2_2版本）。
+ */
+var Main_v2_2 = function() {
+
+    var _paramObj; // 参数对象
+
+    return {
+        /**
+         * 使用发车间隔策略生成时刻表。
+         * @param paramObj 参数对象
+         * @param lpArray 路牌数组
+         * @constructor
+         */
+        BXPplaceClassesTime03 : function(paramObj, lpArray) {
+            // 参数对象
+            _paramObj = paramObj;
+
+            // // 测试行驶时间
+            // var _fcsj = paramObj.toTimeObj("16:20");
+            // var _bcsj = StrategyUtils_v2_2.sFn("CALCU_RUNTIME")(false, _fcsj, paramObj); // 使用策略计算班次行驶时间
+            // console.log("发车时间=" + _fcsj.format("HH:mm") + ",行驶时间=" + _bcsj);
+            //
+
+            // // 测试停站时间
+            // var _fcsj = paramObj.toTimeObj("05:30");
+            // var _layovertime = StrategyUtils_v2_2.sFn("CALCU_LAYOVER_TIME")(
+            //     _fcsj, false, StrategyUtils_v2_2.sFn("CALCU_RUNTIME"), paramObj);
+            // console.log("发车时间=" + _fcsj.format("HH:mm") + ",停站layover时间=" + _layovertime);
+            //
+            // var schedule = {};
+
+            // // 测试间隔时间
+            // var _fcsj = paramObj.toTimeObj("07:30");
+            // var _headway = StrategyUtils_v2_2.sFn("CALCU_HEADWAY_2")(true, _fcsj, _paramObj);
+            // console.log("发车时间=" + _fcsj.format("HH:mm") + ",发车间隔=" + _headway);
+
+            // 1、初始化行车计划
+            var schedule = new InternalScheduleObj_v2_2(paramObj, lpArray);
+            // 2、生成班次（从第2圈开始）
+            schedule.fnCreateBclistWithMasterBc(2, 20);
+            // 3、调整发车间隔
+            schedule.fnAdjustHeadway();
+            // 4、计算吃饭班次
+            schedule.fnCalcuEatBc();
+            // // 6、计算末班车
+            // schedule.fnCalcuLastBc();
+            // 7、重新设置停站时间
+            schedule.fnReSetLayoverTime();
+            // 8、补进出场例保班次
+            schedule.fnCalcuOtherBc();
+
+            //-------------------- 输出ganut图上的班次，班型描述 ----------------------//
+            // TODO：班型再议
+            return {
+                'json':schedule.fnToGanttBcArray(),'bxrcgs':null,
+                'aInternalLpObj': schedule.fnGetLpArray()
+            };
+        },
+
+        //----------------------------------- 导入导出配置 -----------------------------------//
+
+        /**
+         * 导出时刻表配置。
+         * @param fnGetGanttBc 获取gantt班次方法
+         */
+        exportExcelConfig: function(fnGetGanttBc) {
+            var oExcel = new Main_v2_2_ExcelObj(_paramObj, fnGetGanttBc);
+
+            $('.exportAddXls').off('click');
+            $('.exportAddXlsx').off('click');
+
+            $('.exportAddXls').on('click', function() {
+
+                var aInfos = {
+                    "lpObjList": oExcel.fnGetLpBcInfoList(), // 路牌班次信息列表
+                    "statInfoList": oExcel.fnGetStatInfoList(), // 统计项目列表
+                    "parameterInfoList" : oExcel.fnGetParamInfoList() // 参数对象
+                };
+
+                console.log(aInfos);
+
+                $(".exportAdd").addClass("disabled");
+                $(".exportAddSpan").html("正在导出...");
+
+                // 提交
+                $.ajax({
+                    type: 'POST',
+                    url: "/tidc/exportDTDFile/xls",
+                    dataType: 'binary',
+                    contentType: "application/json",
+                    data: JSON.stringify(aInfos),
+                    success: function(data){
+                        oExcel.downloadFile(data, "application/octet-stream", "时刻表信息.xls");
+
+                        $(".exportAdd").removeClass("disabled");
+                        $(".exportAddSpan").html(" 导出数据");
+                    },
+                    error: function(xhr, type){
+                        alert('错误：TODO');
+
+                        $(".exportAdd").removeClass("disabled");
+                        $(".exportAddSpan").html(" 导出数据");
+                    }
+                });
+            });
+
+            $('.exportAddXlsx').on('click', function() {
+                var aInfos = {
+                    "lpObjList": oExcel.fnGetLpBcInfoList(), // 路牌班次信息列表
+                    "statInfoList": oExcel.fnGetStatInfoList(), // 统计项目列表
+                    "parameterInfoList" : oExcel.fnGetParamInfoList() // 参数对象
+                };
+
+                console.log(aInfos);
+
+                $(".exportAdd").addClass("disabled");
+                $(".exportAddSpan").html("正在导出...");
+
+                // 提交
+                $.ajax({
+                    type: 'POST',
+                    url: "/tidc/exportDTDFile/xlsx",
+                    dataType: 'binary',
+                    contentType: "application/json",
+                    data: JSON.stringify(aInfos),
+                    success: function(data){
+                        oExcel.downloadFile(data, "application/octet-stream", "时刻表信息.xlsx");
+
+                        $(".exportAdd").removeClass("disabled");
+                        $(".exportAddSpan").html(" 导出数据");
+                    },
+                    error: function(xhr, type){
+                        alert('错误：TODO');
+
+                        $(".exportAdd").removeClass("disabled");
+                        $(".exportAddSpan").html(" 导出数据");
+                    }
+                });
+            });
+        }
+
+
+    }
 }();
 \ No newline at end of file
@@ -507,6 +507,14 @@
             });
             //缓存路由
             idx=idx.substr(0, idx.length - 1);
+            $.get('/realMap/findRouteAndVersionByLine', {idx: idx}, function (rs) {
+                if (rs) {
+                    for(var lineCode in rs)
+                        storage.setItem(lineCode + '_route', JSON.stringify(rs[lineCode]));
+
+                    eq.emit('cache_route');
+                }
+            });
             $.get('/realMap/findRouteByLine', {idx: idx}, function (rs) {
                 if (rs) {
                     for(var lineCode in rs)
@@ -516,6 +524,7 @@
                 }
             });
+
             //检查线路配置
             checkLineConfig(ls_line_data, function (rs) {
                 if (rs.status == 0)
@@ -89,7 +89,6 @@
 								<th>实际空驶里程</th>
 								<th>烂班里程</th>
 								<th>临加营运里程</th>
-								<th>临加空驶里程</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -302,7 +301,6 @@
 			<td>{{obj.sjfyylc}}</td>
 			<td>{{obj.lblc}}</td>
 			<td>{{obj.ljyylc}}</td>
-			<td>{{obj.ljfyylc}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -186,10 +186,10 @@
 				var temp = tempData[$("#line").val()].split(":");
 				$("#gsdmSing").val(temp[0]);
 				updateCompany();
-// 				$("#fgsdmSing").val(temp[1]);
-				$("#fgsdmSing").val("");
+				$("#fgsdmSing").val(temp[1]);
+// 				$("#fgsdmSing").val("");
 				$("#gsdmSing").attr("disabled", true);
-// 				$("#fgsdmSing").attr("disabled", true);
+				$("#fgsdmSing").attr("disabled", true);
 			}
 		});
@@ -277,7 +277,10 @@ $(function(){
 				var gsdmShif = $("#gsdmShif").val();
 				var fgsdmShif = $("#fgsdmShif").val(); 
 				  var params = {};
-		            params.fgsdmShif =fgsdmShif;
+				  if(line )
+					  if(line ==" " || line ==""){
+						    params.fgsdmShif =fgsdmShif;
+					  }
 		            params.date =date;
 		            params.gsdmShif =gsdmShif;
 		            params.line =line;
@@ -308,12 +311,14 @@ $(function(){
 		var fgsdmShif = $("#fgsdmShif").val();
 		var lineName = $('#line option:selected').text();
 		  var params = {};
-            params.fgsdmShif =fgsdmShif;
-            params.date =date;
-            params.gsdmShif =gsdmShif;
-            params.line =line;
-            params.type='export';
-            params.lineName =lineName;
+		  if(line ==" " || line ==""){
+			    params.fgsdmShif =fgsdmShif;
+		  }            
+		  params.date =date;
+          params.gsdmShif =gsdmShif;
+          params.line =line;
+          params.type='export';
+          params.lineName =lineName;
 		$get('/mcy_export/shifdayExport',params,function(result){
 			window.open("/downloadFile/download?fileName="
 					+moment(date).format("YYYYMMDD")+
@@ -28,7 +28,7 @@
 <div class="page-head">
 	<div class="page-title">
-		<h1>营运线路出车率统计表</h1>
+		<h1>营运线路早高峰出车率统计表</h1>
 	</div>
 </div>
@@ -50,6 +50,15 @@
                         <select class="form-control" name="line" id="line" style="width: 140px;"></select>
                     </div>
                     <div style="margin-top: 10px"></div>
+                    <div style="display: inline-block;">
+						<span class="item-label" style="width: 80px;">线路性质: </span> <select
+							class="form-control" name="nature" id="nature"
+							style="width: 140px;">
+							<option value="0">全部线路</option>
+							<option value="1" selected="selected">营运线路</option>
+							<option value="2">非营运线路</option>
+						</select>
+					</div>
                     <div style="display: inline-block;margin-left: 15px;">
                         <span class="item-label" style="width: 80px;">开始时间: </span>
                         <input class="form-control" type="text" id="startDate" style="width: 140px;"/>
-<!-- 用户线调授权页面 -->
-<div id="user_authorize_wrap" style="height: 100%;">
-    <div class="top_title"></div>
-
-    <div class="xd_line_list">
-    </div>
-    <div class="top_tools">
-        <form class="ct_pattern_form">
-            <div class="uk-margin">
-                <div uk-form-custom="target: > * > span:first" style="display: none">
-                    <select id="pattern_select">
-                        <option value="0">监控模式</option>
-                        <option value="1">主调模式</option>
-                        <option value="2">作废模式</option>
-                    </select>
-                    <button class="uk-button uk-button-default" type="button" tabindex="-1">
-                        <span></span>
-                        <span uk-icon="icon: chevron-down"></span>
-                    </button>
-                </div>
-            </div>
-        </form>
-        <div class="add_line_icon" uk-toggle="target: #select_line_modal">
-            <i uk-icon="icon: plus"></i> 添加线路
-        </div>
-        &nbsp;&nbsp;
-        <button class="uk-button uk-button-primary uk-button-small" id="global_save_btn">保存哇！</button>
-    </div>
-
-    <div class="uk-child-width-expand uk-grid-small xd_menu_grid" uk-grid style="display: none;">
-
-        <div>
-            <h4>数据&统计</h4>
-            <ul class="uk-list uk-list-large uk-list-divider">
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="curr_date_schedule"> 当日计划排班</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="cache_data_manage"> 缓存数据管理</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="history_sch_maintain"> 历史路单维护</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="sch_edit_info"> 班次修正日志</label></li>
-            </ul>
-        </div>
-
-        <div>
-            <h4>报表管理</h4>
-            <ul class="uk-list uk-list-large uk-list-divider">
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_waybill"> 行车路单</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_history_message"> 调度历史消息</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_account"> 驾驶员请求台账</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_correctForm"> 修正报表</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_statisticsDaily"> 统计日报</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_scheduleDaily"> 调度日报</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_jobSummary"> 工作汇总</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_daily"> 班次日报表</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_inoutstation"> 班次到离站</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_oilListMonth"> 月存油报表</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_scheduleAnaly"> 时刻表分析</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_message"> 调度消息分析</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_changetochange"> 换人换车情况统计表</label></li>
-            </ul>
-        </div>
-
-        <div>
-            <h4>车载设备</h4>
-            <ul class="uk-list uk-list-large uk-list-divider">
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="all_devices"> 设备管理</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="directive_history"> 指令下发记录</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="device_report"> 设备上报记录</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="gps_play_back"> 轨迹回放</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="safe_driving"> 安全驾驶(图像)</label></li>
-            </ul>
-        </div>
-
-        <div>
-            <h4>系统设置</h4>
-            <ul class="uk-list uk-list-large uk-list-divider">
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="line_config"> 线路配置</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="fbzdzx_config"> 翻班与自动执行</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="tts_config"> TTS</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="signal_state"> 信号标记</label></li>
-            </ul>
-        </div>
-
-    </div>
-
-    <!-- This is the modal -->
-    <div id="select_line_modal" class="uk-modal-container" uk-modal="bg-close:false;">
-        <div class="uk-modal-dialog uk-modal-body">
-            <button class="uk-modal-close-outside" type="button" uk-close></button>
-            <h2 class="uk-modal-title">添加线路权限</h2>
-            <div>
-                <form>
-                    <div class="ct_field" style="width: 140px;">
-                        <label>状态</label>
-                        <select class="uk-select" id="modal_type_select" style="width: 94px;">
-                            <option value="-1">全部</option>
-                            <option value="0">营运</option>
-                            <option value="1">撤销</option>
-                        </select>
-                    </div>
-                    <div class="ct_field">
-                        <label>公司</label>
-                        <select class="uk-select" id="modal_company_select"></select>
-                    </div>
-                    <div class="ct_field">
-                        <label>分公司</label>
-                        <select class="uk-select" id="modal_sub_company_select" disabled></select>
-                    </div>
-                    <div class="ct_field">
-                        <label>线路</label>
-                        <input class="uk-input" id="modal_line_input" placeholder="没做拼音映射！！"/>
-                    </div>
-                    <label><input class="uk-checkbox" type="checkbox" id="globalCheckbox"> 全选</label>
-                </form>
-                <div class="uk-modal-body line_checkbox_list" style="padding: 0 !important;" uk-overflow-auto>
-                </div>
-            </div>
-            <p class="uk-text-right">
-                <button class="uk-button uk-button-default uk-modal-close" type="button">取消</button>
-                <button class="uk-button uk-button-primary"  id="confirmBtn" type="button">确定</button>
-            </p>
-        </div>
-    </div>
-
-    <script id="authorize-user-auth-lines-temp" type="text/html">
-        {{each list as t i}}
-        <h5>{{t.fgsName}}</h5>
-        <div class="sub_lines">
-            {{each t.list as obj j}}
-            <span title="{{obj.lineCode}}" class="line_btn {{obj.destroy==1?'destroy':''}}">{{obj.name}}</span>
-            {{/each}}
-        </div>
-        {{/each}}
-    </script>
-    <script id="authorize-user-auth-title-temp" type="text/html">
-        <div style="font-weight: 600;">{{name}}（{{userName}}）
-        </div>
-        <!--<div class="desc">最近登录 {{lastLoginDateStr}}</div>-->
-        <div class="desc">...</div>
-    </script>
-
-    <script id="authorize-modal-lines-temp" type="text/html">
-        {{each list as obj i}}
-        <label class="btn {{obj.destroy==1?'destroy':''}}" data-gs="{{obj.company}}" data-fgs="{{obj.brancheCompany}}"
-               title="{{obj.name}}" data-code="{{obj.lineCode}}">
-            <input class="uk-checkbox" type="checkbox">{{obj.name}}
-        </label>
-        {{/each}}
-    </script>
-    <script>
-        (function () {
-            var wrap = '#user_authorize_wrap', user, xd_auth, all_lines, companyData;
-            //分公司名称映射（只用于分组展示，就写死）
-<<<<<<< HEAD
-            var fgs_name_mapp = {
-                '55_3': '上南公司（六分公司）',
-                '55_1': '上南公司（二分公司）',
-                '55_2': '上南公司（三分公司）',
-                '55_4': '上南公司（一分公司）',
-                '55_5': '上南公司（培训部）',
-                '22_2': '金高公司（二分公司）',
-                '22_1': '金高公司（四分公司）',
-                '22_3': '金高公司（三分公司）',
-                '22_5': '金高公司（一分公司）',
-                '26_3': '南汇公司（三分公司）',
-                '26_2': '南汇公司（南汇二分）',
-                '26_1': '南汇公司（南汇一分）',
-                '26_4': '南汇公司（南汇维修公司）',
-                '26_5': '南汇公司（南汇公司）',
-                '26_6': '南汇公司（南汇六分）',
-                '05_5': '杨高公司（杨高分公司）',
-                '05_6': '杨高公司（周浦分公司）',
-                '05_3': '杨高公司（芦潮港分公司）',
-                '05_1': '杨高公司（川沙分公司）',
-                '05_2': '杨高公司（金桥分公司）',
-                '77_78': '闵行公司',
-                '300_301': '金球公交',
-                '99_100': '青浦公交',
-                '24_1': '一车队',
-                '24_2': '二车队',
-                '24_3': '三车队'
-=======
-            var fgs_name_mapp={
-                '55_3': '上南公司（六分公司）', '55_1': '上南公司（二分公司）', '55_2': '上南公司（三分公司）', '55_4': '上南公司（一分公司）', '55_5': '上南公司（培训部）',
-                '22_2': '金高公司（二分公司）', '22_1': '金高公司（四分公司）', '22_3': '金高公司（三分公司）', '22_5': '金高公司（一分公司）',
-                '26_3': '南汇公司（三分公司）', '26_2': '南汇公司（南汇二分）', '26_1': '南汇公司（南汇一分）', '26_4': '南汇公司（南汇维修公司）', '26_5': '南汇公司（南汇公司）', '26_6': '南汇公司（南汇六分）',
-                '05_5': '杨高公司（杨高分公司）', '05_6': '杨高公司（周浦分公司）', '05_3': '杨高公司（芦潮港分公司）', '05_1': '杨高公司（川沙分公司）', '05_2': '杨高公司（金桥分公司）',
-                '77_78': '闵行公司','300_301': '金球公交','302_303': '露虹公交', '99_100': '青浦公交','24_1': '一车队', '24_2': '二车队', '24_3': '三车队'
->>>>>>> 46649faa9a8c89602fbb3f73b0242c178de95777
-            };
-
-            var defauleConfig;
-            var patSelect;
-            $(wrap).on('init', function (e, data) {
-                e.stopPropagation();
-                user = data.user;
-                all_lines = data.lineArray;
-                companyData = data.companyData;
-
-                all_lines.sort(function (a, b) {
-                    return a.name.localeCompare(b.name);
-                });
-                //top title
-                var htmlStr = template('authorize-user-auth-title-temp', user);
-                $('.top_title', wrap).html(htmlStr);
-
-                //用户线调权限
-                defauleConfig = {userId: user.id, pattern: 0, excludeMenus: 'history_sch_maintain'};
-                $.get('/realControAuthority/findByUserId', {userId: user.id}, function (rs) {
-                    //console.log('rsrs',rs);
-                    xd_auth = rs;
-                    if (!xd_auth)
-                        xd_auth = defauleConfig;
-                    //渲染线路权限
-                    render_auth_lines();
-                    //渲染菜单权限
-                    render_auth_menus();
-                    //渲染线路选择modal
-                    //render_line_select_modal();
-                    patSelect = rs.pattern;
-                    $('#pattern_select', wrap).val(xd_auth.pattern).trigger('change').parent().show();
-                });
-            });
-            $('#pattern_select').change(function () {
-                if ($('#pattern_select', wrap).val() == 2 && $('#pattern_select', wrap).val() != patSelect) {
-                    // UIkit.modal.confirm("选择作废模式后该用户将失去所有线路和权限", function(){
-                    //
-                    // });
-                    UIkit.modal.alert("选择作废模式后该用户将失去所有线路和权限!");
-                }
-
-            })
-
-            function render_auth_lines() {
-                var data = [], codeArray = [];
-                if (xd_auth && xd_auth.lineCodeStr)
-                    codeArray = xd_auth.lineCodeStr.split(',');
-
-                $.each(all_lines, function () {
-                    if (codeArray.indexOf(this.lineCode) != -1)
-                        data.push(this);
-                });
-
-                data.sort(function (a, b) {
-                    return a.name.localeCompare(b.name);
-                });
-                //按分公司分组
-                var gd = groupBy(data, 'cgsbm');
-                data = [];
-                for (var code in gd) {
-                    data.push({
-                        code: code,
-                        fgsName: fgs_name_mapp[code],
-                        list: gd[code]
-                    });
-                    if (!fgs_name_mapp[code]) {
-                        alert('出现异常的公司归属 ：' + code);
-                    }
-                }
-
-                data.sort(function (a, b) {
-                    return a.fgsName.localeCompare(b.fgsName);
-                });
-
-                var htmlStr = template('authorize-user-auth-lines-temp', {list: data});
-                $('.xd_line_list', wrap).html(htmlStr);
-
-                //滚动条
-                $('.xd_line_list', wrap).perfectScrollbar({suppressScrollX: true});
-            }
-
-            function render_auth_menus() {
-                debugger
-                var excludeArray = [], event;
-                if (xd_auth && xd_auth.excludeMenus)
-                    excludeArray = xd_auth.excludeMenus.split(',');
-
-                $('.xd_menu_grid li>label>input').each(function () {
-                    event = $(this).data('event');
-                    if (excludeArray.indexOf(event) == -1)
-                        this.checked = true;
-                });
-                $('.xd_menu_grid').show();
-                $('.xd_menu_grid .uk-list', wrap).perfectScrollbar('update');
-            }
-
-            $('.xd_menu_grid .uk-list', wrap).perfectScrollbar({suppressScrollX: true});
-
-            /**
-             * 线路选择modal
-             */
-            var compSelectData, modal = '#select_line_modal', modalRender;
-            $(modal).on('show', function () {
-                if (!modalRender) {
-                    render_line_select_modal();
-                    modalRender = true;
-                }
-                $('#modal_line_input', modal).focus();
-            });
-
-            function render_line_select_modal() {
-                var htmlStr = template('authorize-modal-lines-temp', {
-                    list: all_lines,
-                    destroy: $('.modal_type_select', modal).val()
-                });
-                $('.line_checkbox_list').html(htmlStr);
-                //选中线路
-                var codeArray = [];
-                if (xd_auth && xd_auth.lineCodeStr)
-                    codeArray = xd_auth.lineCodeStr.split(',');
-
-                $('.line_checkbox_list>label.btn').each(function () {
-                    if (codeArray.indexOf($(this).data('code') + '') != -1) {
-                        $(this).addClass('active').find('>input')[0].checked = true;
-                    }
-                });
-
-                //构建公司级联下拉框
-                compSelectData = convert_buss_data(companyData);
-                var companyStr = '<option value="">请选择...</option>';
-                for (var code in compSelectData) {
-                    companyStr += '<option value="' + code + '">' + compSelectData[code].name + '</option>';
-                }
-                $('#modal_company_select', modal).html(companyStr).on('change', function () {
-                    var code = $(this).val(), subSelect = $('#modal_sub_company_select', modal);
-                    if (!code)
-                        subSelect.empty().attr('disabled', 'disabled');
-                    else {
-                        var subCompStr = '<option value="">请选择...</option>';
-                        $.each(compSelectData[code].childs, function () {
-                            subCompStr += '<option value="' + this.businessCode + '">' + this.businessName + '</option>';
-                        });
-                        subSelect.html(subCompStr).removeAttr('disabled');
-                    }
-                    //过滤线路
-                    filter_modal_lines();
-                });
-                $('#modal_sub_company_select', modal).on('change', filter_modal_lines);
-                $('#modal_type_select', modal).on('change', filter_modal_lines);
-            }
-
-            $('#modal_line_input', modal).on('input', function () {
-                var t = $(this).val() + '';
-                if (!t) {
-                    filter_modal_lines();
-                    return;
-                }
-                var codes = [];
-                $.each(all_lines, function () {
-                    if (this.name.indexOf(t) != -1)
-                        codes.push(this.lineCode);
-                });
-
-                var array = $('.line_checkbox_list>label.btn').css('display', 'none');
-                array.each(function () {
-                    if (codes.indexOf($(this).data('code') + '') != -1)
-                        $(this).css('display', 'inline-block');
-                });
-            });
-
-            function filter_modal_lines() {
-                console.log('filter_modal_lines');
-                var company = $('#modal_company_select', modal).val(),//公司代码
-                    sub_company = $('#modal_sub_company_select', modal).val(),//分公司代码
-                    type = $('#modal_type_select', modal).val();//线路状态
-
-                var array = $('.line_checkbox_list>label.btn').css('display', 'none'), s_dom = [];
-
-                if (!company && !sub_company && type == -1) {
-                    array.css('display', 'inline-block');
-                    return;
-                }
-
-                var status;
-                array.each(function () {
-                    if (company && $(this).data('gs') != company)
-                        return true;
-                    if (sub_company && $(this).data('fgs') != sub_company)
-                        return true;
-
-                    status = $(this).hasClass('destroy') ? 1 : 0;
-                    if (type != -1 && type != status)
-                        return true;
-
-                    s_dom.push(this);
-                });
-                for (var i = 0, dom; dom = s_dom[i++];)
-                    $(dom).css('display', 'inline-block');
-            }
-
-            $('.line_checkbox_list').on('click', 'label.btn', function () {
-                if ($('input', this)[0].checked)
-                    $(this).addClass('active');
-                else
-                    $(this).removeClass('active');
-            });
-
-            //全选
-            $('#globalCheckbox', modal).on('click', function () {
-                var state = this.checked;
-                $('.line_checkbox_list>label.btn:visible>input').each(function () {
-                    this.checked = state;
-                });
-
-                $('.line_checkbox_list>label.btn:visible').each(function () {
-                    if (state)
-                        $(this).addClass('active');
-                    else
-                        $(this).removeClass('active');
-                });
-            });
-
-            //确定
-            $('#confirmBtn', modal).on('click', function () {
-                var lines = '';
-                $('.line_checkbox_list>label.btn.active').each(function () {
-                    lines += ($(this).data('code') + ',');
-                });
-                xd_auth.lineCodeStr = lines;
-                render_auth_lines();
-                UIkit.modal(modal).hide();
-            });
-
-
-            //保存
-            $('#global_save_btn', wrap).on('click', function () {
-                $(this).attr('disabled', 'disabled');
-                //调度模式
-                xd_auth.pattern = $('#pattern_select', wrap).val();
-                //要排除的线调菜单
-                var excludeMenus = '';
-                $('.xd_menu_grid ul input[type=checkbox]').each(function () {
-                    if (!this.checked)
-                        excludeMenus += $(this).data('event') + ',';
-                });
-                xd_auth.excludeMenus = excludeMenus;
-                if (xd_auth.pattern == 2) {
-                    //UIkit.modal.confirm("选择作废模式后该用户将失去所有线路和权限", function () {
-                        xd_auth.lineCodeStr = '';
-                        var excludeMenusAll = '';
-                        $('.xd_menu_grid ul input[type=checkbox]').each(function () {
-                            excludeMenusAll += $(this).data('event') + ',';
-                        });
-                        xd_auth.excludeMenus = excludeMenusAll;
-                    //});
-
-                }
-                $.post('/realControAuthority', xd_auth, function (rs) {
-                    UIkit.notification('保存成功！', 'primary');
-                    $('.authorize_right_cont').trigger('refresh-user');
-                });
-            });
-        })();
-    </script>
+<!-- 用户线调授权页面 -->
+<div id="user_authorize_wrap" style="height: 100%;">
+    <div class="top_title"></div>
+
+    <div class="xd_line_list">
+    </div>
+    <div class="top_tools">
+        <form class="ct_pattern_form">
+            <div class="uk-margin">
+                <div uk-form-custom="target: > * > span:first" style="display: none">
+                    <select id="pattern_select">
+                        <option value="0">监控模式</option>
+                        <option value="1">主调模式</option>
+                        <option value="2">作废模式</option>
+                    </select>
+                    <button class="uk-button uk-button-default" type="button" tabindex="-1">
+                        <span></span>
+                        <span uk-icon="icon: chevron-down"></span>
+                    </button>
+                </div>
+            </div>
+        </form>
+        <div class="add_line_icon" uk-toggle="target: #select_line_modal">
+            <i uk-icon="icon: plus"></i> 添加线路
+        </div>
+        &nbsp;&nbsp;
+        <button class="uk-button uk-button-primary uk-button-small" id="global_save_btn">保存哇！</button>
+    </div>
+
+    <div class="uk-child-width-expand uk-grid-small xd_menu_grid" uk-grid style="display: none;">
+
+        <div>
+            <h4>数据&统计</h4>
+            <ul class="uk-list uk-list-large uk-list-divider">
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="curr_date_schedule"> 当日计划排班</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="cache_data_manage"> 缓存数据管理</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="history_sch_maintain"> 历史路单维护</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="sch_edit_info"> 班次修正日志</label></li>
+            </ul>
+        </div>
+
+        <div>
+            <h4>报表管理</h4>
+            <ul class="uk-list uk-list-large uk-list-divider">
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_waybill"> 行车路单</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_history_message"> 调度历史消息</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_account"> 驾驶员请求台账</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_correctForm"> 修正报表</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_statisticsDaily"> 统计日报</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_scheduleDaily"> 调度日报</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_jobSummary"> 工作汇总</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_daily"> 班次日报表</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_inoutstation"> 班次到离站</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_oilListMonth"> 月存油报表</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_scheduleAnaly"> 时刻表分析</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_message"> 调度消息分析</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_changetochange"> 换人换车情况统计表</label></li>
+            </ul>
+        </div>
+
+        <div>
+            <h4>车载设备</h4>
+            <ul class="uk-list uk-list-large uk-list-divider">
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="all_devices"> 设备管理</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="directive_history"> 指令下发记录</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="device_report"> 设备上报记录</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="gps_play_back"> 轨迹回放</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="safe_driving"> 安全驾驶(图像)</label></li>
+            </ul>
+        </div>
+
+        <div>
+            <h4>系统设置</h4>
+            <ul class="uk-list uk-list-large uk-list-divider">
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="line_config"> 线路配置</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="fbzdzx_config"> 翻班与自动执行</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="tts_config"> TTS</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="signal_state"> 信号标记</label></li>
+            </ul>
+        </div>
+
+    </div>
+
+    <!-- This is the modal -->
+    <div id="select_line_modal" class="uk-modal-container" uk-modal="bg-close:false;">
+        <div class="uk-modal-dialog uk-modal-body">
+            <button class="uk-modal-close-outside" type="button" uk-close></button>
+            <h2 class="uk-modal-title">添加线路权限</h2>
+            <div>
+                <form>
+                    <div class="ct_field" style="width: 140px;">
+                        <label>状态</label>
+                        <select class="uk-select" id="modal_type_select" style="width: 94px;">
+                            <option value="-1">全部</option>
+                            <option value="0">营运</option>
+                            <option value="1">撤销</option>
+                        </select>
+                    </div>
+                    <div class="ct_field">
+                        <label>公司</label>
+                        <select class="uk-select" id="modal_company_select"></select>
+                    </div>
+                    <div class="ct_field">
+                        <label>分公司</label>
+                        <select class="uk-select" id="modal_sub_company_select" disabled></select>
+                    </div>
+                    <div class="ct_field">
+                        <label>线路</label>
+                        <input class="uk-input" id="modal_line_input" placeholder="没做拼音映射！！"/>
+                    </div>
+                    <label><input class="uk-checkbox" type="checkbox" id="globalCheckbox"> 全选</label>
+                </form>
+                <div class="uk-modal-body line_checkbox_list" style="padding: 0 !important;" uk-overflow-auto>
+                </div>
+            </div>
+            <p class="uk-text-right">
+                <button class="uk-button uk-button-default uk-modal-close" type="button">取消</button>
+                <button class="uk-button uk-button-primary"  id="confirmBtn" type="button">确定</button>
+            </p>
+        </div>
+    </div>
+
+    <script id="authorize-user-auth-lines-temp" type="text/html">
+        {{each list as t i}}
+        <h5>{{t.fgsName}}</h5>
+        <div class="sub_lines">
+            {{each t.list as obj j}}
+            <span title="{{obj.lineCode}}" class="line_btn {{obj.destroy==1?'destroy':''}}">{{obj.name}}</span>
+            {{/each}}
+        </div>
+        {{/each}}
+    </script>
+    <script id="authorize-user-auth-title-temp" type="text/html">
+        <div style="font-weight: 600;">{{name}}（{{userName}}）
+        </div>
+        <!--<div class="desc">最近登录 {{lastLoginDateStr}}</div>-->
+        <div class="desc">...</div>
+    </script>
+
+    <script id="authorize-modal-lines-temp" type="text/html">
+        {{each list as obj i}}
+        <label class="btn {{obj.destroy==1?'destroy':''}}" data-gs="{{obj.company}}" data-fgs="{{obj.brancheCompany}}"
+               title="{{obj.name}}" data-code="{{obj.lineCode}}">
+            <input class="uk-checkbox" type="checkbox">{{obj.name}}
+        </label>
+        {{/each}}
+    </script>
+    <script>
+        (function () {
+            var wrap = '#user_authorize_wrap', user, xd_auth, all_lines, companyData;
+            //分公司名称映射（只用于分组展示，就写死）
+
+            var fgs_name_mapp = {
+                '55_3': '上南公司（六分公司）',
+                '55_1': '上南公司（二分公司）',
+                '55_2': '上南公司（三分公司）',
+                '55_4': '上南公司（一分公司）',
+                '55_5': '上南公司（培训部）',
+                '22_2': '金高公司（二分公司）',
+                '22_1': '金高公司（四分公司）',
+                '22_3': '金高公司（三分公司）',
+                '22_5': '金高公司（一分公司）',
+                '26_3': '南汇公司（三分公司）',
+                '26_2': '南汇公司（南汇二分）',
+                '26_1': '南汇公司（南汇一分）',
+                '26_4': '南汇公司（南汇维修公司）',
+                '26_5': '南汇公司（南汇公司）',
+                '26_6': '南汇公司（南汇六分）',
+                '05_5': '杨高公司（杨高分公司）',
+                '05_6': '杨高公司（周浦分公司）',
+                '05_3': '杨高公司（芦潮港分公司）',
+                '05_1': '杨高公司（川沙分公司）',
+                '05_2': '杨高公司（金桥分公司）',
+                '77_78': '闵行公司',
+                '300_301': '金球公交',
+                '99_100': '青浦公交',
+                '24_1': '一车队',
+                '24_2': '二车队',
+                '24_3': '三车队'
+
+            };
+
+            var defauleConfig;
+            var patSelect;
+            $(wrap).on('init', function (e, data) {
+                e.stopPropagation();
+                user = data.user;
+                all_lines = data.lineArray;
+                companyData = data.companyData;
+
+                all_lines.sort(function (a, b) {
+                    return a.name.localeCompare(b.name);
+                });
+                //top title
+                var htmlStr = template('authorize-user-auth-title-temp', user);
+                $('.top_title', wrap).html(htmlStr);
+
+                //用户线调权限
+                defauleConfig = {userId: user.id, pattern: 0, excludeMenus: 'history_sch_maintain'};
+                $.get('/realControAuthority/findByUserId', {userId: user.id}, function (rs) {
+                    //console.log('rsrs',rs);
+                    xd_auth = rs;
+                    if (!xd_auth)
+                        xd_auth = defauleConfig;
+                    //渲染线路权限
+                    render_auth_lines();
+                    //渲染菜单权限
+                    render_auth_menus();
+                    //渲染线路选择modal
+                    //render_line_select_modal();
+                    patSelect = rs.pattern;
+                    $('#pattern_select', wrap).val(xd_auth.pattern).trigger('change').parent().show();
+                });
+            });
+            $('#pattern_select').change(function () {
+                if ($('#pattern_select', wrap).val() == 2 && $('#pattern_select', wrap).val() != patSelect) {
+                    // UIkit.modal.confirm("选择作废模式后该用户将失去所有线路和权限", function(){
+                    //
+                    // });
+                    UIkit.modal.alert("选择作废模式后该用户将失去所有线路和权限!");
+                }
+
+            })
+
+            function render_auth_lines() {
+                var data = [], codeArray = [];
+                if (xd_auth && xd_auth.lineCodeStr)
+                    codeArray = xd_auth.lineCodeStr.split(',');
+
+                $.each(all_lines, function () {
+                    if (codeArray.indexOf(this.lineCode) != -1)
+                        data.push(this);
+                });
+
+                data.sort(function (a, b) {
+                    return a.name.localeCompare(b.name);
+                });
+                //按分公司分组
+                var gd = groupBy(data, 'cgsbm');
+                data = [];
+                for (var code in gd) {
+                    data.push({
+                        code: code,
+                        fgsName: fgs_name_mapp[code],
+                        list: gd[code]
+                    });
+                    if (!fgs_name_mapp[code]) {
+                        alert('出现异常的公司归属 ：' + code);
+                    }
+                }
+
+                data.sort(function (a, b) {
+                    return a.fgsName.localeCompare(b.fgsName);
+                });
+
+                var htmlStr = template('authorize-user-auth-lines-temp', {list: data});
+                $('.xd_line_list', wrap).html(htmlStr);
+
+                //滚动条
+                $('.xd_line_list', wrap).perfectScrollbar({suppressScrollX: true});
+            }
+
+            function render_auth_menus() {
+                debugger
+                var excludeArray = [], event;
+                if (xd_auth && xd_auth.excludeMenus)
+                    excludeArray = xd_auth.excludeMenus.split(',');
+
+                $('.xd_menu_grid li>label>input').each(function () {
+                    event = $(this).data('event');
+                    if (excludeArray.indexOf(event) == -1)
+                        this.checked = true;
+                });
+                $('.xd_menu_grid').show();
+                $('.xd_menu_grid .uk-list', wrap).perfectScrollbar('update');
+            }
+
+            $('.xd_menu_grid .uk-list', wrap).perfectScrollbar({suppressScrollX: true});
+
+            /**
+             * 线路选择modal
+             */
+            var compSelectData, modal = '#select_line_modal', modalRender;
+            $(modal).on('show', function () {
+                if (!modalRender) {
+                    render_line_select_modal();
+                    modalRender = true;
+                }
+                $('#modal_line_input', modal).focus();
+            });
+
+            function render_line_select_modal() {
+                var htmlStr = template('authorize-modal-lines-temp', {
+                    list: all_lines,
+                    destroy: $('.modal_type_select', modal).val()
+                });
+                $('.line_checkbox_list').html(htmlStr);
+                //选中线路
+                var codeArray = [];
+                if (xd_auth && xd_auth.lineCodeStr)
+                    codeArray = xd_auth.lineCodeStr.split(',');
+
+                $('.line_checkbox_list>label.btn').each(function () {
+                    if (codeArray.indexOf($(this).data('code') + '') != -1) {
+                        $(this).addClass('active').find('>input')[0].checked = true;
+                    }
+                });
+
+                //构建公司级联下拉框
+                compSelectData = convert_buss_data(companyData);
+                var companyStr = '<option value="">请选择...</option>';
+                for (var code in compSelectData) {
+                    companyStr += '<option value="' + code + '">' + compSelectData[code].name + '</option>';
+                }
+                $('#modal_company_select', modal).html(companyStr).on('change', function () {
+                    var code = $(this).val(), subSelect = $('#modal_sub_company_select', modal);
+                    if (!code)
+                        subSelect.empty().attr('disabled', 'disabled');
+                    else {
+                        var subCompStr = '<option value="">请选择...</option>';
+                        $.each(compSelectData[code].childs, function () {
+                            subCompStr += '<option value="' + this.businessCode + '">' + this.businessName + '</option>';
+                        });
+                        subSelect.html(subCompStr).removeAttr('disabled');
+                    }
+                    //过滤线路
+                    filter_modal_lines();
+                });
+                $('#modal_sub_company_select', modal).on('change', filter_modal_lines);
+                $('#modal_type_select', modal).on('change', filter_modal_lines);
+            }
+
+            $('#modal_line_input', modal).on('input', function () {
+                var t = $(this).val() + '';
+                if (!t) {
+                    filter_modal_lines();
+                    return;
+                }
+                var codes = [];
+                $.each(all_lines, function () {
+                    if (this.name.indexOf(t) != -1)
+                        codes.push(this.lineCode);
+                });
+
+                var array = $('.line_checkbox_list>label.btn').css('display', 'none');
+                array.each(function () {
+                    if (codes.indexOf($(this).data('code') + '') != -1)
+                        $(this).css('display', 'inline-block');
+                });
+            });
+
+            function filter_modal_lines() {
+                console.log('filter_modal_lines');
+                var company = $('#modal_company_select', modal).val(),//公司代码
+                    sub_company = $('#modal_sub_company_select', modal).val(),//分公司代码
+                    type = $('#modal_type_select', modal).val();//线路状态
+
+                var array = $('.line_checkbox_list>label.btn').css('display', 'none'), s_dom = [];
+
+                if (!company && !sub_company && type == -1) {
+                    array.css('display', 'inline-block');
+                    return;
+                }
+
+                var status;
+                array.each(function () {
+                    if (company && $(this).data('gs') != company)
+                        return true;
+                    if (sub_company && $(this).data('fgs') != sub_company)
+                        return true;
+
+                    status = $(this).hasClass('destroy') ? 1 : 0;
+                    if (type != -1 && type != status)
+                        return true;
+
+                    s_dom.push(this);
+                });
+                for (var i = 0, dom; dom = s_dom[i++];)
+                    $(dom).css('display', 'inline-block');
+            }
+
+            $('.line_checkbox_list').on('click', 'label.btn', function () {
+                if ($('input', this)[0].checked)
+                    $(this).addClass('active');
+                else
+                    $(this).removeClass('active');
+            });
+
+            //全选
+            $('#globalCheckbox', modal).on('click', function () {
+                var state = this.checked;
+                $('.line_checkbox_list>label.btn:visible>input').each(function () {
+                    this.checked = state;
+                });
+
+                $('.line_checkbox_list>label.btn:visible').each(function () {
+                    if (state)
+                        $(this).addClass('active');
+                    else
+                        $(this).removeClass('active');
+                });
+            });
+
+            //确定
+            $('#confirmBtn', modal).on('click', function () {
+                var lines = '';
+                $('.line_checkbox_list>label.btn.active').each(function () {
+                    lines += ($(this).data('code') + ',');
+                });
+                xd_auth.lineCodeStr = lines;
+                render_auth_lines();
+                UIkit.modal(modal).hide();
+            });
+
+
+            //保存
+            $('#global_save_btn', wrap).on('click', function () {
+                $(this).attr('disabled', 'disabled');
+                //调度模式
+                xd_auth.pattern = $('#pattern_select', wrap).val();
+                //要排除的线调菜单
+                var excludeMenus = '';
+                $('.xd_menu_grid ul input[type=checkbox]').each(function () {
+                    if (!this.checked)
+                        excludeMenus += $(this).data('event') + ',';
+                });
+                xd_auth.excludeMenus = excludeMenus;
+                if (xd_auth.pattern == 2) {
+                    //UIkit.modal.confirm("选择作废模式后该用户将失去所有线路和权限", function () {
+                        xd_auth.lineCodeStr = '';
+                        var excludeMenusAll = '';
+                        $('.xd_menu_grid ul input[type=checkbox]').each(function () {
+                            excludeMenusAll += $(this).data('event') + ',';
+                        });
+                        xd_auth.excludeMenus = excludeMenusAll;
+                    //});
+
+                }
+                $.post('/realControAuthority', xd_auth, function (rs) {
+                    UIkit.notification('保存成功！', 'primary');
+                    $('.authorize_right_cont').trigger('refresh-user');
+                });
+            });
+        })();
+    </script>
 </div>
 \ No newline at end of file