update

徐烜
2 parents ac2f3b27 1700f00e
Showing 28 changed files with 2165 additions and 1483 deletions
README.md
pom.xml
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/controller/CarsController.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/schedule/CarConfigInfo.java
src/main/java/com/bsth/entity/schedule/EmployeeConfigInfo.java
src/main/java/com/bsth/entity/schedule/SchedulePlan.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1.java
src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1_LP.java
src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1_LP_PK.java
src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1_RY.java
src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1_RY_PK.java
src/main/java/com/bsth/gpsdata/buffer/GpsRealDataBuffer.java
src/main/java/com/bsth/gpsdata/config.properties
src/main/java/com/bsth/gpsdata/controller/GpsDataController.java
src/main/java/com/bsth/gpsdata/thread/GpsBufferRefreshThread.java
src/main/java/com/bsth/gpsdata/util/ConfigUtil.java
src/main/java/com/bsth/service/CarsService.java
-公交调度系统BS版 0.1
-======
-----------
-## 目录
----------
- * [字典表](#字典表)
- * [车载 gps 相关数据](#gps)
-    * [实时gps数据接口 http](#实时gps接口)  
-    * [进出站数据表结构](#进站数据)
-    * [异常警报表结构](#异常警报)
-        * [大间隔](#大间隔)
-        * [超速](#超速)
-        * [越界](#越界)
-        * [越站](#越站)
-        * [聚集](#聚集)
-        * [掉线](#掉线)
-    * [消息上传下发](#消息上传下发)
-    
-----------
-
-##  字典表
-----------
-字典操作全部由前端负责，主要有2种。
-
-1、将字典代码转换为中文 。片段加载完成后，包含 `class="nt-dictionary"` 的标签会被转换，data-group 为所属字典组。
-``` html
-
-<span class="nt-dictionary" data-group="XianLuXingZhi">GJXL</span>
-
---转换后
-<span class="dictionary" data-group="XianLuXingZhi" data-code="GJXL" >过江线路</span>
-```
-2、生成下拉框，当包含`class="nt-dictionary"` 的标签是`select`时。
-``` html
-<!- 原 -->
-<select class="nt-dictionary" data-group="XianLuXingZhi" data-code="GJXL"></select>
-
-<!-- 转换后 -->
-<select class="nt-dictionary" data-group="XianLuXingZhi" >
-    <option value="GJXL">过江线路</option>
-    <option value="CCTXL">村村通线路</option>
-    <option value="YXXL">夜宵线路</option>
-    <option value="CSBS">穿梭巴士</option>
-</select>
-```
-
-##  gps
-----------
-### 实时gps接口
-
-所有在线GPS： [http://192.168.168.192:8080/transport_server/rtgps](http://192.168.168.192:8080/transport_server/rtgps/)
-根据设备号查询：[http://192.168.168.192:8080/transport_server/rtgps/05B01901](http://192.168.168.192:8080/transport_server/rtgps/05B01901)
-    
-<span style="color: red">Response</span>:
-```json
-{
-    "data":[
-    {
-        "companyCode":5,
-        "lineId":10329,
-        "deviceId":"05B01901",
-        "carparkNo":"00000000",
-        "stopNo":"7C890002",
-        "lon":121.549866,
-        "lat":31.238798,
-        "timestamp":1397104499000,
-        "speed":42.0,
-        "direction":245.9,
-        "state":0,
-        "upDown":0
-    }]
-}
-```
-
-| -- | --|--|
-| ---- | ---- | ---- |
-| companyCode | int | 公司代码 |
-| lineId | int | 线路编码 |
-| deviceId | String | 设备编号 |
-| carparkNo | String | 停车场编码 |
-| stopNo | String | 站点编码 |
-| lon | float | 经度 |
-| lat | float | 纬度 |
-| timestamp | long | 时间戳 |
-| speed | float | 速度|
-| direction | float | 方向（角度） |   
-| state | int | 营运状态（ 0 营运 ，1 非营运， -1 无效） |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效）|
-
-
-### 进站数据
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| deviceId | String | 设备号 |
-| lineId | int | 线路编码 |
-| stopNo | long | 站点编码 |
-| timestamp | long | 时间戳 |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
-| createDate | Date | 创建时间 |
-
-
-### 异常警报
-----------
-
-### 大间隔
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| line | int | 线路编码 |
-| station | String | 站点编码 |
-| cVehicle | String | 当前车辆编码 |
-| lastVehicle | String | 上一个车辆编码 | 
-| interval | long | 间隔时间（秒） |
-| timestamp | long | 时间戳 |
-| createDate | Date | 创建时间 |
-
-### 超速
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| vehicle | String | 车辆编码 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
-| lon | float | 经度 | 
-| lat | float | 纬度|
-| speed | float | 速度 |
-| timestamp | long | 时间戳 |
-| createDate | Date | 时间 |
-
-### 越界
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| vehicle | String | 车辆编码 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
-| lon | float | 经度 | 
-| lat | float | 纬度|
-| location | String | 越界位置（由线调页面进行初始转换）意思是该字段默认为空，页面第一次查看时会写入值|
-| timestamp | long | 时间戳 |
-| createDate | Date | 时间 |
-
-
-### 越站
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
-| station | String | 站点编码 |
-| vehicle | String | 车辆编码 |
-| inData | Date | 进站时间 |
-| outDate | Date | 出站时间 |
-
-
-### 聚集
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
-| stations | String | 站点（多个用 , 号分隔。应该是连续站点） |
-| vehicles | String | 车辆编码（多个用 , 号分隔） |
-| timestamp | long | 时间戳 |
-| createDate | Date | 时间 |
-
-
-### 掉线
-----------
-表名：
-
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| id | int | 主键 |
-| line | int | 线路编码 |
-| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
-| vehicle | String | 车辆编码 |
-| lon | float | 经度 | 
-| lat | float | 纬度|
-| timestamp | long | 时间戳 |
-| createDate | Date | 时间 |
-
-##  消息上传下发
-----------
-### 消息下发接口
-[http://192.168.168.192:8080/transport_server/message](http://192.168.168.192:8080/transport_server/message/)
-    
-<span style="color: red">Request</span>:
-```json
-{
-    "deviceId":12345,
-    "timestamp":44324,
-    "operCode":0x60,
-    "data":{
-        "companyCode":22,//short
-	    "deviceId":"029L2222",//string
-    	"timestamp":134326,//long
-	    "instructType":00,//short
-	    "dispatchInstruct":0x00,//short
-	    "msgId":12345,//long
-	    "alarmTime":201606012000,//long
-	    "serviceState":00000000,//long
-	    "txtContent":"你好"//string
-    }
-}
-```
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| deviceId | string | 设备编号 |
-| timestamp | long | 时间戳(ms) |
-| operCode | short | 一级协议 |
-| data.companyCode | short | 公司代码 |
-| data.deviceId | string | 设备编号 |
-| data.timestamp | long | 时间戳 |
-| data.instructType | short | 保留 默认0 |
-| data.dispatchInstruct | short | 调度指令 |
-| data.msgId | long | 同上 |
-| data.alarmTime | long | 闹钟 |
-| data.serviceState | long | 多状态字节 |
-| data.txtContent | string | 下发的消息文本 |
-```json
-{
-    "deviceId":12345,
-    "timestamp":44324,
-    "operCode":0x64,
-    "data":{
-        "cityCode":22,//int
-	    "deviceId":"029L2222",//string
-    	"lineId":"134326"//string
-    }
-}
-```
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| deviceId | string | 设备编号 |
-| timestamp | long | 时间戳(ms) |
-| operCode | short | 一级协议 |
-| data.cityCode | short | 城市区号 |
-| data.deviceId | string | 设备编号 |
-| data.lineId | string | 线路编号 |
-
-```json
-{
-    "deviceId":12345,
-    "timestamp":44324,
-    "operCode":0xC0,
-    "data":{
-        "operCode":0x86,
-        "requestAck":0x06 // 0x06同意 0x15不同意
-    }
-}
-```
-| .. | .. | .. |
-| ---- | ---- | ---- |
-| deviceId | string | 设备编号 |
-| timestamp | long | 时间戳(ms) |
-| operCode | short | 一级协议 |
-| data.operCode | short | 二级协议 |
-| data.requestAck | short | 请求应答字 |
-
-<span style="color: red">Response</span>:
-```json
-{
-    "errCode":0
-}
-```
-
-### 消息上传接口
-    
-<span style="color: red">Request</span>:
-```json
-{
-    "deviceId":12345,
-    "timestamp":44324,
-    "status":0,// 0x80时无数据 0表示失败 1表示成功或设备确认 2表示驾驶员阅读
-    "operCode":0x80,// 消息确认时无数据
-    "data":{
-        "operCode":0x26,//二级协议
-        "requestCode":22//short
-    }// 消息确认将无数据
-}
-```
-
-<span style="color: red">Response</span>:
-```json
-{
-    "errCode":0
-}
+公交调度系统BS版 0.1
+======
+----------
+## 目录
+---------
+ * [字典表](#字典表)
+ * [车载 gps 相关数据](#gps)
+    * [实时gps数据接口 http](#实时gps接口)  
+    * [进出站数据表结构](#进站数据)
+    * [异常警报表结构](#异常警报)
+        * [大间隔](#大间隔)
+        * [超速](#超速)
+        * [越界](#越界)
+        * [越站](#越站)
+        * [聚集](#聚集)
+        * [掉线](#掉线)
+    * [消息上传下发](#消息上传下发)
+    
+----------
+
+##  字典表
+----------
+字典操作全部由前端负责，主要有2种。
+
+1、将字典代码转换为中文 。片段加载完成后，包含 `class="nt-dictionary"` 的标签会被转换，data-group 为所属字典组。
+``` html
+
+<span class="nt-dictionary" data-group="XianLuXingZhi">GJXL</span>
+
+--转换后
+<span class="dictionary" data-group="XianLuXingZhi" data-code="GJXL" >过江线路</span>
+```
+2、生成下拉框，当包含`class="nt-dictionary"` 的标签是`select`时。
+``` html
+<!- 原 -->
+<select class="nt-dictionary" data-group="XianLuXingZhi" data-code="GJXL"></select>
+
+<!-- 转换后 -->
+<select class="nt-dictionary" data-group="XianLuXingZhi" >
+    <option value="GJXL">过江线路</option>
+    <option value="CCTXL">村村通线路</option>
+    <option value="YXXL">夜宵线路</option>
+    <option value="CSBS">穿梭巴士</option>
+</select>
+```
+
+##  gps
+----------
+### 实时gps接口
+
+所有在线GPS： [http://192.168.168.192:8080/transport_server/rtgps](http://192.168.168.192:8080/transport_server/rtgps/)
+根据设备号查询：[http://192.168.168.192:8080/transport_server/rtgps/05B01901](http://192.168.168.192:8080/transport_server/rtgps/05B01901)
+    
+<span style="color: red">Response</span>:
+```json
+{
+    "data":[
+    {
+        "companyCode":5,
+        "lineId":10329,
+        "deviceId":"05B01901",
+        "carparkNo":"00000000",
+        "stopNo":"7C890002",
+        "lon":121.549866,
+        "lat":31.238798,
+        "timestamp":1397104499000,
+        "speed":42.0,
+        "direction":245.9,
+        "state":0,
+        "upDown":0
+    }]
+}
+```
+
+| -- | --|--|
+| ---- | ---- | ---- |
+| companyCode | int | 公司代码 |
+| lineId | int | 线路编码 |
+| deviceId | String | 设备编号 |
+| carparkNo | String | 停车场编码 |
+| stopNo | String | 站点编码 |
+| lon | float | 经度 |
+| lat | float | 纬度 |
+| timestamp | long | 时间戳 |
+| speed | float | 速度|
+| direction | float | 方向（角度） |   
+| state | int | 营运状态（ 0 营运 ，1 非营运， -1 无效） |
+| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效）|
+
+
+### 进站数据
+----------
+表名：
+
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| id | int | 主键 |
+| deviceId | String | 设备号 |
+| lineId | int | 线路编码 |
+| stopNo | long | 站点编码 |
+| timestamp | long | 时间戳 |
+| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
+| createDate | Date | 创建时间 |
+
+
+### 异常警报
+----------
+
+### 大间隔
+----------
+表名：
+
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| id | int | 主键 |
+| line | int | 线路编码 |
+| station | String | 站点编码 |
+| cVehicle | String | 当前车辆编码 |
+| lastVehicle | String | 上一个车辆编码 | 
+| interval | long | 间隔时间（秒） |
+| timestamp | long | 时间戳 |
+| createDate | Date | 创建时间 |
+
+### 超速
+----------
+表名：
+
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| id | int | 主键 |
+| vehicle | String | 车辆编码 |
+| line | int | 线路编码 |
+| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
+| lon | float | 经度 | 
+| lat | float | 纬度|
+| speed | float | 速度 |
+| timestamp | long | 时间戳 |
+| createDate | Date | 时间 |
+
+### 越界
+----------
+表名：
+
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| id | int | 主键 |
+| vehicle | String | 车辆编码 |
+| line | int | 线路编码 |
+| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
+| lon | float | 经度 | 
+| lat | float | 纬度|
+| location | String | 越界位置（由线调页面进行初始转换）意思是该字段默认为空，页面第一次查看时会写入值|
+| timestamp | long | 时间戳 |
+| createDate | Date | 时间 |
+
+
+### 越站
+----------
+表名：
+
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| id | int | 主键 |
+| line | int | 线路编码 |
+| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
+| station | String | 站点编码 |
+| vehicle | String | 车辆编码 |
+| inData | Date | 进站时间 |
+| outDate | Date | 出站时间 |
+
+
+### 聚集
+----------
+表名：
+
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| id | int | 主键 |
+| line | int | 线路编码 |
+| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
+| stations | String | 站点（多个用 , 号分隔。应该是连续站点） |
+| vehicles | String | 车辆编码（多个用 , 号分隔） |
+| timestamp | long | 时间戳 |
+| createDate | Date | 时间 |
+
+
+### 掉线
+----------
+表名：
+
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| id | int | 主键 |
+| line | int | 线路编码 |
+| upDown | int | 上下行（0 上行 ， 1 下行 ， -1 无效） |
+| vehicle | String | 车辆编码 |
+| lon | float | 经度 | 
+| lat | float | 纬度|
+| timestamp | long | 时间戳 |
+| createDate | Date | 时间 |
+
+##  消息上传下发
+----------
+### 消息下发接口
+[http://192.168.168.192:8080/transport_server/message](http://192.168.168.192:8080/transport_server/message/)
+    
+<span style="color: red">Request</span>:
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "operCode":0x60,
+    "data":{
+        "companyCode":22,//short
+	    "deviceId":"029L2222",//string
+    	"timestamp":134326,//long
+	    "instructType":00,//short
+	    "dispatchInstruct":0x00,//short
+	    "msgId":12345,//long
+	    "alarmTime":201606012000,//long
+	    "serviceState":00000000,//long
+	    "txtContent":"你好"//string
+    }
+}
+```
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| deviceId | string | 设备编号 |
+| timestamp | long | 时间戳(ms) |
+| operCode | short | 一级协议 |
+| data.companyCode | short | 公司代码 |
+| data.deviceId | string | 设备编号 |
+| data.timestamp | long | 时间戳 |
+| data.instructType | short | 保留 默认0 |
+| data.dispatchInstruct | short | 调度指令 |
+| data.msgId | long | 同上 |
+| data.alarmTime | long | 闹钟 |
+| data.serviceState | long | 多状态字节 |
+| data.txtContent | string | 下发的消息文本 |
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "operCode":0x64,
+    "data":{
+        "cityCode":22,//int
+	    "deviceId":"029L2222",//string
+    	"lineId":"134326"//string
+    }
+}
+```
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| deviceId | string | 设备编号 |
+| timestamp | long | 时间戳(ms) |
+| operCode | short | 一级协议 |
+| data.cityCode | short | 城市区号 |
+| data.deviceId | string | 设备编号 |
+| data.lineId | string | 线路编号 |
+
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "operCode":0xC0,
+    "data":{
+        "operCode":0x86,
+        "requestAck":0x06 // 0x06同意 0x15不同意
+    }
+}
+```
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| deviceId | string | 设备编号 |
+| timestamp | long | 时间戳(ms) |
+| operCode | short | 一级协议 |
+| data.operCode | short | 二级协议 |
+| data.requestAck | short | 请求应答字 |
+
+<span style="color: red">Response</span>:
+```json
+{
+    "errCode":0
+}
+```
+
+### 消息上传接口
+    
+<span style="color: red">Request</span>:
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "status":0,// 0x80时无数据 0表示失败 1表示成功或设备确认 2表示驾驶员阅读
+    "operCode":0x80,// 消息确认时无数据
+    "data":{
+        "operCode":0x26,//二级协议
+        "requestCode":22//short
+    }// 消息确认将无数据
+}
+```
+
+<span style="color: red">Response</span>:
+```json
+{
+    "errCode":0
+}
 ```
 \ No newline at end of file
@@ -5,7 +5,7 @@
 	<groupId>com.bsth</groupId>
 	<artifactId>bsth_control</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
  
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -3,6 +3,7 @@ package com.bsth;
  
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
  
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,10 +40,10 @@ public class StartCommand implements CommandLineRunner{
 			invocationSecurityMetadataSourceService.loadResourceDefine();
  
 			/**
-			 * 定时GPS实时数据更新线程，每次执行完成4秒后开始下一次
+			 * GPS实时数据更新线程，每次执行完成4秒后开始下一次
 			 * 如果抛出异常，后续执行将被取消
 			 */
-			//scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 4, TimeUnit.SECONDS);
+			scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 4, TimeUnit.SECONDS);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-package com.bsth.controller;
-
-import com.bsth.entity.Cars;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by xu on 16/5/31.
- */
-@RestController
-@RequestMapping("cars")
-public class CarsController extends BaseController<Cars, Integer> {
-}
+package com.bsth.controller;
+
+import com.bsth.entity.Cars;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by xu on 16/5/31.
+ */
+@RestController
+@RequestMapping("cars")
+public class CarsController extends BaseController<Cars, Integer> {
+}
+package com.bsth.entity.realcontrol;
+
+import com.bsth.entity.sys.SysUser;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 实际排班计划明细。
+ */
+@Entity
+@Table(name = "bsth_c_s_sp_info_real")
+public class ScheduleRealInfo {
+
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 排班计划日期 */
+    private Date scheduleDate;
+
+    /** 路牌名称 */
+    private String lpName;
+    /** 线路编码 */
+    private String xlBm;
+    /** 线路名称 */
+    private String xlName;
+    /** 车辆自编号 */
+    private String clZbh;
+
+    /** 报道1时间（格式 HH:mm） */
+    private String bd1Time;
+    /** 出场1时间（格式 HH:mm） */
+    private String cc1Time;
+    /** 驾驶员1工号 */
+    private String j1Gh;
+    /** 驾驶员1名字 */
+    private String j1Name;
+    /** 售票员1工号 */
+    private String s1Gh;
+    /** 售票员1名字 */
+    private String s1Name;
+
+    // 冗余的时刻明细信息
+    /** 线路方向 */
+    private String xlDir;
+    /** 起点站名称 */
+    private String qdz;
+    /** 终点站名称 */
+    private String zdz;
+    /** 发车时间（格式 HH:mm） */
+    private String fcsj;
+    /** 发车顺序号 */
+    private int fcno;
+    /** 对应班次数 */
+    private int bcs;
+    /** 计划里程 */
+    private double jhlc;
+    /** 班次历时 */
+    private int bcsj;
+
+    /** 操作人 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private SysUser user;
+
+    // 创建日期
+    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private Date createDate;
+    // 修改日期
+    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    private Date updateDate;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(Date scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+    public String getCc1Time() {
+        return cc1Time;
+    }
+
+    public void setCc1Time(String cc1Time) {
+        this.cc1Time = cc1Time;
+    }
+
+    public String getJ1Gh() {
+        return j1Gh;
+    }
+
+    public void setJ1Gh(String j1Gh) {
+        this.j1Gh = j1Gh;
+    }
+
+    public String getJ1Name() {
+        return j1Name;
+    }
+
+    public void setJ1Name(String j1Name) {
+        this.j1Name = j1Name;
+    }
+
+    public String getS1Gh() {
+        return s1Gh;
+    }
+
+    public void setS1Gh(String s1Gh) {
+        this.s1Gh = s1Gh;
+    }
+
+    public String getS1Name() {
+        return s1Name;
+    }
+
+    public void setS1Name(String s1Name) {
+        this.s1Name = s1Name;
+    }
+
+    public String getBd1Time() {
+        return bd1Time;
+    }
+
+    public void setBd1Time(String bd1Time) {
+        this.bd1Time = bd1Time;
+    }
+
+    public String getXlDir() {
+        return xlDir;
+    }
+
+    public void setXlDir(String xlDir) {
+        this.xlDir = xlDir;
+    }
+
+    public String getQdz() {
+        return qdz;
+    }
+
+    public void setQdz(String qdz) {
+        this.qdz = qdz;
+    }
+
+    public String getZdz() {
+        return zdz;
+    }
+
+    public void setZdz(String zdz) {
+        this.zdz = zdz;
+    }
+
+    public String getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(String fcsj) {
+        this.fcsj = fcsj;
+    }
+
+    public SysUser getUser() {
+        return user;
+    }
+
+    public void setUser(SysUser user) {
+        this.user = user;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public int getFcno() {
+        return fcno;
+    }
+
+    public void setFcno(int fcno) {
+        this.fcno = fcno;
+    }
+
+    public int getBcs() {
+        return bcs;
+    }
+
+    public void setBcs(int bcs) {
+        this.bcs = bcs;
+    }
+
+    public double getJhlc() {
+        return jhlc;
+    }
+
+    public void setJhlc(double jhlc) {
+        this.jhlc = jhlc;
+    }
+
+    public int getBcsj() {
+        return bcsj;
+    }
+
+    public void setBcsj(int bcsj) {
+        this.bcsj = bcsj;
+    }
+
+    public String getXlBm() {
+        return xlBm;
+    }
+
+    public void setXlBm(String xlBm) {
+        this.xlBm = xlBm;
+    }
+}
-package com.bsth.entity.schedule;
-
-import com.bsth.entity.Cars;
-import com.bsth.entity.Line;
-import com.bsth.entity.sys.SysUser;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * 车辆配置信息。
- */
-@Entity
-@Table(name = "bsth_c_s_ccinfo")
-public class CarConfigInfo {
-
-    /** 主健Id */
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    /** 线路关联 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Line xl;
-    /** 车辆关联 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Cars cl;
-
-
-    /** 早班时间（格式：HH:mm） */
-    @Column(length = 5)
-    private String zbsj;
-    /** 末班时间（格式：HH:mm） */
-    @Column(length = 5)
-    private String mbsj;
-
-    /** 启用日期 */
-    @Column(nullable = false)
-    private Date qyrq;
-    /** 终止日期 */
-    private Date zzrq;
-    @Column(nullable = false)
-    /** 停车点（TODO：这个不知道是否要关联）*/
-    private String tcd;
-    /** 受否切换 0或者1（TODO：不懂，貌似喝历史配车有关） */
-    @Column(nullable = false)
-    private int isSwitch;
-
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser updateBy;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Line getXl() {
-        return xl;
-    }
-
-    public void setXl(Line xl) {
-        this.xl = xl;
-    }
-
-    public Cars getCl() {
-        return cl;
-    }
-
-    public void setCl(Cars cl) {
-        this.cl = cl;
-    }
-
-    public String getZbsj() {
-        return zbsj;
-    }
-
-    public void setZbsj(String zbsj) {
-        this.zbsj = zbsj;
-    }
-
-    public String getMbsj() {
-        return mbsj;
-    }
-
-    public void setMbsj(String mbsj) {
-        this.mbsj = mbsj;
-    }
-
-    public Date getQyrq() {
-        return qyrq;
-    }
-
-    public void setQyrq(Date qyrq) {
-        this.qyrq = qyrq;
-    }
-
-    public Date getZzrq() {
-        return zzrq;
-    }
-
-    public void setZzrq(Date zzrq) {
-        this.zzrq = zzrq;
-    }
-
-    public String getTcd() {
-        return tcd;
-    }
-
-    public void setTcd(String tcd) {
-        this.tcd = tcd;
-    }
-
-    public int getIsSwitch() {
-        return isSwitch;
-    }
-
-    public void setIsSwitch(int isSwitch) {
-        this.isSwitch = isSwitch;
-    }
-
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-}
+package com.bsth.entity.schedule;
+
+import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
+import com.bsth.entity.sys.SysUser;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 车辆配置信息。
+ */
+@Entity
+@Table(name = "bsth_c_s_ccinfo")
+public class CarConfigInfo {
+
+    /** 主健Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 线路关联 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Line xl;
+    /** 车辆关联 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Cars cl;
+
+
+    /** 早班时间（格式：HH:mm） */
+    @Column(length = 5)
+    private String zbsj;
+    /** 末班时间（格式：HH:mm） */
+    @Column(length = 5)
+    private String mbsj;
+
+    /** 启用日期 */
+    @Column(nullable = false)
+    private Date qyrq;
+    /** 终止日期 */
+    private Date zzrq;
+    @Column(nullable = false)
+    /** 停车点（TODO：这个不知道是否要关联）*/
+    private String tcd;
+    /** 受否切换 0或者1（TODO：不懂，貌似喝历史配车有关） */
+    @Column(nullable = false)
+    private int isSwitch;
+
+    /** 创建人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser createBy;
+    /** 修改人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser updateBy;
+
+    /** 创建日期 */
+    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private Date createDate;
+    /** 修改日期 */
+    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    private Date updateDate;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Line getXl() {
+        return xl;
+    }
+
+    public void setXl(Line xl) {
+        this.xl = xl;
+    }
+
+    public Cars getCl() {
+        return cl;
+    }
+
+    public void setCl(Cars cl) {
+        this.cl = cl;
+    }
+
+    public String getZbsj() {
+        return zbsj;
+    }
+
+    public void setZbsj(String zbsj) {
+        this.zbsj = zbsj;
+    }
+
+    public String getMbsj() {
+        return mbsj;
+    }
+
+    public void setMbsj(String mbsj) {
+        this.mbsj = mbsj;
+    }
+
+    public Date getQyrq() {
+        return qyrq;
+    }
+
+    public void setQyrq(Date qyrq) {
+        this.qyrq = qyrq;
+    }
+
+    public Date getZzrq() {
+        return zzrq;
+    }
+
+    public void setZzrq(Date zzrq) {
+        this.zzrq = zzrq;
+    }
+
+    public String getTcd() {
+        return tcd;
+    }
+
+    public void setTcd(String tcd) {
+        this.tcd = tcd;
+    }
+
+    public int getIsSwitch() {
+        return isSwitch;
+    }
+
+    public void setIsSwitch(int isSwitch) {
+        this.isSwitch = isSwitch;
+    }
+
+    public SysUser getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(SysUser createBy) {
+        this.createBy = createBy;
+    }
+
+    public SysUser getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(SysUser updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}
-package com.bsth.entity.schedule;
-
-import com.bsth.entity.Cars;
-import com.bsth.entity.Line;
-import com.bsth.entity.Personnel;
-import com.bsth.entity.sys.SysUser;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * 人员配置信息。
- */
-@Entity
-@Table(name = "bsth_c_s_ecinfo")
-public class EmployeeConfigInfo {
-
-    /** 主键Id */
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    /** 线路关联 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Line xl;
-    /** 车辆关联 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Cars cl;
-    /** 人员关联（驾驶员） */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Personnel jsy;
-    /** 人员关联（售票员） */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Personnel spy;
-
-    /** 搭班编码（TODO：估计是售票员和驾驶员搭配时使用） */
-    private String dbbm;
-
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser updateBy;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Line getXl() {
-        return xl;
-    }
-
-    public void setXl(Line xl) {
-        this.xl = xl;
-    }
-
-    public Cars getCl() {
-        return cl;
-    }
-
-    public void setCl(Cars cl) {
-        this.cl = cl;
-    }
-
-    public Personnel getJsy() {
-        return jsy;
-    }
-
-    public void setJsy(Personnel jsy) {
-        this.jsy = jsy;
-    }
-
-    public Personnel getSpy() {
-        return spy;
-    }
-
-    public void setSpy(Personnel spy) {
-        this.spy = spy;
-    }
-
-    public String getDbbm() {
-        return dbbm;
-    }
-
-    public void setDbbm(String dbbm) {
-        this.dbbm = dbbm;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-}
+package com.bsth.entity.schedule;
+
+import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
+import com.bsth.entity.Personnel;
+import com.bsth.entity.sys.SysUser;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 人员配置信息。
+ */
+@Entity
+@Table(name = "bsth_c_s_ecinfo")
+public class EmployeeConfigInfo {
+
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 线路关联 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Line xl;
+    /** 车辆关联 */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Cars cl;
+    /** 人员关联（驾驶员） */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Personnel jsy;
+    /** 人员关联（售票员） */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Personnel spy;
+
+    /** 搭班编码（TODO：估计是售票员和驾驶员搭配时使用） */
+    private String dbbm;
+
+    /** 创建人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser createBy;
+    /** 修改人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser updateBy;
+
+    /** 创建日期 */
+    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private Date createDate;
+    /** 修改日期 */
+    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    private Date updateDate;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Line getXl() {
+        return xl;
+    }
+
+    public void setXl(Line xl) {
+        this.xl = xl;
+    }
+
+    public Cars getCl() {
+        return cl;
+    }
+
+    public void setCl(Cars cl) {
+        this.cl = cl;
+    }
+
+    public Personnel getJsy() {
+        return jsy;
+    }
+
+    public void setJsy(Personnel jsy) {
+        this.jsy = jsy;
+    }
+
+    public Personnel getSpy() {
+        return spy;
+    }
+
+    public void setSpy(Personnel spy) {
+        this.spy = spy;
+    }
+
+    public String getDbbm() {
+        return dbbm;
+    }
+
+    public void setDbbm(String dbbm) {
+        this.dbbm = dbbm;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}
-package com.bsth.entity.schedule;
-
-import com.bsth.entity.Line;
-import com.bsth.entity.schedule.rule.ScheduleRule1;
-import com.bsth.entity.sys.SysUser;
-
-import javax.persistence.*;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 排班计划。
- */
-@Entity
-@Table(name = "bsth_c_s_sp")
-public class SchedulePlan {
-
-    /** 主键Id */
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    /** 关联的线路 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Line xl;
-    /** 关联的时刻表/模版 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private TTInfo ttInfo;
-    /** 关联的排班规则 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private ScheduleRule1 scheduleRule1;
-
-    /** 排班计划的开始时间 */
-    private Date scheduleFromTime;
-    /** 排班计划的结束时间 */
-    private Date scheduleToTime;
-
-    /** 操作人 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser user;
-
-    /** 使用中间表的一对多关联 明细信息 */
-    @OneToMany(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    @JoinTable(
-            name = "bsth_c_s_sp_r_info",
-            joinColumns = @JoinColumn(name = "sp_id"),
-            inverseJoinColumns = @JoinColumn(name = "sp_info_id")
-    )
-    private List<SchedulePlanInfo> schedulePlanInfoList;
-
-    // 创建日期
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    // 修改日期
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Line getXl() {
-        return xl;
-    }
-
-    public void setXl(Line xl) {
-        this.xl = xl;
-    }
-
-    public TTInfo getTtInfo() {
-        return ttInfo;
-    }
-
-    public void setTtInfo(TTInfo ttInfo) {
-        this.ttInfo = ttInfo;
-    }
-
-    public Date getScheduleFromTime() {
-        return scheduleFromTime;
-    }
-
-    public void setScheduleFromTime(Date scheduleFromTime) {
-        this.scheduleFromTime = scheduleFromTime;
-    }
-
-    public Date getScheduleToTime() {
-        return scheduleToTime;
-    }
-
-    public void setScheduleToTime(Date scheduleToTime) {
-        this.scheduleToTime = scheduleToTime;
-    }
-
-    public SysUser getUser() {
-        return user;
-    }
-
-    public void setUser(SysUser user) {
-        this.user = user;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public ScheduleRule1 getScheduleRule1() {
-        return scheduleRule1;
-    }
-
-    public void setScheduleRule1(ScheduleRule1 scheduleRule1) {
-        this.scheduleRule1 = scheduleRule1;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-}
+package com.bsth.entity.schedule;
+
+import com.bsth.entity.Line;
+import com.bsth.entity.schedule.rule.ScheduleRule1;
+import com.bsth.entity.sys.SysUser;
+
+import javax.persistence.*;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 排班计划。
+ */
+@Entity
+@Table(name = "bsth_c_s_sp")
+public class SchedulePlan {
+
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 关联的线路 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Line xl;
+    /** 关联的时刻表/模版 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private TTInfo ttInfo;
+    /** 关联的排班规则 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private ScheduleRule1 scheduleRule1;
+
+    /** 排班计划的开始时间 */
+    private Date scheduleFromTime;
+    /** 排班计划的结束时间 */
+    private Date scheduleToTime;
+
+    /** 操作人 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private SysUser user;
+
+    /** 使用中间表的一对多关联 明细信息 */
+    @OneToMany(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    @JoinTable(
+            name = "bsth_c_s_sp_r_info",
+            joinColumns = @JoinColumn(name = "sp_id"),
+            inverseJoinColumns = @JoinColumn(name = "sp_info_id")
+    )
+    private List<SchedulePlanInfo> schedulePlanInfoList;
+
+    // 创建日期
+    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private Date createDate;
+    // 修改日期
+    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    private Date updateDate;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Line getXl() {
+        return xl;
+    }
+
+    public void setXl(Line xl) {
+        this.xl = xl;
+    }
+
+    public TTInfo getTtInfo() {
+        return ttInfo;
+    }
+
+    public void setTtInfo(TTInfo ttInfo) {
+        this.ttInfo = ttInfo;
+    }
+
+    public Date getScheduleFromTime() {
+        return scheduleFromTime;
+    }
+
+    public void setScheduleFromTime(Date scheduleFromTime) {
+        this.scheduleFromTime = scheduleFromTime;
+    }
+
+    public Date getScheduleToTime() {
+        return scheduleToTime;
+    }
+
+    public void setScheduleToTime(Date scheduleToTime) {
+        this.scheduleToTime = scheduleToTime;
+    }
+
+    public SysUser getUser() {
+        return user;
+    }
+
+    public void setUser(SysUser user) {
+        this.user = user;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public ScheduleRule1 getScheduleRule1() {
+        return scheduleRule1;
+    }
+
+    public void setScheduleRule1(ScheduleRule1 scheduleRule1) {
+        this.scheduleRule1 = scheduleRule1;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}
-package com.bsth.entity.schedule;
-
-import com.bsth.entity.sys.SysUser;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * 排班计划明细。
- * 内部字段全冗余，无关联对象（外键关联关系），
- * 可以单独存在，其余表要关联此对象/表，必须使用中间对象/表。
- */
-@Entity
-@Table(name = "bsth_c_s_sp_info")
-public class SchedulePlanInfo {
-
-    /** 主键Id */
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    /** 排班计划日期 */
-    private Date scheduleDate;
-
-    /** 路牌名称 */
-    private String lpName;
-    /** 线路编码 */
-    private String xlBm;
-    /** 线路名称 */
-    private String xlName;
-    /** 车辆自编号 */
-    private String clZbh;
-
-
-    /** 报道1时间（格式 HH:mm） */
-    private String bd1Time;
-    /** 出场1时间（格式 HH:mm） */
-    private String cc1Time;
-    /** 驾驶员1工号 */
-    private String j1Gh;
-    /** 驾驶员1名字 */
-    private String j1Name;
-    /** 售票员1工号 */
-    private String s1Gh;
-    /** 售票员1名字 */
-    private String s1Name;
-
-    /** 报道2时间（格式 HH:mm） */
-    private String bd2Time;
-    /** 出场2时间（格式 HH:mm） */
-    private String cc2Time;
-    /** 驾驶员2工号 */
-    private String j2Gh;
-    /** 驾驶员2名字 */
-    private String j2Name;
-    /** 售票员2工号 */
-    private String s2Gh;
-    /** 售票员2名字 */
-    private String s2Name;
-
-    // 冗余的时刻明细信息
-    /** 线路方向 */
-    private String xlDir;
-    /** 起点站名称 */
-    private String qdz;
-    /** 终点站名称 */
-    private String zdz;
-    /** 发车时间（格式 HH:mm） */
-    private String fcsj;
-    /** 发车顺序号 */
-    private int fcno;
-    /** 对应班次数 */
-    private int bcs;
-    /** 计划里程 */
-    private double jhlc;
-    /** 班次历时 */
-    private int bcsj;
-
-    /** 操作人 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser user;
-
-    // 创建日期
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    // 修改日期
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Date getScheduleDate() {
-        return scheduleDate;
-    }
-
-    public void setScheduleDate(Date scheduleDate) {
-        this.scheduleDate = scheduleDate;
-    }
-
-    public String getLpName() {
-        return lpName;
-    }
-
-    public void setLpName(String lpName) {
-        this.lpName = lpName;
-    }
-
-    public String getXlName() {
-        return xlName;
-    }
-
-    public void setXlName(String xlName) {
-        this.xlName = xlName;
-    }
-
-    public String getClZbh() {
-        return clZbh;
-    }
-
-    public void setClZbh(String clZbh) {
-        this.clZbh = clZbh;
-    }
-
-    public String getCc1Time() {
-        return cc1Time;
-    }
-
-    public void setCc1Time(String cc1Time) {
-        this.cc1Time = cc1Time;
-    }
-
-    public String getJ1Gh() {
-        return j1Gh;
-    }
-
-    public void setJ1Gh(String j1Gh) {
-        this.j1Gh = j1Gh;
-    }
-
-    public String getJ1Name() {
-        return j1Name;
-    }
-
-    public void setJ1Name(String j1Name) {
-        this.j1Name = j1Name;
-    }
-
-    public String getS1Gh() {
-        return s1Gh;
-    }
-
-    public void setS1Gh(String s1Gh) {
-        this.s1Gh = s1Gh;
-    }
-
-    public String getS1Name() {
-        return s1Name;
-    }
-
-    public void setS1Name(String s1Name) {
-        this.s1Name = s1Name;
-    }
-
-    public String getBd1Time() {
-        return bd1Time;
-    }
-
-    public void setBd1Time(String bd1Time) {
-        this.bd1Time = bd1Time;
-    }
-
-    public String getBd2Time() {
-        return bd2Time;
-    }
-
-    public void setBd2Time(String bd2Time) {
-        this.bd2Time = bd2Time;
-    }
-
-    public String getCc2Time() {
-        return cc2Time;
-    }
-
-    public void setCc2Time(String cc2Time) {
-        this.cc2Time = cc2Time;
-    }
-
-    public String getJ2Gh() {
-        return j2Gh;
-    }
-
-    public void setJ2Gh(String j2Gh) {
-        this.j2Gh = j2Gh;
-    }
-
-    public String getJ2Name() {
-        return j2Name;
-    }
-
-    public void setJ2Name(String j2Name) {
-        this.j2Name = j2Name;
-    }
-
-    public String getS2Gh() {
-        return s2Gh;
-    }
-
-    public void setS2Gh(String s2Gh) {
-        this.s2Gh = s2Gh;
-    }
-
-    public String getS2Name() {
-        return s2Name;
-    }
-
-    public void setS2Name(String s2Name) {
-        this.s2Name = s2Name;
-    }
-
-    public String getXlDir() {
-        return xlDir;
-    }
-
-    public void setXlDir(String xlDir) {
-        this.xlDir = xlDir;
-    }
-
-    public String getQdz() {
-        return qdz;
-    }
-
-    public void setQdz(String qdz) {
-        this.qdz = qdz;
-    }
-
-    public String getZdz() {
-        return zdz;
-    }
-
-    public void setZdz(String zdz) {
-        this.zdz = zdz;
-    }
-
-    public String getFcsj() {
-        return fcsj;
-    }
-
-    public void setFcsj(String fcsj) {
-        this.fcsj = fcsj;
-    }
-
-    public SysUser getUser() {
-        return user;
-    }
-
-    public void setUser(SysUser user) {
-        this.user = user;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    public int getFcno() {
-        return fcno;
-    }
-
-    public void setFcno(int fcno) {
-        this.fcno = fcno;
-    }
-
-    public int getBcs() {
-        return bcs;
-    }
-
-    public void setBcs(int bcs) {
-        this.bcs = bcs;
-    }
-
-    public double getJhlc() {
-        return jhlc;
-    }
-
-    public void setJhlc(double jhlc) {
-        this.jhlc = jhlc;
-    }
-
-    public int getBcsj() {
-        return bcsj;
-    }
-
-    public void setBcsj(int bcsj) {
-        this.bcsj = bcsj;
-    }
-
-    public String getXlBm() {
-        return xlBm;
-    }
-
-    public void setXlBm(String xlBm) {
-        this.xlBm = xlBm;
-    }
-}
+package com.bsth.entity.schedule;
+
+import com.bsth.entity.sys.SysUser;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 排班计划明细。
+ * 内部字段全冗余，无关联对象（外键关联关系），
+ * 可以单独存在，其余表要关联此对象/表，必须使用中间对象/表。
+ */
+@Entity
+@Table(name = "bsth_c_s_sp_info")
+public class SchedulePlanInfo {
+
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 排班计划日期 */
+    private Date scheduleDate;
+
+    /** 路牌名称 */
+    private String lpName;
+    /** 线路编码 */
+    private String xlBm;
+    /** 线路名称 */
+    private String xlName;
+    /** 车辆自编号 */
+    private String clZbh;
+
+
+    /** 报道1时间（格式 HH:mm） */
+    private String bd1Time;
+    /** 出场1时间（格式 HH:mm） */
+    private String cc1Time;
+    /** 驾驶员1工号 */
+    private String j1Gh;
+    /** 驾驶员1名字 */
+    private String j1Name;
+    /** 售票员1工号 */
+    private String s1Gh;
+    /** 售票员1名字 */
+    private String s1Name;
+
+    /** 报道2时间（格式 HH:mm） */
+    private String bd2Time;
+    /** 出场2时间（格式 HH:mm） */
+    private String cc2Time;
+    /** 驾驶员2工号 */
+    private String j2Gh;
+    /** 驾驶员2名字 */
+    private String j2Name;
+    /** 售票员2工号 */
+    private String s2Gh;
+    /** 售票员2名字 */
+    private String s2Name;
+
+    // 冗余的时刻明细信息
+    /** 线路方向 */
+    private String xlDir;
+    /** 起点站名称 */
+    private String qdz;
+    /** 终点站名称 */
+    private String zdz;
+    /** 发车时间（格式 HH:mm） */
+    private String fcsj;
+    /** 发车顺序号 */
+    private int fcno;
+    /** 对应班次数 */
+    private int bcs;
+    /** 计划里程 */
+    private double jhlc;
+    /** 班次历时 */
+    private int bcsj;
+
+    /** 操作人 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private SysUser user;
+
+    // 创建日期
+    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private Date createDate;
+    // 修改日期
+    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    private Date updateDate;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(Date scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+    public String getCc1Time() {
+        return cc1Time;
+    }
+
+    public void setCc1Time(String cc1Time) {
+        this.cc1Time = cc1Time;
+    }
+
+    public String getJ1Gh() {
+        return j1Gh;
+    }
+
+    public void setJ1Gh(String j1Gh) {
+        this.j1Gh = j1Gh;
+    }
+
+    public String getJ1Name() {
+        return j1Name;
+    }
+
+    public void setJ1Name(String j1Name) {
+        this.j1Name = j1Name;
+    }
+
+    public String getS1Gh() {
+        return s1Gh;
+    }
+
+    public void setS1Gh(String s1Gh) {
+        this.s1Gh = s1Gh;
+    }
+
+    public String getS1Name() {
+        return s1Name;
+    }
+
+    public void setS1Name(String s1Name) {
+        this.s1Name = s1Name;
+    }
+
+    public String getBd1Time() {
+        return bd1Time;
+    }
+
+    public void setBd1Time(String bd1Time) {
+        this.bd1Time = bd1Time;
+    }
+
+    public String getBd2Time() {
+        return bd2Time;
+    }
+
+    public void setBd2Time(String bd2Time) {
+        this.bd2Time = bd2Time;
+    }
+
+    public String getCc2Time() {
+        return cc2Time;
+    }
+
+    public void setCc2Time(String cc2Time) {
+        this.cc2Time = cc2Time;
+    }
+
+    public String getJ2Gh() {
+        return j2Gh;
+    }
+
+    public void setJ2Gh(String j2Gh) {
+        this.j2Gh = j2Gh;
+    }
+
+    public String getJ2Name() {
+        return j2Name;
+    }
+
+    public void setJ2Name(String j2Name) {
+        this.j2Name = j2Name;
+    }
+
+    public String getS2Gh() {
+        return s2Gh;
+    }
+
+    public void setS2Gh(String s2Gh) {
+        this.s2Gh = s2Gh;
+    }
+
+    public String getS2Name() {
+        return s2Name;
+    }
+
+    public void setS2Name(String s2Name) {
+        this.s2Name = s2Name;
+    }
+
+    public String getXlDir() {
+        return xlDir;
+    }
+
+    public void setXlDir(String xlDir) {
+        this.xlDir = xlDir;
+    }
+
+    public String getQdz() {
+        return qdz;
+    }
+
+    public void setQdz(String qdz) {
+        this.qdz = qdz;
+    }
+
+    public String getZdz() {
+        return zdz;
+    }
+
+    public void setZdz(String zdz) {
+        this.zdz = zdz;
+    }
+
+    public String getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(String fcsj) {
+        this.fcsj = fcsj;
+    }
+
+    public SysUser getUser() {
+        return user;
+    }
+
+    public void setUser(SysUser user) {
+        this.user = user;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public int getFcno() {
+        return fcno;
+    }
+
+    public void setFcno(int fcno) {
+        this.fcno = fcno;
+    }
+
+    public int getBcs() {
+        return bcs;
+    }
+
+    public void setBcs(int bcs) {
+        this.bcs = bcs;
+    }
+
+    public double getJhlc() {
+        return jhlc;
+    }
+
+    public void setJhlc(double jhlc) {
+        this.jhlc = jhlc;
+    }
+
+    public int getBcsj() {
+        return bcsj;
+    }
+
+    public void setBcsj(int bcsj) {
+        this.bcsj = bcsj;
+    }
+
+    public String getXlBm() {
+        return xlBm;
+    }
+
+    public void setXlBm(String xlBm) {
+        this.xlBm = xlBm;
+    }
+}
-package com.bsth.entity.schedule.rule;
-
-import com.bsth.entity.Cars;
-import com.bsth.entity.Line;
-import com.bsth.entity.Personnel;
-import com.bsth.entity.schedule.GuideboardInfo;
-
-import javax.persistence.*;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 排班规则1，
- * 基于老系统的规则设定实体，
- * 有所谓的路牌范围，就是关联多个路牌
- * 有所谓的人员返回，就是关联多个人（可能带早晚班）
- * 有起始路牌，起始人员，翻班格式
- */
-@Entity
-@Table(name = "bsth_c_s_sr1")
-public class ScheduleRule1 {
-
-    /** 主键Id */
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    /** 关联线路 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Line xl;
-    /** 关联车辆 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Cars cl;
-    /** 启用日期 */
-    private Date qyrq;
-
-    /** 起始路牌 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private GuideboardInfo qslp;
-    /** 起始人员 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Personnel qsry;
-    /** 翻班格式（TODO：这个目前还不太明白）*/
-    private String fbgs;
-
-    /** 路牌范围（TODO：路牌有序号的需要排序，这个再议了） */
-    @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    @JoinTable(
-            name = "bsth_c_s_sr1_lp",
-            joinColumns = @JoinColumn(name = "SR1_ID"),
-            inverseJoinColumns = @JoinColumn(name = "LP_ID")
-    )
-    private List<GuideboardInfo> guideboardInfos;
-
-    // TODO：暂时不考虑早晚班
-//    /** 是否早晚班 */
-//    private boolean isZWB = false;
-
-    /** 人员范围 */
-    @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    @JoinTable(
-            name = "bsth_c_s_sr1_ry",
-            joinColumns = @JoinColumn(name = "SR1_ID"),
-            inverseJoinColumns = @JoinColumn(name = "RY_ID")
-    )
-    private List<Personnel> personnels;
-
-
-    // 创建日期
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    // 修改日期
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Line getXl() {
-        return xl;
-    }
-
-    public void setXl(Line xl) {
-        this.xl = xl;
-    }
-
-    public Cars getCl() {
-        return cl;
-    }
-
-    public void setCl(Cars cl) {
-        this.cl = cl;
-    }
-
-    public Date getQyrq() {
-        return qyrq;
-    }
-
-    public void setQyrq(Date qyrq) {
-        this.qyrq = qyrq;
-    }
-
-    public GuideboardInfo getQslp() {
-        return qslp;
-    }
-
-    public void setQslp(GuideboardInfo qslp) {
-        this.qslp = qslp;
-    }
-
-    public Personnel getQsry() {
-        return qsry;
-    }
-
-    public void setQsry(Personnel qsry) {
-        this.qsry = qsry;
-    }
-
-    public String getFbgs() {
-        return fbgs;
-    }
-
-    public void setFbgs(String fbgs) {
-        this.fbgs = fbgs;
-    }
-
-    public List<GuideboardInfo> getGuideboardInfos() {
-        return guideboardInfos;
-    }
-
-    public void setGuideboardInfos(List<GuideboardInfo> guideboardInfos) {
-        this.guideboardInfos = guideboardInfos;
-    }
-
-    public List<Personnel> getPersonnels() {
-        return personnels;
-    }
-
-    public void setPersonnels(List<Personnel> personnels) {
-        this.personnels = personnels;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-}
+package com.bsth.entity.schedule.rule;
+
+import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
+import com.bsth.entity.Personnel;
+import com.bsth.entity.schedule.GuideboardInfo;
+
+import javax.persistence.*;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 排班规则1，
+ * 基于老系统的规则设定实体，
+ * 有所谓的路牌范围，就是关联多个路牌
+ * 有所谓的人员返回，就是关联多个人（可能带早晚班）
+ * 有起始路牌，起始人员，翻班格式
+ */
+@Entity
+@Table(name = "bsth_c_s_sr1")
+public class ScheduleRule1 {
+
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 关联线路 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Line xl;
+    /** 关联车辆 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Cars cl;
+    /** 启用日期 */
+    private Date qyrq;
+
+    /** 起始路牌 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private GuideboardInfo qslp;
+    /** 起始人员 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Personnel qsry;
+    /** 翻班格式（TODO：这个目前还不太明白）*/
+    private String fbgs;
+
+    /** 路牌范围（TODO：路牌有序号的需要排序，这个再议了） */
+    @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @JoinTable(
+            name = "bsth_c_s_sr1_lp",
+            joinColumns = @JoinColumn(name = "SR1_ID"),
+            inverseJoinColumns = @JoinColumn(name = "LP_ID")
+    )
+    private List<GuideboardInfo> guideboardInfos;
+
+    // TODO：暂时不考虑早晚班
+//    /** 是否早晚班 */
+//    private boolean isZWB = false;
+
+    /** 人员范围 */
+    @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @JoinTable(
+            name = "bsth_c_s_sr1_ry",
+            joinColumns = @JoinColumn(name = "SR1_ID"),
+            inverseJoinColumns = @JoinColumn(name = "RY_ID")
+    )
+    private List<Personnel> personnels;
+
+
+    // 创建日期
+    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private Date createDate;
+    // 修改日期
+    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    private Date updateDate;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Line getXl() {
+        return xl;
+    }
+
+    public void setXl(Line xl) {
+        this.xl = xl;
+    }
+
+    public Cars getCl() {
+        return cl;
+    }
+
+    public void setCl(Cars cl) {
+        this.cl = cl;
+    }
+
+    public Date getQyrq() {
+        return qyrq;
+    }
+
+    public void setQyrq(Date qyrq) {
+        this.qyrq = qyrq;
+    }
+
+    public GuideboardInfo getQslp() {
+        return qslp;
+    }
+
+    public void setQslp(GuideboardInfo qslp) {
+        this.qslp = qslp;
+    }
+
+    public Personnel getQsry() {
+        return qsry;
+    }
+
+    public void setQsry(Personnel qsry) {
+        this.qsry = qsry;
+    }
+
+    public String getFbgs() {
+        return fbgs;
+    }
+
+    public void setFbgs(String fbgs) {
+        this.fbgs = fbgs;
+    }
+
+    public List<GuideboardInfo> getGuideboardInfos() {
+        return guideboardInfos;
+    }
+
+    public void setGuideboardInfos(List<GuideboardInfo> guideboardInfos) {
+        this.guideboardInfos = guideboardInfos;
+    }
+
+    public List<Personnel> getPersonnels() {
+        return personnels;
+    }
+
+    public void setPersonnels(List<Personnel> personnels) {
+        this.personnels = personnels;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}
-package com.bsth.entity.schedule.rule;
-
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.util.Date;
-
-/**
- * 排班规则1关联的路牌。
- */
-@Entity
-@Table(name = "bsth_c_s_sr1_lp")
-public class ScheduleRule1_LP {
-
-    /** 业务主键 */
-    @EmbeddedId
-    private ScheduleRule1_LP_PK pk;
-
-    // 创建日期
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    // 修改日期
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
-    public ScheduleRule1_LP_PK getPk() {
-        return pk;
-    }
-
-    public void setPk(ScheduleRule1_LP_PK pk) {
-        this.pk = pk;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-}
+package com.bsth.entity.schedule.rule;
+
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * 排班规则1关联的路牌。
+ */
+@Entity
+@Table(name = "bsth_c_s_sr1_lp")
+public class ScheduleRule1_LP {
+
+    /** 业务主键 */
+    @EmbeddedId
+    private ScheduleRule1_LP_PK pk;
+
+    // 创建日期
+    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private Date createDate;
+    // 修改日期
+    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    private Date updateDate;
+
+    public ScheduleRule1_LP_PK getPk() {
+        return pk;
+    }
+
+    public void setPk(ScheduleRule1_LP_PK pk) {
+        this.pk = pk;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}
-package com.bsth.entity.schedule.rule;
-
-import com.bsth.entity.schedule.GuideboardInfo;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * 排班规则1 路牌范围 主键。
- */
-@Embeddable
-public class ScheduleRule1_LP_PK implements Serializable {
-
-    /** 关联的排班规则1 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    @JoinColumn(name = "SR1_ID")
-    private ScheduleRule1 scheduleRule1;
-
-    /** 关联的路牌 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    @JoinColumn(name = "LP_ID")
-    private GuideboardInfo guideboardInfo;
-
-    /** 顺序号 */
-    private Integer orderNo;
-
-    public ScheduleRule1_LP_PK(ScheduleRule1 scheduleRule1, GuideboardInfo guideboardInfo, Integer orderNo) {
-        this.scheduleRule1 = scheduleRule1;
-        this.guideboardInfo = guideboardInfo;
-        this.orderNo = orderNo;
-    }
-
-    public ScheduleRule1 getScheduleRule1() {
-        return scheduleRule1;
-    }
-
-    public void setScheduleRule1(ScheduleRule1 scheduleRule1) {
-        this.scheduleRule1 = scheduleRule1;
-    }
-
-    public GuideboardInfo getGuideboardInfo() {
-        return guideboardInfo;
-    }
-
-    public void setGuideboardInfo(GuideboardInfo guideboardInfo) {
-        this.guideboardInfo = guideboardInfo;
-    }
-
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
-}
+package com.bsth.entity.schedule.rule;
+
+import com.bsth.entity.schedule.GuideboardInfo;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 排班规则1 路牌范围 主键。
+ */
+@Embeddable
+public class ScheduleRule1_LP_PK implements Serializable {
+
+    /** 关联的排班规则1 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    @JoinColumn(name = "SR1_ID")
+    private ScheduleRule1 scheduleRule1;
+
+    /** 关联的路牌 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    @JoinColumn(name = "LP_ID")
+    private GuideboardInfo guideboardInfo;
+
+    /** 顺序号 */
+    private Integer orderNo;
+
+    public ScheduleRule1_LP_PK(ScheduleRule1 scheduleRule1, GuideboardInfo guideboardInfo, Integer orderNo) {
+        this.scheduleRule1 = scheduleRule1;
+        this.guideboardInfo = guideboardInfo;
+        this.orderNo = orderNo;
+    }
+
+    public ScheduleRule1 getScheduleRule1() {
+        return scheduleRule1;
+    }
+
+    public void setScheduleRule1(ScheduleRule1 scheduleRule1) {
+        this.scheduleRule1 = scheduleRule1;
+    }
+
+    public GuideboardInfo getGuideboardInfo() {
+        return guideboardInfo;
+    }
+
+    public void setGuideboardInfo(GuideboardInfo guideboardInfo) {
+        this.guideboardInfo = guideboardInfo;
+    }
+
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+}
-package com.bsth.entity.schedule.rule;
-
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.util.Date;
-
-/**
- * 排班规则1关联的人员。
- */
-@Entity
-@Table(name = "bsth_c_s_sr1_ry")
-public class ScheduleRule1_RY {
-
-    /** 业务主键 */
-    @EmbeddedId
-    private ScheduleRule1_RY_PK pk;
-
-    // 创建日期
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    // 修改日期
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
-    public ScheduleRule1_RY_PK getPk() {
-        return pk;
-    }
-
-    public void setPk(ScheduleRule1_RY_PK pk) {
-        this.pk = pk;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-}
+package com.bsth.entity.schedule.rule;
+
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * 排班规则1关联的人员。
+ */
+@Entity
+@Table(name = "bsth_c_s_sr1_ry")
+public class ScheduleRule1_RY {
+
+    /** 业务主键 */
+    @EmbeddedId
+    private ScheduleRule1_RY_PK pk;
+
+    // 创建日期
+    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private Date createDate;
+    // 修改日期
+    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    private Date updateDate;
+
+    public ScheduleRule1_RY_PK getPk() {
+        return pk;
+    }
+
+    public void setPk(ScheduleRule1_RY_PK pk) {
+        this.pk = pk;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}
-package com.bsth.entity.schedule.rule;
-
-import com.bsth.entity.Personnel;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * 排班规则1 人员范围
- * TODO：暂时不考虑早晚班
- */
-@Embeddable
-public class ScheduleRule1_RY_PK implements Serializable {
-
-    /** 关联的排班规则1 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    @JoinColumn(name = "SR1_ID")
-    private ScheduleRule1 scheduleRule1;
-
-    /** 关联的人员 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    @JoinColumn(name = "RY_ID")
-    private Personnel personnel;
-
-    /** 顺序号 */
-    private Integer orderNo;
-
-    public ScheduleRule1_RY_PK(ScheduleRule1 scheduleRule1, Personnel personnel, Integer orderNo) {
-        this.scheduleRule1 = scheduleRule1;
-        this.personnel = personnel;
-        this.orderNo = orderNo;
-    }
-
-    public ScheduleRule1 getScheduleRule1() {
-        return scheduleRule1;
-    }
-
-    public void setScheduleRule1(ScheduleRule1 scheduleRule1) {
-        this.scheduleRule1 = scheduleRule1;
-    }
-
-    public Personnel getPersonnel() {
-        return personnel;
-    }
-
-    public void setPersonnel(Personnel personnel) {
-        this.personnel = personnel;
-    }
-
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
-}
+package com.bsth.entity.schedule.rule;
+
+import com.bsth.entity.Personnel;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 排班规则1 人员范围
+ * TODO：暂时不考虑早晚班
+ */
+@Embeddable
+public class ScheduleRule1_RY_PK implements Serializable {
+
+    /** 关联的排班规则1 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    @JoinColumn(name = "SR1_ID")
+    private ScheduleRule1 scheduleRule1;
+
+    /** 关联的人员 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    @JoinColumn(name = "RY_ID")
+    private Personnel personnel;
+
+    /** 顺序号 */
+    private Integer orderNo;
+
+    public ScheduleRule1_RY_PK(ScheduleRule1 scheduleRule1, Personnel personnel, Integer orderNo) {
+        this.scheduleRule1 = scheduleRule1;
+        this.personnel = personnel;
+        this.orderNo = orderNo;
+    }
+
+    public ScheduleRule1 getScheduleRule1() {
+        return scheduleRule1;
+    }
+
+    public void setScheduleRule1(ScheduleRule1 scheduleRule1) {
+        this.scheduleRule1 = scheduleRule1;
+    }
+
+    public Personnel getPersonnel() {
+        return personnel;
+    }
+
+    public void setPersonnel(Personnel personnel) {
+        this.personnel = personnel;
+    }
+
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+}
 package com.bsth.gpsdata.buffer;
  
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -63,6 +64,11 @@ public class GpsRealDataBuffer {
 	 */
 	private static Map<String, String> stationCodeMap;
  
+	/**
+	 * 最后同步时间
+	 */
+	private static Long lastUpdateTime;
+	
  
 	public boolean isNullEmpty(){
 		return deviceGpsMap == null;
@@ -170,13 +176,49 @@ public class GpsRealDataBuffer {
 	 * @throws
 	 */
 	public List<GpsRealData> getListByLineCode(Integer lineCode){
-		List<GpsRealData> list = lineGpsMultimap.get(lineCode);
+		List<GpsRealData> list = lineGpsMultimap.get(lineCode)
+					,resList = new ArrayList<>();
  
 		//写入车辆自编号
+		String nbbm;
+		logger.info("list size..." + list.size());
 		for(GpsRealData gpsData : list){
-			gpsData.setNbbm(vehicDeviceMap.get(gpsData.getDeviceId()));
-			gpsData.setStationName(stationCodeMap.get(gpsData.getStopNo()));
+			nbbm = vehicDeviceMap.get(gpsData.getDeviceId());
+			if(null != nbbm){
+				gpsData.setNbbm(nbbm);
+				gpsData.setStationName(stationCodeMap.get(gpsData.getStopNo()));
+				resList.add(gpsData);
+			}
 		}
+		return resList;
+	}
+	
+	/**
+	 * 
+	 * @Title: getListByLineCode 
+	 * @Description: TODO(根据多个线路编码获取该线路所有的GPS点) 
+	 * @return List<GpsRealData>    返回类型 
+	 * @throws
+	 */
+	public List<GpsRealData> getListByLines(Iterator<String> iterator){
+		
+		List<GpsRealData> list = new ArrayList<>();
+		
+		Integer code;
+		while(iterator.hasNext()){
+			code = Integer.parseInt(iterator.next());
+			list.addAll(getListByLineCode(code));
+		}
+		
 		return list;
 	}
+	
+	
+	public void setLastUpdateTime(Long time){
+		lastUpdateTime = time;
+	}
+	
+	public Long getLastUpdateTime(){
+		return lastUpdateTime;
+	}
 }
-#http.gps.real.url= http://222.66.0.204:5555/transport_server/rtgps/
-http.gps.real.url= http://192.168.168.192:8080/transport_server/rtgps/
 \ No newline at end of file
@@ -5,10 +5,12 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
 import com.bsth.gpsdata.buffer.GpsRealDataBuffer;
 import com.bsth.gpsdata.entity.GpsRealData;
+import com.google.common.base.Splitter;
  
 @RestController
 @RequestMapping("gps")
@@ -21,4 +23,9 @@ public class GpsDataController {
 	public List<GpsRealData> findByLineCode(@PathVariable("lineCode") Integer lineCode){
 		return gpsBuffer.getListByLineCode(lineCode);
 	}
+	
+	@RequestMapping(value = "/real/line")
+	public List<GpsRealData> findByLineCode(@RequestParam String lineCodes){
+		return gpsBuffer.getListByLines(Splitter.on(",").split(lineCodes).iterator());
+	}
 }
@@ -21,7 +21,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.gpsdata.buffer.GpsRealDataBuffer;
 import com.bsth.gpsdata.entity.GpsRealData;
-import com.bsth.gpsdata.util.ConfigUtil;
+import com.bsth.util.Tools;
 import com.google.common.collect.ImmutableMap;
  
 /**
@@ -42,7 +42,8 @@ public class GpsBufferRefreshThread extends Thread{
  
  
 	public GpsBufferRefreshThread() {
-		url = ConfigUtil.getProp("http.gps.real.url");
+		Tools t = new Tools("application.properties");
+		url = t.getValue("http.gps.real.url");
 	}
  
 	@Autowired
@@ -81,6 +82,7 @@ public class GpsBufferRefreshThread extends Thread{
  
 				//更新缓存
 				gpsBuffer.updateBuffer(upLines, upGpsList);
+				gpsBuffer.setLastUpdateTime(System.currentTimeMillis());
 			}
  
 			logger.info("本次刷新GPS实时数据耗时：" + (System.currentTimeMillis() - t) + "毫秒");
-package com.bsth.gpsdata.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-public class ConfigUtil {
-	
-	private static Properties properties = new Properties();
-
-	static {
-		InputStream in = Object.class.getResourceAsStream("/com/bsth/gpsdata/config.properties");
-		try {
-			properties.load(in);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public static String getProp(String key){
-
-		return properties.getProperty(key);
-	}
-}
-package com.bsth.service;
-
-import com.bsth.entity.Cars;
-
-/**
- * Created by xu on 16/5/31.
- */
-public interface CarsService extends BaseService<Cars, Integer> {
-}
+package com.bsth.service;
+
+import com.bsth.entity.Cars;
+
+/**
+ * Created by xu on 16/5/31.
+ */
+public interface CarsService extends BaseService<Cars, Integer> {
+}
-package com.bsth.service.impl;
-
-import com.bsth.entity.Cars;
-import com.bsth.service.CarsService;
-import org.springframework.stereotype.Service;
-
-/**
- * Created by xu on 16/5/31.
- */
-@Service
-public class CarsServiceImpl extends BaseServiceImpl<Cars, Integer> implements CarsService {
-}
+package com.bsth.service.impl;
+
+import com.bsth.entity.Cars;
+import com.bsth.service.CarsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by xu on 16/5/31.
+ */
+@Service
+public class CarsServiceImpl extends BaseServiceImpl<Cars, Integer> implements CarsService {
+}
+package com.bsth.util;
+
+import java.io.IOException;
+import java.util.Properties;
+
+public class Tools {  
+    private static Properties p = new Properties();  
+    private static String f;
+    public Tools(String file){
+    	f = file;
+    	try {
+			p.load(Tools.class.getClassLoader().getResourceAsStream(f));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}  
+    }
+  
+    /** 
+     * 根据key得到value的值 
+     */  
+    public String getValue(String key)  
+    {  
+        return p.getProperty(key);  
+    }  
+}  
@@ -24,3 +24,7 @@ spring.view.suffix=.html
 server.session-timeout=-1
  
 security.basic.enabled=false
+
+##
+#http.gps.real.url= http://222.66.0.204:5555/transport_server/rtgps/
+http.gps.real.url= http://192.168.168.192:8080/transport_server/rtgps/
+resources\fatso
+.git
+.settings
+target
 \ No newline at end of file
+/**
+ * @author PanZhao 
+ * @date 2016年3月17日 下午12:44:06 
+ */
+var fs = require('fs');
+var UglifyJS = require("uglify-js");
+
+var minifier = {
+	
+	mergeAndMini: function(fileArray,scriptString, root, isIndex){
+		var len = fileArray.length;
+		for(var i = 0; i < len; i ++){
+			fileArray[i] = root  + fileArray[i].split('/').join('\\');
+		}
+		
+		var result, indoorRs;
+		
+		try {
+			if(fileArray && len > 0)
+				result = UglifyJS.minify(fileArray);
+			
+			if(scriptString)
+				indoorRs = UglifyJS.minify(scriptString, {fromString: true});
+		} catch (e) {
+			console.log(e);
+			process.exit();
+		}
+		
+		return {outside: result?result.code:'', inside: indoorRs?indoorRs.code:''};
+	},
+	mini: function(file){
+		return UglifyJS.minify(file).code;
+	}
+}
+
+module.exports = minifier;
 \ No newline at end of file
+{
+  "name": "fatso",
+  "version": "1.0.0",
+  "description": "子页面js检查、合并、压缩等处理",
+  "main": "start.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "panzhaov5",
+  "license": "ISC",
+  "dependencies": {
+    "cheerio": "^0.20.0",
+    "colors": "^1.1.2",
+    "eventproxy": "^0.3.4",
+    "uglify-js": "^2.6.2"
+  }
+}
+/**
+ * @author PanZhao 
+ * @date 2016年3月17日 下午12:44:06 
+ */
+var fs = require('fs')
+	,cheerio = require('cheerio')
+	,minifier = require('./minifier')
+	,crypto = require("crypto");
+	
+var parse = {
+	html: function(filePath, root){
+		var data = fs.readFileSync(filePath, 'utf-8')
+			,$ = cheerio.load(data)
+			,scriptString = '';
+		
+		var script = $('script')
+			,linkArray = [];
+		
+		for(var i = 0, s; s = script[i++];){
+			//模板
+			if($(s).attr('type') == 'text/html')
+				continue;
+			//不参与的
+			if($(s).data('exclude') == 1)
+				continue;
+			
+			//外部引用JS
+			if($(s).attr('src') != null ){
+				var src = $(s).attr('src');
+				//独立自主第三方
+				if($(s).data('autocephaly') == 1){
+					var mini = minifier.mini(root + src)
+						,code = md5(mini);
+					
+					var newPath = src.substr(0, src.lastIndexOf('/')) + '/' +code + '.js';
+					//重命名文件
+					fs.renameSync(root + src, root + newPath);
+					write(root + newPath, mini);
+					
+					$(s).attr('src', newPath);
+					continue;
+				}else
+					linkArray.push(src);
+			}
+			//内部JS
+			else{
+				scriptString = $(s).html();
+			}
+			
+			$(s).remove();
+		}
+		return {jsArray: linkArray, $: $, scriptString: scriptString};
+	}
+}
+
+
+function md5(text){
+	return crypto.createHash("md5").update(text).digest("hex");
+}
+
+function write(file, text){
+	fs.writeFile(file, text, function (err) {
+	  if (err){
+		  console.log(err.toString().red);
+		  process.exit();
+	  }
+	  console.log(file.green); 
+	});
+}
+
+module.exports = parse;
 \ No newline at end of file
+/**
+ * @author PanZhao 
+ * @date 2016年3月17日 下午12:44:06 
+ */
+var fs = require('fs')
+	,colors = require('colors')
+	,child_process = require('child_process')
+	,EventProxy = require('eventproxy')
+	,parse = require('./parse')
+	,minifier = require('./minifier')
+	,crypto = require("crypto");
+
+//不参与的目录
+var excludes = ['scheduleApp']
+	,ep = new EventProxy()
+	,pName = 'bsth_control'
+	,path = process.cwd()
+	//根目录
+	,root = path.substr(0, path.indexOf('\\src\\main'))
+	,workspace = root.substr(0, root.indexOf('\\' + pName))
+	//临时目录
+	,dest = (workspace + '\\' + pName+'@fatso_copy').replace(/\//g,'\\')
+	,_static = '\\src\\main\\resources\\static'
+	,_pages = dest + _static + '\\pages';
+
+
+//创建临时目录
+fs.mkdir(dest, function(e){
+	if(e)
+		logError('创建临时目录出错，请检查目录 ' + dest + '是否存在');
+	
+	setTimeout(function(){
+		ep.emit('mvn-clean');
+	}, 500);
+});
+//子进程
+var cProcess;
+
+ep.tail('mvn-clean',function(){
+	//清理target
+	logInfo('mvn clean...');
+	cProcess = child_process.exec("mvn clean",{cwd: workspace + '\\' + pName},function(error){
+		if(error)
+			logError(error);
+		
+		logSuccess('mvn clean success');
+		
+		ep.emit('copy-project');
+	});
+	output(cProcess);
+});
+
+//复制项目副本
+ep.tail('copy-project',function(){
+	logInfo('copy project...');
+	var xcopyCom = 'XCOPY '+ root.replace(/\//g,'\\') + ' ' + dest +' /e /exclude:'+path+'\\exclude.txt';
+	cProcess = child_process.exec(xcopyCom,{maxBuffer: 5000*1024},function(error){
+		if(error)
+			logError(error);
+		
+		logSuccess('copy project success');
+		
+		ep.emit('check-js');
+	});
+	//output(cProcess);
+});
+
+//检查JS
+ep.tail('check-js', function(){
+	ep.emit('minifier-js');
+});
+
+//合并压缩JS
+ep.tail('minifier-js', function(){
+	logInfo('handle index.html...');
+	
+	//先处理首页
+	ep.emit('handle-index', function(){
+		//递归处理片段
+		walk(dest + _static + '\\pages', function(item){
+			ep.emit('handle-fragment', item);
+		},
+		function(){
+			ep.emit('package-jar');
+		});
+	});
+});
+
+//打包
+ep.tail('package-jar', function(file){
+	var packageCom = 'mvn clean package';
+	cProcess = child_process.exec(packageCom,{maxBuffer: 5000*1024, cwd: dest},function(error){
+		if(error)
+			logError(error);
+		
+		logSuccess('mvn package success');
+		
+		console.log(('成功打包在 ' + dest + '\\target 目录下').cyan);
+	});
+	
+	output(cProcess);
+});
+
+//处理片段
+ep.tail('handle-fragment', function(file){
+	//要排除的文件
+	for(var i = 0, ex; ex = excludes[i++];){
+		if(file.indexOf(_pages + '\\' + ex) != -1)
+			return false;
+	}
+	handleJavascript(file, function(mini, $){
+		var jsMini;
+		if(mini.inside)
+			jsMini = '(function(){' + mini.inside + '\n' + mini.outside + '})();';
+		else
+			jsMini = '(function(){' + mini.outside + '})();';
+		
+		write(file, $.html() + '<script>' + jsMini + '</script>');
+	});
+	
+});
+
+//处理首页
+ep.tail('handle-index', function(cb){
+	var index = dest + _static + '\\index.html';
+	handleJavascript(index, function(mini, $){
+		var jsMiniText = mini.inside + mini.outside;
+		
+		var code = md5(jsMiniText);
+		fs.open( dest + _static + '\\assets\\js\\' + code + '.js', 'a',  function(err, fd){
+			if(err)
+		    	logError(err);
+			
+			fs.write(fd,jsMiniText, function(){
+				var ss = $('script');
+				
+				$(ss[ss.length - 1]).before('<script src="/assets/js/'+code+'.js"></script>\n');
+				for(var i = 0, s; s = ss[i++];){
+					$(s).removeAttr('data-exclude')
+						.removeAttr('flag')
+						.removeAttr('data-autocephaly');
+				}
+				write(index, $.html());
+				
+				cb && cb();
+			});
+		});
+	});
+});
+
+
+function handleJavascript(item, cb){
+	//解析页面
+	var htmlResult = parse.html(item, dest + _static)
+		,jsArray = htmlResult.jsArray
+		,$ = htmlResult.$
+		,scrStr = htmlResult.scriptString;
+	
+	//合并压缩
+	var mini = minifier.mergeAndMini(jsArray, scrStr, dest + _static);
+	
+	cb && cb(mini, $);
+}
+
+function removeJsLink(s, e){
+	var newArray = [], flag;
+	
+	for(var i = 0, si; si = s[i++];){
+		flag = 0;
+		for(var j = 0,ei; ei = e[j++];){
+			if(si.indexOf(ei) != -1){
+				flag = -1;
+				break;
+			}
+		}
+		
+		if(flag == 0){
+			newArray.push(si);
+		}
+	}
+	return newArray;
+}
+
+function write(file, text){
+	fs.writeFile(file, text, function (err) {
+	  if (err){
+		  console.log(err.toString().red);
+		  process.exit();
+	  }
+	  console.log(file.green); 
+	});
+}
+
+function md5(text){
+	return crypto.createHash("md5").update(text).digest("hex");
+}
+
+
+function walk(path ,handleFile, over) {
+    fs.readdir(path, function(err, files) {
+        if (err) {  
+            console.log('read dir error'.red);  
+        } else {  
+            files.forEach(function(item) {
+                var tmpPath = path + '\\' + item;  
+                fs.stat(tmpPath, function(err1, stats) {  
+                    if (err1) {  
+                        console.log('stat error');  
+                    } else {  
+                        if (stats.isDirectory()) {  
+                            walk(tmpPath, handleFile);  
+                        } else if(item.indexOf('.html') != -1){
+                            handleFile(tmpPath);  
+                        }  
+                    }  
+                })  
+            });
+            
+            over && over();
+        }  
+    });  
+}  
+
+function logInfo(t){
+	console.log(t);
+}
+
+function logSuccess(t){
+	console.log(t.green);
+}
+
+function logError(e){
+	console.log(e.toString().red);
+	process.exit();
+}
+
+function output(cProcess){
+	//标准输出
+	cProcess.stdout.on('data', function (s) {
+		console.log(s);
+	});
+}
 \ No newline at end of file