Merge branch 'master' of 192.168.168.201:panzhaov5/bsth_control

# Conflicts: # src/main/java/com/bsth/repository/schedule/CarConfigInfoRepository.java

Merge branch 'master' of 192.168.168.201:panzhaov5/bsth_control
# Conflicts: # src/main/java/com/bsth/repository/schedule/CarConfigInfoRepository.java
潘钊
2 parents 37848c9a 4b9cb4e6
Showing 54 changed files with 2838 additions and 1426 deletions
pom.xml
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/controller/BaseController.java
src/main/java/com/bsth/controller/CarDeviceController.java
src/main/java/com/bsth/controller/CarParkController.java
src/main/java/com/bsth/controller/CarsController.java
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/controller/PersonnelController.java
src/main/java/com/bsth/controller/SectionRouteController.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/schedule/SchedulePlanController.java
src/main/java/com/bsth/controller/schedule/SchedulePlanInfoController.java
src/main/java/com/bsth/entity/CarPark.java
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/entity/Section.java
src/main/java/com/bsth/entity/Station.java
src/main/java/com/bsth/entity/schedule/GuideboardInfo.java
src/main/java/com/bsth/entity/schedule/TTInfo.java
src/main/java/com/bsth/entity/schedule/TTInfoDetail.java
@@ -102,7 +102,12 @@
 			<artifactId>guava</artifactId>
 			<version>19.0</version>
 		</dependency>
-
+		<!-- ftp文件上传包 -->
+		<dependency>
+		    <groupId>commons-net</groupId>
+		    <artifactId>commons-net</artifactId>
+		    <version>3.5</version>
+		</dependency>
         <!-- drools 6依赖 -->
         <dependency>
             <groupId>org.kie</groupId>
@@ -67,7 +67,7 @@ public class StartCommand implements CommandLineRunner{
 			//一分钟持久化一次实际排班
 			scheduler.scheduleWithFixedDelay(SchedulePersistenceThread, 60 * 1, 60 * 1, TimeUnit.SECONDS);
 			//将实际到离站和排班计划进行匹配 12秒一次
-			//scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 20, 1200, TimeUnit.SECONDS);
+			//scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 5, 1200, TimeUnit.SECONDS);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 package com.bsth.controller;
  
-import java.io.Serializable;
-import java.util.Map;
-
+import com.bsth.common.ResponseCode;
+import com.bsth.service.BaseService;
+import com.bsth.service.schedule.utils.DataImportExportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -12,8 +12,12 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
  
-import com.bsth.service.BaseService;
+import java.io.File;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
  
 /**
  * 
@@ -29,6 +33,8 @@ public class BaseController&lt;T, ID extends Serializable&gt; {
  
 	@Autowired
 	BaseService<T, ID> baseService;
+    @Autowired
+    DataImportExportService dataImportExportService;
  
 	/**
 	 * 
@@ -105,5 +111,41 @@ public class BaseController&lt;T, ID extends Serializable&gt; {
 	public Map<String, Object> delete(@PathVariable("id") ID id){
 		return baseService.delete(id);
 	}
+
+    /**
+     * 上传数据文件，并使用ktr转换文件导入数据。
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/dataImport", method = RequestMethod.POST)
+    public Map<String, Object> uploadDataAndImport(MultipartFile file) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+
+        try {
+            // 获取ktr转换文件绝对路径
+            File ktrfile = new File(this.getClass().getResource(getDataImportKtrClasspath()).toURI());
+            System.out.println(ktrfile.getAbsolutePath());
+            // 导入数据
+            dataImportExportService.fileDataImport(file, ktrfile);
+
+            resultMap.put("status", ResponseCode.SUCCESS);
+            resultMap.put("msg", "导入成功");
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            resultMap.put("status", ResponseCode.ERROR);
+            resultMap.put("msg", exp.getLocalizedMessage());
+        }
+
+        return resultMap;
+    }
+
+    /**
+     * @return 数据导入的ktr转换文件类路径。
+     */
+    protected String getDataImportKtrClasspath() {
+        // 默认返回异常，子类如果要使用导入功能，必须覆写此方法，指定ktr文件类路径
+        throw new RuntimeException("必须override，并指定ktr classpath");
+    }
  
 }
-package com.bsth.controller;
-
-import com.bsth.entity.CarDevice;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * Created by xu on 16/6/15.
- */
-@RestController
-@RequestMapping("carDevice")
-public class CarDeviceController extends BaseController<CarDevice, Long> {
-
-    /**
-     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
-     * @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(@RequestBody CarDevice t){
-        return baseService.save(t);
-    }
-}
+package com.bsth.controller;
+
+import com.bsth.entity.CarDevice;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * Created by xu on 16/6/15.
+ */
+@RestController
+@RequestMapping("carDevice")
+public class CarDeviceController extends BaseController<CarDevice, Long> {
+
+    /**
+     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
+     * @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(@RequestBody CarDevice t){
+        return baseService.save(t);
+    }
+}
+package com.bsth.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.CarPark;
+import com.bsth.service.CarParkService;
+import com.bsth.util.GetUIDAndCode;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@RequestMapping("carpark")
+public class CarParkController extends BaseController<CarPark, Integer> {
+	
+	@Autowired
+	CarParkService service;
+	
+	/**
+	 * @Description :TODO(查询停车场编码)
+	 * 
+	 * @return int <carParkCode 停车场编码>
+	 */
+	@RequestMapping(value="getCarParkCode" , method = RequestMethod.GET)
+	public long getStationCode() {
+		return GetUIDAndCode.getCarParkId();
+		
+	}
+	
+	@RequestMapping(value="carParkSave" , method = RequestMethod.POST)
+	public Map<String, Object> stationSave(@RequestParam Map<String, Object> map) {
+		
+		map.put("createBy", "");
+		
+		map.put("updateBy", "");
+		
+		return service.carParkSave(map);
+		
+	}
+	
+	@RequestMapping(value = "findCarParkInfoFormId",method = RequestMethod.GET)
+	public List<Map<String, Object>> findCarParkInfoFormId(@RequestParam Map<String, Object> map) {
+		
+		return service.findCarParkInfoFormId(map);
+	}
+	
+	@RequestMapping(value="carParkUpdate" , method = RequestMethod.POST)
+	public Map<String, Object> carParkUpdate(@RequestParam Map<String, Object> map) {
+		
+		map.put("updateBy", "");
+		
+		return service.carParkUpdate(map);
+		
+	}
+	
+}
 package com.bsth.controller;
  
-import com.bsth.common.ResponseCode;
 import com.bsth.entity.Cars;
 import com.bsth.service.schedule.utils.DataImportExportService;
 import com.bsth.service.schedule.utils.DataToolsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
  
-import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
  
 /**
@@ -51,28 +47,8 @@ public class CarsController extends BaseController&lt;Cars, Integer&gt; {
         return baseService.validateEquale(map);
     }
  
-    // 上传图片
-    @RequestMapping(value = "/dataImport", method = RequestMethod.POST)
-    public Map<String, Object> uploadPic(MultipartFile file) throws Exception {
-        Map<String, Object> resultMap = new HashMap<>();
-
-        try {
-            // 获取ktr转换文件绝对路径
-            File ktrfile = new File(this.getClass().getResource(
-                    dataToolsProperties.getCarsDatainputktr()).toURI());
-            System.out.println(ktrfile.getAbsolutePath());
-            // 导入数据
-            dataImportExportService.fileDataImport(file, ktrfile);
-
-            resultMap.put("status", ResponseCode.SUCCESS);
-            resultMap.put("msg", "导入成功");
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            resultMap.put("status", ResponseCode.ERROR);
-            resultMap.put("msg", exp.getLocalizedMessage());
-        }
-
-        return resultMap;
+    @Override
+    protected String getDataImportKtrClasspath() {
+        return dataToolsProperties.getCarsDatainputktr();
     }
-
 }
 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;
@@ -7,6 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
  
 import com.bsth.entity.Line;
 import com.bsth.service.LineService;
+import com.bsth.util.GetUIDAndCode;
  
 /**
  * 
@@ -31,12 +34,25 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 	private LineService service;
  
 	/**
-	 * 获取线路编码
+	 * 获取线路编码与ID
 	 * 
 	 * @return int <lineCode：线路编码>
 	 */
 	@RequestMapping(value = "getLineCode", method = RequestMethod.GET)
-	public int getLineCode() {
-		return service.selectMaxIdToLineCode();
+	public long getLineCode() {
+		return GetUIDAndCode.getLineId();
 	}
+	
+	/**
+	 * 
+	 * 保存
+	 * 
+	 */
+	@RequestMapping(method = RequestMethod.POST)
+	public Map<String, Object> save(Line t){
+		
+		t.setId(Integer.valueOf(t.getLineCode()));
+		
+		return service.save(t);
+	} 
 }
-package com.bsth.controller;
-
-import com.bsth.entity.Personnel;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * Created by xu on 16/6/15.
- */
-@RestController
-@RequestMapping("personnel")
-public class PersonnelController extends BaseController<Personnel, Integer> {
-    /**
-     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
-     * @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(@RequestBody Personnel t){
-        return baseService.save(t);
-    }
-
-    /**
-     * 验证。
-     * @param map
-     * @return
-     */
-    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
-    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
-        // 一般比较相同公司下工号是否相同
-        return baseService.validateEquale(map);
-    }
-}
+package com.bsth.controller;
+
+import com.bsth.entity.Personnel;
+import com.bsth.service.schedule.utils.DataImportExportService;
+import com.bsth.service.schedule.utils.DataToolsProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * Created by xu on 16/6/15.
+ */
+@RestController
+@RequestMapping("personnel")
+@EnableConfigurationProperties(DataToolsProperties.class)
+public class PersonnelController extends BaseController<Personnel, Integer> {
+
+    @Autowired
+    private DataImportExportService dataImportExportService;
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
+    /**
+     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
+     * @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(@RequestBody Personnel t){
+        return baseService.save(t);
+    }
+
+    /**
+     * 验证。
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
+    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
+        // 一般比较相同公司下工号是否相同
+        return baseService.validateEquale(map);
+    }
+
+    @Override
+    protected String getDataImportKtrClasspath() {
+        return dataToolsProperties.getEmployeesDatainputktr();
+    }
+}
@@ -47,4 +47,17 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
 		return routeService.getSectionRoute(map);
 	}
  
+	
+	/**
+	 * @Description : TODO(根据路段路由Id查询详情)
+	 * 
+	 * @param  map <id:路段路由ID> 
+	 * 
+	 * @return List<Map<String, Object>>
+	 */
+	@RequestMapping(value = "/findSectionRouteInfoFormId",method = RequestMethod.GET)
+	public List<Map<String, Object>> findSectionRouteInfoFormId(@RequestParam Map<String, Object> map) {
+		
+		return routeService.findSectionRouteInfoFormId(map);
+	}
 }
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
  
 import com.bsth.entity.Station;
 import com.bsth.service.StationService;
+import com.bsth.util.GetUIDAndCode;
  
 /**
  * 
@@ -127,8 +128,8 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	 * @return int <stationCode站点编码>
 	 */
 	@RequestMapping(value="getStationCode" , method = RequestMethod.GET)
-	public int getStationCode() {
-		return service.getStationCode();
+	public long getStationCode() {
+		return GetUIDAndCode.getStationId();
  
 	}
 }
@@ -87,4 +87,31 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 		return service.stationRouteIsDestroy(map);
 	}
  
+	/**
+	 * @Description : TODO(根据线路ID生成行单)
+	 * 
+	 * @param map <id:线路ID>
+	 * 
+	 * @return Map<String, Object> <SUCCESS ; ERROR>
+	 */
+	@RequestMapping(value = "/usingSingle",method = RequestMethod.POST)
+	public Map<String, Object> usingSingle(@RequestParam Map<String, Object> map) {
+		
+		return service.usingSingle(map);
+	}
+	
+	
+	/**
+	 * @Description : TODO(根据站点路由Id查询详情)
+	 * 
+	 * @param  map <id:站点路由ID> 
+	 * 
+	 * @return List<Map<String, Object>>
+	 */
+	@RequestMapping(value = "/findStationRouteInfo",method = RequestMethod.GET)
+	public List<Map<String, Object>> findStationRouteInfo(@RequestParam Map<String, Object> map) {
+		
+		return service.findStationRouteInfo(map);
+	}
+	
 }
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.schedule.SchedulePlan;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by xu on 16/6/16.
- */
-@RestController
-@RequestMapping("spc")
-public class SchedulePlanController extends BaseController<SchedulePlan, Long> {
-}
+package com.bsth.controller.schedule;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.schedule.SchedulePlan;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by xu on 16/6/16.
+ */
+@RestController
+@RequestMapping("spc")
+public class SchedulePlanController extends BaseController<SchedulePlan, Long> {
+}
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by xu on 16/6/16.
- */
-@RestController
-@RequestMapping("spic")
-public class SchedulePlanInfoController extends BaseController<SchedulePlanInfo, Long> {
-}
+package com.bsth.controller.schedule;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by xu on 16/6/16.
+ */
+@RestController
+@RequestMapping("spic")
+public class SchedulePlanInfoController extends BaseController<SchedulePlanInfo, Long> {
+}
 package com.bsth.entity;
  
+import java.util.Date;
+
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
@@ -8,7 +11,7 @@ import javax.persistence.Table;
  
 /**
  * 
- * @ClassName: Line(停车场类)
+ * @ClassName: CarPark(停车场类)
  * 
  * @Description: TODO(停车场)
  * 
@@ -34,14 +37,70 @@ public class CarPark {
 	// 停车场名称
 	private String parkName;
  
-	// 地理位置
-	private String parkPoint;
+	// 地理位置(百度坐标)
+	private String bParkPoint;
+	
+	// 地理位置中心点(百度坐标)
+	private String bCenterPoint;
+	
+	// 地理位置(WGS坐标)
+	private String gParkPoint;
+		
+	// 地理位置中心点(WGS坐标)
+	private String gCenterPoint;
+	
+	/**
+	 * 经纬坐标类型 
+	 * 
+	 * --------- b：百度坐标系
+	 * 
+	 * --------- d：高德坐标系
+	 */
+	private String dbType;
+	
+	/**
+	 * 图形类型
+	 * 
+	 * ------ r：圆形
+	 * 
+	 * ------ p：多边形
+	 */
+	private String shapesType;
+	
+	// 圆形半径
+	private Integer radius;
  
 	// 面积
 	private double area;
  
 	// 所属公司
 	private String company;
+	
+	// 分公司
+	private String brancheCompany;
+	
+	// 是否撤销
+	private Integer destroy;
+	
+	// 版本号
+	private Integer versions;
+	
+	// 描述
+	private String descriptions;
+	
+	// 创建人
+	private Integer createBy;
+		
+	// 修改人
+	private Integer 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;
@@ -66,13 +125,61 @@ public class CarPark {
 	public void setParkName(String parkName) {
 		this.parkName = parkName;
 	}
+	
+	public String getbParkPoint() {
+		return bParkPoint;
+	}
+
+	public void setbParkPoint(String bParkPoint) {
+		this.bParkPoint = bParkPoint;
+	}
+
+	public String getbCenterPoint() {
+		return bCenterPoint;
+	}
+
+	public void setbCenterPoint(String bCenterPoint) {
+		this.bCenterPoint = bCenterPoint;
+	}
+
+	public String getgParkPoint() {
+		return gParkPoint;
+	}
+
+	public void setgParkPoint(String gParkPoint) {
+		this.gParkPoint = gParkPoint;
+	}
+	
+	public String getDbType() {
+		return dbType;
+	}
+
+	public void setDbType(String dbType) {
+		this.dbType = dbType;
+	}
+
+	public String getShapesType() {
+		return shapesType;
+	}
+
+	public void setShapesType(String shapesType) {
+		this.shapesType = shapesType;
+	}
+
+	public Integer getRadius() {
+		return radius;
+	}
  
-	public String getParkPoint() {
-		return parkPoint;
+	public void setRadius(Integer radius) {
+		this.radius = radius;
 	}
  
-	public void setParkPoint(String parkPoint) {
-		this.parkPoint = parkPoint;
+	public String getgCenterPoint() {
+		return gCenterPoint;
+	}
+
+	public void setgCenterPoint(String gCenterPoint) {
+		this.gCenterPoint = gCenterPoint;
 	}
  
 	public double getArea() {
@@ -82,6 +189,14 @@ public class CarPark {
 	public void setArea(double area) {
 		this.area = area;
 	}
+	
+	public String getBrancheCompany() {
+		return brancheCompany;
+	}
+
+	public void setBrancheCompany(String brancheCompany) {
+		this.brancheCompany = brancheCompany;
+	}
  
 	public String getCompany() {
 		return company;
@@ -90,4 +205,61 @@ public class CarPark {
 	public void setCompany(String company) {
 		this.company = company;
 	}
+
+	public Integer getDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(Integer destroy) {
+		this.destroy = destroy;
+	}
+
+	public Integer getVersions() {
+		return versions;
+	}
+
+	public void setVersions(Integer versions) {
+		this.versions = versions;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public Integer getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(Integer createBy) {
+		this.createBy = createBy;
+	}
+
+	public Integer getUpdateBy() {
+		return updateBy;
+	}
+
+	public void setUpdateBy(Integer 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;
+	}
+	
 }
@@ -27,7 +27,7 @@ public class Line implements Serializable {
  
 	// 线路ID
 	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	/*@GeneratedValue(strategy = GenerationType.IDENTITY)*/
 	private Integer id;
  
 	// 线路名称
@@ -28,7 +28,7 @@ import javax.persistence.Table;
 public class Section {
  
 	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	/*@GeneratedValue(strategy = GenerationType.IDENTITY)*/
 	private Integer id;
  
 	// 路段编码
@@ -29,7 +29,7 @@ import javax.persistence.Table;
 public class Station {
  
 	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	/*@GeneratedValue(strategy = GenerationType.IDENTITY)*/
 	private Integer id;
  
 	// 站点编码
-package com.bsth.entity.schedule;
-
-import com.bsth.entity.Line;
-import com.bsth.entity.sys.SysUser;
-
-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;
-
-    /** 路牌顺序号 */
-    @Column(nullable = false)
-    private Integer lpNo;
-    /** 路牌名称 */
-    @Column(nullable = false)
-    private String lpName;
-    /** 路牌类型（普通路牌／临加路牌） */
-    @Column(nullable = false)
-    private String lpType;
-
-    /** 创建人 */
-    @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 Integer getLpNo() {
-        return lpNo;
-    }
-
-    public void setLpNo(Integer 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 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.Line;
+import com.bsth.entity.sys.SysUser;
+
+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;
+
+    /** 路牌顺序号 */
+    @Column(nullable = false)
+    private Integer lpNo;
+    /** 路牌名称 */
+    @Column(nullable = false)
+    private String lpName;
+    /** 路牌类型（普通路牌／临加路牌） */
+    @Column(nullable = false)
+    private String lpType;
+
+    /** 创建人 */
+    @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 Integer getLpNo() {
+        return lpNo;
+    }
+
+    public void setLpNo(Integer 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 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.Line;
-import com.bsth.entity.sys.SysUser;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * 时刻表信息
- */
-@Entity
-@Table(name="bsth_c_s_ttinfo")
-public class TTInfo {
-
-    /** 主键Id */
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    /** 线路关联 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Line xl;
-
-    /** 时刻表名称 */
-    @Column(nullable = false, unique = true)
-    private String name;
-    /** 线路方向（TODO：上下行，上行，下行，这个以后用枚举还是字典再议，现在先用文字） */
-    @Column(nullable = false)
-    private String xlDir;
-    /** 启用日期 */
-    @Column(nullable = false)
-    private Date qyrq;
-    /** 模版类型（TODO：时刻表，间隔式，这个以后用枚举还是字典再议，现在先用文字） */
-    private String templateType;
-    /** 是否启用调度模版 */
-    private Boolean isEnableDisTemplate;
-    /** 路牌数 */
-    private int lpCount;
-    /** 圈数 */
-    private int loopCount;
-
-    // TODO：原系统里的分别在，圈后圈进场，意思不知道，再议
-
-    /** 常规有效日（1-7表示星期一到星期日，多个用逗号隔开） */
-    private String rule_days;
-    /** 特殊有效日期（格式：2001-01-01，多个用逗号隔开） */
-    private String special_days;
-
-
-
-    /** 是否启用（这个是算出来的，不持久化） */
-    @Transient
-    private boolean isEnable;
-
-    /** 操作人员关联 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 更新人员关联 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    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 String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getXlDir() {
-        return xlDir;
-    }
-
-    public void setXlDir(String xlDir) {
-        this.xlDir = xlDir;
-    }
-
-    public Date getQyrq() {
-        return qyrq;
-    }
-
-    public void setQyrq(Date qyrq) {
-        this.qyrq = qyrq;
-    }
-
-    public String getTemplateType() {
-        return templateType;
-    }
-
-    public void setTemplateType(String templateType) {
-        this.templateType = templateType;
-    }
-
-    public Boolean getIsEnableDisTemplate() {
-        return isEnableDisTemplate;
-    }
-
-    public void setIsEnableDisTemplate(Boolean isEnableDisTemplate) {
-        this.isEnableDisTemplate = isEnableDisTemplate;
-    }
-
-    public int getLpCount() {
-        return lpCount;
-    }
-
-    public void setLpCount(int lpCount) {
-        this.lpCount = lpCount;
-    }
-
-    public int getLoopCount() {
-        return loopCount;
-    }
-
-    public void setLoopCount(int loopCount) {
-        this.loopCount = loopCount;
-    }
-
-    public String getRule_days() {
-        return rule_days;
-    }
-
-    public void setRule_days(String rule_days) {
-        this.rule_days = rule_days;
-    }
-
-    public String getSpecial_days() {
-        return special_days;
-    }
-
-    public void setSpecial_days(String special_days) {
-        this.special_days = special_days;
-    }
-
-    public boolean isEnable() {
-        return isEnable;
-    }
-
-    public void setIsEnable(boolean isEnable) {
-        this.isEnable = isEnable;
-    }
-
-    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.Line;
+import com.bsth.entity.sys.SysUser;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 时刻表信息
+ */
+@Entity
+@Table(name="bsth_c_s_ttinfo")
+public class TTInfo {
+
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 线路关联 */
+    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Line xl;
+
+    /** 时刻表名称 */
+    @Column(nullable = false, unique = true)
+    private String name;
+    /** 线路方向（TODO：上下行，上行，下行，这个以后用枚举还是字典再议，现在先用文字） */
+    @Column(nullable = false)
+    private String xlDir;
+    /** 启用日期 */
+    @Column(nullable = false)
+    private Date qyrq;
+    /** 模版类型（TODO：时刻表，间隔式，这个以后用枚举还是字典再议，现在先用文字） */
+    private String templateType;
+    /** 是否启用调度模版 */
+    private Boolean isEnableDisTemplate;
+    /** 路牌数 */
+    private int lpCount;
+    /** 圈数 */
+    private int loopCount;
+
+    // TODO：原系统里的分别在，圈后圈进场，意思不知道，再议
+
+    /** 常规有效日（1-7表示星期一到星期日，多个用逗号隔开） */
+    private String rule_days;
+    /** 特殊有效日期（格式：2001-01-01，多个用逗号隔开） */
+    private String special_days;
+
+
+
+    /** 是否启用（这个是算出来的，不持久化） */
+    @Transient
+    private boolean isEnable;
+
+    /** 操作人员关联 */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private SysUser createBy;
+    /** 更新人员关联 */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    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 String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getXlDir() {
+        return xlDir;
+    }
+
+    public void setXlDir(String xlDir) {
+        this.xlDir = xlDir;
+    }
+
+    public Date getQyrq() {
+        return qyrq;
+    }
+
+    public void setQyrq(Date qyrq) {
+        this.qyrq = qyrq;
+    }
+
+    public String getTemplateType() {
+        return templateType;
+    }
+
+    public void setTemplateType(String templateType) {
+        this.templateType = templateType;
+    }
+
+    public Boolean getIsEnableDisTemplate() {
+        return isEnableDisTemplate;
+    }
+
+    public void setIsEnableDisTemplate(Boolean isEnableDisTemplate) {
+        this.isEnableDisTemplate = isEnableDisTemplate;
+    }
+
+    public int getLpCount() {
+        return lpCount;
+    }
+
+    public void setLpCount(int lpCount) {
+        this.lpCount = lpCount;
+    }
+
+    public int getLoopCount() {
+        return loopCount;
+    }
+
+    public void setLoopCount(int loopCount) {
+        this.loopCount = loopCount;
+    }
+
+    public String getRule_days() {
+        return rule_days;
+    }
+
+    public void setRule_days(String rule_days) {
+        this.rule_days = rule_days;
+    }
+
+    public String getSpecial_days() {
+        return special_days;
+    }
+
+    public void setSpecial_days(String special_days) {
+        this.special_days = special_days;
+    }
+
+    public boolean isEnable() {
+        return isEnable;
+    }
+
+    public void setIsEnable(boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    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.CarPark;
-import com.bsth.entity.Line;
-import com.bsth.entity.Station;
-import com.bsth.entity.sys.SysUser;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * 时刻表明细
- */
-@Entity
-@Table(name = "bsth_c_s_ttinfo_detail")
-public class TTInfoDetail {
-
-    /** 主健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 GuideboardInfo lp;
-
-    /** 发车顺序号 */
-    @Column(nullable = false)
-    private Integer fcno;
-    /** 线路方向（TODO：上下行，上行，下行，这个以后用枚举还是字典再议，现在先用文字） */
-    @Column(nullable = false)
-    private String xlDir;
-    /** 起点站关联 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Station qdz;
-    /** 终点站关联 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Station zdz;
-    /** 停车场关联（出场，进场班次会关联停车场） */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private CarPark tcc;
-
-    /** 发车时间（格式 HH:mm） */
-    @Column(nullable = false, length = 5)
-    private String fcsj;
-    /** 对应班次数 */
-    private Integer bcs;
-    @Column(nullable = false)
-    /** 计划里程 */
-    private Double jhlc;
-    /** 班次历时 */
-    private Integer bcsj;
-
-    /**
-     * 班次类型
-     * TODO：正常班次、出场、进场、加油、临加班次、区间班次、放空班次、放大站班次、两点间空驶
-     * TODO：这个以后用枚举还是字典再议，现在先用文字
-     */
-    @Column(nullable = false)
-    private String bcType;
-
-    /** 是否分班（表示这个班次是否是晚班班次，就是换另外一个驾驶员开）*/
-    private Boolean isFB;
-
-    /** 是否切换线路 */
-    private Boolean isSwitchXl;
-    /** 切换的线路（isSwitchXl == true） */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private Line switchXl;
-    /** 切换线路信息（isSwitchXl == true） */
-    private String switchXlDesc;
-    /** 备注 */
-    private String remark;
-
-    /** 创建人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    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 TTInfo getTtinfo() {
-        return ttinfo;
-    }
-
-    public void setTtinfo(TTInfo ttinfo) {
-        this.ttinfo = ttinfo;
-    }
-
-    public GuideboardInfo getLp() {
-        return lp;
-    }
-
-    public void setLp(GuideboardInfo lp) {
-        this.lp = lp;
-    }
-
-    public Integer getFcno() {
-        return fcno;
-    }
-
-    public void setFcno(Integer fcno) {
-        this.fcno = fcno;
-    }
-
-    public String getXlDir() {
-        return xlDir;
-    }
-
-    public void setXlDir(String xlDir) {
-        this.xlDir = xlDir;
-    }
-
-    public Station getQdz() {
-        return qdz;
-    }
-
-    public void setQdz(Station qdz) {
-        this.qdz = qdz;
-    }
-
-    public Station getZdz() {
-        return zdz;
-    }
-
-    public void setZdz(Station zdz) {
-        this.zdz = zdz;
-    }
-
-    public String getFcsj() {
-        return fcsj;
-    }
-
-    public void setFcsj(String fcsj) {
-        this.fcsj = fcsj;
-    }
-
-    public Integer getBcs() {
-        return bcs;
-    }
-
-    public void setBcs(Integer bcs) {
-        this.bcs = bcs;
-    }
-
-    public Double getJhlc() {
-        return jhlc;
-    }
-
-    public void setJhlc(Double jhlc) {
-        this.jhlc = jhlc;
-    }
-
-    public Integer getBcsj() {
-        return bcsj;
-    }
-
-    public void setBcsj(Integer bcsj) {
-        this.bcsj = bcsj;
-    }
-
-    public String getBcType() {
-        return bcType;
-    }
-
-    public void setBcType(String bcType) {
-        this.bcType = bcType;
-    }
-
-    public Boolean getIsSwitchXl() {
-        return isSwitchXl;
-    }
-
-    public void setIsSwitchXl(Boolean isSwitchXl) {
-        this.isSwitchXl = isSwitchXl;
-    }
-
-    public Line getSwitchXl() {
-        return switchXl;
-    }
-
-    public void setSwitchXl(Line switchXl) {
-        this.switchXl = switchXl;
-    }
-
-    public String getSwitchXlDesc() {
-        return switchXlDesc;
-    }
-
-    public void setSwitchXlDesc(String switchXlDesc) {
-        this.switchXlDesc = switchXlDesc;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    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;
-    }
-
-    public CarPark getTcc() {
-        return tcc;
-    }
-
-    public void setTcc(CarPark tcc) {
-        this.tcc = tcc;
-    }
-
-    public Boolean getIsFB() {
-        return isFB;
-    }
-
-    public void setIsFB(Boolean isFB) {
-        this.isFB = isFB;
-    }
-}
+package com.bsth.entity.schedule;
+
+import com.bsth.entity.CarPark;
+import com.bsth.entity.Line;
+import com.bsth.entity.Station;
+import com.bsth.entity.sys.SysUser;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 时刻表明细
+ */
+@Entity
+@Table(name = "bsth_c_s_ttinfo_detail")
+public class TTInfoDetail {
+
+    /** 主健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 GuideboardInfo lp;
+
+    /** 发车顺序号 */
+    @Column(nullable = false)
+    private Integer fcno;
+    /** 线路方向（TODO：上下行，上行，下行，这个以后用枚举还是字典再议，现在先用文字） */
+    @Column(nullable = false)
+    private String xlDir;
+    /** 起点站关联 */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Station qdz;
+    /** 终点站关联 */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Station zdz;
+    /** 停车场关联（出场，进场班次会关联停车场） */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private CarPark tcc;
+
+    /** 发车时间（格式 HH:mm） */
+    @Column(nullable = false, length = 5)
+    private String fcsj;
+    /** 对应班次数 */
+    private Integer bcs;
+    @Column(nullable = false)
+    /** 计划里程 */
+    private Double jhlc;
+    /** 班次历时 */
+    private Integer bcsj;
+
+    /**
+     * 班次类型
+     * TODO：正常班次、出场、进场、加油、临加班次、区间班次、放空班次、放大站班次、两点间空驶
+     * TODO：这个以后用枚举还是字典再议，现在先用文字
+     */
+    @Column(nullable = false)
+    private String bcType;
+
+    /** 是否分班（表示这个班次是否是晚班班次，就是换另外一个驾驶员开）*/
+    private Boolean isFB;
+
+    /** 是否切换线路 */
+    private Boolean isSwitchXl;
+    /** 切换的线路（isSwitchXl == true） */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private Line switchXl;
+    /** 切换线路信息（isSwitchXl == true） */
+    private String switchXlDesc;
+    /** 备注 */
+    private String remark;
+
+    /** 创建人 */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    private SysUser createBy;
+    /** 修改人 */
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    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 TTInfo getTtinfo() {
+        return ttinfo;
+    }
+
+    public void setTtinfo(TTInfo ttinfo) {
+        this.ttinfo = ttinfo;
+    }
+
+    public GuideboardInfo getLp() {
+        return lp;
+    }
+
+    public void setLp(GuideboardInfo lp) {
+        this.lp = lp;
+    }
+
+    public Integer getFcno() {
+        return fcno;
+    }
+
+    public void setFcno(Integer fcno) {
+        this.fcno = fcno;
+    }
+
+    public String getXlDir() {
+        return xlDir;
+    }
+
+    public void setXlDir(String xlDir) {
+        this.xlDir = xlDir;
+    }
+
+    public Station getQdz() {
+        return qdz;
+    }
+
+    public void setQdz(Station qdz) {
+        this.qdz = qdz;
+    }
+
+    public Station getZdz() {
+        return zdz;
+    }
+
+    public void setZdz(Station zdz) {
+        this.zdz = zdz;
+    }
+
+    public String getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(String fcsj) {
+        this.fcsj = fcsj;
+    }
+
+    public Integer getBcs() {
+        return bcs;
+    }
+
+    public void setBcs(Integer bcs) {
+        this.bcs = bcs;
+    }
+
+    public Double getJhlc() {
+        return jhlc;
+    }
+
+    public void setJhlc(Double jhlc) {
+        this.jhlc = jhlc;
+    }
+
+    public Integer getBcsj() {
+        return bcsj;
+    }
+
+    public void setBcsj(Integer bcsj) {
+        this.bcsj = bcsj;
+    }
+
+    public String getBcType() {
+        return bcType;
+    }
+
+    public void setBcType(String bcType) {
+        this.bcType = bcType;
+    }
+
+    public Boolean getIsSwitchXl() {
+        return isSwitchXl;
+    }
+
+    public void setIsSwitchXl(Boolean isSwitchXl) {
+        this.isSwitchXl = isSwitchXl;
+    }
+
+    public Line getSwitchXl() {
+        return switchXl;
+    }
+
+    public void setSwitchXl(Line switchXl) {
+        this.switchXl = switchXl;
+    }
+
+    public String getSwitchXlDesc() {
+        return switchXlDesc;
+    }
+
+    public void setSwitchXlDesc(String switchXlDesc) {
+        this.switchXlDesc = switchXlDesc;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    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;
+    }
+
+    public CarPark getTcc() {
+        return tcc;
+    }
+
+    public void setTcc(CarPark tcc) {
+        this.tcc = tcc;
+    }
+
+    public Boolean getIsFB() {
+        return isFB;
+    }
+
+    public void setIsFB(Boolean isFB) {
+        this.isFB = isFB;
+    }
+}
-package com.bsth.repository;
-
-import com.bsth.entity.CarDevice;
-import org.springframework.stereotype.Repository;
-
-/**
- * Created by xu on 16/6/15.
- */
-@Repository
-public interface CarDeviceRepository extends BaseRepository<CarDevice, Long> {
-}
+package com.bsth.repository;
+
+import com.bsth.entity.CarDevice;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by xu on 16/6/15.
+ */
+@Repository
+public interface CarDeviceRepository extends BaseRepository<CarDevice, Long> {
+}
+package com.bsth.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.CarPark;
+
+@Repository
+public interface CarParkRepository extends BaseRepository<CarPark, Integer>{
+	
+	// 查询最大ID
+	@Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_car_park) k"
+			, nativeQuery=true)
+	public long carParkMaxId();
+	
+	@Transactional
+    @Modifying
+    @Query(value="INSERT INTO bsth_c_car_park (" +
+    			 "id , area , company , park_code , park_name , " +
+    			 "branche_company , create_by , create_date , descriptions , destroy," +
+    			 "update_by, update_date , versions , b_center_point , b_park_point , " +
+    			 "db_type, g_center_point, g_park_point, radius, shapes_type) " +
+    			 " VALUES(" +
+    			 "?1 , ?2 , ?3 , ?4 , ?5," +
+    			 "?6 , ?7 , str_to_date(?8,'%Y-%m-%d %H:%i:%s') , ?9 , ?10," +
+    			 "?11,str_to_date(?12,'%Y-%m-%d %H:%i:%s') ,?13, ?14, GeomFromText(?15), " +
+    			 "?16, ?17,GeomFromText(?18),?19,?20)", nativeQuery=true)
+	public void carParkSave(Integer id,Double area,String company,String parkCode,String parkName,
+			
+							String brancheCompany,Integer createBy,String createDate,String descriptions,Integer destroy,
+							
+							Integer updateBy,String updateDate,Integer versions,String bCenterPoint,String bParkPoint,
+							
+							String dbType,String gCenterPoint,String gParkPoint,Integer radius,String shapesType);
+	
+	
+	/**
+	 * @Description :TODO(查询路段信息)
+	 * 
+	 * @param map <id:路段路由ID>
+	 * 
+	 * @return List<Object[]>
+	 */
+	@Query(value ="SELECT   k.id AS carParkId," +
+							"k.area AS carParkArea," +
+							"k.company AS carParkCompany," +
+							"k.park_code AS carParkCode," +
+							"k.park_name AS carParkName," +
+							"k.branche_company AS carParkBrancheCompany," +
+							"k.create_by AS carParkCreateBy," +
+							"k.create_date AS carParkCreateDate," +
+							"k.descriptions AS carParkDescriptions," +
+							"k.destroy AS carParkDestroy," +
+							"k.update_by AS carParkUpdate," +
+							"k.update_date AS carParkUpdateDate," +
+							"k.versions AS carParkVersions," +
+							"k.b_center_point AS carParkBcenterPoint," +
+							"AsText(k.b_park_point) AS carParkBparkPoint," +
+							"k.g_center_point AS carParkGcenterPoint," +
+							"AsText(k.g_park_point) AS carParkGparkPoint, " +
+							"k.db_type AS carParkDBtype," +
+							"k.radius AS carParkRadius," +
+							"k.shapes_type AS carParkShapesType FROM bsth_c_car_park k where k.id = ?1", nativeQuery=true)
+	List<Object[]> findCarParkInfoFormId(int id);
+	
+	@Transactional
+    @Modifying
+    @Query(value="UPDATE bsth_c_car_park SET " +
+    		"area =  ?1 , " +
+    		"company = ?2  , " +
+    		"park_code = ?3  , " +
+    		"park_name = ?4  , " +
+    		"branche_company =  ?5  , " +
+    		"create_by =  ?6  , " +
+    		"create_date =  ?7  , " +
+    		"descriptions =  ?8  , " +
+    		"destroy = ?9  , " +
+    		"update_by = ?10  , " +
+    		"update_date = ?11  , " +
+    		"versions = ?12  , " +
+    		"b_center_point = ?13  , " +
+    		"g_center_point = ?14 , " +
+    		"b_park_point = GeomFromText(?15)  , " +
+    		"g_park_point = GeomFromText(?16)  , " +
+    		"db_type = ?17  , " +
+    		"radius = ?18  , " +
+    		"shapes_type = ?19  " +
+    		" WHERE id = ?20   ", nativeQuery=true)
+	public void carParkUpdate(double area,String company,String parkCode,String parkName,String brancheCompany,
+			
+							  Integer createBy ,String createDate,String descriptions,Integer destroy,Integer updateBy,
+							  
+							  String updateDate,Integer versions,String bCenterPoint,String gCenterPoint,String bParkPoint,
+							  
+							  String gParkPoint,String dbType,Integer radius,String shapesType,Integer id );
+	
+}
@@ -5,6 +5,7 @@ import java.util.List;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
  
+import com.bsth.entity.Line;
 import com.bsth.entity.LineInformation;
  
 /**
@@ -28,4 +29,6 @@ public interface LineInformationRepository extends BaseRepository&lt;LineInformatio
  
 	@Query("select i from LineInformation i where i.line.lineCode in ?1")
 	List<LineInformation> findByLine(List<String> lineCodes);
+	
+	List<LineInformation> findByLine(Line line);
 }
@@ -23,11 +23,12 @@ import com.bsth.entity.Line;
 @Repository
 public interface LineRepository extends BaseRepository<Line, Integer> {
  
+	
 	/**
 	 * 获取线路编码
 	 * 
 	 * @return int <lineCode：线路编码>
 	 */
-	@Query(value = " SELECT MAX(id)+1 from bsth_c_line ", nativeQuery = true)
-	public int selectMaxIdToLineCode();
+	@Query(value = "  SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_line) k ", nativeQuery = true)
+	public long selectMaxIdToLineCode();
 }
-package com.bsth.repository;
-
-import com.bsth.entity.Personnel;
-import org.springframework.stereotype.Repository;
-
-/**
- * Created by xu on 16/6/15.
- */
-@Repository
-public interface PersonnelRepository extends BaseRepository<Personnel, Integer> {
-}
+package com.bsth.repository;
+
+import com.bsth.entity.Personnel;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by xu on 16/6/15.
+ */
+@Repository
+public interface PersonnelRepository extends BaseRepository<Personnel, Integer> {
+}
@@ -30,7 +30,7 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
 	// 查询最大ID
 	@Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_section) k"
 			, nativeQuery=true)
-	public int sectionMaxId();
+	public long sectionMaxId();
  
  
 	/**
@@ -54,7 +54,7 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
  
 				 "road_coding , section_distance , section_time , db_type, speed_limit ,"+
  
-				 "descriptions , versions) "+
+				 "descriptions , versions,id) "+
  
 			"VALUES (?1 , ?2 , ?3 , ?4 , ?5 , "+
  
@@ -62,7 +62,7 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
  
 					"?11 , ?12 , ?13 , ?14 , ?15 ,"+
  
-					"?16 , ?17 "+
+					"?16 , ?17, ?18"+
 			")", nativeQuery=true)
 	public void systemSave(String sectionCode , String sectionName , String crosesRoad , String endNode , String startNode,
  
@@ -70,7 +70,7 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
  
 						   String roadCoding,double sectionDistance,double sectionTime,String dbType,double speedLimit,
  
-						   String descriptions, int versions);
+						   String descriptions, int versions,int id);
  
  
 	/**
@@ -69,4 +69,63 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 								"	LEFT JOIN bsth_c_section b  ON a.sectionrouteSection = b.id", nativeQuery=true)
 	List<Object[]> getSectionRoute(int lineId, int directions);
  
+	
+	/**
+	 * @Description :TODO(查询路段信息)
+	 * 
+	 * @param map <id:路段路由ID>
+	 * 
+	 * @return List<Object[]>
+	 */
+	@Query(value ="SELECT a.sectionRouteId," +
+			"a.sectionRouteLineCode," +
+			"a.sectionRouteCode," +
+			"a.sectionRouteDirections," +
+			"a.sectionRouteLine," +
+			"a.sectionRouteSection," +
+			"a.sectionRouteDescriptions," +
+			"a.sectionRouteCreateBy," +
+			"a.sectionRouteCreateDate," +
+			"a.sectionRouteUpdateBy," +
+			"a.sectionRouteUpdateDate," +
+			"a.sectionRouteVersions," +
+			"a.sectionRouteDestroy," +
+			"b.id AS sectionId," +
+			"b.section_code AS sectionCode," +
+			"b.section_name AS sectionName," +
+			"b.road_coding AS sectionRoadCoding," +
+			"b.end_node AS sectionEndCode," +
+			"b.start_node AS sectionStartNode," +
+			"b.middle_node AS sectionMiddleNode," +
+			"b.section_type AS sectionType," +
+			"AsText(b.csection_vector) AS sectionCsectionVector," +
+			"AsText(b.bsection_vector) AS sectionBsectionVector," +
+			"AsText(b.gsection_vector) AS sectionGsectionVector," +
+			"b.section_distance AS sectionDistance," +
+			"b.section_time AS sectionTime," +
+			"b.db_type AS sectionDbtype," +
+			"b.speed_limit AS sectionSpeedLimit," +
+			"b.descriptions AS sectionDescriptions," +
+			"b.create_by AS sectionCreateBy," +
+			"b.create_date AS sectionCreateDate," +
+			"b.update_by AS sectionUpdateBy," +
+			"b.update_date AS sectionUpdateDate," +
+			"b.versions AS sectionVersion FROM (" +
+			" SELECT s.id AS sectionRouteId," +
+			"s.line_code AS sectionRouteLineCode," +
+			"s.sectionroute_code AS sectionRouteCode," +
+			"s.directions AS sectionRouteDirections," +
+			"s.line AS sectionRouteLine," +
+			"s.section AS sectionRouteSection," +
+			"s.descriptions AS sectionRouteDescriptions," +
+			"s.create_by AS sectionRouteCreateBy," +
+			"s.create_date AS sectionRouteCreateDate," +
+			"s.update_by AS sectionRouteUpdateBy," +
+			"s.update_date AS sectionRouteUpdateDate," +
+			"s.versions AS sectionRouteVersions," +
+			"s.destroy AS sectionRouteDestroy" +
+			" FROM  bsth_c_sectionroute s where s.id =?1) a " +
+			" LEFT JOIN bsth_c_section b on a.sectionRouteSection = b.id", nativeQuery=true)
+	List<Object[]> findSectionRouteInfoFormId(int id);
+	
 }
@@ -35,7 +35,7 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
 	 */
 	@Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_station) k"
 			, nativeQuery=true)
-	int stationMaxId();
+	long stationMaxId();
  
 	@Query(value = "SELECT * FROM bsth_c_station s where s.station_name = ?1"
 			, nativeQuery=true)
@@ -63,12 +63,12 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
     			 "?1 , ?2 , ?3 , ?4 , ?5," +
     			 "?6 , ?7 , ?8 , ?9 , GeomFromText(?10),GeomFromText(?11)," +
     			 "?12 ,?13, ?14, ?15, ?16," +
-    			 "?17,?18)", nativeQuery=true)
+    			 "?17,?18,?19)", nativeQuery=true)
 	public void stationSave(String stationCode,String stationName,String roadCoding,String dbType,String bJwpoints,
  
 							Float gLonx, Float gLaty, Float x,Float y, String gPloygonGrid, String bPloygonGrid,
  
-							Integer destroy,Integer radius,String shapesType,Integer versions,String descriptions,Integer createBy,Integer updateBy);
+							Integer destroy,Integer radius,String shapesType,Integer versions,String descriptions,Integer createBy,Integer updateBy,int id);
  
 	/**
 	 * @Description :TODO(站点更新)
@@ -118,4 +118,98 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 				"destroy = ?2 WHERE id = ?1", nativeQuery=true)
 	public void stationRouteIsDestroyUpd(Integer stationRouteId, Integer destroy);
  
+	
+	/**
+	 * @Description : TODO(根据线路ID生成行单)
+	 * 
+	 * @param  lineId:线路ID 
+	 * 
+	 * @return List<Object[]>
+	 */
+	@Query(value = "SELECT * FROM ("+
+				   "SELECT b.g_lonx," +
+				   "b.g_laty,b.b_jwpoints," +
+				   "a.station_mark," +
+				   "a.station_route_code," +
+				   "b.station_cod," +
+				   "a.distances,"+
+				   "b.station_name," +
+				   "a.directions FROM (SELECT " +
+				   "s.station_mark," +
+				   "s.station_route_code," +
+				   "s.directions," +
+				   "s.distances,"+
+				   "s.station FROM bsth_c_stationroute s where  s.line = ?1) a " +
+				   "LEFT JOIN bsth_c_station b " +
+				   " on a.station = b.id ORDER BY a.directions ASC ) k ORDER BY k.directions,k.station_route_code ASC", nativeQuery=true)
+	List<Object[]> usingSingle(Integer lineId);
+	
+	/**
+	 * @Description : TODO(根据站点路由Id查询详情)
+	 * 
+	 * @param  id:站点路由ID 
+	 * 
+	 * @return List<Object[]>
+	 */
+	@Query(value = "SELECT a.stationRouteLine," +
+			" a.stationRouteStation," +
+			" a.stationRouteCode," +
+			" a.stationRouteLIneCode," +
+			" a.stationRouteStationMark," +
+			" a.stationOutStationNmber," +
+			" a.stationRoutedirections," +
+			" a.stationRouteDistances," +
+			" a.stationRouteToTime," +
+			" a.staitonRouteFirstTime," +
+			" a.stationRouteEndTime," +
+			" a.stationRouteDescriptions," +
+			" a.stationRouteDestroy," +
+			" a.stationRouteVersions," +
+			" a.stationRouteCreateBy," +
+			" a.stationRouteCreateDate," +
+			" a.stationRouteUpdateBy," +
+			" a.stationRouteUpdateDate," +
+			" b.id AS stationId," +
+			" b.station_cod AS stationCode," +
+			" b.station_name AS stationName," +
+			" b.road_coding AS stationRoadCoding," +
+			" b.db_type AS stationDbType," +
+			" b.b_jwpoints AS stationJwpoints," +
+			" b.g_lonx AS stationGlonx," +
+			" b.g_laty AS stationGlaty," +
+			" b.x AS stationX," +
+			" b.y AS stationY," +
+			" AsText(b.b_polygon_grid) as stationBPolyonGrid," +
+			" AsText(b.g_polygon_grid) AS stationGPloyonGrid, " +
+			" b.destroy AS stationDestroy," +
+			" b.radius AS stationRadius," +
+			" b.shapes_type AS stationShapesType," +
+			" b.versions AS stationVersions," +
+			" b.descriptions AS sttationDescriptions," +
+			" b.create_by AS stationCreateBy," +
+			" b.create_date AS stationCreateDate," +
+			" b.update_by AS stationUpdateBy," +
+			" b.update_date AS stationUpdateDate," +
+			" a.stationRouteId"+
+			" FROM ( SELECT s.id AS stationRouteId," +
+			" s.line AS stationRouteLine," +
+			" s.station as stationRouteStation," +
+			" s.station_route_code as stationRouteCode," +
+			" s.line_code AS stationRouteLIneCode," +
+			" s.station_mark AS stationRouteStationMark," +
+			" s.out_station_nmber AS stationOutStationNmber," +
+			" s.directions AS stationRoutedirections," +
+			" s.distances AS stationRouteDistances," +
+			" s.to_time AS stationRouteToTime," +
+			" s.first_time AS staitonRouteFirstTime," +
+			" s.end_time AS stationRouteEndTime," +
+			" s.descriptions AS stationRouteDescriptions," +
+			" s.destroy AS stationRouteDestroy," +
+			" s.versions AS stationRouteVersions," +
+			" s.create_by AS stationRouteCreateBy," +
+			" s.create_date AS stationRouteCreateDate," +
+			" s.update_by AS stationRouteUpdateBy," +
+			" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.id = ?1 ) a " +
+			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
+	List<Object[]> findStationRouteInfo(Integer id);
 }
@@ -7,6 +7,7 @@ import java.util.List;
  
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -19,10 +20,9 @@ public interface CarConfigInfoRepository extends BaseRepository&lt;CarConfigInfo, L
  
     @EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
     @Override
-    Page<CarConfigInfo> findAll(Pageable pageable);
-    
+    Page<CarConfigInfo> findAll(Specification<CarConfigInfo> spec, Pageable pageable);
  
 	@EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
 	@Query("select cc from CarConfigInfo cc where cc.xl.lineCode=?1")
 	List<CarConfigInfo> findBylineCode(String lineCode);
-}
+}
 \ No newline at end of file
-package com.bsth.repository.schedule;
-
-import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.repository.BaseRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * Created by xu on 16/6/16.
- */
-@Repository
-public interface SchedulePlanRepository extends BaseRepository<SchedulePlan, Long> {
-}
+package com.bsth.repository.schedule;
+
+import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by xu on 16/6/16.
+ */
+@Repository
+public interface SchedulePlanRepository extends BaseRepository<SchedulePlan, Long> {
+}
-package com.bsth.service;
-
-import com.bsth.entity.CarDevice;
-
-/**
- * Created by xu on 16/6/15.
- */
-public interface CarDeviceService extends BaseService<CarDevice, Long> {
-}
+package com.bsth.service;
+
+import com.bsth.entity.CarDevice;
+
+/**
+ * Created by xu on 16/6/15.
+ */
+public interface CarDeviceService extends BaseService<CarDevice, Long> {
+}
+package com.bsth.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.CarPark;
+
+public interface CarParkService extends BaseService<CarPark, Integer> {
+	
+	Map<String, Object> carParkSave(Map<String, Object> map);
+	
+	List<Map<String, Object>> findCarParkInfoFormId(Map<String, Object> map);
+	
+ 	Map<String, Object> carParkUpdate(Map<String, Object> map);
+   
+}
@@ -22,7 +22,7 @@ public interface LineService extends BaseService&lt;Line, Integer&gt; {
 	/**
 	 * 获取线路编码
 	 * 
-	 * @return int <lineCode：线路编码>
+	 * @return long <lineCode：线路编码>
 	 */
-	int selectMaxIdToLineCode();
+	long selectMaxIdToLineCode();
 }
-package com.bsth.service;
-
-import com.bsth.entity.Personnel;
-
-/**
- * Created by xu on 16/6/15.
- */
-public interface PersonnelService extends BaseService<Personnel, Integer> {
-}
+package com.bsth.service;
+
+import com.bsth.entity.Personnel;
+
+/**
+ * Created by xu on 16/6/15.
+ */
+public interface PersonnelService extends BaseService<Personnel, Integer> {
+}
@@ -23,4 +23,13 @@ import com.bsth.entity.SectionRoute;
 public interface SectionRouteService extends BaseService<SectionRoute, Integer> {
  
 	List<Map<String, Object>> getSectionRoute(Map<String, Object> map);
+	
+	/**
+	 * @Description : TODO(根据路段路由Id查询详情)
+	 * 
+	 * @param  map <id:路段路由ID> 
+	 * 
+	 * @return List<Map<String, Object>>
+	 */
+	List<Map<String, Object>> findSectionRouteInfoFormId(Map<String, Object> map);
 }
@@ -59,4 +59,23 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	  * @return Map<String, Object> <SUCCESS ; ERROR>
 	  */
 	 Map<String, Object> stationRouteIsDestroy(Map<String, Object> map);
+	 
+	 /**
+	  * @Description : TODO(根据线路ID生成行单)
+	  * 
+	  * @param map <id:线路ID>
+	  * 
+	  * @return Map<String, Object> <SUCCESS ; ERROR>
+	  */
+	 Map<String, Object> usingSingle(Map<String, Object> map);
+	 
+	 
+	 /**
+	  * @Description : TODO(根据站点路由Id查询详情)
+	  * 
+	  * @param  map <id:站点路由ID> 
+	  * 
+	  * @return List<Map<String, Object>>
+	  */
+	 List<Map<String, Object>> findStationRouteInfo(Map<String, Object> map);
 }
@@ -34,7 +34,6 @@ public interface StationService extends BaseService&lt;Station, Integer&gt; {
  
 	Map<String, Object> manualSave(Map<String, Object> map);
  
-	int getStationCode();
  
 	/**
 	 * @Description :TODO(新增站点保存)
-package com.bsth.service.impl;
-
-import com.bsth.entity.CarDevice;
-import com.bsth.service.CarDeviceService;
-import org.springframework.stereotype.Service;
-
-/**
- * Created by xu on 16/6/15.
- */
-@Service
-public class CarDeviceServiceImpl extends BaseServiceImpl<CarDevice, Long> implements CarDeviceService {
-}
+package com.bsth.service.impl;
+
+import com.bsth.entity.CarDevice;
+import com.bsth.service.CarDeviceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by xu on 16/6/15.
+ */
+@Service
+public class CarDeviceServiceImpl extends BaseServiceImpl<CarDevice, Long> implements CarDeviceService {
+}
+package com.bsth.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.CarPark;
+import com.bsth.repository.CarParkRepository;
+import com.bsth.service.CarParkService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+ 
+@Service
+public class CarParkServiceImpl extends BaseServiceImpl<CarPark, Integer> implements CarParkService {
+	
+	@Autowired
+	CarParkRepository carParkRepository;
+	
+	@Override
+	public Map<String, Object> carParkSave(Map<String, Object> map) {
+		
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		
+		try {
+			
+			// 停车场编码
+			String parkCode = map.get("parkCode").equals("") ? null : map.get("parkCode").toString();
+			
+			// 停车场id
+			Integer id = Integer.parseInt(parkCode);
+			
+			// 停车场名称
+			String parkName = map.get("parkName").equals("") ? "" : map.get("parkName").toString();
+			
+			// 地理位置(百度坐标集合)
+			String bParkPoint = map.get("bParkPoint").equals("") ? "" : map.get("bParkPoint").toString();
+			
+			// 地理位置(WGS坐标集合)
+			String gParkPoint = map.get("gParkPoint").equals("") ? "" :map.get("gParkPoint").toString();
+			
+			// 地理位置中心点(百度坐标)
+			String bCenterPoint = map.get("bCenterPoint").equals("") ? "" : map.get("bCenterPoint").toString();
+			
+			// 地理位置中心点(WGS坐标)
+			String gCenterPoint = map.get("gCenterPoint").equals("") ? "" : map.get("gCenterPoint").toString();
+			
+			// 坐标类型
+			String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
+			
+			// 图形类型
+			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
+			
+			// 半径
+			Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
+			
+			// 面积
+			double area = map.get("area").equals("") ? null : Double.parseDouble(map.get("area").toString());
+			
+			// 公司
+			String company = map.get("company").equals("") ? "" : map.get("company").toString();
+			
+			// 分公司
+			String brancheCompany = map.get("brancheCompany").equals("") ? "" : map.get("brancheCompany").toString();
+			
+			// 是否撤销
+			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
+			
+			// 版本号
+			Integer versions = map.get("versions").equals("") ? null : Integer.parseInt(map.get("versions").toString());
+			
+			// 描述与说明
+			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
+			
+			SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss"); 
+			
+			Date date = new Date();
+			
+			// 创建日期
+			String createDate = formatter.format(date);
+			
+			// 修改日期
+			String updateDate = formatter.format(date);
+			
+			// 创建人
+			Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
+			
+			// 修改人
+			Integer updateBy = map.get("updateBy").equals("") ? null : Integer.parseInt(map.get("updateBy").toString());
+			
+			carParkRepository.carParkSave(id, area, company, parkCode, parkName, 
+					
+										  brancheCompany, createBy, createDate, descriptions, destroy, 
+										  
+										  updateBy, updateDate, versions, bCenterPoint, bParkPoint, 
+										  
+										  dbType, gCenterPoint, gParkPoint, radius, shapesType);
+			
+			resultMap.put("status", ResponseCode.SUCCESS);
+			
+		} catch (Exception e) {
+
+			resultMap.put("status", ResponseCode.ERROR);
+			
+			logger.error("save erro.", e);
+			
+		}
+		
+		return resultMap;
+	}
+
+	@Override
+	public List<Map<String, Object>> findCarParkInfoFormId(Map<String, Object> map) {
+		 
+		// 获取线路ID
+	    Integer id = map.get("id").equals("") ? 0 : Integer.parseInt(map.get("id").toString());
+		
+	    List<Object[]> objects = carParkRepository.findCarParkInfoFormId(id);
+	    
+	    List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();	 
+	    
+	    int len = objects.size();
+	    
+	    if(objects.size()>0) {
+	    	
+	    	for(int i = 0 ; i < len; i++) {
+	    		
+	    		Map<String, Object> tempM = new HashMap<String,Object>();
+	    		
+	    		tempM.put("carParkId", objects.get(i)[0]);
+	    		
+	    		tempM.put("carParkArea", objects.get(i)[1]);
+	    		
+	    		tempM.put("carParkCompany", objects.get(i)[2]);
+	    		
+	    		tempM.put("carParkCode", objects.get(i)[3]);
+	    		
+	    		tempM.put("carParkName", objects.get(i)[4]);
+	    		
+	    		tempM.put("carParkBrancheCompany", objects.get(i)[5]);
+	    		
+	    		tempM.put("carParkCreateBy", objects.get(i)[6]);
+	    		
+	    		tempM.put("carParkCreateDate", objects.get(i)[7]);
+	    		
+	    		tempM.put("carParkDescriptions", objects.get(i)[8]);
+	    		
+	    		tempM.put("carParkDestroy", objects.get(i)[9]);
+	    		
+	    		tempM.put("carParkUpdate", objects.get(i)[10]);
+	    		
+	    		tempM.put("carParkUpdateDate", objects.get(i)[11]);
+	    		
+	    		tempM.put("carParkVersions", objects.get(i)[12]);
+	    		
+	    		tempM.put("carParkBcenterPoint", objects.get(i)[13]);
+	    		
+	    		tempM.put("carParkBparkPoint", objects.get(i)[14]);
+	    		
+	    		tempM.put("carParkGcenterPoint", objects.get(i)[15]);
+	    		
+	    		tempM.put("carParkGparkPoint", objects.get(i)[16]);
+	    		
+	    		tempM.put("carParkDBtype", objects.get(i)[17]);
+	    		
+	    		tempM.put("carParkRadius", objects.get(i)[18]);
+	    		
+	    		tempM.put("carParkShapesType", objects.get(i)[19]);
+	    		
+	    		resultList.add(tempM);
+	    	}
+	    	
+	    }
+	    
+		return resultList;
+	}
+
+	@Override
+	public Map<String, Object> carParkUpdate(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		
+		try {
+			
+			// id
+			Integer id = map.get("id").equals("") ? null : Integer.parseInt(map.get("id").toString());
+			
+			if(id!=null) {
+				
+				// 面积
+				double area = map.get("area").equals("") ? null : Double.parseDouble(map.get("area").toString());
+				
+				// 中心点（百度坐标）
+				String bCenterPoint = map.get("bCenterPoint").equals("") ? "" : map.get("bCenterPoint").toString();
+				
+				// 图形坐标点集合（百度坐标）
+				String bParkPoint = map.get("bParkPoint").equals("") ? "" : map.get("bParkPoint").toString();
+				
+				// 分公司
+				String brancheCompany = map.get("brancheCompany").equals("")? "" :map.get("brancheCompany").toString();
+				
+				// 公司
+				String company = map.get("company").equals("") ? "" : map.get("company").toString();
+				
+				// 坐标类型
+				String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
+				
+				// 描述与说明
+				String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
+				
+				// 是否撤销
+				Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
+				
+				// 中心点（WGS坐标）
+				String gCenterPoint = map.get("gCenterPoint").equals("") ? "" : map.get("gCenterPoint").toString();
+				
+				// 图形坐标点集合（WGS坐标）
+				String gParkPoint = map.get("gParkPoint").equals("") ? "" : map.get("gParkPoint").toString();
+				
+				// 编码
+				String parkCode = map.get("parkCode").equals("") ? "" : map.get("parkCode").toString();
+				
+				// 名称
+				String parkName = map.get("parkName").equals("") ? "" : map.get("parkName").toString();
+				
+				// 半径
+				Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
+				
+				// 图形类型
+				String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
+				
+				// 版本
+				Integer versions = map.get("versions").equals("") ? null : Integer.parseInt(map.get("versions").toString());
+				
+				// 创建人
+				Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
+				
+				// 创建日期
+				String createDate = map.get("createDate").equals("") ? "" : map.get("createDate").toString();
+				
+				Integer updateBy = map.get("updateBy").equals("") ? null : Integer.parseInt(map.get("updateBy").toString());
+				
+				SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss"); 
+				
+				Date date = new Date();
+				
+				// 修改日期
+				String updateDate = formatter.format(date);
+				
+				carParkRepository.carParkUpdate(area, company, parkCode, parkName, brancheCompany, createBy, createDate, descriptions, destroy, updateBy, updateDate, versions, bCenterPoint, gCenterPoint, bParkPoint, gParkPoint, dbType, radius, shapesType, id);
+				
+			}
+			
+			resultMap.put("status", ResponseCode.SUCCESS);
+			
+		 } catch (Exception e) {
+
+			resultMap.put("status", ResponseCode.ERROR);
+			
+			logger.error("save erro.", e);
+			
+		 }
+		
+		return resultMap;
+	}
+     
+}
@@ -34,7 +34,7 @@ public class LineServiceImpl extends BaseServiceImpl&lt;Line, Integer&gt; implements L
 	 * 
 	 * @return int <lineCode：线路编码>
 	 */
-	public int selectMaxIdToLineCode() {
+	public long selectMaxIdToLineCode() {
 		// TODO Auto-generated method stub
 		return repository.selectMaxIdToLineCode();
 	}
-package com.bsth.service.impl;
-
-import com.bsth.entity.Personnel;
-import com.bsth.service.PersonnelService;
-import org.springframework.stereotype.Service;
-
-/**
- * Created by xu on 16/6/15.
- */
-@Service
-public class PersonnelServiceImpl extends BaseServiceImpl<Personnel, Integer> implements PersonnelService {
-}
+package com.bsth.service.impl;
+
+import com.bsth.entity.Personnel;
+import com.bsth.service.PersonnelService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by xu on 16/6/15.
+ */
+@Service
+public class PersonnelServiceImpl extends BaseServiceImpl<Personnel, Integer> implements PersonnelService {
+}
@@ -91,4 +91,104 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 		return resultList;
 	}
  
+	/**
+	 * @Description : TODO(根据路段路由Id查询详情)
+	 * 
+	 * @param  map <id:路段路由ID> 
+	 * 
+	 * @return List<Map<String, Object>>
+	 */
+	@Override
+	public List<Map<String, Object>> findSectionRouteInfoFormId(Map<String, Object> map) {
+
+		// 获取线路ID
+	    Integer id = map.get("id").equals("") ? 0 : Integer.parseInt(map.get("id").toString());
+		
+	    List<Object[]> objects = repository.findSectionRouteInfoFormId(id);
+	    
+	    List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();	 
+	    
+	    int len = objects.size();
+	    
+	    if(objects.size()>0) {
+	    	
+	    	for(int i = 0 ; i < len; i++) {
+	    		Map<String, Object> tempM = new HashMap<String,Object>();
+	    		
+	    		tempM.put("sectionRouteId", objects.get(i)[0]);
+	    		
+	    		tempM.put("sectionRouteLineCode", objects.get(i)[1]);
+	    		
+	    		tempM.put("sectionRouteCode", objects.get(i)[2]);
+	    		
+	    		tempM.put("sectionRouteDirections", objects.get(i)[3]);
+	    		
+	    		tempM.put("sectionRouteLine", objects.get(i)[4]);
+	    		
+	    		tempM.put("sectionRouteSection", objects.get(i)[5]);
+	    		
+	    		tempM.put("sectionRouteDescriptions", objects.get(i)[6]);
+	    		
+	    		tempM.put("sectionRouteCreateBy", objects.get(i)[7]);
+	    		
+	    		tempM.put("sectionRouteCreateDate", objects.get(i)[8]);
+	    		
+	    		tempM.put("sectionRouteUpdateBy", objects.get(i)[9]);
+	    		
+	    		tempM.put("sectionRouteUpdateDate", objects.get(i)[10]);
+	    		
+	    		tempM.put("sectionRouteVersions", objects.get(i)[11]);
+	    		
+	    		tempM.put("sectionRouteDestroy", objects.get(i)[12]);
+	    		
+	    		tempM.put("sectionId", objects.get(i)[13]);
+	    		
+	    		tempM.put("sectionCode", objects.get(i)[14]);
+	    		
+	    		tempM.put("sectionName", objects.get(i)[15]);
+	    		
+	    		tempM.put("sectionRoadCoding", objects.get(i)[16]);
+	    		
+	    		tempM.put("sectionEndCode", objects.get(i)[17]);
+	    		
+	    		tempM.put("sectionStartNode", objects.get(i)[18]);
+	    		
+	    		tempM.put("sectionMiddleNode", objects.get(i)[19]);
+	    		
+	    		tempM.put("sectionType", objects.get(i)[20]);
+	    		
+	    		tempM.put("sectionCsectionVector", objects.get(i)[21]);
+	    		
+	    		tempM.put("sectionBsectionVector", objects.get(i)[22]);
+	    		
+	    		tempM.put("sectionGsectionVector", objects.get(i)[23]);
+	    		
+	    		tempM.put("sectionDistance", objects.get(i)[24]);
+	    		
+	    		tempM.put("sectionTime", objects.get(i)[25]);
+	    		
+	    		tempM.put("sectionDbtype", objects.get(i)[26]);
+	    		
+	    		tempM.put("sectionSpeedLimit", objects.get(i)[27]);
+	    		
+	    		tempM.put("sectionDescriptions", objects.get(i)[28]);
+	    		
+	    		tempM.put("sectionCreateBy", objects.get(i)[29]);
+	    		
+	    		tempM.put("sectionCreateDate", objects.get(i)[30]);
+	    		
+	    		tempM.put("sectionUpdateBy", objects.get(i)[31]);
+	    		
+	    		tempM.put("sectionUpdateDate", objects.get(i)[32]);
+	    		
+	    		tempM.put("sectionVersion", objects.get(i)[33]);
+	    		
+	    		resultList.add(tempM);
+	    	}
+	    	
+	    }
+	    
+		return resultList;
+	}
+	
 }
 package com.bsth.service.impl;
  
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -17,6 +19,7 @@ import com.bsth.repository.SectionRouteRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.StationRouteService;
+import com.bsth.util.FTPClientUtils;
  
 /**
  * 
@@ -482,4 +485,220 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 		return resultMap;
 	}
+	
+	/**
+	 * @Description : TODO(根据线路ID生成行单)
+	 * 
+	 * @param map <lineId:线路ID>
+	 * 
+	 * @return Map<String, Object> <SUCCESS ; ERROR>
+	 */
+	@Override
+	public Map<String, Object> usingSingle(Map<String, Object> map) {
+		
+		Map<String, Object> resultMap = new HashMap<String,Object>();
+		
+		try {
+			
+			// 获取线路ID
+			Integer lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
+			
+			Line line = lineRepository.findOne(lineId);
+			
+			List<Object[]> objects = repository.usingSingle(lineId);
+			
+			String stationRStr = "";
+			
+			// windows下的文本文件换行符
+			String enterStr = "\r\n";
+			
+			// linux/unix下的文本文件换行符
+			// String enterStr = "\r";
+			
+			if(objects.size()>0) {
+				
+				for(int i = 0; i<objects.size();i++) {
+					
+					// 经度
+					String lng = objects.get(i)[0].toString();
+					
+					// 纬度
+					String lat = " " + objects.get(i)[1].toString();
+					
+					// 站点类型
+					String stationMake =  objects.get(i)[3].toString();
+					
+					if(stationMake.equals("E")) {
+						
+						stationMake = " " + "2";
+						
+					}else {
+						
+						stationMake =" " + "1";
+						
+					}
+					
+					// 站点序号 
+					String stationNo = " " + objects.get(i)[4].toString();
+					
+					// 站点编码
+					String stationCode = " " + objects.get(i)[5].toString();
+					
+					double tempd = Double.parseDouble(objects.get(i)[6].toString())*1000;
+					
+					// 站点距离
+					String staitondistance = " " + String.valueOf((int) tempd);
+					
+					// 限速
+					String sleepStr = " " + "60";
+					
+					// 站点名称
+					String staitonName = " " + objects.get(i)[7].toString();
+					
+					stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + staitonName + enterStr;
+					
+				}
+				
+			}
+			
+			System.out.println(stationRStr);
+			
+			FTPClientUtils  ftpClientUtils = new FTPClientUtils();
+			
+			String url = "192.168.168.101";
+			
+			int  port = 21;
+			
+			String username = "testftpservice";
+			
+			String password = "123";
+			
+			String path = "C:/ftptest";
+			
+			String filename = line.getLineCode() + ".txt";
+			
+			stationRStr  =  line.getName() + enterStr + stationRStr;
+			
+			InputStream input = new ByteArrayInputStream(stationRStr.getBytes("utf-8"));
+			
+			boolean b = ftpClientUtils.uploadFile(url, port, username, password, path, filename, input);
+			
+			System.out.println(b);
+			
+			resultMap.put("status", ResponseCode.SUCCESS);
+			
+		} catch (Exception e) {
+
+			resultMap.put("status", ResponseCode.ERROR);
+			
+			logger.error("save erro.", e);
+			
+		}  
+		return resultMap;
+	}
+
+	@Override
+	public List<Map<String, Object>> findStationRouteInfo(Map<String, Object> map) {
+
+		// 获取线路ID
+	    Integer id = map.get("id").equals("") ? 0 : Integer.parseInt(map.get("id").toString());
+		
+	    List<Object[]> objects = repository.findStationRouteInfo(id);
+	    
+	    List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();	 
+	    
+	    int len = objects.size();
+	    
+	    if(objects.size()>0) {
+	    	
+	    	for(int i = 0 ; i < len; i++) {
+	    		Map<String, Object> tempM = new HashMap<String,Object>();
+	    		
+	    		tempM.put("stationRouteLine", objects.get(i)[0]);
+	    		
+	    		tempM.put("stationRouteStation", objects.get(i)[1]);
+	    		
+	    		tempM.put("stationRouteCode", objects.get(i)[2]);
+	    		
+	    		tempM.put("stationRouteLIneCode", objects.get(i)[3]);
+	    		
+	    		tempM.put("stationRouteStationMark", objects.get(i)[4]);
+	    		
+	    		tempM.put("stationOutStationNmber", objects.get(i)[5]);
+	    		
+	    		tempM.put("stationRoutedirections", objects.get(i)[6]);
+	    		
+	    		tempM.put("stationRouteDistances", objects.get(i)[7]);
+	    		
+	    		tempM.put("stationRouteToTime", objects.get(i)[8]);
+	    		
+	    		tempM.put("staitonRouteFirstTime", objects.get(i)[9]);
+	    		
+	    		tempM.put("stationRouteEndTime", objects.get(i)[10]);
+	    		
+	    		tempM.put("stationRouteDescriptions", objects.get(i)[11]);
+	    		
+	    		tempM.put("stationRouteDestroy", objects.get(i)[12]);
+	    		
+	    		tempM.put("stationRouteVersions", objects.get(i)[13]);
+	    		
+	    		tempM.put("stationRouteCreateBy", objects.get(i)[14]);
+	    		
+	    		tempM.put("stationRouteCreateDate", objects.get(i)[15]);
+	    		
+	    		tempM.put("stationRouteUpdateBy", objects.get(i)[16]);
+	    		
+	    		tempM.put("stationRouteUpdateDate", objects.get(i)[17]);
+	    		
+	    		tempM.put("stationId", objects.get(i)[18]);
+	    		
+	    		tempM.put("stationCode", objects.get(i)[19]);
+	    		
+	    		tempM.put("stationName", objects.get(i)[20]);
+	    		
+	    		tempM.put("stationRoadCoding", objects.get(i)[21]);
+	    		
+	    		tempM.put("stationDbType", objects.get(i)[22]);
+	    		
+	    		tempM.put("stationJwpoints", objects.get(i)[23]);
+	    		
+	    		tempM.put("stationGlonx", objects.get(i)[24]);
+	    		
+	    		tempM.put("stationGlaty", objects.get(i)[25]);
+	    		
+	    		tempM.put("stationX", objects.get(i)[26]);
+	    		
+	    		tempM.put("stationY", objects.get(i)[27]);
+	    		
+	    		tempM.put("stationBPolyonGrid", objects.get(i)[28]);
+	    		
+	    		tempM.put("stationGPloyonGrid", objects.get(i)[29]);
+	    		
+	    		tempM.put("stationDestroy", objects.get(i)[30]);
+	    		
+	    		tempM.put("stationRadius", objects.get(i)[31]);
+	    		
+	    		tempM.put("stationShapesType", objects.get(i)[32]);
+	    		
+	    		tempM.put("stationVersions", objects.get(i)[33]);
+	    		
+	    		tempM.put("sttationDescriptions", objects.get(i)[34]);
+	    		
+	    		tempM.put("stationCreateBy", objects.get(i)[35]);
+	    		
+	    		tempM.put("stationCreateDate", objects.get(i)[36]);
+	    		
+	    		tempM.put("stationUpdateBy", objects.get(i)[37]);
+	    		
+	    		tempM.put("stationUpdateDate", objects.get(i)[38]);
+	    		
+	    		tempM.put("stationRouteId", objects.get(i)[39]);
+	    		
+	    		resultList.add(tempM);
+	    	}
+	    	
+	    }
+	    
+		return resultList;
+	}
 }
@@ -16,16 +16,19 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
+import com.bsth.entity.LineInformation;
 import com.bsth.entity.Section;
 import com.bsth.entity.SectionRoute;
 import com.bsth.entity.Station;
 import com.bsth.entity.StationRoute;
+import com.bsth.repository.LineInformationRepository;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.SectionRepository;
 import com.bsth.repository.SectionRouteRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.StationService;
+import com.bsth.util.GetUIDAndCode;
  
 /**
  * 
@@ -52,6 +55,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	@Autowired
 	private StationRouteRepository routeRepository;
  
+	@Autowired
+	private LineInformationRepository informationRepository;
+	
 	@Autowired 
 	private LineRepository lineRepository;
  
@@ -103,327 +109,521 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 线路ID
 			int lineId = map.get("lineId").toString().equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
  
-			Double sectionDistance = 0.0;
+			// 半径
+			int radius =  map.get("radius").equals("") ? 0 : Integer.parseInt(map.get("radius").toString());
+			
+			// 图形类型
+			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
+			
+			// 路段距离
+			Double sectionDistance = 0.0d;
  
-			Double sectionDuration = 0.0;
+			// 路段时长
+			Double sectionDuration = 0.0d;
+			
+			// 里程(上或者下)
+			double sumUpOrDownMileage = 0.0d;
  
 			// 线路信息
 			Line resultLine = lineRepository.findOne(lineId);
  
+			Map<String, Object> resultSaveMapm = new HashMap<String,Object>();
+			
 			if(!stationJSON.equals("")) {
  
-				JSONArray stationsArray = JSONArray.parseArray(stationJSON);
-				
-				if(stationsArray.size()>0) {
-					
-					for(int i = 0;i <stationsArray.size();i++) {
-						
-						// 站点名称
-						String stationName = stationsArray.getJSONObject(i).equals("") ? "" : stationsArray.getJSONObject(i).get("name").toString();
-						
-						Double distance = stationsArray.getJSONObject(i).get("distance").equals("") ? 0 : Double.parseDouble(stationsArray.getJSONObject(i).get("distance").toString());
-						
-						// 转成公里
-						distance = distance/1000;
-						
-						BigDecimal d = new BigDecimal(distance);
-						
-						distance = d.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-						
-						sectionDistance= distance + sectionDistance;
-						
-						Double duration = stationsArray.getJSONObject(i).get("duration").equals("") ? 0 : Double.parseDouble(stationsArray.getJSONObject(i).get("duration").toString());
-						
-						// 转成分钟
-						duration = duration/60;
-						
-						BigDecimal t = new BigDecimal(duration);
-						
-						duration = t.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-						
-						sectionDuration = duration + sectionDuration;
-						
-						// 百度经纬度坐标
-						String bJwpoints = "";
-						
-						// 百度坐标经度
-						String bLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lng").toString();
-						
-						// 百度坐标纬度
-						String bLatx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lat").toString();
-						
-						// 百度经纬度
-						bJwpoints = bLonx + " " + bLatx;
-						
-						List<Object[]> stationNameList = repository.findStationName(stationName);
-						
-						boolean isHave = isHaveStationname(bJwpoints,stationNameList);
-						
-						// 初始化站点对象
-						Station arg0 =  new Station();
-						
-						// 站点编码
-						int stationCode = 0;
-						
-						if(isHave) {
-							
-							Integer stationId = Integer.parseInt(stationNameList.get(0)[1].toString());
-							
-							arg0 = repository.findOne(stationId);
-							
-							stationCode = Integer.parseInt(arg0.getStationCod());
-							
-						}else {
-							
-							stationCode = repository.stationMaxId();
-							
-							arg0.setStationName(stationName);
-							
-							// 原坐标类型
-							arg0.setDbType(dbType);
-							
-							// 站点地理位置WGS坐标经度
-							String gLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lng").toString();
-							arg0.setgLonx(Float.parseFloat(gLonx));
-							
-							// 站点地理位置WGS坐标纬度
-							String gLaty = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lat").toString();
-							arg0.setgLaty(Float.parseFloat(gLaty));
-							
-							// 半径
-							int radius =  map.get("radius").equals("") ? 0 : Integer.parseInt(map.get("radius").toString());
-							arg0.setRadius(radius);
-							
-							// 图形类型
-							String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
-							arg0.setShapesType(shapesType);
-							
-							// 站点编码
-							arg0.setStationCod(String.valueOf(stationCode+1));
-							
-							// 是否想撤销
-							arg0.setDestroy(destroy);
-							
-							// 版本号
-							arg0.setVersions(versions);
-							
-							arg0.setbJwpoints(bJwpoints);
-							
-							// 插入站点信息
-							repository.save(arg0);
-							
-						}
-						
-						// 站点路由对象
-						StationRoute route = new StationRoute();
-						
-						// 站点名称
-						route.setStationName(stationName);
-						
-						route.setDistances(distance);
-						
-						route.setToTime(duration);
-						
-						
-						// 站点编码
-						route.setStationCode(arg0.getStationCod());
-						
-						// 站点序号
-						route.setStationRouteCode((i+1)*100);
-						
-						// 站点类型
-						if(i==0) {
-							
-							// 起始站
-							route.setStationMark("B");
-							
-						}else if(i==stationsArray.size()-1) {
-							
-							// 终点站
-							route.setStationMark("E");
-							
-						}else {
-							
-							// 中途站
-							route.setStationMark("Z");
-							
-						}
-						
-						// 版本号
-						route.setVersions(versions);
-						
-						// 站点ID
-						route.setStation(arg0);
-						
-						// 方向
-						route.setDirections(directions);
-						
-						// 线路ID
-						route.setLine(resultLine);
-						
-						// 线路编码
-						route.setLineCode(resultLine.getLineCode());
-						
-						route.setDestroy(destroy);
-						
-						// 插入站点路由信息 
-						routeRepository.save(route);
-						
-					}
-					
-				}
+				resultSaveMapm = savaStationAndStationRouteInfo( stationJSON, sectionDistance, sectionDuration, dbType,radius, shapesType, destroy, versions, sumUpOrDownMileage, directions, resultLine);
  
 			}
  
+			sectionDistance = Double.valueOf(resultSaveMapm.get("sectionDistance").toString());
+			
+			sectionDuration= Double.valueOf(resultSaveMapm.get("sectionDuration").toString());
+			
 			// 如果路段信息JSON字符串不为空
 			if(!sectionJSON.equals("")) {
  
-				// 转换成JSON数组
-				JSONArray sectionsArray = JSONArray.parseArray(sectionJSON);
+				saveSectionAndSectionRouteInfo( sectionJSON, directions, resultLine, speedLimitStr,sectionDistance, sectionDuration, dbType, versions, destroy);
+			}
+			
+			sumUpOrDownMileage = Double.valueOf(resultSaveMapm.get("sumUpOrDownMileage").toString());
+			
+			updateLineInfoUpOrDownMileage( resultLine , directions, sumUpOrDownMileage);
+			
+			resultMap.put("status", ResponseCode.SUCCESS);
+			
+		} catch (Exception e) {
+			
+			resultMap.put("status", ResponseCode.ERROR);
+			
+			logger.error("save erro.", e);
+			
+		}
+		
+		return resultMap;
+	}
+	
+	
+	/**
+	 * @Description :保存站点和站点路由信息（系统规划）
+	 * 
+	 * @param stationJSON：站点和站点路由json数据
+	 * 
+	 * @param sectionDistance： 总距离
+	 * 
+	 * @param sectionDuration： 总时长
+	 * 
+	 * @param dbType：原坐标类型
+	 * 
+	 * @param radius：半径
+	 * 
+	 * @param shapesType：图形类型
+	 * 
+	 * @param destroy：是否撤销
+	 * 
+	 * @param versions：版本
+	 * 
+	 * @param sumUpOrDownMileage：里程（上或者下）
+	 * 
+	 * @param directions：方向
+	 * 
+	 * @param resultLine：线路实体类
+	 * 
+	 * @return
+	 * 
+	 * @throws Exception
+	 */
+	public Map<String, Object> savaStationAndStationRouteInfo(String stationJSON,double sectionDistance,double sectionDuration,String dbType,
+			
+			int radius,String shapesType,int destroy,int versions,double sumUpOrDownMileage,int directions,Line resultLine) throws Exception{
+		
+		Map<String, Object> paramsMeleageAndDistncDura = new HashMap<String,Object>();
+		
+		JSONArray stationsArray = JSONArray.parseArray(stationJSON);
+		
+		if(stationsArray.size()>0) {
+			
+			for(int i = 0;i <stationsArray.size();i++) {
  
-				// 原始线状图形坐标集合
-				String sectionsBpoints = "";
+				// 站点名称
+				String stationName = stationsArray.getJSONObject(i).equals("") ? "" : stationsArray.getJSONObject(i).get("name").toString();
  
-				// WGS线状图形坐标集合
-				String sectionsWJPpoints = "";
+				Double distance = stationsArray.getJSONObject(i).get("distance").equals("") ? 0 : Double.parseDouble(stationsArray.getJSONObject(i).get("distance").toString());
  
-				// 遍历
-				for(int s = 0 ;s<sectionsArray.size();s++) {
+				// 转成公里
+				distance = distance/1000;
+				
+				BigDecimal d = new BigDecimal(distance);
+				
+				distance = d.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+				
+				sectionDistance= distance + sectionDistance;
+				
+				Double duration = stationsArray.getJSONObject(i).get("duration").equals("") ? 0 : Double.parseDouble(stationsArray.getJSONObject(i).get("duration").toString());
+				
+				// 转成分钟
+				duration = duration/60;
+				
+				BigDecimal t = new BigDecimal(duration);
+				
+				duration = t.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+				
+				sectionDuration = duration + sectionDuration;
+				
+				// 百度经纬度坐标
+				String bJwpoints = "";
+				
+				// 百度坐标经度
+				String bLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lng").toString();
+				
+				// 百度坐标纬度
+				String bLatx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lat").toString();
+				
+				// 百度经纬度
+				bJwpoints = bLonx + " " + bLatx;
+				
+				List<Object[]> stationNameList = repository.findStationName(stationName);
+				
+				boolean isHave = isHaveStationname(bJwpoints,stationNameList);
+				
+				// 初始化站点对象
+				Station arg0 =  new Station();
+				
+				// 站点编码
+				long stationCode = 0L;
+				
+				if(isHave) {
  
-					String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
+					Integer stationId = Integer.parseInt(stationNameList.get(0)[1].toString());
  
-					String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
+					arg0 = repository.findOne(stationId);
  
-					String WGSLngStr = JSONObject.parseObject(sectionsArray.getJSONObject(s).get("WGSpotion").toString()).get("Lng").toString();
+				}else {
  
-					String WGSLatStr = JSONObject.parseObject(sectionsArray.getJSONObject(s).get("WGSpotion").toString()).get("Lat").toString();
+					stationCode = GetUIDAndCode.getStationId();
  
-					if(s==0) {
-						
-						sectionsBpoints = pointsLngStr + " " + pointsLatStr;
-						
-						sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
-						
-					}else {
-						
-						sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
-						
-						sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
-						
-					}
+					arg0.setStationCod(String.valueOf(stationCode));
+					
+					arg0.setId((int)stationCode);
+					
+					arg0.setStationName(stationName);
+					
+					// 原坐标类型
+					arg0.setDbType(dbType);
+					
+					// 站点地理位置WGS坐标经度
+					String gLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lng").toString();
+					arg0.setgLonx(Float.parseFloat(gLonx));
+					
+					// 站点地理位置WGS坐标纬度
+					String gLaty = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lat").toString();
+					arg0.setgLaty(Float.parseFloat(gLaty));
+					
+					arg0.setRadius(radius);
+					
+					
+					arg0.setShapesType(shapesType);
  
+					// 是否想撤销
+					arg0.setDestroy(destroy);
+					
+					// 版本号
+					arg0.setVersions(versions);
+					
+					arg0.setbJwpoints(bJwpoints);
+					
+					// 插入站点信息
+					repository.save(arg0);
  
 				}
  
-				int sectionMaxId = sectionRepository.sectionMaxId();
+				// 站点路由对象
+				StationRoute route = new StationRoute();
+				
+				// 站点名称
+				route.setStationName(stationName);
+				
+				route.setDistances(distance);
+				
+				sumUpOrDownMileage =  sumUpOrDownMileage + distance;
  
-				String sectionCode = String.valueOf(sectionMaxId+1);
+				route.setToTime(duration);
  
-				String upOrDownStr = "";
  
-				if(directions==0){
+				// 站点编码
+				route.setStationCode(arg0.getStationCod());
+				
+				// 站点序号
+				route.setStationRouteCode((i+1)*100);
+				
+				// 站点类型
+				if(i==0) {
+					
+					// 起始站
+					route.setStationMark("B");
  
-					upOrDownStr = "上行路段";
+				}else if(i==stationsArray.size()-1) {
  
-				}else if(directions==1){
+					// 终点站
+					route.setStationMark("E");
+					
+				}else {
  
-					upOrDownStr = "下行路段";
+					// 中途站
+					route.setStationMark("Z");
  
 				}
  
-			    // 路段名称
-				String sectionName = resultLine.getName()+upOrDownStr;
+				// 版本号
+				route.setVersions(versions);
  
-				// 交出路
-				String crosesRoad = "";
+				// 站点ID
+				route.setStation(arg0);
  
-				// 终止节点
-				String endNode = "";
+				// 方向
+				route.setDirections(directions);
  
-				// 开始节点
-				String startNode = "";
+				// 线路ID
+				route.setLine(resultLine);
  
-				// 中间节点
-				String middleNode = "";
+				// 线路编码
+				route.setLineCode(resultLine.getLineCode());
  
-				// WGS坐标点集合
-				String gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+				route.setDestroy(destroy);
  
-				// 原坐标点集合
-				String bsectionVector = "LINESTRING(" + sectionsBpoints + ")";
+				// 插入站点路由信息 
+				routeRepository.save(route);
+				
+			}
+			
+			paramsMeleageAndDistncDura.put("sumUpOrDownMileage", sumUpOrDownMileage);
+			
+			paramsMeleageAndDistncDura.put("sectionDistance", sectionDistance);
+			
+			paramsMeleageAndDistncDura.put("sectionDuration", sectionDuration);
+			
+		}
+		
+		return paramsMeleageAndDistncDura;
+		
+	}
+	
+	/**
+	 * 
+	 * 
+	 * @param resultLine：线路实体类
+	 * 
+	 * @param directions：方向
+	 * 
+	 * @param sumUpOrDownMileage：里程（上或者下）
+	 */
+	public void updateLineInfoUpOrDownMileage(Line resultLine ,int directions,double sumUpOrDownMileage) {
+		
+		List<LineInformation> listLineInfo = informationRepository.findByLine(resultLine);
+		
+		int listLineSize = listLineInfo.size();
+		
+		// 不存在线路标准信息则插入
+		if(listLineSize==0) {
+			
+			LineInformation paramInfo = new LineInformation();
+			
+			// 上行
+			if(directions==0) {
  
-				// 城建坐标点集合
-				String csectionVector = "";
+				paramInfo.setUpMileage(sumUpOrDownMileage);
  
-				// 路段类型
-				String sectionType = "";
+				paramInfo.setDownMileage(0.0d);
  
-				// 道路编码
-				String roadCoding = "";
+				paramInfo.setTotalMileage(sumUpOrDownMileage+0.0d);
  
-				// 限速
-				double speedLimit = Double.parseDouble(speedLimitStr);
+				paramInfo.setType("zc");
  
-				// 说明
-				String descriptions = "";
+				paramInfo.setLine(resultLine);
  
-				// 路段保存
-				sectionRepository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, 
-											
-											 middleNode, gsectionVector, bsectionVector, sectionType, csectionVector, 
-											 
-											 roadCoding, sectionDistance, sectionDuration, dbType, speedLimit, 
-											 
-											 descriptions, versions);
-											 
+			// 下行	
+			}else if(directions==1) {
  
+				paramInfo.setUpMileage(0.0d);
  
-				Section section = sectionRepository.findOne(Integer.parseInt(sectionCode));
+				paramInfo.setDownMileage(sumUpOrDownMileage);
  
-				// 路段路由
-				SectionRoute sectionRoute = new SectionRoute();
+				paramInfo.setTotalMileage(sumUpOrDownMileage+0.0d);
  
-				// 路段序号
-				sectionRoute.setSectionrouteCode(100);
+				paramInfo.setType("zc");
  
-				// 线路编码
-				sectionRoute.setLineCode(resultLine.getLineCode());
+				paramInfo.setLine(resultLine);
  
-				// 路段ID
-				sectionRoute.setSection(section);
+			}
+			
+			informationRepository.save(paramInfo);
+			
+		// 存在则更新	
+		}else if(listLineSize>0) {
+			
+			for(int s =0;s<listLineSize;s++) {
  
-				sectionRoute.setDestroy(destroy);
+				LineInformation lineInformation = listLineInfo.get(s);
  
-				// 线路ID
-				sectionRoute.setLine(resultLine);
+				double tempUp = lineInformation.getUpMileage();
  
-				// 路段编码
-				sectionRoute.setSectionCode(sectionCode);
+				double tempDown = lineInformation.getDownMileage();
  
-				// 版本
-				sectionRoute.setVersions(versions);
+				// 上行
+				if(directions==0) {
+					
+					if(tempUp>0.0d){
+						
+						continue;
+					}
+					
+					
+					lineInformation.setUpMileage(sumUpOrDownMileage);
+					
+					lineInformation.setTotalMileage(sumUpOrDownMileage+tempDown);
+					
+					
+				}else if(directions==1) {
+					
+					if(tempDown>0.0d){
+						
+						continue;
+					}
+					
+					lineInformation.setDownMileage(sumUpOrDownMileage);
+					
+					lineInformation.setTotalMileage(sumUpOrDownMileage+tempUp);
+					
+				}
  
-				// 方向
-				sectionRoute.setDirections(directions);
+				informationRepository.save(lineInformation);
  
-				// 路段路由保存
-				sectionRouteRepository.save(sectionRoute);
 			}
  
-			resultMap.put("status", ResponseCode.SUCCESS);
+		}
+		
+	}
+	
+	/**
+	 * @Description 保存路段与路段路由信息
+	 * 
+	 * @param sectionJSON：路段与路段路由json字符串数据
+	 * 
+	 * @param directions：方向
+	 * 
+	 * @param resultLine：线路实体类
+	 * 
+	 * @param speedLimitStr：限速
+	 * 
+	 * @param sectionDistance：总距离
+	 * 
+	 * @param sectionDuration：总时长
+	 * 
+	 * @param dbType：原中坐标类型
+	 * 
+	 * @param versions：版本号
+	 * 
+	 * @param destroy：是否撤销
+	 * 
+	 */
+	public void saveSectionAndSectionRouteInfo(String sectionJSON,int directions,Line resultLine,String speedLimitStr,
  
-		} catch (Exception e) {
+			double sectionDistance,double sectionDuration,String dbType,int versions,int destroy) throws Exception{
+		
+		// 转换成JSON数组
+		JSONArray sectionsArray = JSONArray.parseArray(sectionJSON);
+		
+		// 原始线状图形坐标集合
+		String sectionsBpoints = "";
+		
+		// WGS线状图形坐标集合
+		String sectionsWJPpoints = "";
+		
+		// 遍历
+		for(int s = 0 ;s<sectionsArray.size();s++) {
  
-			resultMap.put("status", ResponseCode.ERROR);
+			String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
+			
+			String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
+			
+			String WGSLngStr = JSONObject.parseObject(sectionsArray.getJSONObject(s).get("WGSpotion").toString()).get("Lng").toString();
+			
+			String WGSLatStr = JSONObject.parseObject(sectionsArray.getJSONObject(s).get("WGSpotion").toString()).get("Lat").toString();
+			
+			if(s==0) {
+				
+				sectionsBpoints = pointsLngStr + " " + pointsLatStr;
+				
+				sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
+				
+			}else {
+				
+				sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
+				
+				sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
+				
+			}
  
-			logger.error("save erro.", e);
  
 		}
  
-		return resultMap;
+		long sectionMaxId = GetUIDAndCode.getSectionId();
+		
+		String sectionCode = String.valueOf(sectionMaxId);
+		
+		int sectionid = (int)sectionMaxId;
+		
+		String upOrDownStr = "";
+		
+		if(directions==0){
+			
+			upOrDownStr = "上行路段";
+			
+		}else if(directions==1){
+			
+			upOrDownStr = "下行路段";
+			
+		}
+		
+	    // 路段名称
+		String sectionName = resultLine.getName()+upOrDownStr;
+		
+		// 交出路
+		String crosesRoad = "";
+		
+		// 终止节点
+		String endNode = "";
+		
+		// 开始节点
+		String startNode = "";
+		
+		// 中间节点
+		String middleNode = "";
+		
+		// WGS坐标点集合
+		String gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+		
+		// 原坐标点集合
+		String bsectionVector = "LINESTRING(" + sectionsBpoints + ")";
+		
+		// 城建坐标点集合
+		String csectionVector = "";
+		
+		// 路段类型
+		String sectionType = "";
+		
+		// 道路编码
+		String roadCoding = "";
+		
+		// 限速
+		double speedLimit = Double.parseDouble(speedLimitStr);
+		
+		// 说明
+		String descriptions = "";
+		
+		// 路段保存
+		sectionRepository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, 
+									
+									 middleNode, gsectionVector, bsectionVector, sectionType, csectionVector, 
+									 
+									 roadCoding, sectionDistance, sectionDuration, dbType, speedLimit, 
+									 
+									 descriptions, versions,sectionid);
+									 
+		
+		
+		Section section = sectionRepository.findOne(sectionid);
+		
+		// 路段路由
+		SectionRoute sectionRoute = new SectionRoute();
+		
+		// 路段序号
+		sectionRoute.setSectionrouteCode(100);
+		
+		// 线路编码
+		sectionRoute.setLineCode(resultLine.getLineCode());
+		
+		// 路段ID
+		sectionRoute.setSection(section);
+		
+		sectionRoute.setDestroy(destroy);
+		
+		// 线路ID
+		sectionRoute.setLine(resultLine);
+		
+		// 路段编码
+		sectionRoute.setSectionCode(sectionCode);
+		
+		// 版本
+		sectionRoute.setVersions(versions);
+		
+		// 方向
+		sectionRoute.setDirections(directions);
+		
+		// 路段路由保存
+		sectionRouteRepository.save(sectionRoute);
+		
 	}
  
-	
 	public boolean isHaveStationname(String bJwpoints,List<Object[]> stationNameList) {
  
 		boolean temp = true;
@@ -452,17 +652,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 		return temp;
 	}
  
-	/**
-	 * @Description :TODO(查询站点编码)
-	 * 
-	 * @return int <stationCode站点编码>
-	 */
-	@Override
-	public int getStationCode() {
-		
-		return repository.stationMaxId();
-		
-	}
+	 
  
 	/**
 	 * @Description :TODO(新增站点保存)
@@ -489,6 +679,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 站点编码
 			String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
  
+			// 站点ID
+			int stationId = Integer.valueOf(stationCod);
+			
 			// 站点名称
 			String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
  
@@ -585,13 +778,12 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
  
 									gLonx, gLaty, x, y, gPloygonGrid,bPloygonGrid, destroy, radius, 
  
-									shapesType, versions, descriptions, createBy, updateBy);
+									shapesType, versions, descriptions, createBy, updateBy,stationId);
  
  
  
-			int staitonId = repository.stationMaxId();
  
-			Station station = repository.findOne(staitonId);
+			Station station = repository.findOne(stationId);
  
 			StationRoute arg0 = new StationRoute();
  
@@ -605,9 +797,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			arg0.setStationName(stationName);
  
 			// 站点路由编码
-			arg0.setStationCode(station.getStationCod());
+			arg0.setStationCode(stationCod);
  
-			// 站点路由Id
+			// 站点路由序号
 			arg0.setStationRouteCode(Integer.parseInt(stationRouteCodeArray[0])+1);
  
 			// 站点路由类型
@@ -878,7 +1070,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
  
 						if(distanceStr.indexOf("米")!=-1){
  
-							distance = Double.parseDouble(distanceStr.replaceAll("米", ""));
+							distance = Double.parseDouble(distanceStr.replaceAll("米", "")) / 1000;
  
 						}else if(distanceStr.indexOf("公里")!=-1){
  
@@ -930,7 +1122,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					Station arg0 =  new Station();
  
 					// 站点编码
-					int stationCode = 0;
+					long  stationCode = 0L;
  
 					if(isHave) {
  
@@ -942,7 +1134,11 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
  
 					}else {
  
-						stationCode = repository.stationMaxId();
+						stationCode = GetUIDAndCode.getStationId();
+						
+						int stationId = (int) (stationCode);
+						
+						arg0.setId(stationId);
  
 						arg0.setStationName(stationName);
  
@@ -966,7 +1162,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 						arg0.setShapesType(shapesType);
  
 						// 站点编码
-						arg0.setStationCod(String.valueOf(stationCode+1));
+						arg0.setStationCod(String.valueOf(stationCode));
  
 						// 是否想撤销
 						arg0.setDestroy(destroy);
@@ -978,6 +1174,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
  
 						// 插入站点信息
 						repository.save(arg0);
+						
+						
 						// 站点路由对象
 						StationRoute route = new StationRoute();
  
@@ -1081,16 +1279,13 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 						}
  
 					}
-					System.out.println(sectionName);
-					
-					System.out.println(sectionsBpoints);
+				 
  
-					System.out.println(sectionsWJPpoints);
-					 
+					long sectionMaxId = GetUIDAndCode.getSectionId();
  
-					int sectionMaxId = sectionRepository.sectionMaxId();
+					String sectionCode = String.valueOf(sectionMaxId);
  
-					String sectionCode = String.valueOf(sectionMaxId+1);
+					int sectionId = (int) (sectionMaxId);
  
 					// 交出路
 					String crosesRoad = "";
@@ -1138,7 +1333,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
  
 												 roadCoding, sectionDistance, sectionTime, dbType, speedLimit, 
  
-												 descriptions, versions);
+												 descriptions, versions,sectionId);
  
  
  
-package com.bsth.service.schedule;
-
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.service.BaseService;
-
-/**
- * Created by xu on 16/6/16.
- */
-public interface SchedulePlanInfoService extends BaseService<SchedulePlanInfo, Long> {
-}
+package com.bsth.service.schedule;
+
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.service.BaseService;
+
+/**
+ * Created by xu on 16/6/16.
+ */
+public interface SchedulePlanInfoService extends BaseService<SchedulePlanInfo, Long> {
+}
-package com.bsth.service.schedule;
-
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.service.impl.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * Created by xu on 16/6/16.
- */
-@Service
-public class SchedulePlanInfoServiceImpl extends BaseServiceImpl<SchedulePlanInfo, Long> implements SchedulePlanInfoService {
-}
+package com.bsth.service.schedule;
+
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by xu on 16/6/16.
+ */
+@Service
+public class SchedulePlanInfoServiceImpl extends BaseServiceImpl<SchedulePlanInfo, Long> implements SchedulePlanInfoService {
+}
-package com.bsth.service.schedule;
-
-import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.service.BaseService;
-
-/**
- * Created by xu on 16/6/16.
- */
-public interface SchedulePlanService extends BaseService<SchedulePlan, Long> {
-}
+package com.bsth.service.schedule;
+
+import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.service.BaseService;
+
+/**
+ * Created by xu on 16/6/16.
+ */
+public interface SchedulePlanService extends BaseService<SchedulePlan, Long> {
+}
-package com.bsth.service.schedule;
-
-import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.service.impl.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * Created by xu on 16/6/16.
- */
-@Service
-public class SchedulePlanServiceImpl extends BaseServiceImpl<SchedulePlan, Long> implements SchedulePlanService {
-}
+package com.bsth.service.schedule;
+
+import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by xu on 16/6/16.
+ */
+@Service
+public class SchedulePlanServiceImpl extends BaseServiceImpl<SchedulePlan, Long> implements SchedulePlanService {
+}
-package com.bsth.service.schedule.rules;
-
-/**
- * Created by xu on 16/6/15.
- */
-public class Message {
-    public static final int HELLO = 0;
-    public static final int GOODBYE = 1;
-
-    private String message;
-    private int status;
-    public String getMessage() {
-        return message;
-    }
-    public void setMessage(String message) {
-        this.message = message;
-    }
-    public int getStatus() {
-        return status;
-    }
-    public void setStatus(int status) {
-        this.status = status;
-    }
-}
+package com.bsth.service.schedule.rules;
+
+/**
+ * Created by xu on 16/6/15.
+ */
+public class Message {
+    public static final int HELLO = 0;
+    public static final int GOODBYE = 1;
+
+    private String message;
+    private int status;
+    public String getMessage() {
+        return message;
+    }
+    public void setMessage(String message) {
+        this.message = message;
+    }
+    public int getStatus() {
+        return status;
+    }
+    public void setStatus(int status) {
+        this.status = status;
+    }
+}
-package com.bsth.service.schedule.rules;
-
-import org.kie.api.KieBase;
-import org.kie.api.KieBaseConfiguration;
-import org.kie.api.KieServices;
-import org.kie.api.builder.*;
-import org.kie.api.builder.Message;
-import org.kie.api.builder.model.KieBaseModel;
-import org.kie.api.builder.model.KieModuleModel;
-import org.kie.api.builder.model.KieSessionModel;
-import org.kie.api.conf.EqualityBehaviorOption;
-import org.kie.api.conf.EventProcessingOption;
-import org.kie.api.runtime.KieContainer;
-import org.kie.api.runtime.conf.ClockTypeOption;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Drools 6配置类。
- */
-@Configuration
-public class MyDroolsConfiguration {
-    /**
-     * 返回一个kiebase知识库，直接冲文件系统读入drl规则文件，
-     * TODO：以后需要从数据库读入规则文件，并重新创建kbase知识库。
-     */
-    @Bean
-    public KieBase myKieBase() {
-        // Drools 6开始引入kie统一接口（jboss的jbpm工作流也使用kie接口了），整个定义方式和5差别很大
-        // 这里使用全api方式创建知识库对象，不使用xml的方式，提供最大的灵活性
-
-        // 1、创建kieservices
-        KieServices kieServices = KieServices.Factory.get();
-        // 2、创建KieModuleModel，默认是由kmodule.xml的方式创建，这里使用api方式闯将
-        KieModuleModel kieModuleModel = kieServices.newKieModuleModel();
-        // 2.1、创建KieBaseModel，类似kmodule.xml中的kbase标签
-        KieBaseModel kieBaseModel1 = kieModuleModel.newKieBaseModel("KBase1")
-                .setDefault(true)
-                .setEqualsBehavior(EqualityBehaviorOption.EQUALITY)
-                .setEventProcessingMode(EventProcessingOption.STREAM);
-        // 2.2、创建与kbase关联的KieSessionModel，类似kmodule.xml中的kbase内的ksession标签
-        kieBaseModel1.newKieSessionModel("KSession1")
-                .setDefault(true)
-                .setType(KieSessionModel.KieSessionType.STATEFUL)
-                .setClockType(ClockTypeOption.get("realtime"));
-
-        // 3、创建KieFileSystem，将模型xml，drl等写入，TODO：以后考虑从数据库中获取
-        KieFileSystem kfs = kieServices.newKieFileSystem();
-        // 3.1、写入KieBaseModel（内部包含了KieSessionModel的内容了，注意之前的KieSessionModel的创建方式）
-        kfs.writeKModuleXML(kieModuleModel.toXML());
-
-        // 3.2、写入drl（写法超多，有点混乱）
-        // 这里使用文件的形式写入，TODO：以后考虑从数据库中读drl写入
-        // 注意kfs写的时候如果指定path，强制为src/main/resources/加上文件名，还有就是文件名不要重复否则会覆盖的
-        kfs.write("src/main/resources/HelloWorld.drl", kieServices.getResources()
-                .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/HelloWorld.drl"), "UTF-8"));
-        kfs.write("src/main/resources/shiftloop.drl", kieServices.getResources()
-                .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/shiftloop.drl"), "UTF-8"));
-        // TODO：还有其他drl....
-
-        // 4、创建KieBuilder，使用KieFileSystem构建
-        KieBuilder kieBuilder = kieServices.newKieBuilder(kfs).buildAll();
-        Results results = kieBuilder.getResults();
-        if (results.hasMessages(Message.Level.ERROR))
-            throw new IllegalStateException("构建drools6错误：" + results.getMessages());
-
-        // 5、获取KieContainer
-        // TODO：ReleaseId用处很大，以后再议
-        ReleaseId releaseId = kieServices.getRepository().getDefaultReleaseId();
-        KieContainer kieContainer = kieServices.newKieContainer(releaseId);
-
-        // 6、创建kbase
-        KieBaseConfiguration kieBaseConfiguration = kieServices.newKieBaseConfiguration();
-        KieBase kieBase = kieContainer.newKieBase("KBase1", kieBaseConfiguration);
-
-        return kieBase;
-    }
-}
+package com.bsth.service.schedule.rules;
+
+import org.kie.api.KieBase;
+import org.kie.api.KieBaseConfiguration;
+import org.kie.api.KieServices;
+import org.kie.api.builder.*;
+import org.kie.api.builder.Message;
+import org.kie.api.builder.model.KieBaseModel;
+import org.kie.api.builder.model.KieModuleModel;
+import org.kie.api.builder.model.KieSessionModel;
+import org.kie.api.conf.EqualityBehaviorOption;
+import org.kie.api.conf.EventProcessingOption;
+import org.kie.api.runtime.KieContainer;
+import org.kie.api.runtime.conf.ClockTypeOption;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Drools 6配置类。
+ */
+@Configuration
+public class MyDroolsConfiguration {
+    /**
+     * 返回一个kiebase知识库，直接冲文件系统读入drl规则文件，
+     * TODO：以后需要从数据库读入规则文件，并重新创建kbase知识库。
+     */
+    @Bean
+    public KieBase myKieBase() {
+        // Drools 6开始引入kie统一接口（jboss的jbpm工作流也使用kie接口了），整个定义方式和5差别很大
+        // 这里使用全api方式创建知识库对象，不使用xml的方式，提供最大的灵活性
+
+        // 1、创建kieservices
+        KieServices kieServices = KieServices.Factory.get();
+        // 2、创建KieModuleModel，默认是由kmodule.xml的方式创建，这里使用api方式闯将
+        KieModuleModel kieModuleModel = kieServices.newKieModuleModel();
+        // 2.1、创建KieBaseModel，类似kmodule.xml中的kbase标签
+        KieBaseModel kieBaseModel1 = kieModuleModel.newKieBaseModel("KBase1")
+                .setDefault(true)
+                .setEqualsBehavior(EqualityBehaviorOption.EQUALITY)
+                .setEventProcessingMode(EventProcessingOption.STREAM);
+        // 2.2、创建与kbase关联的KieSessionModel，类似kmodule.xml中的kbase内的ksession标签
+        kieBaseModel1.newKieSessionModel("KSession1")
+                .setDefault(true)
+                .setType(KieSessionModel.KieSessionType.STATEFUL)
+                .setClockType(ClockTypeOption.get("realtime"));
+
+        // 3、创建KieFileSystem，将模型xml，drl等写入，TODO：以后考虑从数据库中获取
+        KieFileSystem kfs = kieServices.newKieFileSystem();
+        // 3.1、写入KieBaseModel（内部包含了KieSessionModel的内容了，注意之前的KieSessionModel的创建方式）
+        kfs.writeKModuleXML(kieModuleModel.toXML());
+
+        // 3.2、写入drl（写法超多，有点混乱）
+        // 这里使用文件的形式写入，TODO：以后考虑从数据库中读drl写入
+        // 注意kfs写的时候如果指定path，强制为src/main/resources/加上文件名，还有就是文件名不要重复否则会覆盖的
+        kfs.write("src/main/resources/HelloWorld.drl", kieServices.getResources()
+                .newInputStreamResource(this.getClass().getResourceAsStream(
+                        "/rules/HelloWorld.drl"), "UTF-8"));
+        kfs.write("src/main/resources/shiftloop.drl", kieServices.getResources()
+                .newInputStreamResource(this.getClass().getResourceAsStream(
+                        "/rules/shiftloop.drl"), "UTF-8"));
+        // TODO：还有其他drl....
+
+        // 4、创建KieBuilder，使用KieFileSystem构建
+        KieBuilder kieBuilder = kieServices.newKieBuilder(kfs).buildAll();
+        Results results = kieBuilder.getResults();
+        if (results.hasMessages(Message.Level.ERROR))
+            throw new IllegalStateException("构建drools6错误：" + results.getMessages());
+
+        // 5、获取KieContainer
+        // TODO：ReleaseId用处很大，以后再议
+        ReleaseId releaseId = kieServices.getRepository().getDefaultReleaseId();
+        KieContainer kieContainer = kieServices.newKieContainer(releaseId);
+
+        // 6、创建kbase
+        KieBaseConfiguration kieBaseConfiguration = kieServices.newKieBaseConfiguration();
+        KieBase kieBase = kieContainer.newKieBase("KBase1", kieBaseConfiguration);
+
+        return kieBase;
+    }
+}
-package com.bsth.service.schedule.rules.shiftloop;
-
-import org.joda.time.DateTime;
-
-/**
- * 排班计算参数_输入。
- */
-public class ScheduleCalcuParam_input {
-    /** 开始计算日期 */
-    private DateTime fromDate;
-    /** 结束计算日期 */
-    private DateTime toDate;
-    /** 时刻表id */
-    private Long ttinfoId;
-
-    public DateTime getFromDate() {
-        return fromDate;
-    }
-
-    public void setFromDate(DateTime fromDate) {
-        this.fromDate = fromDate;
-    }
-
-    public DateTime getToDate() {
-        return toDate;
-    }
-
-    public void setToDate(DateTime toDate) {
-        this.toDate = toDate;
-    }
-
-    public Long getTtinfoId() {
-        return ttinfoId;
-    }
-
-    public void setTtinfoId(Long ttinfoId) {
-        this.ttinfoId = ttinfoId;
-    }
-}
+package com.bsth.service.schedule.rules.shiftloop;
+
+import org.joda.time.DateTime;
+
+/**
+ * 排班计算参数_输入。
+ */
+public class ScheduleCalcuParam_input {
+    /** 开始计算日期 */
+    private DateTime fromDate;
+    /** 结束计算日期 */
+    private DateTime toDate;
+    /** 时刻表id */
+    private Long ttinfoId;
+
+    public DateTime getFromDate() {
+        return fromDate;
+    }
+
+    public void setFromDate(DateTime fromDate) {
+        this.fromDate = fromDate;
+    }
+
+    public DateTime getToDate() {
+        return toDate;
+    }
+
+    public void setToDate(DateTime toDate) {
+        this.toDate = toDate;
+    }
+
+    public Long getTtinfoId() {
+        return ttinfoId;
+    }
+
+    public void setTtinfoId(Long ttinfoId) {
+        this.ttinfoId = ttinfoId;
+    }
+}
-package com.bsth.service.schedule.rules.shiftloop;
-
-import org.joda.time.DateTime;
-
-/**
- * 规则计算出的结果_输出。
- */
-public class ScheduleResult_output {
-    /** 具体日期 */
-    private DateTime sd;
-    /** 用的是哪一组rule */
-    private Long ruleId;
-    /** 路牌id */
-    private Long guideboardId;
-    /** 人员配置id */
-    private Long employeeConfigId;
-    /** 车辆配置id */
-    private Long carConfigId;
-
-    public DateTime getSd() {
-        return sd;
-    }
-
-    public void setSd(DateTime sd) {
-        this.sd = sd;
-    }
-
-    public Long getGuideboardId() {
-        return guideboardId;
-    }
-
-    public void setGuideboardId(Long guideboardId) {
-        this.guideboardId = guideboardId;
-    }
-
-    public Long getEmployeeConfigId() {
-        return employeeConfigId;
-    }
-
-    public void setEmployeeConfigId(Long employeeConfigId) {
-        this.employeeConfigId = employeeConfigId;
-    }
-
-    public Long getCarConfigId() {
-        return carConfigId;
-    }
-
-    public void setCarConfigId(Long carConfigId) {
-        this.carConfigId = carConfigId;
-    }
-
-    public Long getRuleId() {
-        return ruleId;
-    }
-
-    public void setRuleId(Long ruleId) {
-        this.ruleId = ruleId;
-    }
-
-}
+package com.bsth.service.schedule.rules.shiftloop;
+
+import org.joda.time.DateTime;
+
+/**
+ * 规则计算出的结果_输出。
+ */
+public class ScheduleResult_output {
+    /** 具体日期 */
+    private DateTime sd;
+    /** 用的是哪一组rule */
+    private Long ruleId;
+    /** 路牌id */
+    private Long guideboardId;
+    /** 人员配置id */
+    private Long employeeConfigId;
+    /** 车辆配置id */
+    private Long carConfigId;
+
+    public DateTime getSd() {
+        return sd;
+    }
+
+    public void setSd(DateTime sd) {
+        this.sd = sd;
+    }
+
+    public Long getGuideboardId() {
+        return guideboardId;
+    }
+
+    public void setGuideboardId(Long guideboardId) {
+        this.guideboardId = guideboardId;
+    }
+
+    public Long getEmployeeConfigId() {
+        return employeeConfigId;
+    }
+
+    public void setEmployeeConfigId(Long employeeConfigId) {
+        this.employeeConfigId = employeeConfigId;
+    }
+
+    public Long getCarConfigId() {
+        return carConfigId;
+    }
+
+    public void setCarConfigId(Long carConfigId) {
+        this.carConfigId = carConfigId;
+    }
+
+    public Long getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(Long ruleId) {
+        this.ruleId = ruleId;
+    }
+
+}
-package com.bsth.service.schedule.rules.shiftloop;
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.*;
-
-/**
- * 输出结果集合。
- */
-public class ScheduleResults_output {
-    /** 输出列表 */
-    private List<ScheduleResult_output> results = new ArrayList<>();
-
-    public List<ScheduleResult_output> getResults() {
-        return results;
-    }
-
-    public void setResults(List<ScheduleResult_output> results) {
-        this.results = results;
-    }
-
-    /**
-     * 输出每个规则排出来的路牌id列表
-     * @return
-     */
-    public String showGuideboardDesc1() {
-        StringBuilder stringBuilder = new StringBuilder();
-        Map<Long, List<ScheduleResult_output>> groupRuleIdGuideBoardMap = new HashMap<>();
-        for (ScheduleResult_output s : results) {
-            if (groupRuleIdGuideBoardMap.get(s.getRuleId()) == null) {
-                groupRuleIdGuideBoardMap.put(s.getRuleId(), new ArrayList<ScheduleResult_output>());
-            }
-            groupRuleIdGuideBoardMap.get(s.getRuleId()).add(s);
-        }
-
-        for (Long ruleId : groupRuleIdGuideBoardMap.keySet()) {
-            Collections.sort(groupRuleIdGuideBoardMap.get(ruleId), new Comparator<ScheduleResult_output>() {
-                @Override
-                public int compare(ScheduleResult_output o1, ScheduleResult_output o2) {
-                    return o1.getSd().compareTo(o2.getSd());
-                }
-            });
-
-            List<Long> gbids = new ArrayList<>();
-            List<Long> ecids = new ArrayList<>();
-            for (ScheduleResult_output so : groupRuleIdGuideBoardMap.get(ruleId)) {
-                gbids.add(so.getGuideboardId());
-                ecids.add(so.getEmployeeConfigId());
-            }
-
-            stringBuilder.append(
-                    "规则id=" + ruleId + ", " +
-                    "路牌列表=" + StringUtils.join(gbids, ",") + "\n");
-            stringBuilder.append(
-                    "规则id=" + ruleId + ", " +
-                    "人员配置列表=" + StringUtils.join(ecids, ",") + "\n");
-        }
-
-        return stringBuilder.toString();
-    }
-
-    // TODO：人员输出
-}
+package com.bsth.service.schedule.rules.shiftloop;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.*;
+
+/**
+ * 输出结果集合。
+ */
+public class ScheduleResults_output {
+    /** 输出列表 */
+    private List<ScheduleResult_output> results = new ArrayList<>();
+
+    public List<ScheduleResult_output> getResults() {
+        return results;
+    }
+
+    public void setResults(List<ScheduleResult_output> results) {
+        this.results = results;
+    }
+
+    /**
+     * 输出每个规则排出来的路牌id列表
+     * @return
+     */
+    public String showGuideboardDesc1() {
+        StringBuilder stringBuilder = new StringBuilder();
+        Map<Long, List<ScheduleResult_output>> groupRuleIdGuideBoardMap = new HashMap<>();
+        for (ScheduleResult_output s : results) {
+            if (groupRuleIdGuideBoardMap.get(s.getRuleId()) == null) {
+                groupRuleIdGuideBoardMap.put(s.getRuleId(), new ArrayList<ScheduleResult_output>());
+            }
+            groupRuleIdGuideBoardMap.get(s.getRuleId()).add(s);
+        }
+
+        for (Long ruleId : groupRuleIdGuideBoardMap.keySet()) {
+            Collections.sort(groupRuleIdGuideBoardMap.get(ruleId), new Comparator<ScheduleResult_output>() {
+                @Override
+                public int compare(ScheduleResult_output o1, ScheduleResult_output o2) {
+                    return o1.getSd().compareTo(o2.getSd());
+                }
+            });
+
+            List<Long> gbids = new ArrayList<>();
+            List<Long> ecids = new ArrayList<>();
+            for (ScheduleResult_output so : groupRuleIdGuideBoardMap.get(ruleId)) {
+                gbids.add(so.getGuideboardId());
+                ecids.add(so.getEmployeeConfigId());
+            }
+
+            stringBuilder.append(
+                    "规则id=" + ruleId + ", " +
+                    "路牌列表=" + StringUtils.join(gbids, ",") + "\n");
+            stringBuilder.append(
+                    "规则id=" + ruleId + ", " +
+                    "人员配置列表=" + StringUtils.join(ecids, ",") + "\n");
+        }
+
+        return stringBuilder.toString();
+    }
+
+    // TODO：人员输出
+}