Merge branch 'pudong' of http://192.168.168.201:8888/panzhaov5/bsth_control into pudong

王通
2 parents 78022dce 26d356d2
Showing 26 changed files with 2917 additions and 1714 deletions
README.md
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/repository/sys/RoleRepository.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/sys/impl/RoleServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/application-prod.properties
src/main/resources/application.properties
src/main/resources/static/pages/permission/authorize_all/user_auth.html
src/main/resources/static/pages/permission/user/authorize.html
src/main/resources/static/pages/permission/user/edit.html
src/main/resources/static/pages/permission/user/list.html
src/main/resources/static/pages/permission/user/main.html
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lp_change.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_custom.html
-公交调度系统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 | 设备状态字 |
-<<<<<<< HEAD
-| daysYear | int | 对应年中的天数 为分区字段 查询一定要用此字段过滤 |
-=======
-| daysYear | int | 对应年中的天数 为分区字段 查询一定要用此字段过滤 |
-
->>>>>>> af8ec3bedc8644f5813e9adab12a163e93cc7f50
+公交调度系统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 | 对应年中的天数 为分区字段 查询一定要用此字段过滤 |
+
-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);
-	}
-	
-	/**
-	 * 从历史库里删除临加班次
-	 * @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;
+	}
+}
@@ -231,6 +231,15 @@ public class ScheduleRealInfo {
 	 * 换车营运标记 true 表示该主任务由 【中途换车子任务】 级联生成
 	 */
 	private boolean ccService;
+	private Integer lpChange;
+
+	public Integer getLpChange() {
+		return lpChange;
+	}
+
+	public void setLpChange(Integer lpChange) {
+		this.lpChange = lpChange;
+	}
  
 	public boolean isDfAuto() {
 		return dfAuto;
@@ -392,6 +392,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
  
 	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
 	@Override
+	@Query(value = "select r from StationRoute r where r.destroy=0")
 	List<StationRoute> findAll();
  
 	@Query("select new map(sr.station.id as stationid, sr.stationName as stationname) from StationRoute sr where sr.line.id=?1 and sr.directions=?2")
@@ -223,4 +223,12 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Override
 	List<ScheduleRealInfo> findAll();
  
+	@Modifying
+	@Transactional
+	@Query(value = "update ScheduleRealInfo s set s.lpChange=1 where s.id=?1 ")
+	Integer updateLpChange(Long id);
+
+	@Query(value = "select count (s.id) from ScheduleRealInfo s where s.clZbh=?1 and s.scheduleDateStr=?2 and s.xlBm=?3 and s.qdzCode=?4")
+	Object isCircleQdz(String clzbh,String sdr,String xlbm,String qdzCode);
+
 }
@@ -3,6 +3,7 @@ package com.bsth.repository.sys;
  
 import javax.transaction.Transactional;
  
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -10,6 +11,8 @@ import org.springframework.stereotype.Repository;
 import com.bsth.entity.sys.Role;
 import com.bsth.repository.BaseRepository;
  
+import java.util.List;
+
 @Repository
 public interface RoleRepository extends BaseRepository<Role, Integer>{
  
@@ -21,4 +24,7 @@ public interface RoleRepository extends BaseRepository&lt;Role, Integer&gt;{
 	@Transactional
 	@Query("update Role r set r.codeName=?1, r.roleName=?2, r.enable=?3, r.descriptions=?4 where r.id=?5")
 	void update(String codeName, String roleName, boolean enable, String descriptions, Integer id);
+
+	@Query(value = "select * from role where id in(?1)",nativeQuery = true)
+	List<Role> findAllById(String ids);
 }
@@ -193,4 +193,5 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
  
 	List<Map<String, Object>> scheduleCorrectionReport(String gsdm, String fgsdm,
 			String line, String date, String date2);
+	Integer isCircleQdz(String clzbh,String sdr,String xlbm,String qdzCode);
 }
@@ -5606,8 +5606,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ScheduleRealInfo leftSch, rightSch = null;
             for (int i = 0; i < largeList.size(); i++) {
                 leftSch = largeList.get(i);
+                leftSch.setLpChange(1);
                 if (i < smallList.size()) {
                     rightSch = smallList.get(i);
+                    rightSch.setLpChange(1);
                     ts.add(rightSch);
                 } else {
                     //不对称时多出来的
@@ -5626,6 +5628,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
                 carSet.add(leftSch.getClZbh());
                 carSet.add(rightSch.getClZbh());
+                scheduleRealInfoRepository.updateLpChange(leftSch.getId());
+                scheduleRealInfoRepository.updateLpChange(rightSch.getId());
             }
  
             //重新计算路牌的起点应到时间
@@ -5981,6 +5985,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         lMap.add(resMap);
         return lMap;
     }
+
+    @Override
+    public Integer isCircleQdz(String clzbh, String sdr, String xlbm, String qdzCode) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String time =sdf.format(Long.parseLong(sdr));
+
+        Object num=scheduleRealInfoRepository.isCircleQdz(clzbh, time, xlbm, qdzCode);
+        Integer num2=num==0||num==0L?0:1;
+        return num2;
+    }
 }
  
 class AccountMap implements Comparator<Map<String, Object>> {
@@ -103,4 +103,9 @@ public class RoleServiceImpl extends BaseServiceImpl&lt;Role, Integer&gt; implements
 		map.put("userNames", userNames);
 		return map;
 	}
+
+	@Override
+	public List<Role> findAllByIds(String ids) {
+		return roleRepository.findAllById(ids);
+	}
 }
@@ -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/
 \ No newline at end of file
+http.send.directive = http://192.168.168.201:9090/transport_server/message/
@@ -17,22 +17,15 @@ spring.datasource.max-idle=8
 spring.datasource.min-idle=8
 spring.datasource.initial-size=5
  
-spring.datasource.max-wait=10000
-spring.datasource.remove-abandoned=true
-spring.datasource.remove-abandoned-timeout=120
-
 spring.datasource.test-on-borrow=true
 spring.datasource.test-on-connect=true
 spring.datasource.test-on-return=true
 spring.datasource.test-while-idle=true
 spring.datasource.validation-query=select 1
-spring.datasource.time-between-eviction-runs-millis=1800000
  
 ## gps client data
 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
 http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
 ## gateway send directive
-http.send.directive = http://10.10.200.79:8080/transport_server/message/
-## maintenance report
-http.report.url = http://116.247.73.122:9098/jgjwsystem_j2ee/
 \ No newline at end of file
+http.send.directive = http://10.10.200.79:8080/transport_server/message/
 \ No newline at end of file
 spring.profiles: dev,prod
-spring.profiles.active: prod
+spring.profiles.active: dev
  
 spring.view.suffix=.html
 server.session-timeout=-1
-<!-- 用户线调授权页面 -->
-<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>
-                    </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="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': '金球公交','302_303': '露虹公交', '99_100': '青浦公交','24_1': '一车队', '24_2': '二车队', '24_3': '三车队'
-            };
-
-            var defauleConfig;
-
-            $(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();
-                    $('#pattern_select',wrap).val(xd_auth.pattern).trigger('change').parent().show();
-                });
-            });
-
-            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() {
-                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;
-                $.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;
+            //分公司名称映射（只用于分组展示，就写死）
+<<<<<<< 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>
 \ No newline at end of file
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
+    <link rel="stylesheet" href="/assets/plugins/ztree_v3/css/zTreeStyle/zTreeStyle.css" />
+    <style>
+        html,body{
+            height: 100%;
+        }
+        .ct_page{
+            padding: 25px 15px;
+            height: 100%;
+            height: calc(100% - 50px);
+        }
+
+        .ct_cont{
+            height: calc(100% - 41px);
+        }
+
+        .ct_cont>div>div.uk-card{
+            height: 99%;
+        }
+
+        form .uk-inline{
+            width: calc(100% - 4px);
+            margin-left: 2px;
+        }
+
+        .ct-card-body{
+            overflow: auto;
+            padding: 1px 1px 0 2px;
+            height: calc(100% - 54px);
+            position: relative;
+            margin-top: -12px;
+        }
+
+        .ct_li_desc{
+            color: #a8a8a8;
+            font-size: 13px;
+        }
+
+        .ct-card-body .uk-list-large{
+            font-size: 14px;
+        }
+
+        .ct-card-body .uk-list-large>li{
+            cursor: default;
+            padding-left: 20px;
+            margin-top: 2px !important;
+            padding-top: 17px !important;
+            position: relative;
+        }
+
+        .ct-card-body .uk-list-large>li:hover{
+            background: #edecec;
+        }
+
+        .ct-card-body .uk-list-large>li.active{
+            background: #1e87f0 !important;
+            color: white;
+        }
+
+        .ct-card-body .uk-list-large>li.active>span.role-code{
+            color: #ffffff;
+        }
+
+        .ct-card-body .uk-list-large.role-list>li:hover{
+            background: #fff494;
+        }
+
+        .ct-card-body .uk-list-large>li.active .ct_li_desc{
+            color: #e6e6e6;
+        }
+
+        .ct-card-body .uk-list-large>li>span.uk-badge{
+            position: absolute;
+            top: 17px;
+            right: 25px;
+        }
+
+        .ct-card-body .uk-list-large>li>span.role-code{
+            padding: 4px 6px;
+            color: #a8a8a8;
+            margin-left: 5px;
+        }
+
+        .top_title{
+            padding: 9px 0 5px 15px;
+            border-bottom: 1px solid #ededed;
+            border-left: 5px solid #FFC107;
+        }
+
+        .top_title>.desc{
+            font-size: 13px;
+            color: grey;
+            margin-top: 3px;
+        }
+
+        .left_menu_list{
+            overflow: auto;
+            position: relative;
+        }
+
+        .left_menu_list .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
+            opacity: 0.6 !important;
+            padding: 0 !important;
+        }
+
+        ._company{
+            margin: 15px 0px;
+        }
+        ._company>h5{
+            margin-bottom: 10px;
+            font-size: 15px;
+            color: #6b6b6b;
+            text-indent: 12px;
+        }
+        ._company>._fgs>label{
+            padding: 3px 12px 3px 10px;
+            display: inline-block;
+            border: 1px solid gainsboro;
+            border-radius: 2px;
+            margin: 5px;
+            font-size: 14px;
+        }
+        ._company>._fgs>label.active{
+            background: #1e87f0;
+            color: #fff;
+        }
+        ._company .uk-checkbox:checked:focus,
+        .line_checkbox_list .uk-checkbox:checked:focus{
+            background-color: #1e87f0 !important;
+        }
+        .save_icon{
+            position: absolute;
+            right: 2px;
+            background: #bec4c9;
+            font-size: 12px;
+            padding: 2px 15px;
+            color: #fff;
+            box-shadow: 0 5px 15px rgba(0,0,0,0.08);
+            cursor: pointer;
+        }
+        .save_icon:hover{
+            background: #FFC107;
+        }
+        .data_auth_list{
+            position: relative;
+        }
+        #user_authorize_wrap .top_title{
+            border-left: 5px solid #cacac8;
+        }
+        .xd_line_list{
+            height: 37%;
+            padding: 7px;
+            border-bottom: 1px solid #f2f2f2;
+            overflow: auto;
+            position: relative;
+        }
+        .xd_line_list>h5{
+            color: #858585;
+            margin: 5px 5px 5px 0;
+            font-size: 14px;
+        }
+        .sub_lines{
+            padding-left: 15px;
+        }
+        .sub_lines>span.line_btn {
+            background: #00BCD4;
+            color: #fff;
+            padding: 4px 9px;
+            display: inline-block;
+            min-width: 68px;
+            text-align: center;
+            margin: 5px 2px;
+            box-shadow: 0 5px 9px rgba(0,0,0,0.08);
+            cursor: pointer;
+            font-size: 14px;
+            font-family: 微软雅黑;
+        }
+
+        .sub_lines>span.line_btn.destroy{
+            background: #ff5c5c;
+        }
+
+        .sub_lines>span.line_btn.destroy:hover{
+            background: #ff7373;
+        }
+
+        .sub_lines>span.line_btn:hover{
+            background: #2dd7ed;
+        }
+        .add_line_icon{
+            cursor: pointer;
+            padding: 2px 5px;
+            border-radius: 5px;
+            display: inline-block;
+        }
+        .add_line_icon>i{
+            vertical-align: top;
+            margin-top: 3px;
+        }
+        .add_line_icon:hover{
+            background: #ededed;
+        }
+        .ct_pattern_form{
+            display: inline-block;
+        }
+        .xd_menu_grid{
+            padding: 25px 25px 0 25px;
+            height: calc(63% - 91px);
+        }
+        .xd_menu_grid .uk-list{
+            border: 1px solid #ededed;
+            height: calc(100% - 70px);
+            overflow: auto;
+            position: relative;
+        }
+
+        .xd_menu_grid .uk-list>li{
+            margin: 5px 0 !important;
+            padding: 10px 0 0 10px !important;
+            font-size: 14px;
+        }
+        .top_tools{
+            position: absolute;
+            top: 15px;
+            right: 25px;
+        }
+        .ct_field {
+            display: inline-block;
+            width: 240px;
+        }
+        .ct_field>select,.ct_field>input{
+            width: calc(100% - 60px);
+        }
+        .line_checkbox_list{
+            margin-top: 15px;
+        }
+        .line_checkbox_list>.btn{
+            padding: 5px 7px;
+            border-radius: 2px;
+            display: inline-block;
+            margin: 4px 9px;
+            font-size: 14px;
+            font-family: 微软雅黑;
+            border: 1px solid #d9d9d9;
+            width: 100px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+        .line_checkbox_list>.btn>input{
+            margin-right: 5px;
+        }
+        .line_checkbox_list>.btn.active{
+            background: #1e87f0;
+            color: #fff;
+        }
+
+        .line_checkbox_list>.btn.destroy,
+        .line_checkbox_list>.btn.destroy>input{
+            border-color: #ff9595;
+            color: #ff5c5c;
+        }
+
+        .line_checkbox_list>.btn.destroy.active{
+            background: #ff5c5c;
+            color: #fff;
+        }
+
+        .line_checkbox_list>.btn.destroy.active>input{
+            background-color: #ff5c5c !important;
+            border-color: #ff5c5c !important;
+        }
+
+        #role_authorize_wrap .ztree *{
+            font-size: 14px;
+        }
+        #role_authorize_wrap .ztree li{
+            line-height: 21px;
+        }
+        .loading{
+            height: 100%;
+            text-align: center;
+        }
+        .loading .uk-spinner{
+            margin-top: 200px;
+        }
+        .loading circle{
+            stroke: red;
+        }
+
+        #select_line_modal .uk-checkbox:checked {
+            background-color: #1e87f0;
+        }
+    </style>
+</head>
+
+<body>
+<div class="loading">
+    <div uk-spinner></div>
+</div>
+<div class="ct_page" style="display: none;">
+    <h2 class="uk-heading-line uk-heading-bullet"><span>用户授权管理</span></h2>
+    <div class="ct_cont uk-grid-small uk-child-width-expand" uk-grid>
+        <div class="role_list uk-width-1-4 ">
+            <div class="uk-card uk-card-default">
+                <form>
+                    <div class="uk-margin">
+                        <div class="uk-inline" >
+                            <!--<span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>-->
+                            <!--<input class="uk-input role_search_input" type="text" placeholder="搜索角色">-->
+                        </div>
+                    </div>
+                </form>
+
+                <div class="ct-card-body" >
+                    <ul class="uk-list uk-list-large uk-list-divider role-list">
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="user_list uk-width-1-5 ">
+            <div class="uk-card uk-card-default">
+                <form>
+                    <div class="uk-margin">
+                        <div class="uk-inline" >
+                            <!--<span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>-->
+                            <!--<input class="uk-input user_search_input" type="text" placeholder="搜索用户">-->
+                        </div>
+                    </div>
+                </form>
+
+                <div class="ct-card-body">
+                    <ul class="uk-list uk-list-large user-list">
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="auth_cont ">
+            <div class="uk-card uk-card-default authorize_right_cont">
+
+            </div>
+        </div>
+    </div>
+</div>
+
+<script id="authorize-role-list-temp" type="text/html">
+    {{each list as r i}}
+        <li data-id="{{r.id}}" data-name="{{r.roleName}}" data-code="{{r.codeUp}}">{{r.roleName}}
+            <span class="role-code">{{r.codeName}}</span>
+            <div class="ct_li_desc">{{r.createDateStr}}</div>
+            <span class="uk-badge">{{r.count}}</span>
+        </li>
+    {{/each}}
+</script>
+<script id="authorize-user-list-temp" type="text/html">
+    {{each list as u i}}
+    <li class="uk-animation-fade uk-animation-fast" data-name="{{u.name}}" data-code="{{u.userNameUp}}" data-id="{{u.id}}">{{u.name}}<span class="role-code">{{u.userName}}</span></li>
+    {{/each}}
+</script>
+<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+<script src="/assets/js/common.js"></script>
+<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<script src="/assets/plugins/ztree_v3/js/jquery.ztree.core.min.js"></script>
+<script src="/assets/plugins/ztree_v3/js/jquery.ztree.excheck.min.js"></script>
+<script>
+    var storage = window.localStorage;
+
+    if (typeof String.prototype.startsWith != 'function') {
+        String.prototype.startsWith = function (prefix){
+            return this.slice(0, prefix.length) === prefix;
+        };
+    }
+    var roles,users,role_users,modules,companyData,lineArray;
+
+    var ep = EventProxy.create('query_roles', 'query_users', 'query_modules', 'query_company', 'query_line', function (rs, us, ms, cs, lines) {
+        roles = rs;
+        users = us;
+        modules = ms;
+        companyData = cs;
+        lineArray=lines;
+        role_users = {};
+        debugger
+        for(var i=0,r;r=roles[i++];){
+            r.count=0;
+            role_users[r.id]=[];
+            r.createDateStr=moment(r.createDate).format('YYYY-MM-DD HH:ss');
+            r.codeUp=r.codeName.toUpperCase();
+            for(var j=0,u;u=users[j++];){
+                if(u.roles.indexOf(r.id)!=-1){
+                    r.count++;
+                    role_users[r.id].push(u);
+                }
+            }
+        }
+        //渲染角色list
+        render_role_list(roles);
+        //渲染用户list
+        render_user_list(users);
+
+        $('.loading').remove();
+        $('.ct_page').show();
+    });
+
+    //角色点击
+    $('ul.role-list').on('click', 'li', roleClickHanlder);
+    //用户点击
+    $('ul.user-list').on('click', 'li', userClickHanlder);
+
+
+    function roleClickHanlder() {
+        if($(this).hasClass('active') && $('ul.user-list>li.active').length==0)
+            return;
+
+        reset_dom();
+        $('ul.role-list>li.active').removeClass('active');
+        $(this).addClass('active');
+        //重新渲染用户list
+        var id = $(this).data('id');
+        render_user_list(role_users[id]);
+        //加载角色授权页面
+        $('.authorize_right_cont').load('/pages/permission/authorize_all/role_auth.html', function () {
+            $('#role_authorize_wrap', this).trigger('init', {role: get_role(id), modules: modules, companyData: companyData});
+        });
+    }
+
+    function userClickHanlder() {
+        if($(this).hasClass('active'))
+            return;
+
+        reset_dom();
+        $('ul.user-list>li.active').removeClass('active');
+        $(this).addClass('active');
+
+        //加载用户授权页面
+        var id = $(this).data('id');
+        $('.authorize_right_cont').load('/pages/permission/authorize_all/user_auth.html', function () {
+            $('#user_authorize_wrap', this).trigger('init', {user: get_user(id),lineArray:lineArray, companyData:companyData});
+        });
+    }
+
+    //refresh-user
+    $('.authorize_right_cont').on('refresh-user', function () {
+        $('ul.user-list>li.active').removeClass('active').trigger('click');
+    });
+
+    function reset_dom() {
+        $('#select_line_modal').remove();
+    }
+
+    //滚动条
+    $('.ct_page .uk-card .ct-card-body').perfectScrollbar({suppressScrollX: true});
+
+    //query all role
+    var paramsRole = {};
+    paramsRole['codeName'] = 'ROLE_ADMIN';
+    var storage = window.localStorage;
+    var userId=storage.getItem("editUser");
+    $get('/user',{id_eq:userId}, function (rs) {
+        debugger
+        //if (rs)
+        ep.emit('query_roles', rs.content[0].roles);
+    });
+
+
+    //query all user
+    var paramsUser = {};
+    paramsRole['name'] = 'name';
+    $.get('/user/all_distinct',paramsUser, function (rs) {
+        var userA={};
+        for(var i=0,u;u=rs[i++];){
+            if (u.id==userId){
+            discard_field(u);
+            u.userNameUp=u.userName.toUpperCase();
+            u.lastLoginDateStr=moment(u.lastLoginDate).format('YYYY-MM-DD HH:ss');
+                userA[0]=u;
+            }
+        }
+        ep.emit('query_users', userA);
+    });
+
+    //query all modules
+    $.get('/module/all_distinct', function (rs) {
+        ep.emit('query_modules', rs);
+    });
+
+    //query all company data
+    $.get('/business/all', function (rs) {
+        ep.emit('query_company', rs);
+    });
+
+    //query all line
+    $.get('/line/all', {'remove_ne': 1}, function (rs) {
+        ep.emit('query_line', rs);
+    });
+
+    function discard_field(u) {
+        var array = [];
+        $.each(u.roles, function () {
+            array.push(this.id);
+        });
+        u.roles = array;
+    }
+
+    function render_role_list(list) {
+        var htmlStr = template('authorize-role-list-temp', {list: list});
+        $('ul.role-list').html(htmlStr);
+        up_scroll();
+    }
+
+
+    function render_user_list(list) {
+        var htmlStr = template('authorize-user-list-temp', {list: list});
+        $('ul.user-list').html(htmlStr);
+        up_scroll();
+    }
+
+    function reset_role_list(){
+        var actives = $('ul.role-list>li.active');
+        if(actives.length > 0){
+            $('ul.role-list>li.active').removeClass('active');
+            render_user_list(users);
+            $('.authorize_right_cont').empty();
+        }
+    }
+
+    function up_scroll() {
+        $('.ct_page .uk-card .ct-card-body').perfectScrollbar('update');
+    }
+
+
+
+    function get_role(id) {
+        for(var i=0,r;r=roles[i++];){
+            if(r.id==id)
+                return r;
+        }
+        return null;
+    }
+
+    function get_user(id) {
+        for(var i=0,u;u=users[i++];){
+            if(u.id==id)
+                return u;
+        }
+        return null;
+    }
+
+    $(document).on('submit', 'form', function () {
+        return false;
+    });
+
+    function convert_buss_data(rs) {
+        var baseCode;
+        //找到跟节点
+        $.each(rs, function () {
+            if(this.upCode == 0){
+                baseCode=this.businessCode;
+                return false;
+            }
+        });
+        if(!baseCode){
+            alert('大爷找不到根节点，数据有问题吧！！！');
+            return;
+        }
+        //提取二级节点
+        var secondMap={};
+        $.each(rs, function () {
+            if(this.upCode==baseCode){
+                secondMap[this.businessCode] = {
+                    name: this.businessName,
+                    childs: []
+                };
+            }
+        });
+        //分公司节点
+        $.each(rs, function () {
+            if(secondMap[this.upCode])
+                secondMap[this.upCode].childs.push(this);
+        });
+
+        //排序
+        for(var sid in secondMap){
+            secondMap[sid].childs.sort(naturalSort);
+        }
+
+        return secondMap;
+    }
+
+    var naturalSort=function (a, b) {
+        return a.businessName.localeCompare(b.businessName);
+    };
+
+    var groupBy = function (list, field) {
+        var rs = {},
+                key;
+        $.each(list, function () {
+            key = this[field];
+            if (!rs[key])
+                rs[key] = [];
+
+            rs[key].push(this);
+        });
+
+        return rs;
+    };
+</script>
+</body>
+</html>
 \ No newline at end of file
@@ -67,9 +67,13 @@
 					</div>
 				</div>
 			</div>
+			<div>
+			<!--<iframe src="authorize.html?origin=real_control_iframe" frameborder="0" style="height: 600px;width: 100%;"></iframe>-->
+			</div>
 			<div class="form-actions">
 				<div class="row">
 					<div class="col-md-offset-3 col-md-4">
+						<!--<a href="main.html" class="btn green" id="nextStep" ><i class="fa fa-check"></i> 下一步</a>-->
 						<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>
 						<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
 					</div>
@@ -79,6 +83,21 @@
 		<!-- END FORM-->
 	</div>
 </div>
+
+<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;left: 50%;
+	 top: 50%;transform: translate(-50%,-50%);min-width:50%;overflow: visible;bottom: inherit; right: inherit;">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-body" style="text-align: center;"></div>
+			<div class="modal-footer" style="margin: 0 auto;">
+				<center>
+					<button type="button" class="btn btn-primary" data-dismiss="modal" id="noNext" style="margin-right: 20%;padding:5px 35px;background-color: #337AB7;color: white;">&nbsp;完&nbsp;成&nbsp;</button>
+					<button type="button" class="btn btn-primary" id="yesNext">继续配置授权</button>
+				</center>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal -->
+</div>
 <script>
 	$(function(){
 		var id = $.url().param('no');
@@ -169,10 +188,24 @@
 					data: params,
 					success: function(res){
 						layer.msg('修改用户信息成功.');
-						loadPage('list.html');
+					    $('#myModal').modal();
+						//loadPage('list.html');
 					}
 				});
 			}
 		});
+
+		$('#noNext').click(function () {
+            $('#myModal').modal('hide');
+		    $('.modal-backdrop').remove();
+
+            loadPage('list.html');
+        })
+        $('#yesNext').click(function () {
+            var storage = window.localStorage;
+            storage.setItem("editUser",$('#id').val());
+            $('#myModal').modal('hide');
+            window.location.href='main.html'
+        })
 	});
 </script>
 \ No newline at end of file
@@ -60,6 +60,7 @@
                                      </select>
 								</td>
 								<td></td>
+
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
                                                                 <i class="fa fa-search"></i> 搜索</button>
@@ -110,6 +111,8 @@
 	<td>
 		{{obj.lastLoginDate}}
 	</td>
+
+
 	<td>
 		<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>
 		<!--<button type="button" class="btn btn-sm line_allot_btn" data-id="{{obj.id}}">线调线路分配</button>-->
+<iframe src="authorize.html?origin=real_control_iframe" frameborder="0" style="height: 90%;width: 100%;"></iframe>
+<div class="form-actions">
+    <div class="row">
+        <div class="col-md-offset-3 col-md-4">
+            <!--<a href="main.html" class="btn green" ><i class="fa fa-check"></i> 上一步</a>-->
+            <!--<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>-->
+            <!--<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>-->
+        </div>
+    </div>
+</div>
 \ No newline at end of file
@@ -265,6 +265,12 @@ span.fcsj-diff {
     color: #444;
 }
  
+.tl-wfyd {
+    background: rgb( 246,193,10);
+    border-top: 1px solid #d9d9d9 !important;
+    color: #444;
+}
+
 .tl-xxfc{
     background: rgb(0,255,255);
     color: #484747;
@@ -391,6 +391,7 @@
                 var type = $(this).data('type');
                 gb_common.$post('/realSchedule/lpChangeMulti', {leftIdx: leftIdx, rightIdx: rightIdx, type: type}, function (rs) {
                     console.log('rs', rs);
+                    debugger
                     notify_succ("操作成功！！");
                     if(rs.ts)
                         gb_schedule_table.updateSchedule(rs.ts);
@@ -402,6 +403,7 @@
  
  
             function reLoadCurrPageData(){
+                debugger
                 $('[name=lineSelect]', modal).each(function () {
                     var array = gb_common.get_vals(gb_schedule_table.findScheduleByLine($(this).val())).sort(gb_schedule_table.schedule_sort);
                     //按路牌分组
@@ -21,6 +21,7 @@
     </div>
  
     <script>
+        var schselect='';
         (function () {
             var wrap = '#add-sub-task-main-modal .add_custom_wrap',
                     sch, fs=[];
@@ -28,23 +29,23 @@
             $(wrap).on('init', function (e, data) {
                 e.stopPropagation();
                 sch = data.sch;
+                schselect=sch;
                 $('.plus_icon_span', wrap).trigger('click');
             });
-
             //plsu icon
             $('.plus_icon_span', wrap).on('click', addTaskForm);
  
             var bcTypeMap = {'in': 2, 'out': 3, 'normal': 1};
             function addTaskForm() {
-                var htmlStr = template('sub-task-v2-form-temp', {sch: sch})
+                var htmlStr = template('sub-task-v2-form-temp', {sch: schselect})
                 var f = $(htmlStr);
                 $('.forms', wrap).append(f);
                 //字典转换
                 dictionaryUtils.transformDom($('.nt-dictionary', f));
  
                 //班次类型切换
-                if(bcTypeMap[sch.bcType])
-                    $('[name=type2]', f).val(bcTypeMap[sch.bcType]);
+                if(bcTypeMap[schselect.bcType])
+                    $('[name=type2]', f).val(bcTypeMap[schselect.bcType]);
                 $('[name=type2]', f).trigger('change');
  
                 //滚动条到底
@@ -76,7 +77,7 @@
                 e.preventDefault();
  
                 dataArray.push($.extend($(this).serializeJSON(), gb_common.getDisabledVal(this)
-                        , {/*remarks: $('#form-s-t',wrap).val(), */'schedule.id': sch.id}));
+                        , {/*remarks: $('#form-s-t',wrap).val(), */'schedule.id': schselect.id}));
                 $(this).data('valid', true);
  
                 if(allValidSuccess()){
@@ -87,11 +88,11 @@
                             //完成后更新前端数据
                             gb_schedule_table.updateSchedule(rst);
                             UIkit.modal('#add-sub-task-main-modal').hide();
-                            $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: sch});
+                            $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: schselect});
                             gb_data_basic.reload_stat_park_data();
  
                             //更新路牌公里统计面板
-                            gb_schedule_table.showLpMileageTipBySch(sch);
+                            gb_schedule_table.showLpMileageTipBySch(schselect);
                             return;
                         }
                         var data = dataArray[i];
 <div class="uk-modal ct_move_modal" id="add-sub-task-main-modal">
     <div class="uk-modal-dialog" style="width: 1100px;">
-        <a href="" class="uk-modal-close uk-close"></a>
+            <a href="" class="uk-modal-close uk-close" style="position: relative;"></a>
+            <a style="position: absolute; right: 40px;top: 8px;text-decoration-line: none;" id="min_a"  >—</a>
         <div class="uk-modal-header">
             <h2>添加子任务</h2></div>
  
@@ -106,7 +107,7 @@
                 </div>
             </div>
  
-            <div class="uk-grid">
+            <div class="uk-grid zirenwu">
                 <div class="uk-width-2-3 domains"></div>
                 <div class="uk-width-1-3">
                     <div class="uk-form-row">
@@ -215,6 +216,7 @@
             $(modal).on('init', function (e, data) {
                 e.stopPropagation();
                 sch = data.sch;
+                schData=[].concat(sch)
  
                 //站到场数据
                 st_park_data = gb_data_basic.get_stat_park_data()[sch.xlBm];
@@ -231,6 +233,7 @@
  
                 var st_doms = gb_schedule_context_menu.get_st_doms();
                 //普通
+                debugger
                 $('.normalCont', modal).html(st_doms.custom_dom);
                 $('.add_custom_wrap', modal).trigger('init', data);
  
@@ -504,17 +507,18 @@
                 var nf = gb_common.next_elem('sub_task_form_v2', f),
                         nInput = $f('reason', nf);
  
-                if (nf.length > 0 && nInput.length > 0) {
-                    nInput.val(reason).trigger('change');
-                }
-                else {
-                    var cont = f.parents('li.tab_cont'),
+                // if (nf.length > 0 && nInput.length > 0) {
+                //     nInput.val(reason).trigger('change');
+                // }
+                // else {
+                    //var cont = f.parents('li.tab_cont'),
+                    var cont = $(this).parents('.zirenwu'),
                             remInput = $('[name=remarks]', cont);
  
                     if(remInput.val()==reason + ',')
                         return;
                     remInput.val(remInput.val() + reason + ',');
-                }
+                //}
             }
  
             function calcMileageByRoutes(routes, s, e) {
@@ -672,6 +676,33 @@
  
                 return array;
             }
+            var schData={};
+            var addChildModel='';
+            $('#min_a').click(function () {
+                $('#add-sub-task-main-modal').hide();
+
+                if (!$("#minChildDiv").length>0){
+                    var minChildDiv='<div id="minChildDiv" style="width: 300px;height: 25px;z-index: 9999;position: fixed;background-color: #009dd8;bottom: 0;color: #fffbfd;border-radius: 5px;"><span style="margin-left:20px;">添加子任务</span> <a style="margin-left:160px; text-decoration:none;color: white;font-size: 24px;" id="maxChild">□</a><a style="margin-left:10px;text-decoration: none;color: white;" onclick="closeAddChild()">X</a></div>';
+                    $('body').append(minChildDiv);
+                }
+            });
+
+            $('body').on('click','#maxChild',function () {
+                $('#add-sub-task-main-modal').show();
+                $('#minChildDiv').remove();
+            })
+
+
         })();
+
+        function closeAddChild(){
+            $('#add-sub-task-main-modal').remove();
+            $('#minChildDiv').remove();
+        }
+
     </script>
-</div>
 \ No newline at end of file
+</div>
+<script>
+
+
+</script>
 \ No newline at end of file
@@ -24,6 +24,8 @@
                     </div>
                 </div>
                 <i class="uk-icon-eye uk-icon-hover ct_eye_icon"></i>
+                <i class="uk-icon-qrcode uk-icon-hover ct_calu_icon"  data-toggle="tooltip" data-placement="bottom"  title="计算应到实到时间对比"></i>
+
                 <!--<i class="uk-icon-share-alt uk-icon-hover tp_info_icon" ></i>-->
  
                 <span class="warn_multi_station" data-updown="{{dir}}" data-code="{{line.lineCode}}"></span>
@@ -65,7 +67,7 @@
                                     {{sch.clZbh}}
                                 </dd>
                                 <dd>{{sch.qdzArrDatejh}}</dd>
-                                <dd>{{sch.qdzArrDatesj}}</dd>
+                                <dd class="qdzArrDatesjDD"><span class="qdzArrDatesjSPAN">{{sch.qdzArrDatesj}}</span><span class="arrsj-diff">{{sch.arrsj_diff}}</span></dd>
                                 <dd data-sort-val={{sch.fcsjT}}>
                                     {{sch.fcsj}}
                                     {{if sch.bcType == "out"}}
@@ -87,6 +89,9 @@
                                     {{if sch.cTasks.length > 0}}
                                     <span class="uk-badge uk-badge-notification c_task {{if sch.c_t_mileage_status==-1}}c_task_mileage_error{{/if}}">{{sch.cTasks.length}}</span>
                                     {{/if}}
+                                    {{if sch.lpChange==1}}
+                                    <span class="uk-badge uk-badge-success out">换</span>
+                                    {{/if}}
                                 </dd>
                                 <dd data-sort-val={{sch.dfsjT}} dbclick dbclick-type="dfsj" dbclick-val="{{sch.dfsj}}">
                                     {{sch.dfsj}}
@@ -101,12 +106,15 @@
                                       tl-yzx
                                     {{else if sch.status==1}}
                                       tl-zzzx
+                                    {{else if sch.status ==4}}
+                                      tl-wfyd
                                     {{else if sch.status == 0 && sch.late}}
                                         tl-wd
                                     {{/if}} fcsjActualCell">
                                     {{sch.fcsjActual}}<span class="fcsj-diff">{{sch.fcsj_diff}}</span>
                                 </dd>
                                 <dd data-uk-observe>
+
                                     <span title="{{sch.remarks}}"
                                           data-uk-tooltip="{pos:'top-left'}">{{sch.remarks}}</span>
                                 </dd>
+<div id="nav-fbzdzx_config-modal" class="uk-modal">
+    <div class="uk-modal-dialog uk-modal-dialog-blank" style="overflow: hidden;">
+        <button class="uk-modal-close uk-close" type="button"></button>
+        <div class="uk-grid uk-flex-middle" data-uk-grid-margin>
+            <div class="uk-width-medium-1-6 uk-height-viewport line-config-tree" data-uk-observe>
+                <h3 class="title">翻班与自动完成</h3>
+                <div class="uk-accordion" data-uk-accordion="{showfirst:false}" ></div>
+            </div>
+            <div class="uk-width-medium-5-6 uk-height-viewport right-container" data-uk-observe>
+                <div id="fbzdzx_config_entity_panel"></div>
+                <div id="buffer_config_panel"></div>
+            </div>
+        </div>
+    </div>
+
+
+    <script id="nav-fbzdzx_config-modal-tree-temp" type="text/html">
+        {{each array as line i}}
+        <h3 class="uk-accordion-title" data-id="{{line.lineCode}}">{{line.name}}</h3>
+        <div class="uk-accordion-content">
+            <ul class="uk-list uk-list-line" id="smooth_scroll_list">
+                <li><a data-href="#schedule_reload_time_panel" >班次更新时间</a></li>
+                <li><a data-href="#schedule_auto_exec_panel" >班次自动执行</a></li>
+            </ul>
+        </div>
+        {{/each}}
+    </script>
+
+    <script>
+        (function () {
+            var modal = '#nav-fbzdzx_config-modal',
+                    lineConfig, activeCode;
+
+            //初始化滚动条
+            $('.right-container', modal).perfectScrollbar({suppressScrollX: true});
+            /**
+             * 手风琴拨动
+             */
+            $('.uk-accordion').on('toggle.uk.accordion', function (e, active, toggle, content) {
+                if(active){
+                    activeCode = $(toggle).data('id');
+                    load();
+                }
+            });
+
+            $(modal).on('init', function (e, data) {
+                e.stopPropagation();
+                var htmlStr = template('nav-fbzdzx_config-modal-tree-temp', {array: gb_data_basic.activeLines});
+                $('.line-config-tree .uk-accordion', modal).html(htmlStr);
+
+                if(data.activeCode)
+                    activeCode = data.activeCode;
+                else{
+                    //展开tab激活的线路
+                    var $activeTab = $('#main-tab-content>li.line_schedule.uk-active');
+                    if($activeTab.length > 0)
+                        activeCode = $activeTab.data('id');
+                    else{
+                        //展开第一个
+                        var $first = $('.uk-accordion-title:eq(0)', modal);
+                        activeCode = $first.data('id');
+                    }
+                }
+
+                setTimeout(function () {
+                    $('.uk-accordion-title[data-id='+activeCode+']', modal).trigger('click');
+                }, 500);
+            });
+
+
+            var load = function () {
+                //获取线路配置信息
+                $.get('/lineConfig/getByLineCode', {lineCode: activeCode}, function (conf) {
+                    lineConfig = conf;
+
+                    loadConfigEntity();
+                    loadBufferConfig();
+
+                    setTimeout(function () {
+                        //更新滚动条高度
+                        $('.right-container', modal).perfectScrollbar('update');
+                    }, 500);
+                });
+            };
+
+            //线路配置表属性设置
+            var loadConfigEntity = function () {
+                $.get('/real_control_v2/fragments/north/nav/line_config/fbzdzx_config_entity.html', function (attrDom) {
+                    $('.right-container #fbzdzx_config_entity_panel', modal)
+                            .html(attrDom)
+                            .find('#fbzdzx_config_entity_wrap')
+                            .trigger('init', {lineConfig: lineConfig});
+                });
+            };
+
+
+            //瞄点
+            $(modal).on('click', '#smooth_scroll_list>li>a', function () {
+                var id = $(this).data('href');
+                scrollToElement($(id, modal));
+            });
+
+            function scrollToElement(ele) {
+                var cont = $('.right-container', modal), diff = 10;
+                cont.animate({
+                    scrollTop: ele.offset().top - cont.offset().top + cont.scrollTop() - diff
+                }, 300);
+            }
+        })();
+    </script>
+</div>
+<!-- 线路配置表相关属性 -->
+<div id="fbzdzx_config_entity_wrap">
+    <form class="uk-form"></form>
+
+    <script id="fbzdzx_config_entity_form-temp" type="text/html">
+        <div id="schedule_reload_time_panel">
+            <h2 class="btn_title_line">
+                <a class="uk-link-reset">班次更新时间</a>
+            </h2>
+            <div>
+                <div>
+                    <span class="line_name"></span>每天
+                    <div class="uk-form-icon" style="margin: 0 5px;">
+                        <i class="uk-icon-clock-o"></i>
+                        <input name="startOptInput" readonly type="text" class="z-depth-input" value="{{startOpt}}"
+                               style="width: 151px;"
+                               data-uk-timepicker>
+                    </div>
+                    更新到当日排班
+                </div>
+                <ul class="uk-list">
+                    <li>
+                        <small><i class="uk-icon-question-circle"></i> 所有发车时间小于该时间的班次都默认跨过24点，手动调整的实发实达均应用此规则。</small>
+                    </li>
+                </ul>
+                <button class="uk-button uk-button-mini" id="clearRealScheduleBtn">删除实际排班</button>
+                <button class="uk-button uk-button-mini" id="reLoadRealScheduleBtn">重新加载实际排班</button>
+                <button class="uk-button uk-button-mini" disabled>加载历史GPS恢复到离站</button>
+            </div>
+        </div>
+
+        <div id="schedule_auto_exec_panel">
+            <h2 class="btn_title_line">
+                <a class="uk-link-reset">班次自动执行</a>
+            </h2>
+            <div>
+                <div>
+                    <label>
+                        <input type="checkbox" id="enableAutoExec" {{autoExec?"checked":""}}> 启用自动班次执行
+                    </label>
+                </div>
+                <ul class="uk-list">
+                    <li>
+                        <small style="color: red;font-size: 14px;">1、 你必须只应该对【无固定走向且无人监管的线路】启用此项。</small>
+                    </li>
+                    <li>
+                        <small>2、启用该选项后，系统将不再依赖相关定位信号来执行班次。</small>
+                    </li>
+                    <li>
+                        <small>3、系统将在合适的时候自动填入实发实达时间，以完善报表。</small>
+                    </li>
+                    <li>
+                        <small>4、系统不会下发班次调度指令。</small>
+                    </li>
+                </ul>
+            </div>
+        </div>
+
+    </script>
+
+    <script>
+        (function () {
+
+            var wrap = '#fbzdzx_config_entity_wrap', conf, parks, upStationRoutes;
+
+            /**
+             * 删除实际排班
+             */
+            var clearRealSchedule = function (e) {
+                e.stopPropagation();
+                var lineCode = conf.line.lineCode;
+                var htmlStr = '<h4 style="color: red;">你确定要删除【' + conf.line.name + '】今日的实际排班？</h4><h5 style="margin-top: 15px;">今日的实际排班会被删除</h5><h5 style="margin-top: 15px;">人车、路牌、待发等相关班次调整信息会被删除。</h5><h5 style="margin-top: 15px;">调度指令和期间与设备的通讯记录被保留</h5><h5 style="margin-top: 15px;">后台日志中的人工操作痕迹被保留</h5>';
+                alt_confirm(htmlStr, function () {
+                    show_wait_modal('正在清除数据...');
+                    gb_common.$post('/realSchedule/deleteRealSchedule', {lineCode: lineCode}, function () {
+                        //刷新班次表格
+                        gb_schedule_table.reLoadAndRefresh(lineCode);
+                        hide_wait_modal();
+                        notify_succ('删除班次成功！！！');
+                    });
+                }, '确认删除' + conf.line.name + '的实际排班', true);
+
+                return false;
+            };
+
+            /**
+             * 重新载入实际排班
+             */
+            var reLoadRealSchedule = function (e) {
+                e.stopPropagation();
+                var lineCode = conf.line.lineCode;
+                show_wait_modal('正在重载数据...');
+                gb_common.$post('/realSchedule/reLoadRealSchedule', {lineCode: lineCode}, function () {
+                    //刷新班次表格
+                    gb_schedule_table.reLoadAndRefresh(lineCode);
+                    hide_wait_modal();
+                    notify_succ('重新载入班次成功');
+                });
+                return false;
+            };
+
+            $(wrap).on('init', function (e, data) {
+                e.stopPropagation();
+                conf = data.lineConfig;
+                //停车场
+                $.get('/basic/parks', function (rs) {
+                    parks = [];
+                    for (var code in rs) {
+                        parks.push({code: code, name: rs[code]});
+                    }
+
+                    parks.sort(function (a, b) {
+                        return $.trim(a.name).localeCompare($.trim(b.name), 'zh-CN');
+                    });
+                    renderPSDom();
+                });
+                //上行站点路由
+                upStationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(conf.line.lineCode).sort(function (a, b) {
+                    return a.stationRouteCode - b.stationRouteCode;
+                }), 'directions')[0];
+
+                var htmlStr = template('fbzdzx_config_entity_form-temp', conf);
+                $('form', wrap).html(htmlStr);
+
+                $('.line_name', '#fbzdzx_config_entity_wrap').text(conf.line.name);
+                //更新排班时间
+                $('input[name=startOptInput]', wrap).on('change', updateStartTime);
+                //出场时间类型
+                $('select[name=outParkTypeSelect]', wrap).on('change', updateOutParkType);
+                //原线路回场
+                $('select[name=inParkForSourceSelect]', wrap).on('change', enableInParkForSource);
+                //删除班次
+                $('#clearRealScheduleBtn', wrap).on('click', clearRealSchedule);
+                //重新载入实际排班
+                $('#reLoadRealScheduleBtn', wrap).on('click', reLoadRealSchedule);
+                $('#enableAutoExec', wrap).on('click', autoExecFun);
+            });
+
+            function changeTwinsParkAndStation() {
+                var parks='',stations=''
+                        ,$panel = $('.park-and-station-wrap', wrap);
+
+                $('select[name=twinsPark]', $panel).each(function () {
+                    parks += ($(this).val() + ',');
+                });
+
+                $('select[name=twinsStation]', $panel).each(function () {
+                    stations += ($(this).val() + ',');
+                });
+
+                if(parks.length > 0)
+                    parks = parks.substr(0, parks.length - 1);
+                if(stations.length > 0)
+                    stations = stations.substr(0, stations.length - 1);
+
+                gb_common.$post('/lineConfig/parkAndStationSet', {
+                    lineCode: conf.line.lineCode,
+                    twinsPark: parks,
+                    twinsStation: stations
+                }, function (rs) {
+                    notify_succ('已保存！！');
+                    conf = rs.conf;
+                });
+            }
+
+            //更新排班时间
+            var startOptFlag;
+
+            function updateStartTime() {
+                if (startOptFlag || $(this).val() == conf.startOpt)
+                    return;
+                startOptFlag = true;
+                var that = this;
+                setTimeout(function () {
+                    var timeStr = $(that).val();
+                    gb_common.$post('/lineConfig/editTime', {
+                        lineCode: conf.line.lineCode,
+                        time: timeStr
+                    }, function (rs) {
+                        notify_succ('班次更新时间调整为 ' + timeStr);
+                        conf.startOpt = rs.time;
+                    });
+                    startOptFlag = false;
+                }, 300);
+            }
+
+            function updateOutParkType() {
+                var type = $(this).val();
+                var lineCode = conf.line.lineCode;
+
+                var data = {lineCode: lineCode, type: type, parkCode: '', stationCode: ''};
+                //出站既是出场
+                if (type == 2) {
+                    //如果配置上有信息
+                    if(conf.twinsParks){
+                        data.parkCode = conf.twinsParks;
+                        data.stationCode = conf.twinsStations;
+                    }
+                    else{
+                        data.parkCode = gb_data_basic.getLineInformation(lineCode).carPark;//默认关联 线路标准停车场
+                        data.stationCode = upStationRoutes[0].stationCode;//和上行起点站
+                    }
+                }
+                gb_common.$post('/lineConfig/editOutTimeType', data, function (rs) {
+                    notify_succ('调整出场时间类型成功！');
+                    conf = rs.conf;
+
+                    //渲染场站关联dom
+                    renderPSDom();
+                });
+            }
+
+
+
+            function enableInParkForSource() {
+                var enable = $(this).val();
+                gb_common.$post('/lineConfig/enableInParkForSource', {
+                    lineCode: conf.line.lineCode,
+                    enable: enable
+                }, function () {
+                    notify_succ((enable == 1 ? '启用' : '禁用') + '原线路回场');
+                    conf.inParkForSource = enable;
+                });
+            }
+
+
+            /**
+             * 自动执行
+             */
+            function autoExecFun(){
+                var that = this;
+                if(that.checked){
+                    that.checked = false;
+                    alt_confirm('<span style="color: red;font-size: 16px;">启用【' + conf.line.name + '】的自动执行功能？</span>', function () {
+                        var data = {
+                            lineCode: conf.line.lineCode,
+                            autoExec: true
+                        };
+                        gb_common.$post('/lineConfig/setAutoExec', data, function (rs) {
+                            notify_succ('启用成功！');
+                            conf = rs.conf;
+
+                            that.checked = true;
+                        });
+                    }, '我确定要将【' + conf.line.name + '】设置为自动执行', true);
+                }
+                else{
+                    that.checked = true;
+                    alt_confirm('<span style="color: red;font-size: 16px;">禁用【' + conf.line.name + '】的自动执行功能？</span>', function () {
+                        var data = {
+                            lineCode: conf.line.lineCode,
+                            autoExec: false
+                        };
+                        gb_common.$post('/lineConfig/setAutoExec', data, function (rs) {
+                            notify_succ('禁用成功！');
+                            conf = rs.conf;
+
+                            that.checked = false;
+                        });
+                    }, '我确定要禁用【' + conf.line.name + '】的自动执行', true);
+                }
+            }
+
+
+            /**
+             * 删除  场既是站 项目
+             */
+            $(wrap).on('click', '.c_2_s_list .item .uk-close', function () {
+                $(this).parents('.item').remove();
+                changeTwinsParkAndStation();
+            });
+
+
+            $(wrap).on('change', 'select[name=twinsPark]', changeTwinsParkAndStation);
+            $(wrap).on('change', 'select[name=twinsStation]', changeTwinsParkAndStation);
+        })();
+    </script>
+</div>
 \ No newline at end of file
@@ -19,8 +19,8 @@
         <h3 class="uk-accordion-title" data-id="{{line.lineCode}}">{{line.name}}</h3>
         <div class="uk-accordion-content">
             <ul class="uk-list uk-list-line" id="smooth_scroll_list">
-                <li><a data-href="#schedule_reload_time_panel" >班次更新时间</a></li>
-                <li><a data-href="#schedule_auto_exec_panel" >班次自动执行</a></li>
+                <!--<li><a data-href="#schedule_reload_time_panel" >班次更新时间</a></li>-->
+                <!--<li><a data-href="#schedule_auto_exec_panel" >班次自动执行</a></li>-->
                 <li><a data-href="#out_time_type_panel" >出场时间类型</a></li>
                 <li><a data-href="#in_park_source_panel" >原线路回场</a></li>
                 <li><a data-href="#buffer_inOut_diff_panel">到站缓冲区设置</a></li>
@@ -3,58 +3,58 @@
     <form class="uk-form"></form>
  
     <script id="line_config_entity_form-temp" type="text/html">
-        <div id="schedule_reload_time_panel">
-            <h2 class="btn_title_line">
-                <a class="uk-link-reset">班次更新时间</a>
-            </h2>
-            <div>
-                <div>
-                    <span class="line_name"></span>每天
-                    <div class="uk-form-icon" style="margin: 0 5px;">
-                        <i class="uk-icon-clock-o"></i>
-                        <input name="startOptInput" readonly type="text" class="z-depth-input" value="{{startOpt}}"
-                               style="width: 151px;"
-                               data-uk-timepicker>
-                    </div>
-                    更新到当日排班
-                </div>
-                <ul class="uk-list">
-                    <li>
-                        <small><i class="uk-icon-question-circle"></i> 所有发车时间小于该时间的班次都默认跨过24点，手动调整的实发实达均应用此规则。</small>
-                    </li>
-                </ul>
-                <button class="uk-button uk-button-mini" id="clearRealScheduleBtn">删除实际排班</button>
-                <button class="uk-button uk-button-mini" id="reLoadRealScheduleBtn">重新加载实际排班</button>
-                <button class="uk-button uk-button-mini" disabled>加载历史GPS恢复到离站</button>
-            </div>
-        </div>
-
-        <div id="schedule_auto_exec_panel">
-            <h2 class="btn_title_line">
-                <a class="uk-link-reset">班次自动执行</a>
-            </h2>
-            <div>
-                <div>
-                    <label>
-                        <input type="checkbox" id="enableAutoExec" {{autoExec?"checked":""}}> 启用自动班次执行
-                    </label>
-                </div>
-                <ul class="uk-list">
-                    <li>
-                        <small style="color: red;font-size: 14px;">1、 你必须只应该对【无固定走向且无人监管的线路】启用此项。</small>
-                    </li>
-                    <li>
-                        <small>2、启用该选项后，系统将不再依赖相关定位信号来执行班次。</small>
-                    </li>
-                    <li>
-                        <small>3、系统将在合适的时候自动填入实发实达时间，以完善报表。</small>
-                    </li>
-                    <li>
-                        <small>4、系统不会下发班次调度指令。</small>
-                    </li>
-                </ul>
-            </div>
-        </div>
+        <!--<div id="schedule_reload_time_panel">-->
+            <!--<h2 class="btn_title_line">-->
+                <!--<a class="uk-link-reset">班次更新时间</a>-->
+            <!--</h2>-->
+            <!--<div>-->
+                <!--<div>-->
+                    <!--<span class="line_name"></span>每天-->
+                    <!--<div class="uk-form-icon" style="margin: 0 5px;">-->
+                        <!--<i class="uk-icon-clock-o"></i>-->
+                        <!--<input name="startOptInput" readonly type="text" class="z-depth-input" value="{{startOpt}}"-->
+                               <!--style="width: 151px;"-->
+                               <!--data-uk-timepicker>-->
+                    <!--</div>-->
+                    <!--更新到当日排班-->
+                <!--</div>-->
+                <!--<ul class="uk-list">-->
+                    <!--<li>-->
+                        <!--<small><i class="uk-icon-question-circle"></i> 所有发车时间小于该时间的班次都默认跨过24点，手动调整的实发实达均应用此规则。</small>-->
+                    <!--</li>-->
+                <!--</ul>-->
+                <!--<button class="uk-button uk-button-mini" id="clearRealScheduleBtn">删除实际排班</button>-->
+                <!--<button class="uk-button uk-button-mini" id="reLoadRealScheduleBtn">重新加载实际排班</button>-->
+                <!--<button class="uk-button uk-button-mini" disabled>加载历史GPS恢复到离站</button>-->
+            <!--</div>-->
+        <!--</div>-->
+
+        <!--<div id="schedule_auto_exec_panel">-->
+            <!--<h2 class="btn_title_line">-->
+                <!--<a class="uk-link-reset">班次自动执行</a>-->
+            <!--</h2>-->
+            <!--<div>-->
+                <!--<div>-->
+                    <!--<label>-->
+                        <!--<input type="checkbox" id="enableAutoExec" {{autoExec?"checked":""}}> 启用自动班次执行-->
+                    <!--</label>-->
+                <!--</div>-->
+                <!--<ul class="uk-list">-->
+                    <!--<li>-->
+                        <!--<small style="color: red;font-size: 14px;">1、 你必须只应该对【无固定走向且无人监管的线路】启用此项。</small>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<small>2、启用该选项后，系统将不再依赖相关定位信号来执行班次。</small>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<small>3、系统将在合适的时候自动填入实发实达时间，以完善报表。</small>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<small>4、系统不会下发班次调度指令。</small>-->
+                    <!--</li>-->
+                <!--</ul>-->
+            <!--</div>-->
+        <!--</div>-->
  
         <div id="out_time_type_panel">
             <h2 class="btn_title_line">