Merge branch 'master' of 192.168.168.201:panzhaov5/bsth_control

# Conflicts: # src/main/resources/static/metronic_v4.5.4/css/components.css

Merge branch 'master' of 192.168.168.201:panzhaov5/bsth_control
# Conflicts: # src/main/resources/static/metronic_v4.5.4/css/components.css
潘钊
2 parents 50a420ef 3fa956f1
Showing 27 changed files with 2228 additions and 1936 deletions
README.md
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/WebAppConfiguration.java
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/common/ResponseCode.java
src/main/java/com/bsth/controller/BaseController.java
src/main/java/com/bsth/controller/CarsController.java
src/main/java/com/bsth/controller/DictionaryController.java
src/main/java/com/bsth/controller/ModuleController.java
src/main/java/com/bsth/controller/ResourceController.java
src/main/java/com/bsth/controller/RoleController.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/UserController.java
src/main/java/com/bsth/controller/schedule/BusinessInfoController.java
src/main/java/com/bsth/controller/schedule/CarConfigInfoController.java
src/main/java/com/bsth/controller/schedule/EmployeeConfigInfoController.java
src/main/java/com/bsth/controller/schedule/GuideboardInfoController.java
src/main/java/com/bsth/controller/schedule/TTInfoController.java
src/main/java/com/bsth/entity/CarDevice.java
src/main/java/com/bsth/entity/CarPark.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 | 时间 |
 \ No newline at end of file
+公交调度系统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
-package com.bsth;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.*;
-
-@SpringBootApplication
-public class Application{
-	
-	public static void main(String[] args) throws Exception {
-		SpringApplication.run(Application.class, args);
-	}
+package com.bsth;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.*;
+
+@SpringBootApplication
+public class Application{
+	
+	public static void main(String[] args) throws Exception {
+		SpringApplication.run(Application.class, args);
+	}
 }
 \ No newline at end of file
-package com.bsth;
-
-import javax.servlet.Filter;
-
-import org.springframework.boot.context.embedded.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.filter.CharacterEncodingFilter;
-import org.springframework.web.filter.HttpPutFormContentFilter;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.web.socket.config.annotation.EnableWebSocket;
-import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
-import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
-
-import com.bsth.filter.ResourceFilter;
-
-@Configuration
-@EnableWebSocket
-@ComponentScan
-public class WebAppConfiguration extends WebMvcConfigurerAdapter implements WebSocketConfigurer{
-	
-	/**
-	 * 
-	 * @Title: httpPutFormContentFilter 
-	 * @Description: TODO(弥补浏览器不支持PUT/DELETE，对携带 _method 参数的请求进行转换) 
-	 * @return Filter    返回类型 
-	 * @throws
-	 */
-	@Bean
-	public Filter httpPutFormContentFilter() {
-		return new HttpPutFormContentFilter();
-	}
-	
-	/**
-	 * 
-	 * @Title: characterEncodingFilter 
-	 * @Description: TODO(编码过滤器) 
-	 * @return Filter    返回类型 
-	 * @throws
-	 */
-	@Bean
-	public Filter characterEncodingFilter(){
-		return new CharacterEncodingFilter("UTF-8");
-	}
-	
-	/**
-	 * 
-	 * @Title: resourceFilterRegistration 
-	 * @Description: TODO(静态资源过滤器， 只处理 /pages 目录下的片段请求 ) 
-	 * @return FilterRegistrationBean    返回类型 
-	 * @throws
-	*/
-	@Bean
-	public FilterRegistrationBean resourceFilterRegistration(){
-		FilterRegistrationBean registration = new FilterRegistrationBean();
-		registration.setFilter(new ResourceFilter());
-		registration.addUrlPatterns("/pages/*");
-		return registration;
-	} 
-
-	@Override
-	public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-		
-	}
-}
+package com.bsth;
+
+import javax.servlet.Filter;
+
+import org.springframework.boot.context.embedded.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.filter.CharacterEncodingFilter;
+import org.springframework.web.filter.HttpPutFormContentFilter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
+
+import com.bsth.filter.ResourceFilter;
+
+@Configuration
+@EnableWebSocket
+@ComponentScan
+public class WebAppConfiguration extends WebMvcConfigurerAdapter implements WebSocketConfigurer{
+	
+	/**
+	 * 
+	 * @Title: httpPutFormContentFilter 
+	 * @Description: TODO(弥补浏览器不支持PUT/DELETE，对携带 _method 参数的请求进行转换) 
+	 * @return Filter    返回类型 
+	 * @throws
+	 */
+	@Bean
+	public Filter httpPutFormContentFilter() {
+		return new HttpPutFormContentFilter();
+	}
+	
+	/**
+	 * 
+	 * @Title: characterEncodingFilter 
+	 * @Description: TODO(编码过滤器) 
+	 * @return Filter    返回类型 
+	 * @throws
+	 */
+	@Bean
+	public Filter characterEncodingFilter(){
+		return new CharacterEncodingFilter("UTF-8");
+	}
+	
+	/**
+	 * 
+	 * @Title: resourceFilterRegistration 
+	 * @Description: TODO(静态资源过滤器， 只处理 /pages 目录下的片段请求 ) 
+	 * @return FilterRegistrationBean    返回类型 
+	 * @throws
+	*/
+	@Bean
+	public FilterRegistrationBean resourceFilterRegistration(){
+		FilterRegistrationBean registration = new FilterRegistrationBean();
+		registration.setFilter(new ResourceFilter());
+		registration.addUrlPatterns("/pages/*");
+		return registration;
+	} 
+
+	@Override
+	public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
+		
+	}
+}
-package com.bsth.common;
-
-/**
- * 
- * @ClassName: Constants 
- * @Description: TODO(常量类) 
- * @author PanZhao 
- * @date 2016年3月18日 下午11:06:53 
- *
- */
-public class Constants {
-	
-	
-	/**
-	 * 不需要拦截的资源
-	 */
-	public static final String LOGIN = "/login";
-	public static final String LOGIN_PAGE = "/login.html";
-	public static final String ASSETS_URL = "/assets/**";
-	public static final String FAVICON_URL = "/favicon.ico";
-	public static final String METRONIC_URL = "/metronic_v4.5.4/**";
-	public static final String LOGIN_FAILURE = "/user/loginFailure";
-}
+package com.bsth.common;
+
+/**
+ * 
+ * @ClassName: Constants 
+ * @Description: TODO(常量类) 
+ * @author PanZhao 
+ * @date 2016年3月18日 下午11:06:53 
+ *
+ */
+public class Constants {
+	
+	
+	/**
+	 * 不需要拦截的资源
+	 */
+	public static final String LOGIN = "/login";
+	public static final String LOGIN_PAGE = "/login.html";
+	public static final String ASSETS_URL = "/assets/**";
+	public static final String FAVICON_URL = "/favicon.ico";
+	public static final String METRONIC_URL = "/metronic_v4.5.4/**";
+	public static final String LOGIN_FAILURE = "/user/loginFailure";
+}
-package com.bsth.common;
-
-/**
- * 
- * @ClassName: ResponseCode
- * @Description: TODO(响应状态码)
- * @author PanZhao
- * @date 2016年3月18日 下午11:12:08
- *
- */
-public enum ResponseCode {
-
-	SUCCESS("操作成功", 200), 
-	NO_PERMISSION("无资源访问权限", 403), 
-	NO_AUTHENTICATION("客户端未授权", 407), 
-	ERROR("服务器异常", 500);
-
-	private String text;
-	private int code;
-
-	ResponseCode(String text, int code) {
-		this.text = text;
-		this.code = code;
-	}
-
-	@Override
-	public String toString() {
-		return this.code + "";
-	}
-
-	public String getText() {
-		return this.text;
-	}
-}
+package com.bsth.common;
+
+/**
+ * 
+ * @ClassName: ResponseCode
+ * @Description: TODO(响应状态码)
+ * @author PanZhao
+ * @date 2016年3月18日 下午11:12:08
+ *
+ */
+public enum ResponseCode {
+
+	SUCCESS("操作成功", 200), 
+	NO_PERMISSION("无资源访问权限", 403), 
+	NO_AUTHENTICATION("客户端未授权", 407), 
+	ERROR("服务器异常", 500);
+
+	private String text;
+	private int code;
+
+	ResponseCode(String text, int code) {
+		this.text = text;
+		this.code = code;
+	}
+
+	@Override
+	public String toString() {
+		return this.code + "";
+	}
+
+	public String getText() {
+		return this.text;
+	}
+}
-package com.bsth.controller;
-
-import java.io.Serializable;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.bsth.service.BaseService;
-
-/**
- * 
- * @ClassName: BaseController 
- * @Description: TODO(基础的Controller实现) 
- * @author PanZhao 
- * @date 2016年3月17日 下午12:44:06 
- * 
- * @param <T>
- * @param <ID> 主键类型
- */
-public class BaseController<T, ID extends Serializable> {
-	
-	@Autowired
-	BaseService<T, ID> baseService;
-	
-	/**
-	 * 
-	 * @Title: list 
-	 * @Description: TODO(多条件分页查询) 
-	 * @param @param map 查询条件
-	 * @param @param page 页码
-	 * @param @param size 每页显示数量
-	 * @throws
-	 */
-	@RequestMapping(method = RequestMethod.GET)
-	public Page<T> list(@RequestParam Map<String, Object> map,
-			@RequestParam(defaultValue = "0") int page,
-			@RequestParam(defaultValue = "10") int size,
-			@RequestParam(defaultValue = "id") String order,
-			@RequestParam(defaultValue = "DESC") String direction){
-		
-		Direction d;
-		
-		if(null != direction && direction.equals("ASC"))
-			d = Direction.ASC;
-		else
-			d = Direction.DESC;
-		
-		return baseService.list(map, new PageRequest(page, size, new Sort(d, order)));
-	}
-	
-	/**
-	 * 
-	 * @Title: list 
-	 * @Description: TODO(多条件查询) 
-	 * @param @param map
-	 * @throws
-	 */
-	@RequestMapping(value = "/all", method = RequestMethod.GET)
-	public Iterable<T> list(@RequestParam Map<String, Object> map){
-		return baseService.list(map);
-	}
-	
-	/**
-	 * 
-	 * @Title: save 
-	 * @Description: TODO(持久化对象) 
-	 * @param @param t
-	 * @param @return    设定文件 
-	 * @return Map<String,Object>  {status: 1（成功），-1（失败）}
-	 * @throws
-	 */
-	@RequestMapping(method = RequestMethod.POST)
-	public Map<String, Object> save(T t){
-		return baseService.save(t);
-	}
-	
-	/**
-	 * 
-	 * @Title: findById 
-	 * @Description: TODO(根据主键获取单个对象) 
-	 * @param @param id
-	 * @throws
-	 */
-	@RequestMapping(value="/{id}",method = RequestMethod.GET)
-	public T findById(@PathVariable("id") ID id){
-		return baseService.findById(id);
-	}
-	
-	/**
-	 * 
-	 * @Title: delete 
-	 * @Description: TODO(根据主键删除对象) 
-	 * @param @param id
-	 * @throws
-	 */
-	@RequestMapping(value="/{id}",method = RequestMethod.DELETE)
-	public Map<String, Object> delete(@PathVariable("id") ID id){
-		return baseService.delete(id);
-	}
-	
-}
+package com.bsth.controller;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.bsth.service.BaseService;
+
+/**
+ * 
+ * @ClassName: BaseController 
+ * @Description: TODO(基础的Controller实现) 
+ * @author PanZhao 
+ * @date 2016年3月17日 下午12:44:06 
+ * 
+ * @param <T>
+ * @param <ID> 主键类型
+ */
+public class BaseController<T, ID extends Serializable> {
+	
+	@Autowired
+	BaseService<T, ID> baseService;
+	
+	/**
+	 * 
+	 * @Title: list 
+	 * @Description: TODO(多条件分页查询) 
+	 * @param @param map 查询条件
+	 * @param @param page 页码
+	 * @param @param size 每页显示数量
+	 * @throws
+	 */
+	@RequestMapping(method = RequestMethod.GET)
+	public Page<T> list(@RequestParam Map<String, Object> map,
+			@RequestParam(defaultValue = "0") int page,
+			@RequestParam(defaultValue = "10") int size,
+			@RequestParam(defaultValue = "id") String order,
+			@RequestParam(defaultValue = "DESC") String direction){
+		
+		Direction d;
+		
+		if(null != direction && direction.equals("ASC"))
+			d = Direction.ASC;
+		else
+			d = Direction.DESC;
+		
+		return baseService.list(map, new PageRequest(page, size, new Sort(d, order)));
+	}
+	
+	/**
+	 * 
+	 * @Title: list 
+	 * @Description: TODO(多条件查询) 
+	 * @param @param map
+	 * @throws
+	 */
+	@RequestMapping(value = "/all", method = RequestMethod.GET)
+	public Iterable<T> list(@RequestParam Map<String, Object> map){
+		return baseService.list(map);
+	}
+	
+	/**
+	 * 
+	 * @Title: save 
+	 * @Description: TODO(持久化对象) 
+	 * @param @param t
+	 * @param @return    设定文件 
+	 * @return Map<String,Object>  {status: 1（成功），-1（失败）}
+	 * @throws
+	 */
+	@RequestMapping(method = RequestMethod.POST)
+	public Map<String, Object> save(T t){
+		return baseService.save(t);
+	}
+	
+	/**
+	 * 
+	 * @Title: findById 
+	 * @Description: TODO(根据主键获取单个对象) 
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value="/{id}",method = RequestMethod.GET)
+	public T findById(@PathVariable("id") ID id){
+		return baseService.findById(id);
+	}
+	
+	/**
+	 * 
+	 * @Title: delete 
+	 * @Description: TODO(根据主键删除对象) 
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value="/{id}",method = RequestMethod.DELETE)
+	public Map<String, Object> delete(@PathVariable("id") ID id){
+		return baseService.delete(id);
+	}
+	
+}
+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 org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bsth.entity.sys.Dictionary;
-
-@RestController
-@RequestMapping("dictionary")
-public class DictionaryController extends BaseController<Dictionary, Integer>{
-
-}
+package com.bsth.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.entity.sys.Dictionary;
+
+@RestController
+@RequestMapping("dictionary")
+public class DictionaryController extends BaseController<Dictionary, Integer>{
+
+}
-package com.bsth.controller;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bsth.entity.sys.Module;
-import com.bsth.service.ModuleService;
-
-@RestController
-@RequestMapping("module")
-public class ModuleController extends BaseController<Module, Integer>{
-
-	@Autowired
-	ModuleService moduleService;
-	
-	@RequestMapping(value = "/findByGroupType")
-	public List<Module> findByGroupType(@RequestParam String group){
-		return moduleService.findByGroupType(group);
-	}
-	
-	/**
-	 * 
-	 * @Title: findByRoleId 
-	 * @Description: TODO(根据角色获取功能模块) 
-	 * @param @param roleId
-	 * @throws
-	 */
-	@RequestMapping(value = "/findByCurrentUser")
-	public List<Module> findByCurrentUser(){
-		return moduleService.findByCurrentUser();
-	}
-}
+package com.bsth.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.entity.sys.Module;
+import com.bsth.service.ModuleService;
+
+@RestController
+@RequestMapping("module")
+public class ModuleController extends BaseController<Module, Integer>{
+
+	@Autowired
+	ModuleService moduleService;
+	
+	@RequestMapping(value = "/findByGroupType")
+	public List<Module> findByGroupType(@RequestParam String group){
+		return moduleService.findByGroupType(group);
+	}
+	
+	/**
+	 * 
+	 * @Title: findByRoleId 
+	 * @Description: TODO(根据角色获取功能模块) 
+	 * @param @param roleId
+	 * @throws
+	 */
+	@RequestMapping(value = "/findByCurrentUser")
+	public List<Module> findByCurrentUser(){
+		return moduleService.findByCurrentUser();
+	}
+}
-package com.bsth.controller;
-
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.alibaba.fastjson.JSON;
-import com.bsth.entity.sys.Resource;
-import com.bsth.service.ResourceService;
-
-@RestController
-@RequestMapping("resource")
-public class ResourceController extends BaseController<Resource, Integer>{
-	
-	@Autowired
-	ResourceService resourceService;
-	
-	@RequestMapping(value = "/batch", method = RequestMethod.POST)
-	public Map<String, Object> save(@RequestParam String array){
-		return resourceService.saveList(JSON.parseArray(array, Resource.class));
-	}
-}
+package com.bsth.controller;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.bsth.entity.sys.Resource;
+import com.bsth.service.ResourceService;
+
+@RestController
+@RequestMapping("resource")
+public class ResourceController extends BaseController<Resource, Integer>{
+	
+	@Autowired
+	ResourceService resourceService;
+	
+	@RequestMapping(value = "/batch", method = RequestMethod.POST)
+	public Map<String, Object> save(@RequestParam String array){
+		return resourceService.saveList(JSON.parseArray(array, Resource.class));
+	}
+}
-package com.bsth.controller;
-
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bsth.entity.sys.Role;
-import com.bsth.service.RoleService;
-
-@RestController
-@RequestMapping("role")
-public class RoleController extends BaseController<Role, Integer>{
-	
-	
-	@Autowired
-	RoleService roleService;
-	
-	/**
-	 * 
-	 * @Title: settRoleModules 
-	 * @Description: TODO(为角色设置模块，全量覆盖) 
-	 * @param @param roleId 角色ID
-	 * @param @param mIds  模块ID字符串（1,2,3,4）
-	 * @throws
-	 */
-	@RequestMapping(value = "/settModules", method = RequestMethod.POST)
-	public Map<String, Object> settRoleModules(@RequestParam Integer roleId,@RequestParam String mIds){
-		return roleService.settRoleModules(roleId, mIds);
-	}
-}
+package com.bsth.controller;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.entity.sys.Role;
+import com.bsth.service.RoleService;
+
+@RestController
+@RequestMapping("role")
+public class RoleController extends BaseController<Role, Integer>{
+	
+	
+	@Autowired
+	RoleService roleService;
+	
+	/**
+	 * 
+	 * @Title: settRoleModules 
+	 * @Description: TODO(为角色设置模块，全量覆盖) 
+	 * @param @param roleId 角色ID
+	 * @param @param mIds  模块ID字符串（1,2,3,4）
+	 * @throws
+	 */
+	@RequestMapping(value = "/settModules", method = RequestMethod.POST)
+	public Map<String, Object> settRoleModules(@RequestParam Integer roleId,@RequestParam String mIds){
+		return roleService.settRoleModules(roleId, mIds);
+	}
+}
 package com.bsth.controller;
+import java.util.Map;
+
+import org.hibernate.annotations.Parameter;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.alibaba.fastjson.JSONArray;
 import com.bsth.entity.Station;
+import com.bsth.service.StationService;
 /**
  * 
@@ -24,5 +32,23 @@ import com.bsth.entity.Station;
 @RestController
 @RequestMapping("station")
 public class StationController extends BaseController<Station, Integer> {
-
+	
+	@Autowired
+	private StationService service;
+	
+	@RequestMapping(value="collection" , method = RequestMethod.POST)
+	public Map<String, Object> collection(@RequestParam Map<String, Object> map) {
+		
+		String strJSON = map.get("json").toString().equals("")  ? "" : map.get("json").toString();
+		
+		if(!strJSON.equals("")) {
+			
+			JSONArray stationsArray = JSONArray.parseArray(strJSON);
+			
+			
+			
+		}
+		
+		return null;
+	}
 }
-package com.bsth.controller;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
-import org.springframework.security.web.authentication.session.SessionAuthenticationException;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.bsth.entity.sys.SysUser;
-
-@RestController
-@RequestMapping("user")
-public class UserController extends BaseController<SysUser, Integer>{
-	
-	/**
-	 * 
-	 * @Title: loginFailure 
-	 * @Description: TODO(查询登录失败的详细信息) 
-	 * @param @param request
-	 * @return String    返回类型 
-	 * @throws
-	 */
-	@RequestMapping("/loginFailure")
-	public String loginFailure(HttpServletRequest request){
-		String msg = "";
-		HttpSession session = request.getSession();
-		
-		Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION");
-		
-		if(obj instanceof BadCredentialsException)
-			msg = "登录失败，用户名或密码错误.";
-		else if(obj instanceof SessionAuthenticationException)
-			msg = "登录失败，当前策略不允许重复登录.";
-		session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION");
-		return msg;
-	}
-	
-	/**
-	 * 
-	 * @Title: logout 
-	 * @Description: TODO(注销吧皮卡丘) 
-	 * @param @param request
-	 * @return ModelAndView    返回类型 
-	 * @throws
-	 */
-	@RequestMapping("/logout")
-	public ModelAndView logout(HttpServletRequest request, HttpServletResponse response){
-		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-		if (auth != null){
-			new SecurityContextLogoutHandler().logout(request, response, auth);
-		}
-		return new ModelAndView("/");
-	}
-}
+package com.bsth.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
+import org.springframework.security.web.authentication.session.SessionAuthenticationException;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.bsth.entity.sys.SysUser;
+
+@RestController
+@RequestMapping("user")
+public class UserController extends BaseController<SysUser, Integer>{
+	
+	/**
+	 * 
+	 * @Title: loginFailure 
+	 * @Description: TODO(查询登录失败的详细信息) 
+	 * @param @param request
+	 * @return String    返回类型 
+	 * @throws
+	 */
+	@RequestMapping("/loginFailure")
+	public String loginFailure(HttpServletRequest request){
+		String msg = "";
+		HttpSession session = request.getSession();
+		
+		Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION");
+		
+		if(obj instanceof BadCredentialsException)
+			msg = "登录失败，用户名或密码错误.";
+		else if(obj instanceof SessionAuthenticationException)
+			msg = "登录失败，当前策略不允许重复登录.";
+		session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION");
+		return msg;
+	}
+	
+	/**
+	 * 
+	 * @Title: logout 
+	 * @Description: TODO(注销吧皮卡丘) 
+	 * @param @param request
+	 * @return ModelAndView    返回类型 
+	 * @throws
+	 */
+	@RequestMapping("/logout")
+	public ModelAndView logout(HttpServletRequest request, HttpServletResponse response){
+		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+		if (auth != null){
+			new SecurityContextLogoutHandler().logout(request, response, auth);
+		}
+		return new ModelAndView("/");
+	}
+}
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.schedule.BusinessInfo;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by xu on 16/5/11.
- */
-@RestController
-@RequestMapping("bic")
-public class BusinessInfoController extends BaseController<BusinessInfo, Long> {
-}
+package com.bsth.controller.schedule;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.schedule.BusinessInfo;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by xu on 16/5/11.
+ */
+@RestController
+@RequestMapping("bic")
+public class BusinessInfoController extends BaseController<BusinessInfo, Long> {
+}
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.schedule.CarConfigInfo;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by xu on 16/5/9.
- */
-@RestController
-@RequestMapping("cci")
-public class CarConfigInfoController extends BaseController<CarConfigInfo, Long> {
-}
+package com.bsth.controller.schedule;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.schedule.CarConfigInfo;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by xu on 16/5/9.
+ */
+@RestController
+@RequestMapping("cci")
+public class CarConfigInfoController extends BaseController<CarConfigInfo, Long> {
+}
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.schedule.EmployeeConfigInfo;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by xu on 16/5/10.
- */
-@RestController
-@RequestMapping("eci")
-public class EmployeeConfigInfoController extends BaseController<EmployeeConfigInfo, Long> {
-}
+package com.bsth.controller.schedule;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.schedule.EmployeeConfigInfo;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by xu on 16/5/10.
+ */
+@RestController
+@RequestMapping("eci")
+public class EmployeeConfigInfoController extends BaseController<EmployeeConfigInfo, Long> {
+}
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.schedule.GuideboardInfo;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by xu on 16/5/11.
- */
-@RestController
-@RequestMapping("gic")
-public class GuideboardInfoController extends BaseController<GuideboardInfo, Long> {
-}
+package com.bsth.controller.schedule;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.schedule.GuideboardInfo;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by xu on 16/5/11.
+ */
+@RestController
+@RequestMapping("gic")
+public class GuideboardInfoController extends BaseController<GuideboardInfo, Long> {
+}
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.schedule.TTInfo;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by xu on 16/5/12.
- */
-@RestController
-@RequestMapping("tic")
-public class TTInfoController extends BaseController<TTInfo, Long> {
-}
+package com.bsth.controller.schedule;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.schedule.TTInfo;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by xu on 16/5/12.
+ */
+@RestController
+@RequestMapping("tic")
+public class TTInfoController extends BaseController<TTInfo, Long> {
+}
-package com.bsth.entity;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * 车辆设备信息（记录车辆设备变更情况，因为是历史表，字段不做关联）
- */
-@Entity
-@Table(name = "bsth_c_car_device")
-public class CarDevice {
-
-    /** 主键 */
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    /** 公司名称 */
-    @Column(nullable = false)
-    private String gsName;
-    /** 内部编号（自编号） */
-    private String clZbh;
-    /** 线路名称 */
-    private String xlName;
-
-    /** 旧终端号 */
-    private String oldDeviceNo;
-    /** 新终端号 */
-    private String newDeviceNo;
-    /** 旧SIM卡号 */
-    private String oldSimNo;
-    /** 新SIM卡号 */
-    private String newSimNo;
-
-    /** 故障描述 */
-    private String troubleDesc;
-    /** 保修描述 */
-    private String guaranteeDesc;
-
-    // 创建日期
-    @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 String getGsName() {
-        return gsName;
-    }
-
-    public void setGsName(String gsName) {
-        this.gsName = gsName;
-    }
-
-    public String getClZbh() {
-        return clZbh;
-    }
-
-    public void setClZbh(String clZbh) {
-        this.clZbh = clZbh;
-    }
-
-    public String getXlName() {
-        return xlName;
-    }
-
-    public void setXlName(String xlName) {
-        this.xlName = xlName;
-    }
-
-    public String getOldDeviceNo() {
-        return oldDeviceNo;
-    }
-
-    public void setOldDeviceNo(String oldDeviceNo) {
-        this.oldDeviceNo = oldDeviceNo;
-    }
-
-    public String getNewDeviceNo() {
-        return newDeviceNo;
-    }
-
-    public void setNewDeviceNo(String newDeviceNo) {
-        this.newDeviceNo = newDeviceNo;
-    }
-
-    public String getOldSimNo() {
-        return oldSimNo;
-    }
-
-    public void setOldSimNo(String oldSimNo) {
-        this.oldSimNo = oldSimNo;
-    }
-
-    public String getNewSimNo() {
-        return newSimNo;
-    }
-
-    public void setNewSimNo(String newSimNo) {
-        this.newSimNo = newSimNo;
-    }
-
-    public String getTroubleDesc() {
-        return troubleDesc;
-    }
-
-    public void setTroubleDesc(String troubleDesc) {
-        this.troubleDesc = troubleDesc;
-    }
-
-    public String getGuaranteeDesc() {
-        return guaranteeDesc;
-    }
-
-    public void setGuaranteeDesc(String guaranteeDesc) {
-        this.guaranteeDesc = guaranteeDesc;
-    }
-
-    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;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 车辆设备信息（记录车辆设备变更情况，因为是历史表，字段不做关联）
+ */
+@Entity
+@Table(name = "bsth_c_car_device")
+public class CarDevice {
+
+    /** 主键 */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 公司名称 */
+    @Column(nullable = false)
+    private String gsName;
+    /** 内部编号（自编号） */
+    private String clZbh;
+    /** 线路名称 */
+    private String xlName;
+
+    /** 旧终端号 */
+    private String oldDeviceNo;
+    /** 新终端号 */
+    private String newDeviceNo;
+    /** 旧SIM卡号 */
+    private String oldSimNo;
+    /** 新SIM卡号 */
+    private String newSimNo;
+
+    /** 故障描述 */
+    private String troubleDesc;
+    /** 保修描述 */
+    private String guaranteeDesc;
+
+    // 创建日期
+    @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 String getGsName() {
+        return gsName;
+    }
+
+    public void setGsName(String gsName) {
+        this.gsName = gsName;
+    }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+    public String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
+
+    public String getOldDeviceNo() {
+        return oldDeviceNo;
+    }
+
+    public void setOldDeviceNo(String oldDeviceNo) {
+        this.oldDeviceNo = oldDeviceNo;
+    }
+
+    public String getNewDeviceNo() {
+        return newDeviceNo;
+    }
+
+    public void setNewDeviceNo(String newDeviceNo) {
+        this.newDeviceNo = newDeviceNo;
+    }
+
+    public String getOldSimNo() {
+        return oldSimNo;
+    }
+
+    public void setOldSimNo(String oldSimNo) {
+        this.oldSimNo = oldSimNo;
+    }
+
+    public String getNewSimNo() {
+        return newSimNo;
+    }
+
+    public void setNewSimNo(String newSimNo) {
+        this.newSimNo = newSimNo;
+    }
+
+    public String getTroubleDesc() {
+        return troubleDesc;
+    }
+
+    public void setTroubleDesc(String troubleDesc) {
+        this.troubleDesc = troubleDesc;
+    }
+
+    public String getGuaranteeDesc() {
+        return guaranteeDesc;
+    }
+
+    public void setGuaranteeDesc(String guaranteeDesc) {
+        this.guaranteeDesc = guaranteeDesc;
+    }
+
+    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;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+
+/**
+ * 
+ * @ClassName: Line(停车场类)
+ * 
+ * @Description: TODO(停车场)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016-06-01 16:06:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_car_park")
+public class CarPark {
+	
+	@Id
+	@GeneratedValue
+	private Integer id;
+	
+	// 停车场编号
+	private String parkCode;
+	
+	// 停车场名称
+	private String parkName;
+	
+	// 地理位置
+	private String parkPoint;
+	
+	// 面积
+	private double area;
+	
+	// 所属公司
+	private String company;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getParkCode() {
+		return parkCode;
+	}
+
+	public void setParkCode(String parkCode) {
+		this.parkCode = parkCode;
+	}
+
+	public String getParkName() {
+		return parkName;
+	}
+
+	public void setParkName(String parkName) {
+		this.parkName = parkName;
+	}
+
+	public String getParkPoint() {
+		return parkPoint;
+	}
+
+	public void setParkPoint(String parkPoint) {
+		this.parkPoint = parkPoint;
+	}
+
+	public double getArea() {
+		return area;
+	}
+
+	public void setArea(double area) {
+		this.area = area;
+	}
+
+	public String getCompany() {
+		return company;
+	}
+
+	public void setCompany(String company) {
+		this.company = company;
+	}
+}
 package com.bsth.entity;
+import com.bsth.entity.sys.SysUser;
+
 import javax.persistence.*;
 import java.util.Date;
@@ -27,7 +29,7 @@ public class Cars {
 	private Integer id;
     /** 自编号/内部编号 */
-    @Column(nullable = false, length = 8)
+    @Column(nullable = false, length = 8, unique = true)
     private String insideCode;
     // 公司、分公司暂时不用关联实体
@@ -42,7 +44,7 @@ public class Cars {
     /** 分公司 */
     private String brancheCompany;
-    /** 车辆编码 */
+    /** 车辆编码（TODO：在原系统里没有，这里暂时留着） */
     @Column(nullable = false)
 	private String carCode;
     /** 车牌号 */
@@ -94,421 +96,423 @@ public class Cars {
     private Date closeDate;
 	/** 是否空调车 */
-	private boolean hvacCar;
+    @Column(nullable = true)
+    private Boolean hvacCar;
 	/** 有无人售票 */
-	private boolean ticketType;
+    @Column(nullable = true)
+	private Boolean ticketType;
     /** 是否有LED服务屏 */
-    private boolean ledScreen;
+    @Column(nullable = true)
+    private Boolean ledScreen;
 	/** 是否有TV视频 */
-	private boolean tvVideoType;
+    @Column(nullable = true)
+	private Boolean tvVideoType;
 	/** 车辆类型 */
 	private String carType;
     /** 是否机动车（机动车类型选择）*/
-    private String VehicleStats;
+    private String vehicleStats;
     /** 营运状态 */
-    private Integer operatorsState;
-    /** 是否电车 */
-    private boolean sfdc;
+    private String operatorsState;
+    /** 是否电车（TODO：在原系统里没有，这里暂时留着） */
+    private Boolean sfdc;
     /** 备注/描述 */
     private String descriptions;
-
-	
-	// 车辆序号
+	/** 车辆序号（TODO：在原系统里没有，这里暂时留着） */
 	private String carOrdinal;
-	// 视频编号
+	/** 视频编号 */
 	private String videoCode;
-	// 是否报废
-	private boolean scrapState;
-	// 是否切换
+	/** 是否报废 */
+    @Column(nullable = true)
+	private Boolean scrapState;
+	/** 是否切换（TODO：在原系统里没有，这里暂时留着）*/
 	private Integer isSwitch;
-	
+    /** 线路名称（TODO：在原系统里没有，这里暂时留着，并且不做线路关联，只保留个名字） */
+    private String xlmc;
-		
-	// 创建人
-	private Integer createBy;
+
+	/** 创建人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+	private SysUser createBy;
-	// 修改人
-	private Integer updateBy;
+	/** 修改人 */
+    @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;
-	
-	// 线路ID
-	@OneToOne
-	private Line lineid;
-	public Integer getId() {
-		return id;
-	}
+    public Integer getId() {
+        return id;
+    }
-	public void setId(Integer id) {
-		this.id = id;
-	}
+    public void setId(Integer id) {
+        this.id = id;
+    }
-	public String getCarCode() {
-		return carCode;
-	}
+    public String getInsideCode() {
+        return insideCode;
+    }
-	public void setCarCode(String carCode) {
-		this.carCode = carCode;
-	}
+    public void setInsideCode(String insideCode) {
+        this.insideCode = insideCode;
+    }
-	public String getCarPlate() {
-		return carPlate;
-	}
+    public String getBusinessCode() {
+        return businessCode;
+    }
-	public void setCarPlate(String carPlate) {
-		this.carPlate = carPlate;
-	}
+    public void setBusinessCode(String businessCode) {
+        this.businessCode = businessCode;
+    }
-	public String getInsideCode() {
-		return insideCode;
-	}
+    public String getCompany() {
+        return company;
+    }
-	public void setInsideCode(String insideCode) {
-		this.insideCode = insideCode;
-	}
+    public void setCompany(String company) {
+        this.company = company;
+    }
-	public String getCarClass() {
-		return carClass;
-	}
+    public String getBrancheCompanyCode() {
+        return brancheCompanyCode;
+    }
-	public void setCarClass(String carClass) {
-		this.carClass = carClass;
-	}
+    public void setBrancheCompanyCode(String brancheCompanyCode) {
+        this.brancheCompanyCode = brancheCompanyCode;
+    }
-	public Integer getCarSeatnNumber() {
-		return carSeatnNumber;
-	}
+    public String getBrancheCompany() {
+        return brancheCompany;
+    }
-	public void setCarSeatnNumber(Integer carSeatnNumber) {
-		this.carSeatnNumber = carSeatnNumber;
-	}
+    public void setBrancheCompany(String brancheCompany) {
+        this.brancheCompany = brancheCompany;
+    }
-	public String getCarStandard() {
-		return carStandard;
-	}
+    public String getCarCode() {
+        return carCode;
+    }
-	public void setCarStandard(String carStandard) {
-		this.carStandard = carStandard;
-	}
+    public void setCarCode(String carCode) {
+        this.carCode = carCode;
+    }
-	public Double getSpeed() {
-		return speed;
-	}
+    public String getCarPlate() {
+        return carPlate;
+    }
-	public void setSpeed(Double speed) {
-		this.speed = speed;
-	}
+    public void setCarPlate(String carPlate) {
+        this.carPlate = carPlate;
+    }
-	public boolean isHvacCar() {
-		return hvacCar;
-	}
+    public String getSupplierName() {
+        return supplierName;
+    }
-	public void setHvacCar(boolean hvacCar) {
-		this.hvacCar = hvacCar;
-	}
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
-	public Double getKburnStandard() {
-		return kburnStandard;
-	}
+    public String getEquipmentCode() {
+        return equipmentCode;
+    }
-	public void setKburnStandard(Double kburnStandard) {
-		this.kburnStandard = kburnStandard;
-	}
+    public void setEquipmentCode(String equipmentCode) {
+        this.equipmentCode = equipmentCode;
+    }
-	public Double getGburnStandard() {
-		return gburnStandard;
-	}
+    public String getCarClass() {
+        return carClass;
+    }
-	public void setGburnStandard(Double gburnStandard) {
-		this.gburnStandard = gburnStandard;
-	}
+    public void setCarClass(String carClass) {
+        this.carClass = carClass;
+    }
-	public boolean isTicketType() {
-		return ticketType;
-	}
+    public Double getSpeed() {
+        return speed;
+    }
-	public void setTicketType(boolean ticketType) {
-		this.ticketType = ticketType;
-	}
+    public void setSpeed(Double speed) {
+        this.speed = speed;
+    }
-	public boolean isTvVideoType() {
-		return tvVideoType;
-	}
+    public Integer getCarSeatnNumber() {
+        return carSeatnNumber;
+    }
-	public void setTvVideoType(boolean tvVideoType) {
-		this.tvVideoType = tvVideoType;
-	}
+    public void setCarSeatnNumber(Integer carSeatnNumber) {
+        this.carSeatnNumber = carSeatnNumber;
+    }
-	public boolean isLedScreen() {
-		return ledScreen;
-	}
+    public String getCarStandard() {
+        return carStandard;
+    }
-	public void setLedScreen(boolean ledScreen) {
-		this.ledScreen = ledScreen;
-	}
+    public void setCarStandard(String carStandard) {
+        this.carStandard = carStandard;
+    }
-	public String getEquipmentCode() {
-		return equipmentCode;
-	}
+    public Double getKburnStandard() {
+        return kburnStandard;
+    }
-	public void setEquipmentCode(String equipmentCode) {
-		this.equipmentCode = equipmentCode;
-	}
+    public void setKburnStandard(Double kburnStandard) {
+        this.kburnStandard = kburnStandard;
+    }
-	public String getMakeCodeOne() {
-		return makeCodeOne;
-	}
+    public Double getGburnStandard() {
+        return gburnStandard;
+    }
-	public void setMakeCodeOne(String makeCodeOne) {
-		this.makeCodeOne = makeCodeOne;
-	}
+    public void setGburnStandard(Double gburnStandard) {
+        this.gburnStandard = gburnStandard;
+    }
-	public String getMakeCodeTwo() {
-		return makeCodeTwo;
-	}
+    public String getScrapCode() {
+        return scrapCode;
+    }
-	public void setMakeCodeTwo(String makeCodeTwo) {
-		this.makeCodeTwo = makeCodeTwo;
-	}
+    public void setScrapCode(String scrapCode) {
+        this.scrapCode = scrapCode;
+    }
-	public String getCarGride() {
-		return carGride;
-	}
+    public Date getScrapDate() {
+        return scrapDate;
+    }
-	public void setCarGride(String carGride) {
-		this.carGride = carGride;
-	}
+    public void setScrapDate(Date scrapDate) {
+        this.scrapDate = scrapDate;
+    }
-	public String getEmissionsStandard() {
-		return emissionsStandard;
-	}
+    public String getMakeCodeOne() {
+        return makeCodeOne;
+    }
-	public void setEmissionsStandard(String emissionsStandard) {
-		this.emissionsStandard = emissionsStandard;
-	}
+    public void setMakeCodeOne(String makeCodeOne) {
+        this.makeCodeOne = makeCodeOne;
+    }
-	public String getEngineCodeOne() {
-		return engineCodeOne;
-	}
+    public String getMakeCodeTwo() {
+        return makeCodeTwo;
+    }
-	public void setEngineCodeOne(String engineCodeOne) {
-		this.engineCodeOne = engineCodeOne;
-	}
+    public void setMakeCodeTwo(String makeCodeTwo) {
+        this.makeCodeTwo = makeCodeTwo;
+    }
-	public String getEngineCodeTwo() {
-		return engineCodeTwo;
-	}
+    public String getCarGride() {
+        return carGride;
+    }
-	public void setEngineCodeTwo(String engineCodeTwo) {
-		this.engineCodeTwo = engineCodeTwo;
-	}
+    public void setCarGride(String carGride) {
+        this.carGride = carGride;
+    }
-	public String getCarNumberOne() {
-		return carNumberOne;
-	}
+    public String getEmissionsStandard() {
+        return emissionsStandard;
+    }
-	public void setCarNumberOne(String carNumberOne) {
-		this.carNumberOne = carNumberOne;
-	}
+    public void setEmissionsStandard(String emissionsStandard) {
+        this.emissionsStandard = emissionsStandard;
+    }
-	public String getCarNumberTwo() {
-		return carNumberTwo;
-	}
+    public String getEngineCodeOne() {
+        return engineCodeOne;
+    }
-	public void setCarNumberTwo(String carNumberTwo) {
-		this.carNumberTwo = carNumberTwo;
-	}
+    public void setEngineCodeOne(String engineCodeOne) {
+        this.engineCodeOne = engineCodeOne;
+    }
-	public String getCarType() {
-		return carType;
-	}
+    public String getEngineCodeTwo() {
+        return engineCodeTwo;
+    }
-	public void setCarType(String carType) {
-		this.carType = carType;
-	}
+    public void setEngineCodeTwo(String engineCodeTwo) {
+        this.engineCodeTwo = engineCodeTwo;
+    }
-	public String getBusinessCode() {
-		return businessCode;
-	}
+    public String getCarNumberOne() {
+        return carNumberOne;
+    }
-	public void setBusinessCode(String businessCode) {
-		this.businessCode = businessCode;
-	}
+    public void setCarNumberOne(String carNumberOne) {
+        this.carNumberOne = carNumberOne;
+    }
-	public String getCompany() {
-		return company;
-	}
+    public String getCarNumberTwo() {
+        return carNumberTwo;
+    }
-	public void setCompany(String company) {
-		this.company = company;
-	}
+    public void setCarNumberTwo(String carNumberTwo) {
+        this.carNumberTwo = carNumberTwo;
+    }
-	public String getBrancheCompany() {
-		return brancheCompany;
-	}
+    public Date getOpenDate() {
+        return openDate;
+    }
-	public void setBrancheCompany(String brancheCompany) {
-		this.brancheCompany = brancheCompany;
-	}
+    public void setOpenDate(Date openDate) {
+        this.openDate = openDate;
+    }
-	public String getCarOrdinal() {
-		return carOrdinal;
-	}
+    public Date getCloseDate() {
+        return closeDate;
+    }
-	public void setCarOrdinal(String carOrdinal) {
-		this.carOrdinal = carOrdinal;
-	}
+    public void setCloseDate(Date closeDate) {
+        this.closeDate = closeDate;
+    }
-	public String getVehicleStats() {
-		return VehicleStats;
-	}
+    public Boolean getHvacCar() {
+        return hvacCar;
+    }
-	public void setVehicleStats(String vehicleStats) {
-		VehicleStats = vehicleStats;
-	}
+    public void setHvacCar(Boolean hvacCar) {
+        this.hvacCar = hvacCar;
+    }
-	public String getVideoCode() {
-		return videoCode;
-	}
+    public Boolean getTicketType() {
+        return ticketType;
+    }
-	public void setVideoCode(String videoCode) {
-		this.videoCode = videoCode;
-	}
+    public void setTicketType(Boolean ticketType) {
+        this.ticketType = ticketType;
+    }
-	public Integer getOperatorsState() {
-		return operatorsState;
-	}
+    public Boolean getLedScreen() {
+        return ledScreen;
+    }
-	public void setOperatorsState(Integer operatorsState) {
-		this.operatorsState = operatorsState;
-	}
+    public void setLedScreen(Boolean ledScreen) {
+        this.ledScreen = ledScreen;
+    }
-	public Date getOpenDate() {
-		return openDate;
-	}
+    public Boolean getTvVideoType() {
+        return tvVideoType;
+    }
-	public void setOpenDate(Date openDate) {
-		this.openDate = openDate;
-	}
+    public void setTvVideoType(Boolean tvVideoType) {
+        this.tvVideoType = tvVideoType;
+    }
-	public Date getCloseDate() {
-		return closeDate;
-	}
+    public String getCarType() {
+        return carType;
+    }
-	public void setCloseDate(Date closeDate) {
-		this.closeDate = closeDate;
-	}
+    public void setCarType(String carType) {
+        this.carType = carType;
+    }
-	public boolean isScrapState() {
-		return scrapState;
-	}
+    public String getVehicleStats() {
+        return vehicleStats;
+    }
-	public void setScrapState(boolean scrapState) {
-		this.scrapState = scrapState;
-	}
+    public void setVehicleStats(String vehicleStats) {
+        this.vehicleStats = vehicleStats;
+    }
-	public String getScrapCode() {
-		return scrapCode;
-	}
+    public String getOperatorsState() {
+        return operatorsState;
+    }
-	public void setScrapCode(String scrapCode) {
-		this.scrapCode = scrapCode;
-	}
+    public void setOperatorsState(String operatorsState) {
+        this.operatorsState = operatorsState;
+    }
-	public Date getScrapDate() {
-		return scrapDate;
-	}
+    public Boolean getSfdc() {
+        return sfdc;
+    }
-	public void setScrapDate(Date scrapDate) {
-		this.scrapDate = scrapDate;
-	}
+    public void setSfdc(Boolean sfdc) {
+        this.sfdc = sfdc;
+    }
-	public Integer getIsSwitch() {
-		return isSwitch;
-	}
+    public String getDescriptions() {
+        return descriptions;
+    }
-	public void setIsSwitch(Integer isSwitch) {
-		this.isSwitch = isSwitch;
-	}
+    public void setDescriptions(String descriptions) {
+        this.descriptions = descriptions;
+    }
-	public String getDescriptions() {
-		return descriptions;
-	}
+    public String getCarOrdinal() {
+        return carOrdinal;
+    }
-	public void setDescriptions(String descriptions) {
-		this.descriptions = descriptions;
-	}
+    public void setCarOrdinal(String carOrdinal) {
+        this.carOrdinal = carOrdinal;
+    }
-	public Integer getCreateBy() {
-		return createBy;
-	}
+    public String getVideoCode() {
+        return videoCode;
+    }
-	public void setCreateBy(Integer createBy) {
-		this.createBy = createBy;
-	}
+    public void setVideoCode(String videoCode) {
+        this.videoCode = videoCode;
+    }
-	public Integer getUpdateBy() {
-		return updateBy;
-	}
+    public Boolean getScrapState() {
+        return scrapState;
+    }
-	public void setUpdateBy(Integer updateBy) {
-		this.updateBy = updateBy;
-	}
+    public void setScrapState(Boolean scrapState) {
+        this.scrapState = scrapState;
+    }
-	public Date getCreateDate() {
-		return createDate;
-	}
+    public Integer getIsSwitch() {
+        return isSwitch;
+    }
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
+    public void setIsSwitch(Integer isSwitch) {
+        this.isSwitch = isSwitch;
+    }
-	public Date getUpdateDate() {
-		return updateDate;
-	}
+    public String getXlmc() {
+        return xlmc;
+    }
-	public void setUpdateDate(Date updateDate) {
-		this.updateDate = updateDate;
-	}
+    public void setXlmc(String xlmc) {
+        this.xlmc = xlmc;
+    }
-	public Line getLineid() {
-		return lineid;
-	}
+    public SysUser getCreateBy() {
+        return createBy;
+    }
-	public void setLineid(Line lineid) {
-		this.lineid = lineid;
-	}
+    public void setCreateBy(SysUser createBy) {
+        this.createBy = createBy;
+    }
-    public String getBrancheCompanyCode() {
-        return brancheCompanyCode;
+    public SysUser getUpdateBy() {
+        return updateBy;
     }
-    public void setBrancheCompanyCode(String brancheCompanyCode) {
-        this.brancheCompanyCode = brancheCompanyCode;
+    public void setUpdateBy(SysUser updateBy) {
+        this.updateBy = updateBy;
     }
-    public String getSupplierName() {
-        return supplierName;
+    public Date getCreateDate() {
+        return createDate;
     }
-    public void setSupplierName(String supplierName) {
-        this.supplierName = supplierName;
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
     }
-    public boolean isSfdc() {
-        return sfdc;
+    public Date getUpdateDate() {
+        return updateDate;
     }
-    public void setSfdc(boolean sfdc) {
-        this.sfdc = sfdc;
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
     }
 }
 package com.bsth.entity;
-import java.util.Date;
+import com.bsth.entity.sys.SysUser;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
+import java.util.Date;
 /**
  * 
@@ -26,205 +22,224 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "bsth_c_personnel")
 public class Personnel {
-	
+
+    /** 主键Id */
 	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@GeneratedValue
 	private Integer id;
-	
-	// 人员编码
+
+    /** 所属公司 */
+    @Column(nullable = false)
+    private String company;
+    /** 公司编码 */
+    @Column(nullable = false)
+    private String companyCode;
+    /** 所属分公司 */
+    private String brancheCompany;
+    /** 分公司编码 */
+    private String brancheCompanyCode;
+    /** 工号 */
+    @Column(nullable = false, unique = true)
+    private String jobCode;
+    /** 姓名 */
+    @Column(nullable = false)
+    private String personnelName;
+
+    /** 运营服务证书号 */
+    private String papersCode;
+    /** 一卡通工作卡号 */
+    private String icCardCode;
+    /** 性别（TODO：暂时使用男/女，不使用字典） */
+    private String personnelType;
+    /** 所属岗位/工种（TODO：暂时不使用字典） */
+    private String posts;
+
+
+	/** 人员编码（TODO：在原系统里没有，这里暂时留着） */
 	private String personnelCode;
-	
-	// 工号
-	private String jobCode;
-	
-	// 姓名
-	private String personnelName;
-	
-	// 性别
-	private Integer personnelType;
-	
-	// 照片地址
+	/** 照片地址（TODO：在原系统里没有，这里暂时留着） */
 	private String personnelImg;
-	
-	// 线路编号
+	/** 线路编号（TODO：在原系统里没有，这里暂时留着） */
 	private String lineCode;
-	
-	// 一卡通工作卡号
-	private String icCardCode;
-	
-	// 运营服务证书号
-	private String papersCode;
-	
-	// 所属岗位
-	private String posts;
-	
-	// 所属公司
-	private String company;
-
-	// 分公司
-	private String brancheCompany;
-	
-	// 创建人
-	private Integer createBy;
-	
-	// 联系电话
+	/** 联系电话（TODO：在原系统里没有，这里暂时留着） */
 	private String telphone;
-	
-	// 修改人
-	private Integer updateBy;
-			
-	// 描述
-	private String descriptions;
-			
-	// 创建日期
+    /** 描述（TODO：在原系统里没有，这里暂时留着） */
+    private String descriptions;
+
+
+
+    /** 创建人 */
+    @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 Integer getId() {
-		return id;
-	}
-	public void setId(Integer id) {
-		this.id = id;
-	}
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public String getBrancheCompany() {
+        return brancheCompany;
+    }
+
+    public void setBrancheCompany(String brancheCompany) {
+        this.brancheCompany = brancheCompany;
+    }
+
+    public String getBrancheCompanyCode() {
+        return brancheCompanyCode;
+    }
+
+    public void setBrancheCompanyCode(String brancheCompanyCode) {
+        this.brancheCompanyCode = brancheCompanyCode;
+    }
+
+    public String getJobCode() {
+        return jobCode;
+    }
+
+    public void setJobCode(String jobCode) {
+        this.jobCode = jobCode;
+    }
+
+    public String getPersonnelName() {
+        return personnelName;
+    }
+
+    public void setPersonnelName(String personnelName) {
+        this.personnelName = personnelName;
+    }
+
+    public String getPapersCode() {
+        return papersCode;
+    }
+
+    public void setPapersCode(String papersCode) {
+        this.papersCode = papersCode;
+    }
+
+    public String getIcCardCode() {
+        return icCardCode;
+    }
+
+    public void setIcCardCode(String icCardCode) {
+        this.icCardCode = icCardCode;
+    }
+
+    public String getPersonnelType() {
+        return personnelType;
+    }
+
+    public void setPersonnelType(String personnelType) {
+        this.personnelType = personnelType;
+    }
+
+    public String getPosts() {
+        return posts;
+    }
-	public String getPersonnelCode() {
-		return personnelCode;
-	}
+    public void setPosts(String posts) {
+        this.posts = posts;
+    }
-	public void setPersonnelCode(String personnelCode) {
-		this.personnelCode = personnelCode;
-	}
+    public String getPersonnelCode() {
+        return personnelCode;
+    }
-	public String getJobCode() {
-		return jobCode;
-	}
+    public void setPersonnelCode(String personnelCode) {
+        this.personnelCode = personnelCode;
+    }
-	public void setJobCode(String jobCode) {
-		this.jobCode = jobCode;
-	}
+    public String getPersonnelImg() {
+        return personnelImg;
+    }
-	public String getPersonnelName() {
-		return personnelName;
-	}
+    public void setPersonnelImg(String personnelImg) {
+        this.personnelImg = personnelImg;
+    }
-	public void setPersonnelName(String personnelName) {
-		this.personnelName = personnelName;
-	}
+    public String getLineCode() {
+        return lineCode;
+    }
-	public Integer getPersonnelType() {
-		return personnelType;
-	}
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
-	public void setPersonnelType(Integer personnelType) {
-		this.personnelType = personnelType;
-	}
+    public String getTelphone() {
+        return telphone;
+    }
-	public String getPersonnelImg() {
-		return personnelImg;
-	}
-
-	public void setPersonnelImg(String personnelImg) {
-		this.personnelImg = personnelImg;
-	}
-
-	public String getLineCode() {
-		return lineCode;
-	}
-
-	public void setLineCode(String lineCode) {
-		this.lineCode = lineCode;
-	}
-
-	public String getIcCardCode() {
-		return icCardCode;
-	}
-
-	public void setIcCardCode(String icCardCode) {
-		this.icCardCode = icCardCode;
-	}
-
-	public String getPapersCode() {
-		return papersCode;
-	}
-
-	public void setPapersCode(String papersCode) {
-		this.papersCode = papersCode;
-	}
-
-	public String getPosts() {
-		return posts;
-	}
-
-	public void setPosts(String posts) {
-		this.posts = posts;
-	}
-
-	public String getCompany() {
-		return company;
-	}
-
-	public void setCompany(String company) {
-		this.company = company;
-	}
-
-	public String getBrancheCompany() {
-		return brancheCompany;
-	}
-
-	public void setBrancheCompany(String brancheCompany) {
-		this.brancheCompany = brancheCompany;
-	}
-
-	public Integer getCreateBy() {
-		return createBy;
-	}
-
-	public void setCreateBy(Integer createBy) {
-		this.createBy = createBy;
-	}
+    public void setTelphone(String telphone) {
+        this.telphone = telphone;
+    }
-	public String getTelphone() {
-		return telphone;
-	}
+    public String getDescriptions() {
+        return descriptions;
+    }
-	public void setTelphone(String telphone) {
-		this.telphone = telphone;
-	}
+    public void setDescriptions(String descriptions) {
+        this.descriptions = descriptions;
+    }
-	public Integer getUpdateBy() {
-		return updateBy;
-	}
+    public SysUser getCreateBy() {
+        return createBy;
+    }
-	public void setUpdateBy(Integer updateBy) {
-		this.updateBy = updateBy;
-	}
+    public void setCreateBy(SysUser createBy) {
+        this.createBy = createBy;
+    }
-	public String getDescriptions() {
-		return descriptions;
-	}
+    public SysUser getUpdateBy() {
+        return updateBy;
+    }
-	public void setDescriptions(String descriptions) {
-		this.descriptions = descriptions;
-	}
+    public void setUpdateBy(SysUser updateBy) {
+        this.updateBy = updateBy;
+    }
-	public Date getCreateDate() {
-		return createDate;
-	}
+    public Date getCreateDate() {
+        return createDate;
+    }
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
-	public Date getUpdateDate() {
-		return updateDate;
-	}
+    public Date getUpdateDate() {
+        return updateDate;
+    }
-	public void setUpdateDate(Date updateDate) {
-		this.updateDate = updateDate;
-	}
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
 }
-package com.bsth.entity.schedule;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * 线路运营信息汇总。
- * TODO：暂时这样写，演示后重新修正
- */
-@Entity
-@Table(name = "bsth_c_s_bi")
-public class BusinessInfo {
-
-    /** 主键Id */
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    /** TODO：之后修正 */
-    /** 线路名称 */
-    private String xlName;
-    /** 线路编码 */
-    private String xlBm;
-    /** 公司名称 */
-    private String gsName;
-    /** 分公司名称 */
-    private String fgsName;
-
-    /** 配车数 */
-    private int pcCount;
-    /** 人员数 */
-    private int ryCount;
-    /** 路牌数 */
-    private int lpCount;
-    /** 套跑数 */
-    private int tpCount;
-    /** 时刻表数 */
-    private int ttCount;
-    /** 调度规则数 */
-    private int srCount;
-    /** 调度计划数 */
-    private int spCount;
-
-    // 创建日期
-    @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 String getXlName() {
-        return xlName;
-    }
-
-    public void setXlName(String xlName) {
-        this.xlName = xlName;
-    }
-
-    public String getXlBm() {
-        return xlBm;
-    }
-
-    public void setXlBm(String xlBm) {
-        this.xlBm = xlBm;
-    }
-
-    public String getGsName() {
-        return gsName;
-    }
-
-    public void setGsName(String gsName) {
-        this.gsName = gsName;
-    }
-
-    public String getFgsName() {
-        return fgsName;
-    }
-
-    public void setFgsName(String fgsName) {
-        this.fgsName = fgsName;
-    }
-
-    public int getPcCount() {
-        return pcCount;
-    }
-
-    public void setPcCount(int pcCount) {
-        this.pcCount = pcCount;
-    }
-
-    public int getRyCount() {
-        return ryCount;
-    }
-
-    public void setRyCount(int ryCount) {
-        this.ryCount = ryCount;
-    }
-
-    public int getLpCount() {
-        return lpCount;
-    }
-
-    public void setLpCount(int lpCount) {
-        this.lpCount = lpCount;
-    }
-
-    public int getTpCount() {
-        return tpCount;
-    }
-
-    public void setTpCount(int tpCount) {
-        this.tpCount = tpCount;
-    }
-
-    public int getTtCount() {
-        return ttCount;
-    }
-
-    public void setTtCount(int ttCount) {
-        this.ttCount = ttCount;
-    }
-
-    public int getSrCount() {
-        return srCount;
-    }
-
-    public void setSrCount(int srCount) {
-        this.srCount = srCount;
-    }
-
-    public int getSpCount() {
-        return spCount;
-    }
-
-    public void setSpCount(int spCount) {
-        this.spCount = spCount;
-    }
-
-    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 javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 线路运营信息汇总。
+ * TODO：暂时这样写，演示后重新修正
+ */
+@Entity
+@Table(name = "bsth_c_s_bi")
+public class BusinessInfo {
+
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** TODO：之后修正 */
+    /** 线路名称 */
+    private String xlName;
+    /** 线路编码 */
+    private String xlBm;
+    /** 公司名称 */
+    private String gsName;
+    /** 分公司名称 */
+    private String fgsName;
+
+    /** 配车数 */
+    private int pcCount;
+    /** 人员数 */
+    private int ryCount;
+    /** 路牌数 */
+    private int lpCount;
+    /** 套跑数 */
+    private int tpCount;
+    /** 时刻表数 */
+    private int ttCount;
+    /** 调度规则数 */
+    private int srCount;
+    /** 调度计划数 */
+    private int spCount;
+
+    // 创建日期
+    @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 String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
+
+    public String getXlBm() {
+        return xlBm;
+    }
+
+    public void setXlBm(String xlBm) {
+        this.xlBm = xlBm;
+    }
+
+    public String getGsName() {
+        return gsName;
+    }
+
+    public void setGsName(String gsName) {
+        this.gsName = gsName;
+    }
+
+    public String getFgsName() {
+        return fgsName;
+    }
+
+    public void setFgsName(String fgsName) {
+        this.fgsName = fgsName;
+    }
+
+    public int getPcCount() {
+        return pcCount;
+    }
+
+    public void setPcCount(int pcCount) {
+        this.pcCount = pcCount;
+    }
+
+    public int getRyCount() {
+        return ryCount;
+    }
+
+    public void setRyCount(int ryCount) {
+        this.ryCount = ryCount;
+    }
+
+    public int getLpCount() {
+        return lpCount;
+    }
+
+    public void setLpCount(int lpCount) {
+        this.lpCount = lpCount;
+    }
+
+    public int getTpCount() {
+        return tpCount;
+    }
+
+    public void setTpCount(int tpCount) {
+        this.tpCount = tpCount;
+    }
+
+    public int getTtCount() {
+        return ttCount;
+    }
+
+    public void setTtCount(int ttCount) {
+        this.ttCount = ttCount;
+    }
+
+    public int getSrCount() {
+        return srCount;
+    }
+
+    public void setSrCount(int srCount) {
+        this.srCount = srCount;
+    }
+
+    public int getSpCount() {
+        return spCount;
+    }
+
+    public void setSpCount(int spCount) {
+        this.spCount = spCount;
+    }
+
+    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 javax.persistence.*;
-import java.util.Date;
-
-/**
- * 车辆配置信息。
- */
-@Entity
-@Table(name = "bsth_c_s_ccinfo")
-public class CarConfigInfo {
-
-    /** 主健Id */
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    /** TODO：等其他实体类完整后，做关联引用 */
-
-    /** 线路关联 */
-    @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;
-
-    /** 启用日期 */
-    private Date qyrq;
-    /** 终止日期 */
-    private Date zzrq;
-    /** 停车点（TODO：这个不知道是否要关联）（ */
-    private String tcd;
-    /** 受否切换（TODO：不懂） */
-    private int isSwitch;
-
-    // 创建日期
-    @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 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 Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    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 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 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(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Cars cl;
-    /** 人员关联（驾驶员） */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Personnel jsy;
-    /** 人员关联（售票员） */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Personnel spy;
-
-    /** 搭班编码（TODO：不懂） */
-    private String dbbm;
-
-    // 创建日期
-    @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 javax.persistence.*;
-import javax.persistence.Table;
-import java.util.Date;
-
-/**
- * 路牌信息。
- */
-@Entity
-@Table(name = "bsth_c_s_gbi")
-public class GuideboardInfo {
-
-    /** 主键Id */
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    /** 线路关联 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Line xl;
-
-    /** 路牌顺序号 */
-    private int lpNo;
-    /** 路牌名称 */
-    private String lpName;
-    /** 路牌类型（普通路牌／临加路牌） */
-    private String lpType;
-
-    // 创建日期
-    @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 int getLpNo() {
-        return lpNo;
-    }
-
-    public void setLpNo(int lpNo) {
-        this.lpNo = lpNo;
-    }
-
-    public String getLpName() {
-        return lpName;
-    }
-
-    public void setLpName(String lpName) {
-        this.lpName = lpName;
-    }
-
-    public String getLpType() {
-        return lpType;
-    }
-
-    public void setLpType(String lpType) {
-        this.lpType = lpType;
-    }
-
-    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 javax.persistence.*;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * 路牌信息。
+ */
+@Entity
+@Table(name = "bsth_c_s_gbi")
+public class GuideboardInfo {
+
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 线路关联 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Line xl;
+
+    /** 路牌顺序号 */
+    private int lpNo;
+    /** 路牌名称 */
+    private String lpName;
+    /** 路牌类型（普通路牌／临加路牌） */
+    private String lpType;
+
+    // 创建日期
+    @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 int getLpNo() {
+        return lpNo;
+    }
+
+    public void setLpNo(int lpNo) {
+        this.lpNo = lpNo;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getLpType() {
+        return lpType;
+    }
+
+    public void setLpType(String lpType) {
+        this.lpType = lpType;
+    }
+
+    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;
+    }
+}