1.

王通
1 parent 46ed921a
Showing 22 changed files with 2118 additions and 2118 deletions
README.md
src/main/java/com/bsth/controller/realcontrol/dto/LpData.java
src/main/java/com/bsth/controller/schedule/core/legacy/GuideboardInfoController.java
src/main/java/com/bsth/data/gpsdata_v2/load/GatewayHttpLoader.java
src/main/java/com/bsth/entity/Cars.java
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/entity/LineInformation.java
src/main/java/com/bsth/entity/Personnel.java
src/main/java/com/bsth/entity/realcontrol/ChildTaskPlan.java
src/main/java/com/bsth/entity/realcontrol/OilStationSociety.java
src/main/java/com/bsth/entity/schedule/CarConfigInfo.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/CarsServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/GuideboardInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/java/com/bsth/service/schedule/timetable/strategy/impl/TimetableExcelPVDataExportStrategyImpl.java
src/main/resources/application-iraq.properties
-公交调度系统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>Out</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) | Up |
-
-## 动态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 Up ， 1 Down ， -1 无效）|
-
-
-### 进站数据
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| deviceId | String | 设备号 |
-| lineId | int | 线路编码 |
-| stopNo | long | 站点编码 |
-| timestamp | long | 时间戳 |
-| upDown | int | 上下行（0 Up ， 1 Down ， -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 Up ， 1 Down ， -1 无效） |
-| lon | float | 经度 | 
-| lat | float | 纬度|
-| speed | float | 速度 |
-| timestamp | long | 时间戳 |
-| createDate | Date | 时间 |
-
-### 越界
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| vehicle | String | 车辆编码 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 Up ， 1 Down ， -1 无效） |
-| lon | float | 经度 | 
-| lat | float | 纬度|
-| location | String | 越界位置（由线调页面进行初始转换）意思是该字段默认为空，页面第一次查看时会写入值|
-| timestamp | long | 时间戳 |
-| createDate | Date | 时间 |
-
-
-### 越站
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 Up ， 1 Down ， -1 无效） |
-| station | String | 站点编码 |
-| vehicle | String | 车辆编码 |
-| inData | Date | 进站时间 |
-| outDate | Date | 出站时间 |
-
-
-### 聚集
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 Up ， 1 Down ， -1 无效） |
-| stations | String | 站点（多个用 , 号分隔。应该是连续站点） |
-| vehicles | String | 车辆编码（多个用 , 号分隔） |
-| timestamp | long | 时间戳 |
-| createDate | Date | 时间 |
-
-
-### 掉线
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 Up ， 1 Down ， -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 | Request code0xa1 恢复运营 0xa2 申请调档 0xa3 出场请求 0xa5 进场请求 0xa7 加油请求 0x50 车辆故障 0x70 路阻报告 0x60 事故报告 0x11 扣证纠纷 0x12 报警 |
-<span style="color: red">Response</span>:
-```json
-{
-    "errCode":0
-}
-```
-
-### 车辆历史GPS
-----------
-表名:BSTH_C_GPS_INFO
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| cityCode | int | 城市代码 |
-| industryCode | int | 行业代码 |
-| companyCode | int | 企业代码 |
-| lineId | int | 线路编号 |
-| deviceId | string | 设备编号 |
-| driverNo | int | 驾驶员工号 |
-| carparkSerialNo | int | 停车场序列号 |
-| carparkNo | string | 停车场编号 |
-| stopSerialNo | int | 站点序列号 |
-| stopNo | string | 停车场编号 |
-| lon | float | 经度 |
-| lat | float | 维度 |
-| ts | long | 时间戳 |
-| speedSensor | float | 发动机速度 |
-| speedGps | float | gps速度 |
-| direction | float | 角度0-359 |
-| inTemp | int | 车内温度 |
-| serviceState | long | 设备状态字 |
-| daysYear | int | 对应年中的天数 为分区字段 查询一定要用此字段过滤 |
-
+公交调度系统BS版 0.1
+======
+----------
+## 目录
+---------
+ * [字典表](#字典表)
+ * [动态jpa查询实现](#动态jpa查询实现)
+ * [车载 gps 相关数据](#gps)
+    * [实时gps数据接口 http](#实时gps接口)  
+    * [进出站数据表结构](#进站数据)
+    * [异常警报表结构](#异常警报)
+        * [大间隔](#大间隔)
+        * [超速](#超速)
+        * [越界](#越界)
+        * [Overstepping station](#Overstepping station)
+        * [聚集](#聚集)
+        * [掉线](#掉线)
+    * [调度消息下发接口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>Out</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) | Up |
+
+## 动态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 Up ， 1 Down ， -1 无效）|
+
+
+### 进站数据
+----------
+表名：
+
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| id | int | 主键 |
+| deviceId | String | 设备号 |
+| lineId | int | 线路编码 |
+| stopNo | long | 站点编码 |
+| timestamp | long | 时间戳 |
+| upDown | int | 上下行（0 Up ， 1 Down ， -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 Up ， 1 Down ， -1 无效） |
+| lon | float | 经度 | 
+| lat | float | 纬度|
+| speed | float | 速度 |
+| timestamp | long | 时间戳 |
+| createDate | Date | 时间 |
+
+### 越界
+----------
+表名：
+
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| id | int | 主键 |
+| vehicle | String | 车辆编码 |
+| line | int | 线路编码 |
+| upDown | int | 上下行（0 Up ， 1 Down ， -1 无效） |
+| lon | float | 经度 | 
+| lat | float | 纬度|
+| location | String | 越界位置（由线调页面进行初始转换）意思是该字段默认为空，页面第一次查看时会写入值|
+| timestamp | long | 时间戳 |
+| createDate | Date | 时间 |
+
+
+### Overstepping station
+----------
+表名：
+
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| id | int | 主键 |
+| line | int | 线路编码 |
+| upDown | int | 上下行（0 Up ， 1 Down ， -1 无效） |
+| station | String | 站点编码 |
+| vehicle | String | 车辆编码 |
+| inData | Date | 进站时间 |
+| outDate | Date | 出站时间 |
+
+
+### 聚集
+----------
+表名：
+
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| id | int | 主键 |
+| line | int | 线路编码 |
+| upDown | int | 上下行（0 Up ， 1 Down ， -1 无效） |
+| stations | String | 站点（多个用 , 号分隔。应该是连续站点） |
+| vehicles | String | 车辆编码（多个用 , 号分隔） |
+| timestamp | long | 时间戳 |
+| createDate | Date | 时间 |
+
+
+### 掉线
+----------
+表名：
+
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| id | int | 主键 |
+| line | int | 线路编码 |
+| upDown | int | 上下行（0 Up ， 1 Down ， -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 | Request code0xa1 恢复运营 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.dto;
-
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-
-/**
- * 路牌相关的数据（换路牌时要换的字段）
- * Created by panzhao on 2017/3/2.
- */
-public class LpData {
-
-    public LpData(ScheduleRealInfo sch) {
-        this.jGh = sch.getjGh();
-        this.jName = sch.getjName();
-        this.sGh = sch.getsGh();
-        this.sName = sch.getsName();
-        this.nbbm = sch.getClZbh();
-
-        this.fcsj = sch.getFcsjActualTime();
-        this.zdsj = sch.getZdsjActualTime();
-
-        this.qdName = sch.getQdzName();
-        this.zdzName = sch.getZdzName();
-    }
-
-    public void appendTo(ScheduleRealInfo sch, int type) {
-
-        if (type == 0) {
-            //只换人
-            sch.setjGh(this.jGh);
-            sch.setjName(this.jName);
-            sch.setsGh(this.sGh);
-            sch.setsName(this.sName);
-        } else if (type == 1) {
-            //只换车
-            sch.setClZbh(this.nbbm);
-            changeRealTime(sch);
-            /*//换实际时间
-            if(changeRealTime){
-                changeRealTime(sch);
-            }*/
-
-        } else if (type == 2) {
-            //换人并换车
-            sch.setjGh(this.jGh);
-            sch.setjName(this.jName);
-            sch.setsGh(this.sGh);
-            sch.setsName(this.sName);
-            sch.setClZbh(this.nbbm);
-
-            //换实际时间
-            //if(changeRealTime){
-                changeRealTime(sch);
-            //}
-        }
-    }
-
-    public void changeRealTime(ScheduleRealInfo sch){
-        if (this.fcsj != null && this.qdName.equals(sch.getQdzName()))
-            sch.setFcsjActualAll(this.fcsj);
-        if (this.zdsj != null && this.zdzName.equals(sch.getZdzName()))
-            sch.setZdsjActualAll(this.zdsj);
-    }
-
-    /**
-     * 起点站名称
-     */
-    private String qdName;
-
-    /**
-     * 终点站名称
-     */
-    private String zdzName;
-
-    /**
-     * 驾驶员
-     */
-    private String jGh;
-    private String jName;
-
-    /**
-     * 售票员
-     */
-    private String sGh;
-    private String sName;
-
-    /**
-     * 车辆自编号
-     */
-    private String nbbm;
-
-    /**
-     * 实际发车时间
-     */
-    private Long fcsj;
-
-    /**
-     * 实际终点时间
-     */
-    private Long zdsj;
-
-    public String getjGh() {
-        return jGh;
-    }
-
-    public void setjGh(String jGh) {
-        this.jGh = jGh;
-    }
-
-    public String getjName() {
-        return jName;
-    }
-
-    public void setjName(String jName) {
-        this.jName = jName;
-    }
-
-    public String getsGh() {
-        return sGh;
-    }
-
-    public void setsGh(String sGh) {
-        this.sGh = sGh;
-    }
-
-    public String getsName() {
-        return sName;
-    }
-
-    public void setsName(String sName) {
-        this.sName = sName;
-    }
-
-    public String getNbbm() {
-        return nbbm;
-    }
-
-    public void setNbbm(String nbbm) {
-        this.nbbm = nbbm;
-    }
-
-    public Long getFcsj() {
-        return fcsj;
-    }
-
-    public void setFcsj(Long fcsj) {
-        this.fcsj = fcsj;
-    }
-
-    public Long getZdsj() {
-        return zdsj;
-    }
-
-    public void setZdsj(Long zdsj) {
-        this.zdsj = zdsj;
-    }
-}
+package com.bsth.controller.realcontrol.dto;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+/**
+ * 路牌相关的数据（换路牌时要换的字段）
+ * Created by panzhao on 2017/3/2.
+ */
+public class LpData {
+
+    public LpData(ScheduleRealInfo sch) {
+        this.jGh = sch.getjGh();
+        this.jName = sch.getjName();
+        this.sGh = sch.getsGh();
+        this.sName = sch.getsName();
+        this.nbbm = sch.getClZbh();
+
+        this.fcsj = sch.getFcsjActualTime();
+        this.zdsj = sch.getZdsjActualTime();
+
+        this.qdName = sch.getQdzName();
+        this.zdzName = sch.getZdzName();
+    }
+
+    public void appendTo(ScheduleRealInfo sch, int type) {
+
+        if (type == 0) {
+            //只换人
+            sch.setjGh(this.jGh);
+            sch.setjName(this.jName);
+            sch.setsGh(this.sGh);
+            sch.setsName(this.sName);
+        } else if (type == 1) {
+            //只换车
+            sch.setClZbh(this.nbbm);
+            changeRealTime(sch);
+            /*//换实际时间
+            if(changeRealTime){
+                changeRealTime(sch);
+            }*/
+
+        } else if (type == 2) {
+            //换人并换车
+            sch.setjGh(this.jGh);
+            sch.setjName(this.jName);
+            sch.setsGh(this.sGh);
+            sch.setsName(this.sName);
+            sch.setClZbh(this.nbbm);
+
+            //换实际时间
+            //if(changeRealTime){
+                changeRealTime(sch);
+            //}
+        }
+    }
+
+    public void changeRealTime(ScheduleRealInfo sch){
+        if (this.fcsj != null && this.qdName.equals(sch.getQdzName()))
+            sch.setFcsjActualAll(this.fcsj);
+        if (this.zdsj != null && this.zdzName.equals(sch.getZdzName()))
+            sch.setZdsjActualAll(this.zdsj);
+    }
+
+    /**
+     * 起点站名称
+     */
+    private String qdName;
+
+    /**
+     * Terminal station name
+     */
+    private String zdzName;
+
+    /**
+     * 驾驶员
+     */
+    private String jGh;
+    private String jName;
+
+    /**
+     * 售票员
+     */
+    private String sGh;
+    private String sName;
+
+    /**
+     * 车辆自编号
+     */
+    private String nbbm;
+
+    /**
+     * 实际发车时间
+     */
+    private Long fcsj;
+
+    /**
+     * 实际终点时间
+     */
+    private Long zdsj;
+
+    public String getjGh() {
+        return jGh;
+    }
+
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
+    }
+
+    public String getjName() {
+        return jName;
+    }
+
+    public void setjName(String jName) {
+        this.jName = jName;
+    }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public String getsName() {
+        return sName;
+    }
+
+    public void setsName(String sName) {
+        this.sName = sName;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public Long getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(Long fcsj) {
+        this.fcsj = fcsj;
+    }
+
+    public Long getZdsj() {
+        return zdsj;
+    }
+
+    public void setZdsj(Long zdsj) {
+        this.zdsj = zdsj;
+    }
+}
-package com.bsth.controller.schedule.core.legacy;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.controller.schedule.BController;
-import com.bsth.controller.schedule.core.GuideboardInfoController_facade;
-import com.bsth.entity.schedule.GuideboardInfo;
-import com.bsth.repository.schedule.GuideboardInfoRepository;
-import com.bsth.service.schedule.GuideboardInfoService;
-import com.bsth.service.schedule.exception.ScheduleException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 路牌管理控制器。
- */
-@RestController
-@ConditionalOnMissingBean(GuideboardInfoController_facade.class)
-@RequestMapping("gic")
-public class GuideboardInfoController extends BController<GuideboardInfo, Long> {
-    @Autowired
-    private GuideboardInfoService guideboardInfoService;
-
-    @Autowired
-    private GuideboardInfoRepository guideboardInfoRepository;
-
-    @RequestMapping(value = "/ttlpnames", method = RequestMethod.GET)
-    public List<Map<String, Object>> findLpName(Long ttid) {
-        return guideboardInfoRepository.findLpName(ttid);
-    }
-
-    @RequestMapping(value = "lpno/{xlid}", method = RequestMethod.GET)
-    public Map<String, Object> getLpNo(@PathVariable("xlid") Integer xl) {
-        Map<String, Object> rtn = new HashMap<>();
-        try {
-            rtn.put("data", guideboardInfoService.getMaxLpno(xl));
-            rtn.put("status", ResponseCode.SUCCESS);
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", exp.getMessage());
-        }
-
-        return rtn;
-    }
-
-    @RequestMapping(value = "/validate_lpno", method = RequestMethod.GET)
-    public Map<String, Object> validate_lpno(@RequestParam Map<String, Object> param) {
-        Map<String, Object> rtn = new HashMap<>();
-        try {
-            // 路牌编号验证
-            GuideboardInfo guideboardInfo = new GuideboardInfo(
-                    param.get("id_eq"),
-                    param.get("xl.id_eq"),
-                    param.get("lpNo_eq"),
-                    null
-            );
-            guideboardInfoService.validate_lpno(guideboardInfo);
-            rtn.put("status", ResponseCode.SUCCESS);
-        } catch (ScheduleException exp) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", exp.getMessage());
-        }
-        return rtn;
-    }
-
-    @RequestMapping(value = "/validate_lpname", method = RequestMethod.GET)
-    public Map<String, Object> validate_lpname(@RequestParam Map<String, Object> param) {
-        Map<String, Object> rtn = new HashMap<>();
-        try {
-            // 路牌名称验证
-            GuideboardInfo guideboardInfo = new GuideboardInfo(
-                    param.get("id_eq"),
-                    param.get("xl.id_eq"),
-                    null,
-                    param.get("lpName_eq")
-            );
-            guideboardInfoService.validate_lpname(guideboardInfo);
-            rtn.put("status", ResponseCode.SUCCESS);
-        } catch (ScheduleException exp) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", exp.getMessage());
-        }
-        return rtn;
-    }
-}
+package com.bsth.controller.schedule.core.legacy;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.controller.schedule.core.GuideboardInfoController_facade;
+import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.repository.schedule.GuideboardInfoRepository;
+import com.bsth.service.schedule.GuideboardInfoService;
+import com.bsth.service.schedule.exception.ScheduleException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 路牌管理控制器。
+ */
+@RestController
+@ConditionalOnMissingBean(GuideboardInfoController_facade.class)
+@RequestMapping("gic")
+public class GuideboardInfoController extends BController<GuideboardInfo, Long> {
+    @Autowired
+    private GuideboardInfoService guideboardInfoService;
+
+    @Autowired
+    private GuideboardInfoRepository guideboardInfoRepository;
+
+    @RequestMapping(value = "/ttlpnames", method = RequestMethod.GET)
+    public List<Map<String, Object>> findLpName(Long ttid) {
+        return guideboardInfoRepository.findLpName(ttid);
+    }
+
+    @RequestMapping(value = "lpno/{xlid}", method = RequestMethod.GET)
+    public Map<String, Object> getLpNo(@PathVariable("xlid") Integer xl) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            rtn.put("data", guideboardInfoService.getMaxLpno(xl));
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_lpno", method = RequestMethod.GET)
+    public Map<String, Object> validate_lpno(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // Guide board code验证
+            GuideboardInfo guideboardInfo = new GuideboardInfo(
+                    param.get("id_eq"),
+                    param.get("xl.id_eq"),
+                    param.get("lpNo_eq"),
+                    null
+            );
+            guideboardInfoService.validate_lpno(guideboardInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_lpname", method = RequestMethod.GET)
+    public Map<String, Object> validate_lpname(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 路牌名称验证
+            GuideboardInfo guideboardInfo = new GuideboardInfo(
+                    param.get("id_eq"),
+                    param.get("xl.id_eq"),
+                    null,
+                    param.get("lpName_eq")
+            );
+            guideboardInfoService.validate_lpname(guideboardInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+}
@@ -45,7 +45,7 @@ public class GatewayHttpLoader implements ApplicationContextAware{
     static GpsRealData gpsRealData;
  
     static{
-        url = "http://47.76.243.65:18080/transport_server/rtgps/";
+        url = "http://172.30.191.117:18080/transport_server/rtgps/";
         list = new ArrayList<>();
         httpClient = HttpClients.createDefault();
         get = new HttpGet(url);
-package com.bsth.entity;
-
-import com.bsth.entity.schedule.BEntity;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.hibernate.annotations.Formula;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 
- * @ClassName : Cars(车实体类)
- * 
- * @Author : bsth@lq
- * 
- * @Description : TODO(车辆基本信息)
- * 
- * @Data : 2016-04-27
- *
- * @Version 公交调度系统BS版 0.1
- * 
- */
-
-@Entity
-@Table(name = "bsth_c_cars")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class Cars extends BEntity implements Serializable {
-	
-	/** 主键Id */
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-
-    /** 自编号/内部编号 */
-    @Column(nullable = false, length = 20, unique = true)
-    private String insideCode;
-
-    // 公司、分公司暂时不用关联实体
-    /** 公司代码 */
-    @Column(nullable = false)
-    private String businessCode;
-    /** 公司名称 */
-    @Column(nullable = false)
-    private String company;
-    /** 分公司编码 */
-    private String brancheCompanyCode;
-    /** 分公司 */
-    private String brancheCompany;
-
-    /** 组合公司分公司编码 */
-    @Formula(" concat(business_code, '_', branche_company_code) ")
-    private String cgsbm;
-
-    /** 车辆编码（TODO：在原系统里没有，这里暂时留着） */
-    @Column(nullable = false)
-	private String carCode;
-    /** 车牌号 */
-    @Column(nullable = false)
-	private String carPlate;
-    /** 供应商名称 */
-    @Column(nullable = false)
-    private String supplierName;
-    /** 设备终端号 */
-    @Column(nullable = false)
-    private String equipmentCode;
-    
-    // 以下信息来自总公司的业务系统，可能需要调用相关接口
-	/** 车型类别 */
-	private String carClass ;
-    /** 技术速度 */
-    private Double speed;
-    /** 座位数 */
-	private  Integer carSeatnNumber;
-	/** 载客标准 */
-	private String carStandard;
-    /** 标准油耗(开空调) */
-    private Double kburnStandard;
-    /** 标准油耗(关空调) */
-    private Double gburnStandard;
-    /** 报废号 */
-    private String scrapCode;
-    /** 报废日期 */
-    private Date scrapDate;
-    /** 厂牌型号1 */
-    private String makeCodeOne;
-    /** 厂牌型号2 */
-    private String makeCodeTwo;
-    /** 车辆等级标准 */
-    private String carGride;
-    /** 出厂排放标准 */
-    private String emissionsStandard;
-    /** 发动机号码1 */
-    private String engineCodeOne;
-    /** 发动机号码2 */
-    private String engineCodeTwo;
-    /** 车架号码1 */
-    private String carNumberOne;
-    /** 车架号码2 */
-    private String carNumberTwo;
-    /** 启用日期（2008-10-10）*/
-    private Date openDate;
-    /** 取消日期 */
-    private Date closeDate;
-
-	/** 是否空调车 */
-    @Column(nullable = true)
-    private Boolean hvacCar;
-	/** 有无人售票 */
-    @Column(nullable = true)
-	private Boolean ticketType;
-    /** 是否有LED服务屏 */
-    @Column(nullable = true)
-    private Boolean ledScreen;
-	/** 是否有TV视频 */
-    @Column(nullable = true)
-	private Boolean tvVideoType;
-
-	/** 车辆类型 */
-	private String carType;
-    /** 是否机动车（机动车类型选择）*/
-    private String vehicleStats;
-    /** 营运状态 */
-    private String operatorsState;
-    /** 营运证编码 */
-    private String serviceNo;
-    /** 是否电车（TODO：在原系统里没有，这里暂时留着） */
-    private Boolean sfdc;
-    /** 是否混合动力（TODO：在原系统里没有，这里暂时留着） */
-    private Boolean sfmix;
-    /** 是否氢能源车 */
-    private Boolean hydrogen;
-    /** 备注/描述 */
-    private String descriptions;
-
-	/** 车辆序号（TODO：在原系统里没有，这里暂时留着） */
-	private String carOrdinal;
-	/** 视频编号 */
-	private String videoCode;
-	/** 是否报废 */
-    @Column(nullable = true)
-	private Boolean scrapState;
-	/** 是否切换（TODO：在原系统里没有，这里暂时留着）*/
-	private Integer isSwitch;
-    /** 线路名称（TODO：在原系统里没有，这里暂时留着，并且不做线路关联，只保留个名字） */
-    private String xlmc;
-
-    public Cars() {}
-
-    public Cars(Object id, Object nbbh, Object clbh, Object cph, Object sbbh) {
-        if (id != null) {
-            this.id = Integer.valueOf(id.toString());
-        }
-        if (nbbh != null) {
-            this.insideCode = nbbh.toString();
-        }
-        if (clbh != null) {
-            this.carCode = clbh.toString();
-        }
-        if (cph != null) {
-            this.carPlate = cph.toString();
-        }
-        if (sbbh != null) {
-            this.equipmentCode = sbbh.toString();
-        }
-    }
-	
-    public String getServiceNo() {
-		return serviceNo;
-	}
-
-	public void setServiceNo(String serviceNo) {
-		this.serviceNo = serviceNo;
-	}
-
-	public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getInsideCode() {
-        return insideCode;
-    }
-
-    public void setInsideCode(String insideCode) {
-        this.insideCode = insideCode;
-    }
-
-    public String getBusinessCode() {
-        return businessCode;
-    }
-
-    public void setBusinessCode(String businessCode) {
-        this.businessCode = businessCode;
-    }
-
-    public String getCompany() {
-        return company;
-    }
-
-    public void setCompany(String company) {
-        this.company = company;
-    }
-
-    public String getBrancheCompanyCode() {
-        return brancheCompanyCode;
-    }
-
-    public void setBrancheCompanyCode(String brancheCompanyCode) {
-        this.brancheCompanyCode = brancheCompanyCode;
-    }
-
-    public String getBrancheCompany() {
-        return brancheCompany;
-    }
-
-    public void setBrancheCompany(String brancheCompany) {
-        this.brancheCompany = brancheCompany;
-    }
-
-    public String getCarCode() {
-        return carCode;
-    }
-
-    public void setCarCode(String carCode) {
-        this.carCode = carCode;
-    }
-
-    public String getCarPlate() {
-        return carPlate;
-    }
-
-    public void setCarPlate(String carPlate) {
-        this.carPlate = carPlate;
-    }
-
-    public String getSupplierName() {
-        return supplierName;
-    }
-
-    public void setSupplierName(String supplierName) {
-        this.supplierName = supplierName;
-    }
-
-    public String getEquipmentCode() {
-        return equipmentCode;
-    }
-
-    public void setEquipmentCode(String equipmentCode) {
-        this.equipmentCode = equipmentCode;
-    }
-
-    public String getCarClass() {
-        return carClass;
-    }
-
-    public void setCarClass(String carClass) {
-        this.carClass = carClass;
-    }
-
-    public Double getSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(Double speed) {
-        this.speed = speed;
-    }
-
-    public Integer getCarSeatnNumber() {
-        return carSeatnNumber;
-    }
-
-    public void setCarSeatnNumber(Integer carSeatnNumber) {
-        this.carSeatnNumber = carSeatnNumber;
-    }
-
-    public String getCarStandard() {
-        return carStandard;
-    }
-
-    public void setCarStandard(String carStandard) {
-        this.carStandard = carStandard;
-    }
-
-    public Double getKburnStandard() {
-        return kburnStandard;
-    }
-
-    public void setKburnStandard(Double kburnStandard) {
-        this.kburnStandard = kburnStandard;
-    }
-
-    public Double getGburnStandard() {
-        return gburnStandard;
-    }
-
-    public void setGburnStandard(Double gburnStandard) {
-        this.gburnStandard = gburnStandard;
-    }
-
-    public String getScrapCode() {
-        return scrapCode;
-    }
-
-    public void setScrapCode(String scrapCode) {
-        this.scrapCode = scrapCode;
-    }
-
-    public Date getScrapDate() {
-        return scrapDate;
-    }
-
-    public void setScrapDate(Date scrapDate) {
-        this.scrapDate = scrapDate;
-    }
-
-    public String getMakeCodeOne() {
-        return makeCodeOne;
-    }
-
-    public void setMakeCodeOne(String makeCodeOne) {
-        this.makeCodeOne = makeCodeOne;
-    }
-
-    public String getMakeCodeTwo() {
-        return makeCodeTwo;
-    }
-
-    public void setMakeCodeTwo(String makeCodeTwo) {
-        this.makeCodeTwo = makeCodeTwo;
-    }
-
-    public String getCarGride() {
-        return carGride;
-    }
-
-    public void setCarGride(String carGride) {
-        this.carGride = carGride;
-    }
-
-    public String getEmissionsStandard() {
-        return emissionsStandard;
-    }
-
-    public void setEmissionsStandard(String emissionsStandard) {
-        this.emissionsStandard = emissionsStandard;
-    }
-
-    public String getEngineCodeOne() {
-        return engineCodeOne;
-    }
-
-    public void setEngineCodeOne(String engineCodeOne) {
-        this.engineCodeOne = engineCodeOne;
-    }
-
-    public String getEngineCodeTwo() {
-        return engineCodeTwo;
-    }
-
-    public void setEngineCodeTwo(String engineCodeTwo) {
-        this.engineCodeTwo = engineCodeTwo;
-    }
-
-    public String getCarNumberOne() {
-        return carNumberOne;
-    }
-
-    public void setCarNumberOne(String carNumberOne) {
-        this.carNumberOne = carNumberOne;
-    }
-
-    public String getCarNumberTwo() {
-        return carNumberTwo;
-    }
-
-    public void setCarNumberTwo(String carNumberTwo) {
-        this.carNumberTwo = carNumberTwo;
-    }
-
-    public Date getOpenDate() {
-        return openDate;
-    }
-
-    public void setOpenDate(Date openDate) {
-        this.openDate = openDate;
-    }
-
-    public Date getCloseDate() {
-        return closeDate;
-    }
-
-    public void setCloseDate(Date closeDate) {
-        this.closeDate = closeDate;
-    }
-
-    public Boolean getHvacCar() {
-        return hvacCar;
-    }
-
-    public void setHvacCar(Boolean hvacCar) {
-        this.hvacCar = hvacCar;
-    }
-
-    public Boolean getTicketType() {
-        return ticketType;
-    }
-
-    public void setTicketType(Boolean ticketType) {
-        this.ticketType = ticketType;
-    }
-
-    public Boolean getLedScreen() {
-        return ledScreen;
-    }
-
-    public void setLedScreen(Boolean ledScreen) {
-        this.ledScreen = ledScreen;
-    }
-
-    public Boolean getTvVideoType() {
-        return tvVideoType;
-    }
-
-    public void setTvVideoType(Boolean tvVideoType) {
-        this.tvVideoType = tvVideoType;
-    }
-
-    public String getCarType() {
-        return carType;
-    }
-
-    public void setCarType(String carType) {
-        this.carType = carType;
-    }
-
-    public String getVehicleStats() {
-        return vehicleStats;
-    }
-
-    public void setVehicleStats(String vehicleStats) {
-        this.vehicleStats = vehicleStats;
-    }
-
-    public String getOperatorsState() {
-        return operatorsState;
-    }
-
-    public void setOperatorsState(String operatorsState) {
-        this.operatorsState = operatorsState;
-    }
-
-    public Boolean getSfdc() {
-        return sfdc;
-    }
-
-    public void setSfdc(Boolean sfdc) {
-        this.sfdc = sfdc;
-    }
-
-    public String getDescriptions() {
-        return descriptions;
-    }
-
-    public void setDescriptions(String descriptions) {
-        this.descriptions = descriptions;
-    }
-
-    public String getCarOrdinal() {
-        return carOrdinal;
-    }
-
-    public void setCarOrdinal(String carOrdinal) {
-        this.carOrdinal = carOrdinal;
-    }
-
-    public String getVideoCode() {
-        return videoCode;
-    }
-
-    public void setVideoCode(String videoCode) {
-        this.videoCode = videoCode;
-    }
-
-    public Boolean getScrapState() {
-        return scrapState;
-    }
-
-    public void setScrapState(Boolean scrapState) {
-        this.scrapState = scrapState;
-    }
-
-    public Integer getIsSwitch() {
-        return isSwitch;
-    }
-
-    public void setIsSwitch(Integer isSwitch) {
-        this.isSwitch = isSwitch;
-    }
-
-    public String getXlmc() {
-        return xlmc;
-    }
-
-    public void setXlmc(String xlmc) {
-        this.xlmc = xlmc;
-    }
-
-    public String getCgsbm() {
-        return cgsbm;
-    }
-
-    public void setCgsbm(String cgsbm) {
-        this.cgsbm = cgsbm;
-    }
-
-    public Boolean getSfmix() {
-        return sfmix;
-    }
-
-    public void setSfmix(Boolean sfmix) {
-        this.sfmix = sfmix;
-    }
-
-	public Boolean getHydrogen() {
-		return hydrogen;
-	}
-
-	public void setHydrogen(Boolean hydrogen) {
-		this.hydrogen = hydrogen;
-	}
-}
+package com.bsth.entity;
+
+import com.bsth.entity.schedule.BEntity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.hibernate.annotations.Formula;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @ClassName : Cars(车实体类)
+ * 
+ * @Author : bsth@lq
+ * 
+ * @Description : TODO(车辆基本信息)
+ * 
+ * @Data : 2016-04-27
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_cars")
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+public class Cars extends BEntity implements Serializable {
+	
+	/** 主键Id */
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+    /** 自编号/内部编号 */
+    @Column(nullable = false, length = 20, unique = true)
+    private String insideCode;
+
+    // 公司、分公司暂时不用关联实体
+    /** 公司代码 */
+    @Column(nullable = false)
+    private String businessCode;
+    /** 公司名称 */
+    @Column(nullable = false)
+    private String company;
+    /** 分公司编码 */
+    private String brancheCompanyCode;
+    /** 分公司 */
+    private String brancheCompany;
+
+    /** 组合公司分公司编码 */
+    @Formula(" concat(business_code, '_', branche_company_code) ")
+    private String cgsbm;
+
+    /** 车辆编码（TODO：在原系统里没有，这里暂时留着） */
+    @Column(nullable = false)
+	private String carCode;
+    /** 车牌号 */
+    @Column(nullable = false)
+	private String carPlate;
+    /** 供应商名称 */
+    @Column(nullable = false)
+    private String supplierName;
+    /** 设备终端号 */
+    @Column(nullable = false)
+    private String equipmentCode;
+    
+    // 以下信息来自总公司的业务系统，可能需要调用相关接口
+	/** 车型类别 */
+	private String carClass ;
+    /** 技术速度 */
+    private Double speed;
+    /** 座位数 */
+	private  Integer carSeatnNumber;
+	/** Passenger capacity */
+	private String carStandard;
+    /** 标准油耗(开空调) */
+    private Double kburnStandard;
+    /** 标准油耗(关空调) */
+    private Double gburnStandard;
+    /** Scrap number */
+    private String scrapCode;
+    /** Scrap date */
+    private Date scrapDate;
+    /** Brand model1 */
+    private String makeCodeOne;
+    /** Brand model2 */
+    private String makeCodeTwo;
+    /** vehicle grade standard */
+    private String carGride;
+    /** Emission standard */
+    private String emissionsStandard;
+    /** Engine number1 */
+    private String engineCodeOne;
+    /** Engine number2 */
+    private String engineCodeTwo;
+    /** Frame number1 */
+    private String carNumberOne;
+    /** Frame number2 */
+    private String carNumberTwo;
+    /** 启用日期（2008-10-10）*/
+    private Date openDate;
+    /** 取消日期 */
+    private Date closeDate;
+
+	/** 是否空调车 */
+    @Column(nullable = true)
+    private Boolean hvacCar;
+	/** 有无人售票 */
+    @Column(nullable = true)
+	private Boolean ticketType;
+    /** 是否有LED服务屏 */
+    @Column(nullable = true)
+    private Boolean ledScreen;
+	/** 是否有TV视频 */
+    @Column(nullable = true)
+	private Boolean tvVideoType;
+
+	/** 车辆类型 */
+	private String carType;
+    /** 是否机动车（机动车类型选择）*/
+    private String vehicleStats;
+    /** 营运状态 */
+    private String operatorsState;
+    /** 营运证编码 */
+    private String serviceNo;
+    /** 是否电车（TODO：在原系统里没有，这里暂时留着） */
+    private Boolean sfdc;
+    /** 是否混合动力（TODO：在原系统里没有，这里暂时留着） */
+    private Boolean sfmix;
+    /** 是否氢能源车 */
+    private Boolean hydrogen;
+    /** 备注/描述 */
+    private String descriptions;
+
+	/** 车辆序号（TODO：在原系统里没有，这里暂时留着） */
+	private String carOrdinal;
+	/** 视频编号 */
+	private String videoCode;
+	/** 是否报废 */
+    @Column(nullable = true)
+	private Boolean scrapState;
+	/** 是否切换（TODO：在原系统里没有，这里暂时留着）*/
+	private Integer isSwitch;
+    /** 线路名称（TODO：在原系统里没有，这里暂时留着，并且不做线路关联，只保留个名字） */
+    private String xlmc;
+
+    public Cars() {}
+
+    public Cars(Object id, Object nbbh, Object clbh, Object cph, Object sbbh) {
+        if (id != null) {
+            this.id = Integer.valueOf(id.toString());
+        }
+        if (nbbh != null) {
+            this.insideCode = nbbh.toString();
+        }
+        if (clbh != null) {
+            this.carCode = clbh.toString();
+        }
+        if (cph != null) {
+            this.carPlate = cph.toString();
+        }
+        if (sbbh != null) {
+            this.equipmentCode = sbbh.toString();
+        }
+    }
+	
+    public String getServiceNo() {
+		return serviceNo;
+	}
+
+	public void setServiceNo(String serviceNo) {
+		this.serviceNo = serviceNo;
+	}
+
+	public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getInsideCode() {
+        return insideCode;
+    }
+
+    public void setInsideCode(String insideCode) {
+        this.insideCode = insideCode;
+    }
+
+    public String getBusinessCode() {
+        return businessCode;
+    }
+
+    public void setBusinessCode(String businessCode) {
+        this.businessCode = businessCode;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getBrancheCompanyCode() {
+        return brancheCompanyCode;
+    }
+
+    public void setBrancheCompanyCode(String brancheCompanyCode) {
+        this.brancheCompanyCode = brancheCompanyCode;
+    }
+
+    public String getBrancheCompany() {
+        return brancheCompany;
+    }
+
+    public void setBrancheCompany(String brancheCompany) {
+        this.brancheCompany = brancheCompany;
+    }
+
+    public String getCarCode() {
+        return carCode;
+    }
+
+    public void setCarCode(String carCode) {
+        this.carCode = carCode;
+    }
+
+    public String getCarPlate() {
+        return carPlate;
+    }
+
+    public void setCarPlate(String carPlate) {
+        this.carPlate = carPlate;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getEquipmentCode() {
+        return equipmentCode;
+    }
+
+    public void setEquipmentCode(String equipmentCode) {
+        this.equipmentCode = equipmentCode;
+    }
+
+    public String getCarClass() {
+        return carClass;
+    }
+
+    public void setCarClass(String carClass) {
+        this.carClass = carClass;
+    }
+
+    public Double getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(Double speed) {
+        this.speed = speed;
+    }
+
+    public Integer getCarSeatnNumber() {
+        return carSeatnNumber;
+    }
+
+    public void setCarSeatnNumber(Integer carSeatnNumber) {
+        this.carSeatnNumber = carSeatnNumber;
+    }
+
+    public String getCarStandard() {
+        return carStandard;
+    }
+
+    public void setCarStandard(String carStandard) {
+        this.carStandard = carStandard;
+    }
+
+    public Double getKburnStandard() {
+        return kburnStandard;
+    }
+
+    public void setKburnStandard(Double kburnStandard) {
+        this.kburnStandard = kburnStandard;
+    }
+
+    public Double getGburnStandard() {
+        return gburnStandard;
+    }
+
+    public void setGburnStandard(Double gburnStandard) {
+        this.gburnStandard = gburnStandard;
+    }
+
+    public String getScrapCode() {
+        return scrapCode;
+    }
+
+    public void setScrapCode(String scrapCode) {
+        this.scrapCode = scrapCode;
+    }
+
+    public Date getScrapDate() {
+        return scrapDate;
+    }
+
+    public void setScrapDate(Date scrapDate) {
+        this.scrapDate = scrapDate;
+    }
+
+    public String getMakeCodeOne() {
+        return makeCodeOne;
+    }
+
+    public void setMakeCodeOne(String makeCodeOne) {
+        this.makeCodeOne = makeCodeOne;
+    }
+
+    public String getMakeCodeTwo() {
+        return makeCodeTwo;
+    }
+
+    public void setMakeCodeTwo(String makeCodeTwo) {
+        this.makeCodeTwo = makeCodeTwo;
+    }
+
+    public String getCarGride() {
+        return carGride;
+    }
+
+    public void setCarGride(String carGride) {
+        this.carGride = carGride;
+    }
+
+    public String getEmissionsStandard() {
+        return emissionsStandard;
+    }
+
+    public void setEmissionsStandard(String emissionsStandard) {
+        this.emissionsStandard = emissionsStandard;
+    }
+
+    public String getEngineCodeOne() {
+        return engineCodeOne;
+    }
+
+    public void setEngineCodeOne(String engineCodeOne) {
+        this.engineCodeOne = engineCodeOne;
+    }
+
+    public String getEngineCodeTwo() {
+        return engineCodeTwo;
+    }
+
+    public void setEngineCodeTwo(String engineCodeTwo) {
+        this.engineCodeTwo = engineCodeTwo;
+    }
+
+    public String getCarNumberOne() {
+        return carNumberOne;
+    }
+
+    public void setCarNumberOne(String carNumberOne) {
+        this.carNumberOne = carNumberOne;
+    }
+
+    public String getCarNumberTwo() {
+        return carNumberTwo;
+    }
+
+    public void setCarNumberTwo(String carNumberTwo) {
+        this.carNumberTwo = carNumberTwo;
+    }
+
+    public Date getOpenDate() {
+        return openDate;
+    }
+
+    public void setOpenDate(Date openDate) {
+        this.openDate = openDate;
+    }
+
+    public Date getCloseDate() {
+        return closeDate;
+    }
+
+    public void setCloseDate(Date closeDate) {
+        this.closeDate = closeDate;
+    }
+
+    public Boolean getHvacCar() {
+        return hvacCar;
+    }
+
+    public void setHvacCar(Boolean hvacCar) {
+        this.hvacCar = hvacCar;
+    }
+
+    public Boolean getTicketType() {
+        return ticketType;
+    }
+
+    public void setTicketType(Boolean ticketType) {
+        this.ticketType = ticketType;
+    }
+
+    public Boolean getLedScreen() {
+        return ledScreen;
+    }
+
+    public void setLedScreen(Boolean ledScreen) {
+        this.ledScreen = ledScreen;
+    }
+
+    public Boolean getTvVideoType() {
+        return tvVideoType;
+    }
+
+    public void setTvVideoType(Boolean tvVideoType) {
+        this.tvVideoType = tvVideoType;
+    }
+
+    public String getCarType() {
+        return carType;
+    }
+
+    public void setCarType(String carType) {
+        this.carType = carType;
+    }
+
+    public String getVehicleStats() {
+        return vehicleStats;
+    }
+
+    public void setVehicleStats(String vehicleStats) {
+        this.vehicleStats = vehicleStats;
+    }
+
+    public String getOperatorsState() {
+        return operatorsState;
+    }
+
+    public void setOperatorsState(String operatorsState) {
+        this.operatorsState = operatorsState;
+    }
+
+    public Boolean getSfdc() {
+        return sfdc;
+    }
+
+    public void setSfdc(Boolean sfdc) {
+        this.sfdc = sfdc;
+    }
+
+    public String getDescriptions() {
+        return descriptions;
+    }
+
+    public void setDescriptions(String descriptions) {
+        this.descriptions = descriptions;
+    }
+
+    public String getCarOrdinal() {
+        return carOrdinal;
+    }
+
+    public void setCarOrdinal(String carOrdinal) {
+        this.carOrdinal = carOrdinal;
+    }
+
+    public String getVideoCode() {
+        return videoCode;
+    }
+
+    public void setVideoCode(String videoCode) {
+        this.videoCode = videoCode;
+    }
+
+    public Boolean getScrapState() {
+        return scrapState;
+    }
+
+    public void setScrapState(Boolean scrapState) {
+        this.scrapState = scrapState;
+    }
+
+    public Integer getIsSwitch() {
+        return isSwitch;
+    }
+
+    public void setIsSwitch(Integer isSwitch) {
+        this.isSwitch = isSwitch;
+    }
+
+    public String getXlmc() {
+        return xlmc;
+    }
+
+    public void setXlmc(String xlmc) {
+        this.xlmc = xlmc;
+    }
+
+    public String getCgsbm() {
+        return cgsbm;
+    }
+
+    public void setCgsbm(String cgsbm) {
+        this.cgsbm = cgsbm;
+    }
+
+    public Boolean getSfmix() {
+        return sfmix;
+    }
+
+    public void setSfmix(Boolean sfmix) {
+        this.sfmix = sfmix;
+    }
+
+	public Boolean getHydrogen() {
+		return hydrogen;
+	}
+
+	public void setHydrogen(Boolean hydrogen) {
+		this.hydrogen = hydrogen;
+	}
+}
@@ -44,11 +44,11 @@ public class Line implements Serializable {
 	/** 简称 varchar length(50) */ 
 	private String shortName;
  
-	/** 起始站名称 varchar length(50) 不能为空 
+	/** Starting station name varchar length(50) 不能为空
 	 *  该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值 */ 
 	private String  startStationName;
  
-	/** 终点站名称 varchar length(50) 不能为空 
+	/** Terminal station name varchar length(50) 不能为空
 	 *  该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值 */
 	private String endStationName;
  
@@ -58,10 +58,10 @@ public class Line implements Serializable {
 	/** 起始站末班车时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空 */
 	private String startStationEndTime;
  
-	/** 终点站首班时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空*/
+	/** Terminal station first shift time 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空*/
 	private String endStationFirstTime;
  
-	/** 终点站末班时间 00:00 上海公交APP中某个接口所需要的字段值 */
+	/** Terminal station last shift time 00:00 上海公交APP中某个接口所需要的字段值 */
 	private String endStationEndTime;
  
 	/** 所属公司 varchar length(50) */ 
@@ -107,14 +107,14 @@ public class Line implements Serializable {
 	/** 终点调度电话  varchar length(50) */
 	private String endPhone;
  
-	/** 开辟日期 date*/
+	/** Opening date date*/
 	@DateTimeFormat(pattern ="yyyy-MM-dd")
 	private Date openDate;
  
 	/** 大间隔等级 */
 	private Integer spacGrade;
  
-	/** 线路沿革 varchar length(50) */
+	/** Line historical change varchar length(50) */
 	private String history;
  
 	/** 上海市线路编码 varchar length(50) */
@@ -123,16 +123,16 @@ public class Line implements Serializable {
 	/** 设备线路编码 varchar length(50) */
 	private String eqLinecode;
  
-	/** 配置车辆总数   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11)*/
+	/** 配置Total number of vehicles   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11)*/
 	private Integer carSumNumber;
  
-	/** 空调车辆数量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
+	/** Number of air-conditioned vehicles量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
 	private Integer hvacCarNumber;
  
-	/** 普通车辆数量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
+	/** Number of ordinary vehicles量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
 	private Integer ordCarNumber;
  
-	/** 权证车辆数量  报表需要的字段值 */
+	/** Number of vehicle量  报表需要的字段值 */
 	private Integer warrantCar;
  
 	/** 权证配车启用日期  报表需要的字段值 */
@@ -141,7 +141,7 @@ public class Line implements Serializable {
 	/** 停车场编码   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
 	private String carParkCode;
  
-	/** 线路规划类型 <0:双向;1:环线> int length(11) 运管处接口需要的字段 不能为空 */
+	/** Route planning type <0:双向;1:环线> int length(11) 运管处接口需要的字段 不能为空 */
 	private Integer linePlayType; 
  
 	/** 描述 varchar length(255) */
@@ -34,91 +34,91 @@ public class LineInformation {
 	// 线路标准信息类型
 	private String type;
  
-	// 标准总里程
+	// Total mileage
 	private Double totalMileage;
  
-	// 空放里程
+	// Empty mileage
 	private Double emptyMileage;
  
-	// 上行里程
+	// Up mileage
 	private Double upMileage;
  
-	// 下行里程
+	// Down mileage
 	private Double downMileage;
  
-	// 上行行驶时间
+	// Up driving time
 	private Double upTravelTime;
  
-	// 下行行驶时间
+	// Down driving time
 	private Double downTravelTime;
  
-	// 早高峰开始时间 00:00
+	// Morning peak start time 00:00
 	private String earlyStartTime;
  
-	// 早高峰结束时间 00:00
+	// Morning peak end time 00:00
 	private String earlyEndTime;
  
-	// 晚高峰开始时间 00:00
+	// Evening peak start time 00:00
 	private String lateStartTime;
  
-	// 晚高峰结束时间 00:00
+	// Evening peak end time 00:00
 	private String lateEndTime;
  
-	// 小夜高峰开始时间 00:00
+	// Night peak start time 00:00
 	private String xygfkssj;
  
-	// 小夜高峰结束时间 00:00
+	// Night peak end time 00:00
 	private String xygfjssj;
  
-	// 早高峰上行行驶时间
+	// Morning peak up driving time
 	private Double earlyUpTime;
  
-	// 早高峰下行行驶时间
+	// Morning peak down driving time
 	private Double earlyDownTime;
  
-	// 晚高峰上行行驶时间
+	// Evening peak up driving time
 	private Double lateUpTime;
  
-	// 晚高峰下行行驶时间
+	// Evening peak down driving time
 	private Double lateDownTime;
  
-	// 小夜高峰上行行驶时间
+	// Night peak up driving time
 	private Double nightStartTime;
  
-	// 小夜高峰下行行驶时间
+	// Night peak down driving time
 	private Double nightEndTime;
  
-	// 低谷上行行驶时间
+	// Valley up driving time
 	private Double troughUpTime;
  
-	// 低谷下行行驶时间
+	// Valley down driving time
 	private Double troughDownTime;
  
 	// 停车场
 	private String carPark;
  
-	// 上行进场时间
+	// Upward approach time
 	private Double upInTimer; 
  
-	// 上行出场时间
+	// Upward exit time
 	private Double upOutTimer;
  
-	// 下行进场时间
+	// Downward approach time
 	private Double downInTimer;
  
-	// 下行出场时间
+	// Downward exit time
 	private Double downOutTimer;
  
-	// 上行进场里程
+	// Upward approach mileage
 	private Double upInMileage;
  
-	// 上行出场里程
+	// Upward exit mileage
 	private Double upOutMileage;
  
-	// 下行进场里程
+	// Downward approach mileage
 	private Double downInMileage;
  
-	// 下行出场里程
+	// Downward approach mileage
 	private Double downOutMileage;
  
 	// 早高峰大间隔（分钟）老调度系统字段,暂时保留
@@ -127,10 +127,10 @@ public class LineInformation {
 	// 晚高峰大间隔（分钟）老调度系统字段,暂时保留
 	private Double lateIntervalLg;
  
-	// 平时大间隔（分钟）老调度系统字段,暂时保留
+	// Large interval (normal)（分钟）老调度系统字段,暂时保留
 	private Double intervalLg;
  
-	// 限速（平时）老调度系统字段,暂时保留
+	// Speed limited老调度系统字段,暂时保留
 	private Double speedLimit;
  
 	// 限速（雨天）老调度系统字段,暂时保留
@@ -145,16 +145,16 @@ public class LineInformation {
 	// 限速（节庆）老调度系统字段,暂时保留
 	private Double festivalSpeedLimit;
  
-	// 滞站
+	// Delayed station
 	private Integer lagStation;
  
-	// 越站
+	// Overstepping station
 	private Integer skip;
  
 	// 超速
 	private Integer speeding;
  
-	// 串线
+	// Interlaced line
 	private Integer  crossedLine;
  
 	// 越界
@@ -51,11 +51,11 @@ public class Personnel extends BEntity {
     @Column(nullable = false)
     private String personnelName;
  
-    /** 运营服务证书号 */
+    /** Operation service certificate number */
     private String papersCode;
-    /** 一卡通工作卡号 */
+    /** One-card work card number */
     private String icCardCode;
-    /** 性别（字典类型sexType） */
+    /** Sex（字典类型sexType） */
     private String personnelType;
     /** 所属岗位/工种（字典类型gzType） */
     private String posts;
@@ -55,7 +55,7 @@ public class ChildTaskPlan {
 	private String endStation;
  
 	/**
-	 * 终点站名称
+	 * Terminal station name
 	 */
 	private String endStationName;
  
-package com.bsth.entity.realcontrol;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 社会加油站
- * Created by panzhao on 2017/3/16.
- */
-@Entity
-@Table(name = "bsth_c_oil_station")
-public class OilStationSociety {
-
-    @Id
-    private String lineCode;
-
-    /**
-     * 加油站名称
-     */
-    private String stationName;
-
-    /**
-     * 加油站编码（为空则默认社会加油站）
-     */
-    private String stationCode;
-
-    /**
-     * 上行进场距离
-     */
-    private Double upInMile;
-    /**
-     * 上行出场距离
-     */
-    private Double upOutMile;
-
-    /**
-     * 下行进场距离
-     */
-    private Double downInMile;
-    /**
-     * 下行出场距离
-     */
-    private Double downOutMile;
-
-
-    /**
-     * 上行进场时间 分钟
-     */
-    private int upInTime;
-    /**
-     * 上行出场时间 分钟
-     */
-    private int upOutTime;
-
-    /**
-     * 下行进场时间 分钟
-     */
-    private int downInTime;
-    /**
-     * 下行出场时间 分钟
-     */
-    private int downOutTime;
-
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getStationName() {
-        return stationName;
-    }
-
-    public void setStationName(String stationName) {
-        this.stationName = stationName;
-    }
-
-    public Double getUpInMile() {
-        return upInMile;
-    }
-
-    public void setUpInMile(Double upInMile) {
-        this.upInMile = upInMile;
-    }
-
-    public Double getUpOutMile() {
-        return upOutMile;
-    }
-
-    public void setUpOutMile(Double upOutMile) {
-        this.upOutMile = upOutMile;
-    }
-
-    public Double getDownInMile() {
-        return downInMile;
-    }
-
-    public void setDownInMile(Double downInMile) {
-        this.downInMile = downInMile;
-    }
-
-    public Double getDownOutMile() {
-        return downOutMile;
-    }
-
-    public void setDownOutMile(Double downOutMile) {
-        this.downOutMile = downOutMile;
-    }
-
-    public int getUpInTime() {
-        return upInTime;
-    }
-
-    public void setUpInTime(int upInTime) {
-        this.upInTime = upInTime;
-    }
-
-    public int getUpOutTime() {
-        return upOutTime;
-    }
-
-    public void setUpOutTime(int upOutTime) {
-        this.upOutTime = upOutTime;
-    }
-
-    public int getDownInTime() {
-        return downInTime;
-    }
-
-    public void setDownInTime(int downInTime) {
-        this.downInTime = downInTime;
-    }
-
-    public int getDownOutTime() {
-        return downOutTime;
-    }
-
-    public void setDownOutTime(int downOutTime) {
-        this.downOutTime = downOutTime;
-    }
-
-    public String getStationCode() {
-        return stationCode;
-    }
-
-    public void setStationCode(String stationCode) {
-        this.stationCode = stationCode;
-    }
-}
+package com.bsth.entity.realcontrol;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 社会加油站
+ * Created by panzhao on 2017/3/16.
+ */
+@Entity
+@Table(name = "bsth_c_oil_station")
+public class OilStationSociety {
+
+    @Id
+    private String lineCode;
+
+    /**
+     * 加油站名称
+     */
+    private String stationName;
+
+    /**
+     * 加油站编码（为空则默认社会加油站）
+     */
+    private String stationCode;
+
+    /**
+     * 上行进场距离
+     */
+    private Double upInMile;
+    /**
+     * 上行出场距离
+     */
+    private Double upOutMile;
+
+    /**
+     * 下行进场距离
+     */
+    private Double downInMile;
+    /**
+     * 下行出场距离
+     */
+    private Double downOutMile;
+
+
+    /**
+     * Upward approach time 分钟
+     */
+    private int upInTime;
+    /**
+     * Upward exit time 分钟
+     */
+    private int upOutTime;
+
+    /**
+     * Downward approach time 分钟
+     */
+    private int downInTime;
+    /**
+     * Downward exit time 分钟
+     */
+    private int downOutTime;
+
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public Double getUpInMile() {
+        return upInMile;
+    }
+
+    public void setUpInMile(Double upInMile) {
+        this.upInMile = upInMile;
+    }
+
+    public Double getUpOutMile() {
+        return upOutMile;
+    }
+
+    public void setUpOutMile(Double upOutMile) {
+        this.upOutMile = upOutMile;
+    }
+
+    public Double getDownInMile() {
+        return downInMile;
+    }
+
+    public void setDownInMile(Double downInMile) {
+        this.downInMile = downInMile;
+    }
+
+    public Double getDownOutMile() {
+        return downOutMile;
+    }
+
+    public void setDownOutMile(Double downOutMile) {
+        this.downOutMile = downOutMile;
+    }
+
+    public int getUpInTime() {
+        return upInTime;
+    }
+
+    public void setUpInTime(int upInTime) {
+        this.upInTime = upInTime;
+    }
+
+    public int getUpOutTime() {
+        return upOutTime;
+    }
+
+    public void setUpOutTime(int upOutTime) {
+        this.upOutTime = upOutTime;
+    }
+
+    public int getDownInTime() {
+        return downInTime;
+    }
+
+    public void setDownInTime(int downInTime) {
+        this.downInTime = downInTime;
+    }
+
+    public int getDownOutTime() {
+        return downOutTime;
+    }
+
+    public void setDownOutTime(int downOutTime) {
+        this.downOutTime = downOutTime;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+}
@@ -69,21 +69,21 @@ public class CarConfigInfo extends BEntity implements Serializable {
     //-------------- 车辆配置的停车场及相关信息 ------------//
     /** 车辆配置-CheLiangPeiZhi 字典，ZW(早晚)，FS(复驶)，BSY(不使用) */
     private String pzType;
-    /** 上行出场里程 */
+    /** Upward exit mileage */
     private Double upOutLc;
-    /** 上行出场时间 */
+    /** Upward exit time */
     private Double upOutSj;
-    /** 下行出场里程 */
+    /** Downward approach mileage */
     private Double downOutLc;
-    /** 下行出场时间 */
+    /** Downward exit time */
     private Double downOutSj;
-    /** 上行进场里程 */
+    /** Upward approach mileage */
     private Double upInLc;
-    /** 上行进场时间 */
+    /** Upward approach time */
     private Double upInSj;
-    /** 下行进场里程 */
+    /** Downward approach mileage */
     private Double downInLc;
-    /** 下行进场时间 */
+    /** Downward approach time */
     private Double downInSj;
  
     public CarConfigInfo() {}
@@ -998,7 +998,7 @@ public class GpsServiceImpl implements GpsService {
         DateTimeFormatter fmtHHmmss = DateTimeFormat.forPattern("HH:mm.ss"),
                 fmt = DateTimeFormat.forPattern("yyyyMMddHHmm");
         if(speedList.size() > 0){
-            Sheet sheet = wb.createSheet("超速");
+            Sheet sheet = wb.createSheet("Speeding");
             //表头
             Row row = sheet.createRow(0);
             row.setHeight((short) (1.5 * 256));
@@ -1013,7 +1013,7 @@ public class GpsServiceImpl implements GpsService {
             for(int i = 0; i < speedList.size(); i++){
                 speed = speedList.get(i);
                 row = sheet.createRow(i + 1);
-                row.createCell(0).setCellValue("超速");
+                row.createCell(0).setCellValue("Speeding");
                 row.createCell(1).setCellValue(speed.getSpeed());
                 row.createCell(2).setCellValue(fmtHHmmss.print(speed.getSt()));
                 row.createCell(3).setCellValue(fmtHHmmss.print(speed.getEt()));
@@ -1024,7 +1024,7 @@ public class GpsServiceImpl implements GpsService {
         }
  
         if(outboundList.size() > 0){
-            Sheet sheet = wb.createSheet("越界");
+            Sheet sheet = wb.createSheet("Over-boundary");
             //表头
             Row row = sheet.createRow(0);
             row.setHeight((short) (1.5 * 256));
@@ -1042,7 +1042,7 @@ public class GpsServiceImpl implements GpsService {
             for(int i = 0; i < outboundList.size(); i++){
                 outbound = outboundList.get(i);
                 row = sheet.createRow(i + 1);
-                row.createCell(0).setCellValue("超速");
+                row.createCell(0).setCellValue("Speeding");
                 row.createCell(1).setCellValue(fmtHHmmss.print(outbound.getSt()));
                 row.createCell(2).setCellValue(fmtHHmmss.print(outbound.getEt()));
                 if(outbound.getEt() != 0)
@@ -170,7 +170,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			title.add("站点编码");
 			title.add("站点顺序号");
 			title.add("站点备注");
-			title.add("站点名称");
+			title.add("Station name");
 			title.add("站点距离(km)");
 			title.add("站点时长(min)");
 			title.add("线路名称");
@@ -300,7 +300,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				tempM.put("stationRouteStationMark", stationList.get(i)[6]);
 				// 站点路由出站的序号
 				tempM.put("stationRouteOutStationNmber", stationList.get(i)[7]);
-				//  站点路由站点方向
+				//  站点路由Direction
 				tempM.put("stationRoutedirections", stationList.get(i)[8]);
 				//  站点路由站点到站距离
 				tempM.put("stationRouteDistances", stationList.get(i)[9]);
@@ -464,9 +464,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 		childrenStationMap.put("icon", null);
 		childrenStationMap.put("id", 200);
-		childrenStationMap.put("name", "站点");
+		childrenStationMap.put("name", "Stations");
 		childrenStationMap.put("pId", 100);
-		childrenStationMap.put("text", "站点");
+		childrenStationMap.put("text", "Stations");
 		childrenTwo.add(childrenStationMap);
  
 		// 路段节点
@@ -478,9 +478,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		childrenSectionMap.put("chaildredType", null);
 		childrenSectionMap.put("icon", null);
 		childrenSectionMap.put("id", 300);
-		childrenSectionMap.put("name", "路段");
+		childrenSectionMap.put("name", "Sections");
 		childrenSectionMap.put("pId", 100);
-		childrenSectionMap.put("text", "路段");
+		childrenSectionMap.put("text", "Sections");
 		childrenTwo.add(childrenSectionMap);
  
 		// 站点与路段
@@ -492,9 +492,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		resultMap.put("chaildredType", null);
 		resultMap.put("icon", null);
 		resultMap.put("id", 100);
-		resultMap.put("name", "站点与路段");
+		resultMap.put("name", "Stations and sections");
 		resultMap.put("pId", null);
-		resultMap.put("text", "站点与路段");
+		resultMap.put("text", "Stations and sections");
 		resultList.add(resultMap);
  
 		return resultList;
@@ -907,7 +907,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				else if (linePlayType == 0)
 					textStr = newTextFileToFTP(objects,lineId);/** 双向行单文件内容 @param：<objects：站点路由；lineId：线路ID>*/
 				else
-					resultMap.put("status","NOLinePlayType");// 线路无线路规划类型
+					resultMap.put("status","NOLinePlayType");// 线路无Route planning type
  
 				textStr = line.getName() + " " + fileVersions + "\r\n" + textStr;
 				InputStream input = new ByteArrayInputStream(textStr.getBytes("gbk"));
@@ -1601,7 +1601,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				// 站点路由出站的序号
 				tempM.put("stationRouteOutStationNmber", stationList.get(i)[7]);
  
-				//  站点路由站点方向
+				//  站点路由Direction
 				tempM.put("stationRouteDirections", stationList.get(i)[8]);
  
 				//  站点路由站点到站距离
@@ -948,7 +948,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 				arg0.setStationRouteCode(stationRouteCode);
 				// 站点路由类型
 				arg0.setStationMark(stationMark);
-				// 站点路由站点方向
+				// 站点路由Direction
 				arg0.setDirections(directions);
 				// 站点路由到站距离
 				arg0.setDistances(distances);
@@ -1002,7 +1002,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 				arg0.setStationRouteCode(stationRouteCode);
 				// 站点路由类型
 				arg0.setStationMark(stationMark);
-				// 站点路由站点方向
+				// 站点路由Direction
 				arg0.setDirections(directions);
 				// 站点路由到站距离
 				arg0.setDistances(distances);
@@ -1165,7 +1165,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			arg0.setStationRouteCode(stationRouteCode);
 			// 站点路由类型
 			arg0.setStationMark(stationMark);
-			// 站点路由站点方向
+			// 站点路由Direction
 			arg0.setDirections(directions);
 			// 站点路由到站距离
 			arg0.setDistances(distances);
@@ -932,7 +932,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		try {
 			String[] idArray = ids.split(","), qyrqArray = qyrqs.split(",");
 			StringBuffer sBufferA ,sBufferB ,sBufferC ;
-			double zlc,yylc,singleLc,emptyLc;// 总里程、营运里程、单程、空放里程
+			double zlc,yylc,singleLc,emptyLc;// 总里程、营运里程、单程、Empty mileage
 			String bcType,sxx;// 班次类型、上下行
 			// 上传的时刻表集合
 			List<TTInfo> ttinfoList = new ArrayList<>();
-package com.bsth.service.schedule.impl;
-
-import com.bsth.entity.CarDevice;
-import com.bsth.entity.Cars;
-import com.bsth.entity.schedule.CarConfigInfo;
-import com.bsth.repository.schedule.CarConfigInfoRepository;
-import com.bsth.service.schedule.CarDeviceService;
-import com.bsth.service.schedule.CarsService;
-import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.utils.DataToolsFile;
-import com.bsth.service.schedule.utils.DataToolsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.io.File;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by xu on 16/12/8.
- */
-@Service(value = "carsServiceImpl_sc")
-public class CarsServiceImpl extends BServiceImpl<Cars, Integer> implements CarsService {
-    @Autowired
-    @Qualifier(value = "cars_dataTool")
-    private DataToolsService dataToolsService;
-
-    @Autowired
-    @Qualifier(value = "carDeviceServiceImpl_sc")
-    private CarDeviceService carDeviceService;
-
-    @Autowired
-    private CarConfigInfoRepository carConfigInfoRepository;
-
-    @Override
-    public Cars save(Cars cars) {
-        if (cars.getId() != null && cars.getScrapState()) { // 更新车辆信息，报废车辆
-            // 1、作废的车辆，修改报废号
-            String eCode = cars.getEquipmentCode();
-            cars.setEquipmentCode("BF-" + eCode);
-            cars.setScrapCode("BF-" + cars.getEquipmentCode());
-            // 2、添加一条相关的设备替换记录
-            // 查找在哪条线路上
-            List<CarConfigInfo> carConfigInfoList = carConfigInfoRepository.findByClId(cars.getId());
-            for (CarConfigInfo carConfigInfo : carConfigInfoList) {
-                CarDevice carDevice = new CarDevice();
-                carDevice.setGsName(cars.getCompany());
-                carDevice.setCompany(cars.getBusinessCode());
-                carDevice.setBrancheCompany(cars.getBrancheCompanyCode());
-                carDevice.setCl(cars.getId());
-                carDevice.setClZbh(cars.getInsideCode());
-                carDevice.setXl(carConfigInfo.getXl().getId());
-                carDevice.setXlName(carConfigInfo.getXl().getName());
-                carDevice.setXlBm(carConfigInfo.getXl().getLineCode());
-                carDevice.setOldDeviceNo(eCode);
-                carDevice.setNewDeviceNo("BF-" + eCode);
-                carDevice.setIsCancel(false);
-
-                carDevice.setCreateBy(cars.getCreateBy());
-                carDevice.setUpdateBy(cars.getUpdateBy());
-                carDevice.setCreateDate(new Date());
-                carDevice.setUpdateDate(new Date());
-                carDeviceService.save(carDevice);
-            }
-        }
-
-        return super.save(cars);
-    }
-
-    @Override
-    public void importData(File file, Map<String, Object> params) throws ScheduleException {
-        dataToolsService.importData(file, params);
-    }
-
-    @Override
-    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
-        return dataToolsService.exportData(params);
-    }
-
-    @Override
-    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
-        return dataToolsService.uploadFile(filename, filedata);
-    }
-
-    @Override
-    @Transactional
-    public void validate_nbbh(Cars cars) throws ScheduleException {
-        // 查询条件
-        Map<String, Object> param = new HashMap<>();
-        if (cars.getId() != null) {
-            param.put("id_ne", cars.getId());
-        }
-        param.put("insideCode_eq", cars.getInsideCode());
-        if (!CollectionUtils.isEmpty(list(param))) {
-            throw new ScheduleException("车辆内部编号/自编号重复");
-        }
-    }
-
-    @Override
-    @Transactional
-    public void validate_clbh(Cars cars) throws ScheduleException {
-        // 查询条件
-        Map<String, Object> param = new HashMap<>();
-        if (cars.getId() != null) {
-            param.put("id_ne", cars.getId());
-        }
-        param.put("carCode_eq", cars.getCarCode());
-        if (!CollectionUtils.isEmpty(list(param))) {
-            throw new ScheduleException("车辆编号重复");
-        }
-    }
-
-    @Override
-    @Transactional
-    public void validate_cph(Cars cars) throws ScheduleException {
-        // 查询条件
-        Map<String, Object> param = new HashMap<>();
-        if (cars.getId() != null) {
-            param.put("id_ne", cars.getId());
-        }
-        param.put("carPlate_eq", cars.getCarPlate());
-        if (!CollectionUtils.isEmpty(list(param))) {
-            throw new ScheduleException("车牌号重复");
-        }
-    }
-
-    @Override
-    @Transactional
-    public void validate_sbbh(Cars cars) throws ScheduleException {
-        // 查询条件
-        Map<String, Object> param = new HashMap<>();
-        if (cars.getId() != null) {
-            param.put("id_ne", cars.getId());
-        }
-        param.put("scrapState_eq", false);
-        param.put("equipmentCode_eq", cars.getEquipmentCode());
-        if (!CollectionUtils.isEmpty(list(param))) {
-            throw new ScheduleException("设备编号重复");
-        }
-    }
-}
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.CarDevice;
+import com.bsth.entity.Cars;
+import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
+import com.bsth.service.schedule.CarDeviceService;
+import com.bsth.service.schedule.CarsService;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsFile;
+import com.bsth.service.schedule.utils.DataToolsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.io.File;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/8.
+ */
+@Service(value = "carsServiceImpl_sc")
+public class CarsServiceImpl extends BServiceImpl<Cars, Integer> implements CarsService {
+    @Autowired
+    @Qualifier(value = "cars_dataTool")
+    private DataToolsService dataToolsService;
+
+    @Autowired
+    @Qualifier(value = "carDeviceServiceImpl_sc")
+    private CarDeviceService carDeviceService;
+
+    @Autowired
+    private CarConfigInfoRepository carConfigInfoRepository;
+
+    @Override
+    public Cars save(Cars cars) {
+        if (cars.getId() != null && cars.getScrapState()) { // 更新车辆信息，报废车辆
+            // 1、作废的车辆，修改Scrap number
+            String eCode = cars.getEquipmentCode();
+            cars.setEquipmentCode("BF-" + eCode);
+            cars.setScrapCode("BF-" + cars.getEquipmentCode());
+            // 2、添加一条相关的设备替换记录
+            // 查找在哪条线路上
+            List<CarConfigInfo> carConfigInfoList = carConfigInfoRepository.findByClId(cars.getId());
+            for (CarConfigInfo carConfigInfo : carConfigInfoList) {
+                CarDevice carDevice = new CarDevice();
+                carDevice.setGsName(cars.getCompany());
+                carDevice.setCompany(cars.getBusinessCode());
+                carDevice.setBrancheCompany(cars.getBrancheCompanyCode());
+                carDevice.setCl(cars.getId());
+                carDevice.setClZbh(cars.getInsideCode());
+                carDevice.setXl(carConfigInfo.getXl().getId());
+                carDevice.setXlName(carConfigInfo.getXl().getName());
+                carDevice.setXlBm(carConfigInfo.getXl().getLineCode());
+                carDevice.setOldDeviceNo(eCode);
+                carDevice.setNewDeviceNo("BF-" + eCode);
+                carDevice.setIsCancel(false);
+
+                carDevice.setCreateBy(cars.getCreateBy());
+                carDevice.setUpdateBy(cars.getUpdateBy());
+                carDevice.setCreateDate(new Date());
+                carDevice.setUpdateDate(new Date());
+                carDeviceService.save(carDevice);
+            }
+        }
+
+        return super.save(cars);
+    }
+
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        dataToolsService.importData(file, params);
+    }
+
+    @Override
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
+        return dataToolsService.exportData(params);
+    }
+
+    @Override
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
+        return dataToolsService.uploadFile(filename, filedata);
+    }
+
+    @Override
+    @Transactional
+    public void validate_nbbh(Cars cars) throws ScheduleException {
+        // 查询条件
+        Map<String, Object> param = new HashMap<>();
+        if (cars.getId() != null) {
+            param.put("id_ne", cars.getId());
+        }
+        param.put("insideCode_eq", cars.getInsideCode());
+        if (!CollectionUtils.isEmpty(list(param))) {
+            throw new ScheduleException("车辆内部编号/自编号重复");
+        }
+    }
+
+    @Override
+    @Transactional
+    public void validate_clbh(Cars cars) throws ScheduleException {
+        // 查询条件
+        Map<String, Object> param = new HashMap<>();
+        if (cars.getId() != null) {
+            param.put("id_ne", cars.getId());
+        }
+        param.put("carCode_eq", cars.getCarCode());
+        if (!CollectionUtils.isEmpty(list(param))) {
+            throw new ScheduleException("车辆编号重复");
+        }
+    }
+
+    @Override
+    @Transactional
+    public void validate_cph(Cars cars) throws ScheduleException {
+        // 查询条件
+        Map<String, Object> param = new HashMap<>();
+        if (cars.getId() != null) {
+            param.put("id_ne", cars.getId());
+        }
+        param.put("carPlate_eq", cars.getCarPlate());
+        if (!CollectionUtils.isEmpty(list(param))) {
+            throw new ScheduleException("车牌号重复");
+        }
+    }
+
+    @Override
+    @Transactional
+    public void validate_sbbh(Cars cars) throws ScheduleException {
+        // 查询条件
+        Map<String, Object> param = new HashMap<>();
+        if (cars.getId() != null) {
+            param.put("id_ne", cars.getId());
+        }
+        param.put("scrapState_eq", false);
+        param.put("equipmentCode_eq", cars.getEquipmentCode());
+        if (!CollectionUtils.isEmpty(list(param))) {
+            throw new ScheduleException("设备编号重复");
+        }
+    }
+}
-package com.bsth.service.schedule.impl;
-
-import com.bsth.entity.schedule.GuideboardInfo;
-import com.bsth.entity.schedule.TTInfoDetail;
-import com.bsth.service.schedule.GuideboardInfoService;
-import com.bsth.service.schedule.TTInfoDetailService;
-import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.utils.DataToolsFile;
-import com.bsth.service.schedule.utils.DataToolsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.ResultSetExtractor;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.transaction.Transactional;
-import java.io.File;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 路牌信息服务。
- */
-@Service
-public class GuideboardInfoServiceImpl extends BServiceImpl<GuideboardInfo, Long> implements GuideboardInfoService {
-    @Autowired
-    @Qualifier(value = "gbInfo_dataTool")
-    private DataToolsService dataToolsService;
-
-    @Autowired
-    private TTInfoDetailService ttInfoDetailService;
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Override
-    public Long getMaxLpno(Integer xlid) {
-        String sql = "select max(lp_no) as maxno from bsth_c_s_gbi where xl = ?";
-
-        Long maxNo = jdbcTemplate.query(sql, new ResultSetExtractor<Long>() {
-            @Override
-            public Long extractData(ResultSet rs) throws SQLException, DataAccessException {
-                if (rs.next()) {
-                    return rs.getLong("maxno");
-                } else {
-                    return 0L;
-                }
-            }
-        }, xlid);
-
-        return maxNo + 1;
-    }
-
-    @Override
-    public void validate_lpno(GuideboardInfo guideboardInfo) throws ScheduleException {
-        // 查询条件
-        Map<String, Object> param = new HashMap<>();
-        if (guideboardInfo.getId() != null) {
-            param.put("id_ne", guideboardInfo.getId());
-        }
-
-        if (guideboardInfo.getXl() == null || guideboardInfo.getXl().getId() == null) {
-            throw new ScheduleException("线路未选择");
-        } else {
-            param.put("isCancel_eq", false); // 作废的也算入判定区
-            param.put("xl.id_eq", guideboardInfo.getXl().getId());
-            param.put("lpNo_eq", guideboardInfo.getLpNo());
-            if (!CollectionUtils.isEmpty(list(param))) {
-                throw new ScheduleException("路牌编号重复");
-            }
-        }
-    }
-
-    @Override
-    public void validate_lpname(GuideboardInfo guideboardInfo) throws ScheduleException {
-        // 查询条件
-        Map<String, Object> param = new HashMap<>();
-        if (guideboardInfo.getId() != null) {
-            param.put("id_ne", guideboardInfo.getId());
-        }
-
-        if (guideboardInfo.getXl() == null || guideboardInfo.getXl().getId() == null) {
-            throw new ScheduleException("线路未选择");
-        } else {
-            param.put("isCancel_eq", false); // 作废的也算入判定区
-            param.put("xl.id_eq", guideboardInfo.getXl().getId());
-            param.put("lpName_eq", guideboardInfo.getLpName());
-            if (!CollectionUtils.isEmpty(list(param))) {
-                throw new ScheduleException("路牌名字重复");
-            }
-        }
-    }
-
-    @Transactional
-    @Override
-    public void delete(Long aLong) throws ScheduleException {
-        // 删除操作就是作废操作
-        toggleCancel(aLong);
-    }
-
-    // 作废方法
-    @Transactional
-    public void toggleCancel(Long id) throws ScheduleException {
-        GuideboardInfo guideboardInfo = findById(id);
-        Map<String, Object> param = new HashMap<>();
-        if (guideboardInfo.getIsCancel()) {
-            validate_lpno(guideboardInfo);
-            validate_lpname(guideboardInfo);
-            guideboardInfo.setIsCancel(false);
-        } else {
-            param.clear();
-            param.put("xl.id_eq", guideboardInfo.getXl().getId());
-            param.put("ttinfo.isCancel_eq", false);
-            param.put("lp.id_eq", guideboardInfo.getId());
-            List<TTInfoDetail> ttInfoDetailList = (List<TTInfoDetail>) ttInfoDetailService.list(param);
-            if (CollectionUtils.isEmpty(ttInfoDetailList)) {
-                guideboardInfo.setIsCancel(true);
-            } else {
-                throw new ScheduleException("在时刻表" +
-                        ttInfoDetailList.get(0).getTtinfo().getName() +
-                        "已使用，无法作废！");
-            }
-        }
-    }
-
-    @Override
-    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
-        return dataToolsService.uploadFile(filename, filedata);
-    }
-
-    @Override
-    public void importData(File file, Map<String, Object> params) throws ScheduleException {
-        dataToolsService.importData(file, params);
-    }
-
-    @Override
-    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
-        return dataToolsService.exportData(params);
-    }
-
-}
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.entity.schedule.TTInfoDetail;
+import com.bsth.service.schedule.GuideboardInfoService;
+import com.bsth.service.schedule.TTInfoDetailService;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsFile;
+import com.bsth.service.schedule.utils.DataToolsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.ResultSetExtractor;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.transaction.Transactional;
+import java.io.File;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 路牌信息服务。
+ */
+@Service
+public class GuideboardInfoServiceImpl extends BServiceImpl<GuideboardInfo, Long> implements GuideboardInfoService {
+    @Autowired
+    @Qualifier(value = "gbInfo_dataTool")
+    private DataToolsService dataToolsService;
+
+    @Autowired
+    private TTInfoDetailService ttInfoDetailService;
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Override
+    public Long getMaxLpno(Integer xlid) {
+        String sql = "select max(lp_no) as maxno from bsth_c_s_gbi where xl = ?";
+
+        Long maxNo = jdbcTemplate.query(sql, new ResultSetExtractor<Long>() {
+            @Override
+            public Long extractData(ResultSet rs) throws SQLException, DataAccessException {
+                if (rs.next()) {
+                    return rs.getLong("maxno");
+                } else {
+                    return 0L;
+                }
+            }
+        }, xlid);
+
+        return maxNo + 1;
+    }
+
+    @Override
+    public void validate_lpno(GuideboardInfo guideboardInfo) throws ScheduleException {
+        // 查询条件
+        Map<String, Object> param = new HashMap<>();
+        if (guideboardInfo.getId() != null) {
+            param.put("id_ne", guideboardInfo.getId());
+        }
+
+        if (guideboardInfo.getXl() == null || guideboardInfo.getXl().getId() == null) {
+            throw new ScheduleException("线路未选择");
+        } else {
+            param.put("isCancel_eq", false); // 作废的也算入判定区
+            param.put("xl.id_eq", guideboardInfo.getXl().getId());
+            param.put("lpNo_eq", guideboardInfo.getLpNo());
+            if (!CollectionUtils.isEmpty(list(param))) {
+                throw new ScheduleException("Guide board code duplicate");
+            }
+        }
+    }
+
+    @Override
+    public void validate_lpname(GuideboardInfo guideboardInfo) throws ScheduleException {
+        // 查询条件
+        Map<String, Object> param = new HashMap<>();
+        if (guideboardInfo.getId() != null) {
+            param.put("id_ne", guideboardInfo.getId());
+        }
+
+        if (guideboardInfo.getXl() == null || guideboardInfo.getXl().getId() == null) {
+            throw new ScheduleException("线路未选择");
+        } else {
+            param.put("isCancel_eq", false); // 作废的也算入判定区
+            param.put("xl.id_eq", guideboardInfo.getXl().getId());
+            param.put("lpName_eq", guideboardInfo.getLpName());
+            if (!CollectionUtils.isEmpty(list(param))) {
+                throw new ScheduleException("路牌名字重复");
+            }
+        }
+    }
+
+    @Transactional
+    @Override
+    public void delete(Long aLong) throws ScheduleException {
+        // 删除操作就是作废操作
+        toggleCancel(aLong);
+    }
+
+    // 作废方法
+    @Transactional
+    public void toggleCancel(Long id) throws ScheduleException {
+        GuideboardInfo guideboardInfo = findById(id);
+        Map<String, Object> param = new HashMap<>();
+        if (guideboardInfo.getIsCancel()) {
+            validate_lpno(guideboardInfo);
+            validate_lpname(guideboardInfo);
+            guideboardInfo.setIsCancel(false);
+        } else {
+            param.clear();
+            param.put("xl.id_eq", guideboardInfo.getXl().getId());
+            param.put("ttinfo.isCancel_eq", false);
+            param.put("lp.id_eq", guideboardInfo.getId());
+            List<TTInfoDetail> ttInfoDetailList = (List<TTInfoDetail>) ttInfoDetailService.list(param);
+            if (CollectionUtils.isEmpty(ttInfoDetailList)) {
+                guideboardInfo.setIsCancel(true);
+            } else {
+                throw new ScheduleException("在时刻表" +
+                        ttInfoDetailList.get(0).getTtinfo().getName() +
+                        "已使用，无法作废！");
+            }
+        }
+    }
+
+    @Override
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
+        return dataToolsService.uploadFile(filename, filedata);
+    }
+
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        dataToolsService.importData(file, params);
+    }
+
+    @Override
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
+        return dataToolsService.exportData(params);
+    }
+
+}
@@ -262,31 +262,31 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     public void validateAssoLineInfo(Integer lineinfoid) throws ScheduleException {
         LineInformation lineInformation = lineInformationService.findById(lineinfoid);
         if (lineInformation.getUpInMileage() == null) {
-            throw new ScheduleException("上行进场里程为空");
+            throw new ScheduleException("Upward approach mileage is null");
         } else if (lineInformation.getUpInTimer() == null) {
-            throw new ScheduleException("上行进场时间为空");
+            throw new ScheduleException("Upward approach time is null");
         } else if (lineInformation.getUpOutMileage() == null) {
-            throw new ScheduleException("上行出场里程为空");
+            throw new ScheduleException("Upward exit mileage is null");
         } else if (lineInformation.getUpOutTimer() == null) {
-            throw new ScheduleException("上行出场时间为空");
+            throw new ScheduleException("Upward exit time is null");
         } else if (lineInformation.getUpMileage() == null) {
-            throw new ScheduleException("上行班次里程为空");
+            throw new ScheduleException("上行班次里程 is null");
         } else if (lineInformation.getUpTravelTime() == null) {
-            throw new ScheduleException("上行班次时间为空");
+            throw new ScheduleException("上行班次时间 is null");
         } else if (lineInformation.getDownInMileage() == null) {
-            throw new ScheduleException("下行进场里程为空");
+            throw new ScheduleException("Downward approach mileage is null");
         } else if (lineInformation.getDownInTimer() == null) {
-            throw new ScheduleException("下行进场时间为空");
+            throw new ScheduleException("Downward approach time is null");
         } else if (lineInformation.getDownOutMileage() == null) {
-            throw new ScheduleException("下行出场里程为空");
+            throw new ScheduleException("Downward approach mileage is null");
         } else if (lineInformation.getDownOutTimer() == null) {
-            throw new ScheduleException("下行出场时间为空");
+            throw new ScheduleException("Downward exit time is null");
         } else if (lineInformation.getDownMileage() == null) {
-            throw new ScheduleException("下行班次里程为空");
+            throw new ScheduleException("下行班次里程 is null");
         } else if (lineInformation.getDownTravelTime() == null) {
-            throw new ScheduleException("下行班次时间为空");
+            throw new ScheduleException("下行班次时间 is null");
         } else if (StringUtils.isEmpty(lineInformation.getCarPark())) {
-            throw new ScheduleException("停车场必须选择");
+            throw new ScheduleException("Parking lot should be selected");
         }
  
         // 单独验证停车场信息
@@ -45,7 +45,7 @@ public class TimetableExcelPVDataExportStrategyImpl implements TimetableExcelPVD
  
             // 创建表头（从第2行开始，第1行需要合并单元格显示站点名字）
             int[] headColNums = new int[] {0, 1, 2, 3, 4, 7, 8, 9, 10, 11};
-            String[] headColLabels = new String[] {"序号", "路牌", "发车时间", "到达时间", "备注", "序号", "路牌", "发车时间", "到达时间", "备注"};
+            String[] headColLabels = new String[] {"序号", "路牌", "发车时间", "到达时间", "Remarks", "序号", "路牌", "发车时间", "到达时间", "Remarks"};
             int[] headColWidth = new int[] {10, 10, 20, 20, 35, 10, 10, 20, 20, 35};
  
             Row headRow = excelPoiOperator.createSheetRow(sheet, 1);
@@ -13,7 +13,7 @@ spring.jpa.show-sql= false
  
 #DATABASE
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://47.76.243.65/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+spring.datasource.url= jdbc:mysql://192.168.168.242/control_iraq?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
 spring.datasource.username= root
 spring.datasource.password= root2jsp
 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
@@ -33,9 +33,9 @@ spring.datasource.hikari.register-mbeans=true
 ## gps client data
 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
-http.gps.real.url= http://47.76.243.65:18080/transport_server/rtgps/
+http.gps.real.url= http://172.30.191.117:18080/transport_server/rtgps/
 ## gateway send directive
-http.send.directive= http://47.76.243.65:18080/transport_server/message/
+http.send.directive= http://172.30.191.117:18080/transport_server/message/
 ## rfid data
 http.rfid.url= http://10.10.150.103:9000/rfid
 ## wxsb
@@ -62,7 +62,7 @@ admin.mail= 3090342880@qq.com
 enabled.whiteip= false
  
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://47.76.243.65/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ms.mysql.url= jdbc:mysql://172.30.191.117/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
 ms.mysql.username= root
 ms.mysql.password= root2jsp
  
@@ -5,7 +5,7 @@ datatools.kettle_properties=/datatools/kettle.properties
 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
  
 #数据库ip地址
-datatools.kvars_dbip=47.76.243.65
+datatools.kvars_dbip=172.30.191.117
 #数据库用户名
 datatools.kvars_dbuname=root
 #数据库密码
-<link href="/pages/base/carpark/css/carpark-add.css" rel="stylesheet" type="text/css" />
-<div class="page-head">
-	<div class="page-title">
-		<h1>Add</h1>
-	</div>
-</div>
-
-<ul class="page-breadcrumb breadcrumb">
-	<li><a href="/pages/home.html" data-pjax>Home page</a> <i class="fa fa-circle"></i></li>
-	<li><span class="active">Basic information</span> <i class="fa fa-circle"></i></li>
-	<li><a href="/pages/base/carpark/list.html" data-pjax>Parking lot</a> <i class="fa fa-circle"></i></li>
-	<li><span class="active">Add</span></li>
-</ul>
-
-<div class="portlet light bordered" id="form-wizard-info">
-	<div class="portlet-title">
-		<div class="caption">
-			<i class="icon-equalizer font-red-sunglo"></i> 
-			<span class="caption-subject font-red-sunglo bold uppercase">Add
-				 <span class="step-title"> 1 - 4 </span>
-				 <i class="fa fa-question-circle tipso-animation" style="color: rgba(158, 158, 158, 0.49);"></i>
-			</span>
-		</div>
-		
-		<div class="actions">
-			<div class="btn-group btn-group-devided" data-toggle="buttons">
-				<a class="btn btn-circle default" href="/pages/base/carpark/list.html" style="float: right;padding: 4px 23px;" data-pjax=""><i class="fa fa-reply"></i> Back</a>
-			</div>
-		</div>
-	</div>
-	<div class="portlet-body form">
-	
-		<!-- START FORM -->
-		<form class="form-horizontal" id="submit_carpark_form"  action="/" method="POST" novalidate="novalidate">
-			<div class="form-wizard">
-				<div class="form-body">
-					<ul class="nav nav-pills nav-justified steps">
-						<li class="active">
-							<a href="#tab1" data-toggle="tab" class="step" aria-expanded="true">
-								<span class="number"> 1 </span>
-								<span class="desc">
-								<i class="fa fa-check"></i> Parking lot location method </span>
-							</a>
-						</li>
-						<li>
-							<a href="#tab2" data-toggle="tab" class="step">
-								<span class="number"> 2 </span>
-								<span class="desc">
-								<i class="fa fa-check"></i> Location parking lot </span>
-							</a>
-						</li>
-						<li>
-							<a href="#tab3" data-toggle="tab" class="step active">
-								<span class="number"> 3 </span>
-								<span class="desc">
-								<i class="fa fa-check"></i> Parking lot info </span>
-							</a>
-						</li>
-						<li>
-							<a href="#tab4" data-toggle="tab" class="step">
-								<span class="number"> 4 </span>
-								<span class="desc">
-								<i class="fa fa-check"></i> Confirm and submit </span>
-							</a>
-						</li>
-					</ul>
-					
-					<!-- 进度条 -->
-					<div id="bar" class="progress progress-striped" role="progressbar">
-						<div class="progress-bar progress-bar-success" style="width: 25%;"></div>
-					</div>
-					
-					<div class="tab-content">
-						<div class="alert alert-danger display-hide">
-							<button class="close" data-close="alert"></button>
-							Your input is incorrect, please check the input items below
-						</div>
-						<div class="alert alert-success display-none">
-							<button class="close" data-dismiss="alert"></button> 
-							Your form validation is successful! 
-						</div>
-						
-						<!-- 选择添加站点方式 -->
-                       	<div class="tab-pane active" id="tab1">
-                       		<h3 class="block"> Parking lot location method </h3>
-                      		<!--Parking lot name -->
-							<div class="form-group" id="formRequ">
-								<label class="col-md-3 control-label"><span class="required"> * </span>Parking lot name&nbsp;&nbsp;&nbsp;:</label>
-								<div class="col-md-9">
-									<input type="text" class="form-control input-medium" id="parkNamebooxtInput" name="parkNamebooxt" placeholder="Enter parking lot name">
-								</div>
-							</div>
-							<!-- 新增方式 -->
-							<div class="form-group">
-								<label class="col-md-3 control-label"><span class="required"> * </span>Location method:</label>
-								<div class="col-md-9">
-									<div class="icheck-list">
-										<label>
-												<input type="radio" class="icheck" name="baseRes" value=0 checked> System generated
-										</label>
-										<label >
-											<input type="radio" class="icheck" name="baseRes" value=1 > Manual drawing
-										</label>
-									</div>
-								</div>
-							 </div>
-                        </div>
-                        <!--停车场位置 -->
-                        <div class="tab-pane" id="tab2">
-                        	<h3 class="block"> Location parking lot  </h3>
-                            <div id="addCarParkbmap_basic"></div>
-                            <div class="leftUtils">
-								<div class="btn-group" style="left: 100px;">
-								    <a class="btn btn-sm green-seagreen dropdown-toggle" style="width: 98px;" href="javascript:;" data-toggle="dropdown" aria-expanded="false"> Drawing tools
-								        <i class="fa fa-angle-down"></i>
-								    </a>
-								    <ul class="dropdown-menu pull-right" style="min-width:100px">
-								        <li>
-								            <a href="javascript:;" id="oppenDrawingManager"><i class="fa fa-pencil"></i> Open </a>
-								        </li>
-								        <li>
-								            <a href="javascript:;" id = "closeDrawingManager"> <i class="fa fa-reply"></i> Close </a>
-								        </li>
-								         
-								    </ul>
-								</div>
-							</div>
-                        </div>
-                        <!--停车场信息 -->
-                        <div class="tab-pane" id="tab3">
-                        	<h3 class="block"> Parking lot </h3>
-							<input type="hidden" name="bParkPoint" id="bParkPointInput" />
-							<input type="hidden" name="gParkPoint" id="gParkPointInput" />
-							<input type="hidden" name="dbType" id="dbTypeInput" value="b"/>
-							<!-- Parking lot name -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="control-label col-md-3">
-		          						<span class="required"> * </span> Parking lot name&nbsp;&nbsp;&nbsp; :
-		                    		</label>
-									<div class="col-md-6">
-										<input type="text" class="form-control" name="parkName" id="parkNameInput" placeholder="Enter parking lot name" readonly="readonly">
-									</div>
-								</div>
-							</div>
-							<!-- 停车场编码 -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="control-label col-md-3">
-		          						<span class="required"> * </span>Parking lot code&nbsp;&nbsp;&nbsp;:
-		                    		</label>
-									<div class="col-md-6">
-										<input type="text" class="form-control"  name="parkCode" id="parkCodeInput" placeholder="Enter parking lot code">
-									</div>
-								</div>
-							</div>
-							<!-- WGS84 coordinates -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="col-md-3 control-label"><span class="required"> * </span>WGS84 coordinates:</label>
-									<div class="col-md-6">
-										<input type="text" class="form-control" name="bCenterPoint" id="bCenterPointInput" readonly="readonly" placeholder="Enter the WGS84 coordinates">
-									</div>
-								</div>
-							</div>
-					
-							<!-- Geometry type -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="col-md-3 control-label"><span class="required"> * </span>Geometry type:</label>
-									<div class="col-md-6">
-										<input type="text" class="form-control" name="shapesType" id="shapesTypeSelect" readonly="readonly" placeholder="Enter the geometry type">
-									</div>
-								</div>
-							</div>
-							<!-- Circle radius -->
-							<div class="form-body" id="radiusGroup">
-								<div class="form-group">
-									<label class="col-md-3 control-label"><span class="required"> * </span> Circle radius&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-									<div class="col-md-6">
-										<input type="text" class="form-control" name="radius" id="radiusInput" placeholder="Enter the circle radius">
-									</div>
-								</div>
-							</div>
-							<!-- 是否撤销 -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="col-md-3 control-label"><span class="required"> * </span>Is Destroyed&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-									<div class="col-md-6">
-										<select name="destroy" class="form-control" id="destroySelect">
-											<option value="">Select</option>
-											<option value="0">No</option>
-											<option value="1">Yes</option>
-										</select>
-									</div>
-								</div>
-							</div>
-							<!-- Area -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="col-md-3 control-label">Area&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-									<div class="col-md-6">
-										<input type="text" class="form-control" name="area" id="areaInput" placeholder="Enter the area">
-										<span class="help-block">Unit: square meters(㎡)</span>
-									</div>
-								</div>
-							</div>
-							<!-- 所属公司 -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="col-md-3 control-label"><span class="required"> * </span>Company&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-									<div class="col-md-6">
-										<select name="company" class="form-control" style="width:100%" id="companySelect"></select>
-									</div>
-								</div>
-							</div>
-							<!-- Branch company -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="col-md-3 control-label"><span class="required"> * </span>Branch company&nbsp;&nbsp;&nbsp;:</label>
-									<div class="col-md-6">
-										<select name="brancheCompany" class="form-control" style="width:100%" id="brancheCompanySelect">
-										</select>
-									</div>
-								</div>
-							</div>
-							<!-- 版本号 -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="col-md-3 control-label">Version&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-									<div class="col-md-6">
-										<input type="text" class="form-control" name="versions" value='1' Readonly placeholder="Enter the version number">
-									</div>
-								</div>
-							</div>
-							<!-- Description -->
-			                <div class="form-group">
-			                	<label class="control-label col-md-3"> Description&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-		                 		<div class="col-md-6">
-		                     		<textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea" placeholder="Description"></textarea>
-		                    	</div>
-			                </div>
-                        	 
-                        </div>
-                        <!-- 确定提交资料信息 -->
-                        <div class="tab-pane" id="tab4">
-                           <h3 class="block"> Confirm the parking lot information you will be submit </h3>
-                           <h4 class="form-section"> Coordinates </h4>
-                           <div class="form-group">
-                               <label class="control-label col-md-3"> Geometry type: </label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="shapesType"> </p>
-                               </div>
-                           </div>
-                           <div class="form-group">
-                               <label class="control-label col-md-3"> Circle radius&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="radius"> </p>
-                               </div>
-                           </div> 
-                           
-                           <div class="form-group">
-                               <label class="control-label col-md-3"> WGS84 coordinates: </label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="bCenterPoint"> </p>
-                               </div>
-                           </div> 
-                           <h4 class="form-section"> Parking lot </h4>
-                           <div class="form-group">
-                               <label class="control-label col-md-3">Parking lot name&nbsp;&nbsp;&nbsp;:</label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="parkName"> </p>
-                               </div>
-                           </div>
-                           <div class="form-group">
-                              <label class="control-label col-md-3">Parking lot code&nbsp;&nbsp;&nbsp;:</label>
-                              <div class="col-md-4">
-                                  <p class="form-control-static" data-display="parkCode"> </p>
-                              </div>
-                           </div>
-                           <div class="form-group">
-                               <label class="control-label col-md-3">State&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="destroy"> </p>
-                               </div>
-                           </div>
-                           <div class="form-group">
-                              <label class="control-label col-md-3">Area&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-                              <div class="col-md-4">
-                                  <p class="form-control-static" data-display="area"> </p>
-                              </div>
-                           </div>
-                           <div class="form-group">
-                               <label class="control-label col-md-3">Company&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="company"> </p>
-                               </div>
-                           </div>
-                           <div class="form-group">
-                               <label class="control-label col-md-3">Branch company&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="brancheCompany"> </p>
-                               </div>
-                           </div>
-                            <div class="form-group">
-                               <label class="control-label col-md-3">Version&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="versions"> </p>
-                               </div>
-                           </div>
-                           <div class="form-group">
-                               <label class="control-label col-md-3">Description&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="descriptions"> </p>
-                               </div>
-                           </div>
-                        </div>
-                   </div>
-              </div>
-              <div class="form-actions">
-                 <div class="row">
-                     <div class="col-md-offset-3 col-md-9">
-                         <a href="javascript:;" class="btn default button-previous disabled" style="display: none;">
-                             <i class="fa fa-angle-left"></i>Back </a>
-                         <a href="javascript:;" class="btn btn-outline green button-next"> Next
-                             <i class="fa fa-angle-right"></i>
-                         </a>
-                         <a href="javascript:;" class="btn green button-submit" style="display: none;" id="submintBtn"> Submit
-                             <i class="fa fa-check"></i>
-                         </a>
-                     </div>
-                 </div>
-              </div>
-        	</div>
-        </form>
-		<!-- END FORM-->
-	</div>
-</div>
-<!-- 函数方法JS类库 -->
-<script src="/pages/base/carpark/js/add-input-function.js"></script>
-<!-- 表单向导JS类库 -->
-<script src="/pages/base/carpark/js/add-form-wizard.js"></script>
-<!-- reload事件 -->
-<script src="/pages/base/carpark/js/add-form-reload.js"></script>
-<!-- 地图JS类库 -->
-<script src="/pages/base/carpark/js/add-vmap-world.js"></script>
-<!-- 表单元素事件JS类库 -->
+<link href="/pages/base/carpark/css/carpark-add.css" rel="stylesheet" type="text/css" />
+<div class="page-head">
+	<div class="page-title">
+		<h1>Add</h1>
+	</div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>Home page</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">Basic information</span> <i class="fa fa-circle"></i></li>
+	<li><a href="/pages/base/carpark/list.html" data-pjax>Parking lot</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">Add</span></li>
+</ul>
+
+<div class="portlet light bordered" id="form-wizard-info">
+	<div class="portlet-title">
+		<div class="caption">
+			<i class="icon-equalizer font-red-sunglo"></i> 
+			<span class="caption-subject font-red-sunglo bold uppercase">Add
+				 <span class="step-title"> 1 - 4 </span>
+				 <i class="fa fa-question-circle tipso-animation" style="color: rgba(158, 158, 158, 0.49);"></i>
+			</span>
+		</div>
+		
+		<div class="actions">
+			<div class="btn-group btn-group-devided" data-toggle="buttons">
+				<a class="btn btn-circle default" href="/pages/base/carpark/list.html" style="float: right;padding: 4px 23px;" data-pjax=""><i class="fa fa-reply"></i> Back</a>
+			</div>
+		</div>
+	</div>
+	<div class="portlet-body form">
+	
+		<!-- START FORM -->
+		<form class="form-horizontal" id="submit_carpark_form"  action="/" method="POST" novalidate="novalidate">
+			<div class="form-wizard">
+				<div class="form-body">
+					<ul class="nav nav-pills nav-justified steps">
+						<li class="active">
+							<a href="#tab1" data-toggle="tab" class="step" aria-expanded="true">
+								<span class="number"> 1 </span>
+								<span class="desc">
+								<i class="fa fa-check"></i> Parking lot location method </span>
+							</a>
+						</li>
+						<li>
+							<a href="#tab2" data-toggle="tab" class="step">
+								<span class="number"> 2 </span>
+								<span class="desc">
+								<i class="fa fa-check"></i> Location parking lot </span>
+							</a>
+						</li>
+						<li>
+							<a href="#tab3" data-toggle="tab" class="step active">
+								<span class="number"> 3 </span>
+								<span class="desc">
+								<i class="fa fa-check"></i> Parking lot info </span>
+							</a>
+						</li>
+						<li>
+							<a href="#tab4" data-toggle="tab" class="step">
+								<span class="number"> 4 </span>
+								<span class="desc">
+								<i class="fa fa-check"></i> Confirm and submit </span>
+							</a>
+						</li>
+					</ul>
+					
+					<!-- 进度条 -->
+					<div id="bar" class="progress progress-striped" role="progressbar">
+						<div class="progress-bar progress-bar-success" style="width: 25%;"></div>
+					</div>
+					
+					<div class="tab-content">
+						<div class="alert alert-danger display-hide">
+							<button class="close" data-close="alert"></button>
+							Your input is incorrect, please check the input items below
+						</div>
+						<div class="alert alert-success display-none">
+							<button class="close" data-dismiss="alert"></button> 
+							Your form validation is successful! 
+						</div>
+						
+						<!-- Select station add method -->
+                       	<div class="tab-pane active" id="tab1">
+                       		<h3 class="block"> Parking lot location method </h3>
+                      		<!--Parking lot name -->
+							<div class="form-group" id="formRequ">
+								<label class="col-md-3 control-label"><span class="required"> * </span>Parking lot name&nbsp;&nbsp;&nbsp;:</label>
+								<div class="col-md-9">
+									<input type="text" class="form-control input-medium" id="parkNamebooxtInput" name="parkNamebooxt" placeholder="Enter parking lot name">
+								</div>
+							</div>
+							<!-- Add method -->
+							<div class="form-group">
+								<label class="col-md-3 control-label"><span class="required"> * </span>Location method:</label>
+								<div class="col-md-9">
+									<div class="icheck-list">
+										<label>
+												<input type="radio" class="icheck" name="baseRes" value=0 checked> System generated
+										</label>
+										<label >
+											<input type="radio" class="icheck" name="baseRes" value=1 > Manual drawing
+										</label>
+									</div>
+								</div>
+							 </div>
+                        </div>
+                        <!--停车场位置 -->
+                        <div class="tab-pane" id="tab2">
+                        	<h3 class="block"> Location parking lot  </h3>
+                            <div id="addCarParkbmap_basic"></div>
+                            <div class="leftUtils">
+								<div class="btn-group" style="left: 100px;">
+								    <a class="btn btn-sm green-seagreen dropdown-toggle" style="width: 98px;" href="javascript:;" data-toggle="dropdown" aria-expanded="false"> Drawing tools
+								        <i class="fa fa-angle-down"></i>
+								    </a>
+								    <ul class="dropdown-menu pull-right" style="min-width:100px">
+								        <li>
+								            <a href="javascript:;" id="oppenDrawingManager"><i class="fa fa-pencil"></i> Open </a>
+								        </li>
+								        <li>
+								            <a href="javascript:;" id = "closeDrawingManager"> <i class="fa fa-reply"></i> Close </a>
+								        </li>
+								         
+								    </ul>
+								</div>
+							</div>
+                        </div>
+                        <!--停车场信息 -->
+                        <div class="tab-pane" id="tab3">
+                        	<h3 class="block"> Parking lot </h3>
+							<input type="hidden" name="bParkPoint" id="bParkPointInput" />
+							<input type="hidden" name="gParkPoint" id="gParkPointInput" />
+							<input type="hidden" name="dbType" id="dbTypeInput" value="b"/>
+							<!-- Parking lot name -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="control-label col-md-3">
+		          						<span class="required"> * </span> Parking lot name&nbsp;&nbsp;&nbsp; :
+		                    		</label>
+									<div class="col-md-6">
+										<input type="text" class="form-control" name="parkName" id="parkNameInput" placeholder="Enter parking lot name" readonly="readonly">
+									</div>
+								</div>
+							</div>
+							<!-- 停车场编码 -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="control-label col-md-3">
+		          						<span class="required"> * </span>Parking lot code&nbsp;&nbsp;&nbsp;:
+		                    		</label>
+									<div class="col-md-6">
+										<input type="text" class="form-control"  name="parkCode" id="parkCodeInput" placeholder="Enter parking lot code">
+									</div>
+								</div>
+							</div>
+							<!-- WGS84 coordinates -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="col-md-3 control-label"><span class="required"> * </span>WGS84 coordinates:</label>
+									<div class="col-md-6">
+										<input type="text" class="form-control" name="bCenterPoint" id="bCenterPointInput" readonly="readonly" placeholder="Enter the WGS84 coordinates">
+									</div>
+								</div>
+							</div>
+					
+							<!-- Geometry type -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="col-md-3 control-label"><span class="required"> * </span>Geometry type:</label>
+									<div class="col-md-6">
+										<input type="text" class="form-control" name="shapesType" id="shapesTypeSelect" readonly="readonly" placeholder="Enter the geometry type">
+									</div>
+								</div>
+							</div>
+							<!-- Circle radius -->
+							<div class="form-body" id="radiusGroup">
+								<div class="form-group">
+									<label class="col-md-3 control-label"><span class="required"> * </span> Circle radius&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+									<div class="col-md-6">
+										<input type="text" class="form-control" name="radius" id="radiusInput" placeholder="Enter the circle radius">
+									</div>
+								</div>
+							</div>
+							<!-- 是否撤销 -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="col-md-3 control-label"><span class="required"> * </span>Is Destroyed&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+									<div class="col-md-6">
+										<select name="destroy" class="form-control" id="destroySelect">
+											<option value="">Select</option>
+											<option value="0">No</option>
+											<option value="1">Yes</option>
+										</select>
+									</div>
+								</div>
+							</div>
+							<!-- Area -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="col-md-3 control-label">Area&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+									<div class="col-md-6">
+										<input type="text" class="form-control" name="area" id="areaInput" placeholder="Enter the area">
+										<span class="help-block">Unit: square meters(㎡)</span>
+									</div>
+								</div>
+							</div>
+							<!-- 所属公司 -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="col-md-3 control-label"><span class="required"> * </span>Company&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+									<div class="col-md-6">
+										<select name="company" class="form-control" style="width:100%" id="companySelect"></select>
+									</div>
+								</div>
+							</div>
+							<!-- Branch company -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="col-md-3 control-label"><span class="required"> * </span>Branch company&nbsp;&nbsp;&nbsp;:</label>
+									<div class="col-md-6">
+										<select name="brancheCompany" class="form-control" style="width:100%" id="brancheCompanySelect">
+										</select>
+									</div>
+								</div>
+							</div>
+							<!-- 版本号 -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="col-md-3 control-label">Version&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+									<div class="col-md-6">
+										<input type="text" class="form-control" name="versions" value='1' Readonly placeholder="Enter the version number">
+									</div>
+								</div>
+							</div>
+							<!-- Description -->
+			                <div class="form-group">
+			                	<label class="control-label col-md-3"> Description&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+		                 		<div class="col-md-6">
+		                     		<textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea" placeholder="Description"></textarea>
+		                    	</div>
+			                </div>
+                        	 
+                        </div>
+                        <!-- 确定提交资料信息 -->
+                        <div class="tab-pane" id="tab4">
+                           <h3 class="block"> Confirm the parking lot information you will be submit </h3>
+                           <h4 class="form-section"> Coordinates </h4>
+                           <div class="form-group">
+                               <label class="control-label col-md-3"> Geometry type: </label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="shapesType"> </p>
+                               </div>
+                           </div>
+                           <div class="form-group">
+                               <label class="control-label col-md-3"> Circle radius&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="radius"> </p>
+                               </div>
+                           </div> 
+                           
+                           <div class="form-group">
+                               <label class="control-label col-md-3"> WGS84 coordinates: </label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="bCenterPoint"> </p>
+                               </div>
+                           </div> 
+                           <h4 class="form-section"> Parking lot </h4>
+                           <div class="form-group">
+                               <label class="control-label col-md-3">Parking lot name&nbsp;&nbsp;&nbsp;:</label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="parkName"> </p>
+                               </div>
+                           </div>
+                           <div class="form-group">
+                              <label class="control-label col-md-3">Parking lot code&nbsp;&nbsp;&nbsp;:</label>
+                              <div class="col-md-4">
+                                  <p class="form-control-static" data-display="parkCode"> </p>
+                              </div>
+                           </div>
+                           <div class="form-group">
+                               <label class="control-label col-md-3">State&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="destroy"> </p>
+                               </div>
+                           </div>
+                           <div class="form-group">
+                              <label class="control-label col-md-3">Area&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                              <div class="col-md-4">
+                                  <p class="form-control-static" data-display="area"> </p>
+                              </div>
+                           </div>
+                           <div class="form-group">
+                               <label class="control-label col-md-3">Company&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="company"> </p>
+                               </div>
+                           </div>
+                           <div class="form-group">
+                               <label class="control-label col-md-3">Branch company&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="brancheCompany"> </p>
+                               </div>
+                           </div>
+                            <div class="form-group">
+                               <label class="control-label col-md-3">Version&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="versions"> </p>
+                               </div>
+                           </div>
+                           <div class="form-group">
+                               <label class="control-label col-md-3">Description&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="descriptions"> </p>
+                               </div>
+                           </div>
+                        </div>
+                   </div>
+              </div>
+              <div class="form-actions">
+                 <div class="row">
+                     <div class="col-md-offset-3 col-md-9">
+                         <a href="javascript:;" class="btn default button-previous disabled" style="display: none;">
+                             <i class="fa fa-angle-left"></i>Back </a>
+                         <a href="javascript:;" class="btn btn-outline green button-next"> Next
+                             <i class="fa fa-angle-right"></i>
+                         </a>
+                         <a href="javascript:;" class="btn green button-submit" style="display: none;" id="submintBtn"> Submit
+                             <i class="fa fa-check"></i>
+                         </a>
+                     </div>
+                 </div>
+              </div>
+        	</div>
+        </form>
+		<!-- END FORM-->
+	</div>
+</div>
+<!-- 函数方法JS类库 -->
+<script src="/pages/base/carpark/js/add-input-function.js"></script>
+<!-- 表单向导JS类库 -->
+<script src="/pages/base/carpark/js/add-form-wizard.js"></script>
+<!-- reload事件 -->
+<script src="/pages/base/carpark/js/add-form-reload.js"></script>
+<!-- 地图JS类库 -->
+<script src="/pages/base/carpark/js/add-vmap-world.js"></script>
+<!-- 表单元素事件JS类库 -->
 <script src="/pages/base/carpark/js/add-form-events.js"></script>
 \ No newline at end of file