12312

youxiw2000
2 parents 02362ca0 8c415bd1
Showing 25 changed files with 1834 additions and 851 deletions
pom.xml
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/InoutCarparkController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/CarPark.java
src/main/java/com/bsth/entity/LsInoutSectionRoute.java
src/main/java/com/bsth/entity/Section.java
src/main/java/com/bsth/entity/Station.java
src/main/java/com/bsth/entity/schedule/datasync/VehicleDataSyncTask.java
src/main/java/com/bsth/repository/CarParkRepository.java
src/main/java/com/bsth/repository/LsInoutSectionRouteRepository.java
src/main/java/com/bsth/repository/LsStationRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/repository/schedule/TTInfoDetailRepository.java
@@ -400,6 +400,12 @@
             <version>1.0.0</version>
         </dependency>
+		<!-- geotool -->
+		<dependency>
+			<groupId>org.locationtech.jts</groupId>
+			<artifactId>jts-core</artifactId>
+			<version>1.16.1</version>
+		</dependency>
     </dependencies>
 	<dependencyManagement>
@@ -54,4 +54,9 @@ public class Constants {
 	 * 批量解除调度指令和班次的外键约束
 	 */
 	public static final String MULTI_REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch in ";
+
+	/**
+	 * 批量解除子任务和班次的外键约束
+	 */
+	public static final String MULTI_REMOVE_CHILDTASK_SCH_FK = "update bsth_c_s_child_task set schedule=NULL where schedule in ";
 }
+package com.bsth.controller;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.LsInoutSectionRoute;
+import com.bsth.repository.StationRouteCacheRepository;
+import com.bsth.repository.StationRouteRepository;
+import com.bsth.service.InoutCarparkService;
+import com.bsth.service.StationRouteService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("inout")
+public class InoutCarparkController extends BaseController<LsInoutSectionRoute, Long>{
+
+    private final static Logger logger = LoggerFactory.getLogger(InoutCarparkController.class);
+	
+	@Autowired
+	InoutCarparkService inoutCarparkService;
+    
+    @RequestMapping(value = "/getStartEndByLine", method = RequestMethod.GET)
+    public Map<String, Object> getStartEndByLine(@RequestParam("lineId")int lineId, @RequestParam("version")int version) {
+    	return inoutCarparkService.getStartEndByLine(lineId, version);
+    }
+
+    @RequestMapping(value = "/getRouteByStartEnd", method = RequestMethod.GET)
+    public Map<String, Object> getRouteByStartEnd(@RequestParam("lineId")int lineId, @RequestParam("version")int version, @RequestParam("start")String start, @RequestParam("end")String end) {
+        return inoutCarparkService.getRouteByStartEnd(lineId, version, start, end);
+    }
+
+    /**
+     * 新增路段信息
+     *
+     * @param map：<bsectionVector：折线百度坐标集合；dbType：圆坐标类型；descriptions：描述与说明；destroy：是否撤销；directions：方向；lineId：线路ID
+     *
+     * 			   lineCode ：线路编码；roadCoding：道路编码；sectionCode：路段编码；sectionDistance：路段长度；sectionName：路段名称；sectionTime：路段时长；
+     *
+     * 			   sectionrouteCode：路段序号；speedLimit：路段限速>
+     *
+     * @return map<SUCCESS：成功；ERROR：异常>
+     */
+    @RequestMapping(value="sectionSave" , method = RequestMethod.POST)
+    public Map<String, Object> sectionSave(@RequestParam Map<String, Object> map) {
+        map.put("createBy", "");
+        map.put("updateBy", "");
+        return inoutCarparkService.sectionSave(map);
+    }
+
+    /**
+     * @Description :TODO(编辑线路走向)
+     *
+     * @param map <sectionId:路段ID； sectionJSON：路段信息>
+     *
+     * @return Map<String, Object> <SUCCESS ; ERROR>
+     */
+    @RequestMapping(value="sectionUpdate" , method = RequestMethod.POST)
+    public Map<String, Object> sectionUpdate(@RequestParam Map<String, Object> map) {
+
+        map.put("updateBy", "");
+
+        map.put("createBy", "");
+
+        map.put("createDate", "");
+
+        return inoutCarparkService.sectionUpdate(map);
+
+    }
+
+    /**
+     * @param id //路段路由id
+     * @Description: TODO(撤销路段)
+     */
+    @RequestMapping(value = "/destroy", method = RequestMethod.POST)
+    public Map<String, Object> destroy(@RequestParam Map<String, Object> map) {
+        return inoutCarparkService.destroy(map);
+    }
+
+    /**
+     * 从历史轨迹做进场路径规划
+     * @Description: TODO(撤销路段)
+     */
+    @RequestMapping(value = "/pathPlaningByHistory", method = RequestMethod.POST)
+    public Map<String, Object> pathPlaningByHistory(@RequestParam Map<String, Object> map){
+        Map<String, Object> result = new HashMap<>();
+        result.put("status", ResponseCode.SUCCESS);
+        try {
+            String schId = (String)map.get("schId"), version = (String)map.get("version");
+            if (StringUtils.isEmpty(schId) || StringUtils.isEmpty(version)) {
+                throw new RuntimeException("无效的参数");
+            }
+            inoutCarparkService.pathPlaningByHistory(Long.parseLong(schId), Integer.parseInt(version));
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            logger.error("路径规划异常", e);
+        }
+
+        return result;
+    }
+}
@@ -234,8 +234,24 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	@RequestMapping(value = "/checkDate",method = RequestMethod.GET)
 	public String checkDate(@RequestParam Map<String, Object> map){
-		String list=ylbService.checkDate(map);
-		return list;
+		String result=ylbService.checkDate(map);
+		return result;
+	}
+	
+	@RequestMapping(value = "/getModifyRights",method = RequestMethod.GET)
+	public Map<String, Object> getModifyRights(@RequestParam Map<String, Object> map){
+		String result=ylbService.getModifyRights();
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		resMap.put("text", result);
+		return resMap;
+	}
+	
+	@RequestMapping(value = "/modifyRightsChange",method = RequestMethod.GET)
+	public Map<String, Object> modifyRightsChange(@RequestParam Map<String, Object> map){
+		String result=ylbService.modifyRightsChange();
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		resMap.put("text", result);
+		return resMap;
 	}
 	@RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
@@ -13,9 +13,12 @@ import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.external.TccExternalService;
+import com.bsth.entity.Line;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.LineRepository;
 import com.bsth.repository.directive.D60Repository;
+import com.bsth.service.LineService;
 import com.bsth.websocket.handler.SendUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Splitter;
@@ -59,6 +62,13 @@ public class ServiceDataInterface {
     @Autowired
     private SendUtils sendUtils;
+
+    @Autowired
+    LineRepository lineRepository;
+    
+    @Autowired
+    private LineService service;
+    
     /**
      * 获取车辆 和 当前执行班次对照信息
      *
@@ -324,9 +334,26 @@ public class ServiceDataInterface {
         ObjectMapper mapper = new ObjectMapper();
         try {
+            List<Map<String,String>> emergencyList = new ArrayList();
+            List<Map<String,String>> emergencyListAll = new ArrayList();
             List<Map> maps = mapper.readValue(jsonStr,mapper.getTypeFactory().constructParametricType(List.class, Map.class));
             for (Map map : maps) {
                 sendUtils.sendContingencyPlan(map);
+                emergencyList.add((Map<String, String>) map.get("emergencyLine"));
+            }
+      
+            for (Map.Entry<String, String> m : BasicData.lineCode2NameMap.entrySet()){
+                for (Map<String,String> emer : emergencyList){
+                    for (Map.Entry<String,String> t : emer.entrySet()){
+                        if(m.getKey().equals(t.getKey())){
+                            emergencyListAll.add(emer); //
+                            Line line = lineRepository.findById(Integer.parseInt(t.getKey())).get();
+                            line.setName(t.getValue());
+                            Map<String, Object> status = service.update(line);
+                            logger.info("应急接口修改线路名称-----------------------"+status.get("status"));
+                        }
+                    }
+                }
             }
         } catch (IOException e) {
             result.put("errCode", 502);
@@ -218,8 +218,9 @@ public class ReportController {
 		return new ArrayList<Map<String, Object>>();
 	}
 	@RequestMapping(value = "/sreachZd", method = RequestMethod.GET)
-	public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx) {
-		return service.sreachZd(line,zdlx);
+	public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx,
+			@RequestParam String date1,@RequestParam String date2) {
+		return service.sreachZd(line,zdlx,date1,date2);
 	}
-package com.bsth.controller.schedule;
-
-import com.bsth.service.TrafficManageService;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * @author BSTH
- *
- */
-@RestController
-@RequestMapping("trmg")
-public class TrafficManageController {
-
-    @Autowired
-    private TrafficManageService trManageService;
-
-
-    @RequestMapping(value = "/setXL", method = RequestMethod.GET)
-    public String setXL(@RequestParam("ids") String ids) throws Exception {
-        try {
-            return trManageService.setXL(ids);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setXLByInUse", method = RequestMethod.GET)
-    public String setXLByInUse(@RequestParam("inUse") String inUse) throws Exception {
-        try {
-            return trManageService.setXLByInUse(inUse);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setCL", method = RequestMethod.GET)
-    public String setCL() throws Exception {
-        try {
-            return trManageService.setCL();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setSJ", method = RequestMethod.GET)
-    public String setSJ() throws Exception {
-        try {
-            return trManageService.setSJ();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setLD", method = RequestMethod.GET)
-    public String setLD() throws Exception {
-        try {
-            return trManageService.setLD();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setLDByDate", method = RequestMethod.GET)
-    public String setLDByDate(@RequestParam("theDate") String theDate) throws Exception {
-        try {
-            return trManageService.setLD(theDate);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setLDFile", method = RequestMethod.GET)
-    public String setLDFile() throws Exception {
-        try {
-            return trManageService.setLDFile();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setLCYH", method = RequestMethod.GET)
-    public String setLCYH() throws Exception {
-        try {
-            return trManageService.setLCYH();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setDDRB", method = RequestMethod.GET)
-    public String setDDRB() throws Exception {
-        try {
-            return trManageService.setDDRB();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setJHBC", method = RequestMethod.GET)
-    public String setJHBC() throws Exception {
-        try {
-            return trManageService.setJHBC();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setJHBCByDate", method = RequestMethod.GET)
-    public String setJHBCByDate(@RequestParam("theDate") String theDate) throws Exception {
-        try {
-            return trManageService.setJHBC(theDate);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setSKB", method = RequestMethod.GET)
-    public String setSKB(@RequestParam("ids") String ids) throws Exception {
-        try {
-            return trManageService.setSKB(ids);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setXLPC", method = RequestMethod.GET)
-    public String setXLPC() throws Exception {
-        try {
-            return trManageService.setXLPC();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setCS", method = RequestMethod.GET)
-    public String setCS() throws Exception {
-        try {
-            return trManageService.setCS();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/getDownLoadAllDataFile", method = RequestMethod.GET)
-    public String getDownLoadAllDataFile() throws Exception {
-        try {
-            return trManageService.getDownLoadAllDataFile();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-}
+package com.bsth.controller.schedule;
+
+import com.bsth.service.TrafficManageService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * @author BSTH
+ *
+ */
+@RestController
+@RequestMapping("trmg")
+public class TrafficManageController {
+
+    @Autowired
+    private TrafficManageService trManageService;
+
+
+    @RequestMapping(value = "/setXL", method = RequestMethod.GET)
+    public String setXL(@RequestParam("ids") String ids) throws Exception {
+        try {
+            return trManageService.setXL(ids);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setXLByInUse", method = RequestMethod.GET)
+    public String setXLByInUse(@RequestParam("inUse") String inUse) throws Exception {
+        try {
+            return trManageService.setXLByInUse(inUse);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setCL", method = RequestMethod.GET)
+    public String setCL() throws Exception {
+        try {
+            return trManageService.setCL();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setSJ", method = RequestMethod.GET)
+    public String setSJ() throws Exception {
+        try {
+            return trManageService.setSJ();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setLD", method = RequestMethod.GET)
+    public String setLD() throws Exception {
+        try {
+            return trManageService.setLD();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setLDByDate", method = RequestMethod.GET)
+    public String setLDByDate(@RequestParam("theDate") String theDate) throws Exception {
+        try {
+            return trManageService.setLD(theDate);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setLDFile", method = RequestMethod.GET)
+    public String setLDFile() throws Exception {
+        try {
+            return trManageService.setLDFile();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setLCYH", method = RequestMethod.GET)
+    public String setLCYH() throws Exception {
+        try {
+            return trManageService.setLCYH();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setDDRB", method = RequestMethod.GET)
+    public String setDDRB() throws Exception {
+        try {
+            return trManageService.setDDRB();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setJHBC", method = RequestMethod.GET)
+    public String setJHBC() throws Exception {
+        try {
+            return trManageService.setJHBC();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setJHBCByDate", method = RequestMethod.GET)
+    public String setJHBCByDate(@RequestParam("theDate") String theDate) throws Exception {
+        try {
+            return trManageService.setJHBC(theDate);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setSKB", method = RequestMethod.GET)
+    public String setSKB(@RequestParam("ids") String ids, @RequestParam("qyrqs") String qyrqs) throws Exception {
+        try {
+            return trManageService.setSKB(ids, qyrqs);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setXLPC", method = RequestMethod.GET)
+    public String setXLPC() throws Exception {
+        try {
+            return trManageService.setXLPC();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setCS", method = RequestMethod.GET)
+    public String setCS() throws Exception {
+        try {
+            return trManageService.setCS();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/getDownLoadAllDataFile", method = RequestMethod.GET)
+    public String getDownLoadAllDataFile() throws Exception {
+        try {
+            return trManageService.getDownLoadAllDataFile();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+}
@@ -6,6 +6,7 @@ import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.handlers.*;
 import com.bsth.email.SendEmailController;
 import com.bsth.email.entity.EmailBean;
+import com.bsth.util.IpUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
@@ -109,7 +110,7 @@ public class DataHandleProcess {
     				//发送邮件
     				EmailBean mail = new EmailBean();
     				mail.setSubject("线调GPS处理");
-    				mail.setContent("GPS处理超时，检查日志信息<br/>");
+    				mail.setContent(IpUtils.getLocalIpAddress() + "GPS处理超时，检查日志信息<br/>");
     				sendEmailController.sendMail("113252620@qq.com", mail);
     				logger.info(new ObjectMapper().writeValueAsString(list));
     				logger.info("DataHandlerProcess:邮件发送成功!");
@@ -1020,6 +1020,7 @@ public class DayOfSchedule {
                     }
                     inStr.deleteCharAt(inStr.length() - 1).append(")");
                     jdbcTemplate.update(Constants.MULTI_REMOVE_DIRECTIVE_SCH_FK + " " + inStr.toString());
+                    jdbcTemplate.update(Constants.MULTI_REMOVE_CHILDTASK_SCH_FK + " " + inStr.toString());
                 }
                 //删除班次数据
@@ -40,7 +40,7 @@ public class CarPark {
 	// 地理位置(百度坐标)
 	private String bParkPoint;
-	
+
 	// 地理位置中心点(百度坐标)
 	private String bCenterPoint;
@@ -81,7 +81,7 @@ public class CarPark {
 	private String brancheCompany;
 	 /** 组合公司分公司编码 */
-    @Formula(" concat(company, '_', branche_company) ")
+	@Transient
     private String cgsbm;
 	// 是否撤销
@@ -106,14 +106,6 @@ public class CarPark {
 	// 修改日期
 	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
-	
-	public String getCgsbm() {
-		return cgsbm;
-	}
-
-	public void setCgsbm(String cgsbm) {
-		this.cgsbm = cgsbm;
-	}
 	public Integer getId() {
 		return id;
@@ -219,6 +211,14 @@ public class CarPark {
 		this.company = company;
 	}
+	public String getCgsbm() {
+		return this.company + "_" + this.brancheCompany;
+	}
+
+	public void setCgsbm(String cgsbm) {
+		this.cgsbm = cgsbm;
+	}
+
 	public Integer getDestroy() {
 		return destroy;
 	}
+package com.bsth.entity;
+
+import javax.persistence.*;
+import java.util.Date;
+
+
+/**
+ * 
+ * @ClassName : LsInoutSectionRoute(历史进出场路段路由实体类)
+ * 
+ * @Author : bsth@lq
+ * 
+ * @Description : TODO(历史路段路由)
+ *	
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_ls_inout_sectionroute")
+public class LsInoutSectionRoute {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+	
+	// 路段路由序号
+	private Integer sectionrouteCode;
+	
+	// 线路编号
+	private String lineCode;
+
+	/**
+	 * 进出场起点编码
+	 */
+	private String start;
+
+	/**
+	 * 进出场终点编码
+	 */
+	private String end;
+	
+	// 路段编号
+	private String sectionCode;
+	
+	// 路段路由方向
+	private Integer directions;
+	
+	// 版本号
+	private Integer versions;
+	
+	// 是否撤销
+	private Integer destroy;
+	
+	// 描述
+	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;
+		
+	// 路段信息
+	@OneToOne
+	private Section section;
+	
+	// 线路信息
+	@ManyToOne
+	private Line line;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Integer getSectionrouteCode() {
+		return sectionrouteCode;
+	}
+
+	public void setSectionrouteCode(Integer sectionrouteCode) {
+		this.sectionrouteCode = sectionrouteCode;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getStart() {
+		return start;
+	}
+
+	public void setStart(String start) {
+		this.start = start;
+	}
+
+	public String getEnd() {
+		return end;
+	}
+
+	public void setEnd(String end) {
+		this.end = end;
+	}
+
+	public String getSectionCode() {
+		return sectionCode;
+	}
+
+	public void setSectionCode(String sectionCode) {
+		this.sectionCode = sectionCode;
+	}
+
+	public Integer getDirections() {
+		return directions;
+	}
+
+	public void setDirections(Integer directions) {
+		this.directions = directions;
+	}
+
+	public Integer getVersions() {
+		return versions;
+	}
+
+	public void setVersions(Integer versions) {
+		this.versions = versions;
+	}
+	
+	public Integer getDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(Integer destroy) {
+		this.destroy = destroy;
+	}
+
+	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;
+	}
+
+	public Section getSection() {
+		return section;
+	}
+
+	public void setSection(Section section) {
+		this.section = section;
+	}
+
+	public Line getLine() {
+		return line;
+	}
+
+	public void setLine(Line line) {
+		this.line = line;
+	}
+}
 package com.bsth.entity;
+import org.hibernate.annotations.Formula;
+
 import java.util.Date;
 import javax.persistence.Column;
@@ -53,12 +55,15 @@ public class Section{
 	private String sectionType;
 	// 路段矢量(空间坐标点集合)--GPS坐标点
+	@Formula("ST_AsText(gsection_vector)")
 	private String gsectionVector;
 	// 路段矢量(空间坐标点集合)--百度原始坐标坐标点
+	@Formula("ST_AsText(bsection_vector)")
 	private String bsectionVector;
 	// 路段矢量(空间坐标点集合)--城建坐标点
+	@Formula("ST_AsText(csection_vector)")
 	private String csectionVector;
 	// 交叉路
 package com.bsth.entity;
+import com.bsth.util.Geo.Point;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.hibernate.annotations.Formula;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKBReader;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 /**
@@ -89,6 +89,9 @@ public class Station {
 	// 多边形空间原坐标坐标点集合
 	private byte[] bPolygonGrid;
+
+	@Transient
+	private String bdPolygon;
 	/**
 	 * 是否撤销
@@ -272,6 +275,17 @@ public class Station {
 		this.bPolygonGrid = bPolygonGrid;
 	}
+	public String getBdPolygon() {
+		if (bPolygonGrid == null) {
+			return null;
+		}
+		Geometry geometry = getGeometryFromBytes(getbPolygonGrid());
+		if (geometry == null) {
+			return null;
+		}
+		return geometry.toString();
+	}
+
 	public Integer getDestroy() {
 		return destroy;
 	}
@@ -328,6 +342,48 @@ public class Station {
 		this.updateDate = updateDate;
 	}
+	private static Geometry getGeometryFromBytes(byte[] geometryAsBytes) {
+		Geometry geometry = null;
+		try {
+			// 字节数组小于5，说明geometry有问题
+			if (geometryAsBytes.length < 5) {
+				throw new Exception("Invalid geometry inputStream - less than five bytes");
+			}
+
+			//first four bytes of the geometry are the SRID,
+			//followed by the actual WKB.  Determine the SRID
+			//这里是取字节数组的前4个来解析srid
+			byte[] sridBytes = new byte[4];
+			System.arraycopy(geometryAsBytes, 0, sridBytes, 0, 4);
+			boolean bigEndian = (geometryAsBytes[4] == 0x00);
+			// 解析srid
+			int srid = 0;
+			if (bigEndian) {
+				for (int i = 0; i < sridBytes.length; i++) {
+					srid = (srid << 8) + (sridBytes[i] & 0xff);
+				}
+			} else {
+				for (int i = 0; i < sridBytes.length; i++) {
+					srid += (sridBytes[i] & 0xff) << (8 * i);
+				}
+			}
+
+			//use the JTS WKBReader for WKB parsing
+			WKBReader wkbReader = new WKBReader();
+			// 使用geotool的WKBReader 把字节数组转成geometry对象。
+			//copy the byte array, removing the first four
+			//SRID bytes
+			byte[] wkb = new byte[geometryAsBytes.length - 4];
+			System.arraycopy(geometryAsBytes, 4, wkb, 0, wkb.length);
+			geometry = wkbReader.read(wkb);
+			geometry.setSRID(srid);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return geometry;
+	}
+
 	@Override
 	public String toString() {
 		return "Station [id=" + id + ", stationCod=" + stationCod + ", stationName=" + stationName + ", roadCoding="
@@ -9,7 +9,7 @@ import java.io.Serializable;
 import java.util.Date;
 /**
- * 车辆数据同步日志。
+ * 车辆数据同步任务。
  */
 @Data
 @Builder
-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 (" +
-    			 " 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 ,  str_to_date(?7,'%Y-%m-%d %H:%i:%s') , ?8 , ?9 , ?10," +
-    			 
-    			 "str_to_date(?11,'%Y-%m-%d %H:%i:%s'), ?12 ,?13,ST_GeomFromText(?14), ?15, " +
-    			 
-    			 "?16, ST_GeomFromText(?17), ?18,?19)", nativeQuery=true)
-	public void carParkSave(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," +
-							"ST_AsText(k.b_park_point) AS carParkBparkPoint," +
-							"k.g_center_point AS carParkGcenterPoint," +
-							"ST_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 =  str_to_date(?7,'%Y-%m-%d %H:%i:%s')  , " +
-    		"descriptions =  ?8  , " +
-    		"destroy = ?9  , " +
-    		"update_by = ?10  , " +
-    		"update_date =str_to_date(?11,'%Y-%m-%d %H:%i:%s')  , " +
-    		"versions = ?12  , " +
-    		"b_center_point = ?13  , " +
-    		"g_center_point = ?14 , " +
-    		"b_park_point = ST_GeomFromText(?15)  , " +
-    		"g_park_point = ST_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 );
-
-	@Query(value = "select st_astext(g_park_point), shapes_type, g_center_point, radius,park_code,park_name  from bsth_c_car_park where park_code=?1", nativeQuery = true)
-	public Object[][] bufferAera(String parkCode);
-	
-	@Query(value ="SELECT p.park_name,p.park_code from bsth_c_car_park p where p.park_code = ?1", nativeQuery=true)
-	List<Object[]> selectTccInfoByCode(String  parkCode);
-}
+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 (" +
+    			 " 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 ,  str_to_date(?7,'%Y-%m-%d %H:%i:%s') , ?8 , ?9 , ?10," +
+    			 
+    			 "str_to_date(?11,'%Y-%m-%d %H:%i:%s'), ?12 ,?13,ST_GeomFromText(?14), ?15, " +
+    			 
+    			 "?16, ST_GeomFromText(?17), ?18,?19)", nativeQuery=true)
+	public void carParkSave(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," +
+							"ST_AsText(k.b_park_point) AS carParkBparkPoint," +
+							"k.g_center_point AS carParkGcenterPoint," +
+							"ST_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 =  str_to_date(?7,'%Y-%m-%d %H:%i:%s')  , " +
+    		"descriptions =  ?8  , " +
+    		"destroy = ?9  , " +
+    		"update_by = ?10  , " +
+    		"update_date =str_to_date(?11,'%Y-%m-%d %H:%i:%s')  , " +
+    		"versions = ?12  , " +
+    		"b_center_point = ?13  , " +
+    		"g_center_point = ?14 , " +
+    		"b_park_point = ST_GeomFromText(?15)  , " +
+    		"g_park_point = ST_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 );
+
+	@Query(value = "select st_astext(g_park_point), shapes_type, g_center_point, radius,park_code,park_name  from bsth_c_car_park where park_code=?1", nativeQuery = true)
+	public Object[][] bufferAera(String parkCode);
+	
+	@Query(value ="SELECT p.park_name,p.park_code from bsth_c_car_park p where p.park_code = ?1", nativeQuery=true)
+	List<Object[]> selectTccInfoByCode(String  parkCode);
+
+	@Query(value ="select c.id, c.area,c.company,c.park_code,c.park_name,c.branche_company,c.create_by,c.create_date,c.descriptions,c.destroy,c.update_by,c.update_date,c.versions,c.b_center_point,ST_AsText(c.b_park_point) b_park_point,c.g_center_point,ST_AsText(c.g_park_point) g_park_point,c.db_type,c.radius,c.shapes_type from bsth_c_line_information l left join bsth_c_car_park c on l.car_park = c.park_code  where l.line = ?1", nativeQuery=true)
+	CarPark findByLineId(int  lineId);
+}
+package com.bsth.repository;
+
+import com.bsth.entity.LsInoutSectionRoute;
+import com.bsth.entity.LsSectionRoute;
+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 java.util.List;
+
+/**
+ * 
+ * @Interface: SectionRouteRepository(路段路由Repository数据持久层接口)
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: TODO(路段路由Repository数据持久层接口)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Repository
+public interface LsInoutSectionRouteRepository extends BaseRepository<LsInoutSectionRoute, Long> {
+
+	/**
+	 * 查询待更新线路的路段路由
+	 */
+	@Query(value = "SELECT sr FROM LsInoutSectionRoute sr where sr.line.id =?1 and sr.versions=?2 and sr.start=?3 and sr.end=?4 and sr.destroy=0")
+	List<LsInoutSectionRoute> getRouteByStartEnd(int lineId, int version, String start, String end);
+
+	/**
+	 *
+	 * @param lineCode
+	 * @param version
+	 * @param start
+	 * @param end
+	 * @param sectionrouteCode
+	 */
+	@Modifying
+	@Query(value="UPDATE bsth_c_ls_inout_sectionroute set sectionroute_code = (sectionroute_code+1) where line_code = ?1 and versions = ?2  and start = ?3 and end = ?4 and sectionroute_code >=?5 and destroy = 0", nativeQuery=true)
+	public void sectionUpdSectionRouteCode(String lineCode, int version, String start, String end, Integer sectionrouteCode);
+
+	/**
+	 * 撤销线路某版本进出场
+	 * @param lineCode
+	 * @param version
+	 * @param start
+	 * @param end
+	 */
+	@Modifying
+	@Query(value="UPDATE bsth_c_ls_inout_sectionroute set destroy = 1 where line_code = ?1 and versions = ?2  and start = ?3 and end = ?4", nativeQuery=true)
+	public void destroy(String lineCode, int version, String start, String end);
+}
-package com.bsth.repository;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.repository.EntityGraph;
-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.LsStationRoute;
-import com.bsth.entity.StationRoute;
-
-/**
- * 
- * @Interface: StationRouteRepository(站点路由Repository数据持久层接口)
- * 
- * @Extends : BaseRepository
- * 
- * @Description: TODO(站点路由Repository数据持久层接口)
- * 
- * @Author bsth@lq
- *
- * @Version 公交调度系统BS版 0.1
- * 
- */
-
-@Repository
-public interface LsStationRouteRepository extends BaseRepository<LsStationRoute, Integer> {
-	
-	/**
-	 * 查询待更新线路的站点路由
-	 */
-	@EntityGraph(value = "ls_stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value = "SELECT DISTINCT sr FROM LsStationRoute sr where sr.line.id =?1 and sr.lineCode=?2 and sr.versions=?3 and sr.destroy=0")
-	List<LsStationRoute> findupdated(Integer lineId, String lineCode, Integer versions);
-	
-	@Query(value = "SELECT  a.`stationRoute.id`," +
-		    "a.`stationRoute.line`," +
-		    "a.`stationRoute.station`," +
-			"a.`stationRoute.stationName`," +
-			"a.`stationRoute.stationRouteCode`," +
-			"a.`stationRoute.lineCode`," +
-			"a.`stationRoute.stationMark`," +
-			"a.`stationRoute.outStationNmber`," +
-			"a.`stationRoute.directions`," +
-			"a.`stationRoute.distances`," +
-			"a.`stationRoute.toTime`," +
-			"a.`stationRoute.firstTime`," +
-			"a.`stationRoute.endTime`," +
-			"a.`stationRoute.descriptions`," +
-			"a.`stationRoute.versions`," +
-			"b.id AS 'station.id'," +
-			"b.station_cod AS 'station.stationCod'," +
-			"b.station_name AS 'station.stationName'," +
-			"b.road_coding AS 'station.roadCoding'," +
-			"b.db_type AS 'station.dbType'," +
-			"b.b_jwpoints AS 'station.bJwpoints'," +
-			"b.g_lonx AS 'station.gLonx'," +
-			"b.g_lonx AS 'station.gLaty'," +
-			"b.x AS 'station.x'," +
-			"b.y AS 'station.y'," +
-			"b.shapes_type AS 'station.shapesType'," +
-			"b.radius AS 'station.radius'," +
-			"ST_AsText(b.g_polygon_grid) AS 'station.gPolygonGrid'," +
-			"ST_AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," +
-			"b.destroy AS 'station.destroy'," +
-			"b.versions AS 'station.versions'," +
-			"b.descriptions AS 'station.descriptions', " +
-			"a.`stationRoute.industryCode` " +
-			" FROM (" +
-				"SELECT r.id AS 'stationRoute.id'," +
-				" r.line AS 'stationRoute.line'," +
-				"r.station AS 'stationRoute.station'," +
-				"r.station_name AS 'stationRoute.stationName'," +
-				"r.station_route_code as 'stationRoute.stationRouteCode'," +
-				"r.line_code AS 'stationRoute.lineCode'," +
-				"r.station_mark AS 'stationRoute.stationMark'," +
-				"r.out_station_nmber AS 'stationRoute.outStationNmber'," +
-				"r.directions AS 'stationRoute.directions'," +
-				"r.distances AS 'stationRoute.distances'," +
-				"r.to_time AS 'stationRoute.toTime'," +
-				"r.first_time AS 'stationRoute.firstTime'," +
-				"r.end_time AS 'stationRoute.endTime'," +
-				"r.descriptions AS 'stationRoute.descriptions'," +
-				"r.versions AS 'stationRoute.versions', " +
-				"r.industry_code AS 'stationRoute.industryCode' " +
-			" FROM bsth_c_ls_stationroute r  WHERE  r.line = ?1 and r.directions = ?2 and r.versions=?3 and r.destroy=0) a " +
-			"LEFT JOIN bsth_c_station b " +
-			"ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true)
-	List<Object[]> findPoints(Integer lineId, Integer direction, Integer versions);
-
-	
-	@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," +
-			" a.stationRouteName," +
-			" 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," +
-			" ST_AsText(b.b_polygon_grid) as stationBPolyonGrid," +
-			" ST_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," +
-			"b.station_name as zdmc, "+
-			"a.industryCode "+
-			" FROM ( SELECT s.id AS stationRouteId," +
-				" s.line AS stationRouteLine," +
-				" s.station as stationRouteStation," +
-				" s.station_name AS stationRouteName," +
-				" s.station_route_code as stationRouteCode," +
-				" s.industry_code as industryCode," +
-				" 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_ls_stationroute s WHERE s.line = ?1 and s.directions = ?2 and s.versions=?3 and s.destroy = 0) a " +
-			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id order by a.stationRouteCode", nativeQuery=true)
-	List<Object[]> getStationRouteList(Integer lineId, Integer dir ,Integer version);
-	/**
-     * 更新路线前删除线路版本号历史原有站点路由
-     * 
-     * @param line
-     * @param dir
-     */
-    @Modifying
-    @Transactional
-    @Query(value="DELETE from bsth_c_ls_stationroute where line = ?1  and directions = ?2 and versions = ?3", nativeQuery=true)
-    public void batchDelete(Integer line,Integer dir, Integer versions);
-
-    /**
-     * 更新路线前撤销线路版本号历史原有站点路由
-     * 
-     * @param line
-     * @param dir
-     */
-    @Modifying
-    @Query(value="UPDATE bsth_c_ls_stationroute set destroy = 1 where line = ?1  and directions = ?2 and versions = ?3", nativeQuery=true)
-    public void batchDestroy(Integer sectionRouteLine, Integer directions, Integer versions);
-    
-    /**
-     * 按线路编码查询各站点的顺序号
-     * @param lineCode 线路编码
-     * @param lineVersion 版本号
-     * @return
-     */
-    @Query("SELECT new map(" +
-            "lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
-            "line.linePlayType as linePlayType,s.stationMark as stationMark) " +
-            "FROM " +
-            "LsStationRoute s " +
-            "WHERE " +
-            "s.destroy = 0 AND s.lineCode = ?1 AND s.versions = ?2 " +
-            "ORDER BY " +
-            "lineCode,directions,stationRouteCode")
-    List<Map<String, String>> findLineWithLineCode4Ygc(String lineCode,Integer lineVersion);
-	/**
-	 * @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," +
-			" a.stationRouteName," +
-			" 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," +
-			" ST_AsText(b.b_polygon_grid) as stationBPolyonGrid," +
-			" ST_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,b.station_name as zdmc, " +
-			" a.industryCode "+
-			" FROM " +
-			"( SELECT s.id AS stationRouteId," +
-				" s.line AS stationRouteLine," +
-				" s.station as stationRouteStation," +
-				" s.station_name AS stationRouteName," +
-				" s.station_route_code as stationRouteCode," +
-				" s.industry_code as industryCode," +
-				" 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_ls_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);
-	
-    // 批量修改站点行业编码
-	@Modifying
-	@Query(value="update bsth_c_ls_stationroute set industry_code =?2 where id = ?1 ", nativeQuery=true)
-	void updIndustryCode(Integer id, String industryCode);
-	
-    @Modifying
-	@Query(value="UPDATE bsth_c_ls_stationroute  set station_route_code = (station_route_code+10) where line = ?1  and directions = ?2 and station_route_code >=?3 and destroy = 0", nativeQuery=true)
-	void stationUpdStationRouteCode(Integer line,Integer dir,Integer routeCod);
-    
-    @Modifying
-    @Query(value="update bsth_c_ls_stationroute set directions = case directions when 1 then 0 when 0 then 1 end where line = ?1 ", nativeQuery=true)
-	void stationRouteDir(Integer line);
-
-	@Query("select r from LsStationRoute r where r.line.id=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
-	List<LsStationRoute> findByLine(int lineId, int dir);
-
-    @Modifying
-    @Query(value="update bsth_c_ls_stationroute set distances =?2 where id = ?1 ", nativeQuery=true)
-	void upddis(Integer id,Double dis);
-
-    @Query(value="select * from  bsth_c_ls_stationroute where line_code = ?3 and directions = ?4 and destroy = 0 and versions = ?5 limit ?1,?2", nativeQuery=true)
-	Iterable<LsStationRoute> page(int start , int end , int line ,int dir, int version);
-    
-    @Query(value="select count(*) from  bsth_c_ls_stationroute where line_code = ?1 and directions = ?2 and destroy = 0 and versions = ?3 ", nativeQuery=true)
-	int count(int line, int dir, int version);
-}
+package com.bsth.repository;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.jpa.repository.EntityGraph;
+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.LsStationRoute;
+
+/**
+ * 
+ * @Interface: StationRouteRepository(站点路由Repository数据持久层接口)
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: TODO(站点路由Repository数据持久层接口)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Repository
+public interface LsStationRouteRepository extends BaseRepository<LsStationRoute, Integer> {
+	
+	/**
+	 * 查询待更新线路的站点路由
+	 */
+	@EntityGraph(value = "ls_stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value = "SELECT DISTINCT sr FROM LsStationRoute sr where sr.line.id =?1 and sr.lineCode=?2 and sr.versions=?3 and sr.destroy=0")
+	List<LsStationRoute> findupdated(Integer lineId, String lineCode, Integer versions);
+	
+	@Query(value = "SELECT  a.`stationRoute.id`," +
+		    "a.`stationRoute.line`," +
+		    "a.`stationRoute.station`," +
+			"a.`stationRoute.stationName`," +
+			"a.`stationRoute.stationRouteCode`," +
+			"a.`stationRoute.lineCode`," +
+			"a.`stationRoute.stationMark`," +
+			"a.`stationRoute.outStationNmber`," +
+			"a.`stationRoute.directions`," +
+			"a.`stationRoute.distances`," +
+			"a.`stationRoute.toTime`," +
+			"a.`stationRoute.firstTime`," +
+			"a.`stationRoute.endTime`," +
+			"a.`stationRoute.descriptions`," +
+			"a.`stationRoute.versions`," +
+			"b.id AS 'station.id'," +
+			"b.station_cod AS 'station.stationCod'," +
+			"b.station_name AS 'station.stationName'," +
+			"b.road_coding AS 'station.roadCoding'," +
+			"b.db_type AS 'station.dbType'," +
+			"b.b_jwpoints AS 'station.bJwpoints'," +
+			"b.g_lonx AS 'station.gLonx'," +
+			"b.g_lonx AS 'station.gLaty'," +
+			"b.x AS 'station.x'," +
+			"b.y AS 'station.y'," +
+			"b.shapes_type AS 'station.shapesType'," +
+			"b.radius AS 'station.radius'," +
+			"ST_AsText(b.g_polygon_grid) AS 'station.gPolygonGrid'," +
+			"ST_AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," +
+			"b.destroy AS 'station.destroy'," +
+			"b.versions AS 'station.versions'," +
+			"b.descriptions AS 'station.descriptions', " +
+			"a.`stationRoute.industryCode` " +
+			" FROM (" +
+				"SELECT r.id AS 'stationRoute.id'," +
+				" r.line AS 'stationRoute.line'," +
+				"r.station AS 'stationRoute.station'," +
+				"r.station_name AS 'stationRoute.stationName'," +
+				"r.station_route_code as 'stationRoute.stationRouteCode'," +
+				"r.line_code AS 'stationRoute.lineCode'," +
+				"r.station_mark AS 'stationRoute.stationMark'," +
+				"r.out_station_nmber AS 'stationRoute.outStationNmber'," +
+				"r.directions AS 'stationRoute.directions'," +
+				"r.distances AS 'stationRoute.distances'," +
+				"r.to_time AS 'stationRoute.toTime'," +
+				"r.first_time AS 'stationRoute.firstTime'," +
+				"r.end_time AS 'stationRoute.endTime'," +
+				"r.descriptions AS 'stationRoute.descriptions'," +
+				"r.versions AS 'stationRoute.versions', " +
+				"r.industry_code AS 'stationRoute.industryCode' " +
+			" FROM bsth_c_ls_stationroute r  WHERE  r.line = ?1 and r.directions = ?2 and r.versions=?3 and r.destroy=0) a " +
+			"LEFT JOIN bsth_c_station b " +
+			"ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true)
+	List<Object[]> findPoints(Integer lineId, Integer direction, Integer versions);
+
+	
+	@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," +
+			" a.stationRouteName," +
+			" 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," +
+			" ST_AsText(b.b_polygon_grid) as stationBPolyonGrid," +
+			" ST_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," +
+			"b.station_name as zdmc, "+
+			"a.industryCode "+
+			" FROM ( SELECT s.id AS stationRouteId," +
+				" s.line AS stationRouteLine," +
+				" s.station as stationRouteStation," +
+				" s.station_name AS stationRouteName," +
+				" s.station_route_code as stationRouteCode," +
+				" s.industry_code as industryCode," +
+				" 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_ls_stationroute s WHERE s.line = ?1 and s.directions = ?2 and s.versions=?3 and s.destroy = 0) a " +
+			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id order by a.stationRouteCode", nativeQuery=true)
+	List<Object[]> getStationRouteList(Integer lineId, Integer dir ,Integer version);
+	/**
+     * 更新路线前删除线路版本号历史原有站点路由
+     * 
+     * @param line
+     * @param dir
+     */
+    @Modifying
+    @Transactional
+    @Query(value="DELETE from bsth_c_ls_stationroute where line = ?1  and directions = ?2 and versions = ?3", nativeQuery=true)
+    public void batchDelete(Integer line,Integer dir, Integer versions);
+
+    /**
+     * 更新路线前撤销线路版本号历史原有站点路由
+     * 
+     * @param line
+     * @param dir
+     */
+    @Modifying
+    @Query(value="UPDATE bsth_c_ls_stationroute set destroy = 1 where line = ?1  and directions = ?2 and versions = ?3", nativeQuery=true)
+    public void batchDestroy(Integer sectionRouteLine, Integer directions, Integer versions);
+    
+    /**
+     * 按线路编码查询各站点的顺序号
+     * @param lineCode 线路编码
+     * @param lineVersion 版本号
+     * @return
+     */
+    @Query("SELECT new map(" +
+            "lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
+            "line.linePlayType as linePlayType,s.stationMark as stationMark) " +
+            "FROM " +
+            "LsStationRoute s " +
+            "WHERE " +
+            "s.destroy = 0 AND s.lineCode = ?1 AND s.versions = ?2 " +
+            "ORDER BY " +
+            "lineCode,directions,stationRouteCode")
+    List<Map<String, String>> findLineWithLineCode4Ygc(String lineCode,Integer lineVersion);
+	/**
+	 * @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," +
+			" a.stationRouteName," +
+			" 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," +
+			" ST_AsText(b.b_polygon_grid) as stationBPolyonGrid," +
+			" ST_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,b.station_name as zdmc, " +
+			" a.industryCode "+
+			" FROM " +
+			"( SELECT s.id AS stationRouteId," +
+				" s.line AS stationRouteLine," +
+				" s.station as stationRouteStation," +
+				" s.station_name AS stationRouteName," +
+				" s.station_route_code as stationRouteCode," +
+				" s.industry_code as industryCode," +
+				" 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_ls_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);
+	
+    // 批量修改站点行业编码
+	@Modifying
+	@Query(value="update bsth_c_ls_stationroute set industry_code =?2 where id = ?1 ", nativeQuery=true)
+	void updIndustryCode(Integer id, String industryCode);
+	
+    @Modifying
+	@Query(value="UPDATE bsth_c_ls_stationroute  set station_route_code = (station_route_code+10) where line = ?1  and directions = ?2 and station_route_code >=?3 and destroy = 0", nativeQuery=true)
+	void stationUpdStationRouteCode(Integer line,Integer dir,Integer routeCod);
+    
+    @Modifying
+    @Query(value="update bsth_c_ls_stationroute set directions = case directions when 1 then 0 when 0 then 1 end where line = ?1 ", nativeQuery=true)
+	void stationRouteDir(Integer line);
+
+	@Query("select r from LsStationRoute r where r.line.id=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
+	List<LsStationRoute> findByLine(int lineId, int dir);
+
+    @Modifying
+    @Query(value="update bsth_c_ls_stationroute set distances =?2 where id = ?1 ", nativeQuery=true)
+	void upddis(Integer id,Double dis);
+
+    @Query(value="select * from  bsth_c_ls_stationroute where line_code = ?3 and directions = ?4 and destroy = 0 and versions = ?5 limit ?1,?2", nativeQuery=true)
+	Iterable<LsStationRoute> page(int start , int end , int line ,int dir, int version);
+    
+    @Query(value="select count(*) from  bsth_c_ls_stationroute where line_code = ?1 and directions = ?2 and destroy = 0 and versions = ?3 ", nativeQuery=true)
+	int count(int line, int dir, int version);
+	
+	@Query(value = " select r.station_code, r.station_name, r.versions " +
+					"from bsth_c_ls_stationroute r where r.line_code = ?1 " +
+					"and r.directions=?2 and r.destroy = 0 and r.versions in(" +
+					"select v.versions from bsth_c_line_versions v where v.line_code=?1 " +
+					"and ((date_format(v.start_date, '%Y-%m-%d') >= ?3 and date_format(v.start_date, '%Y-%m-%d') <= ?4) " +
+					" or  (date_format(v.start_date, '%Y-%m-%d') <= ?4 and date_format(v.end_date, '%Y-%m-%d') >= ?4) " +
+					" or  (date_format(v.start_date, '%Y-%m-%d') >= ?3 and date_format(v.end_date, '%Y-%m-%d') <= ?4))" +
+					") order by r.versions desc, r.station_route_code asc ", nativeQuery = true)
+    List<Object[]> findHistory(String lineCode, Integer updown, String date1, String date2);
+
+	@Query("select r from LsStationRoute r where r.line.id=?1 and r.versions=?2 and r.directions=?3 and r.destroy=0 order by r.stationRouteCode")
+	List<LsStationRoute> findByLineVersion(int lineId, int version, int dir);
+}
@@ -422,7 +422,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	@Query("select r from StationRoute r where r.line.id=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
 	List<StationRoute> findByLine(Integer lineId, Integer dir);
-	@Query("select r from StationRoute r where r.lineCode=?1 and r.directions=?2 and versions is not null order by r.destroy, r.stationRouteCode")
+	@Query("select r from StationRoute r where r.lineCode=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
 	List<StationRoute> findAllByLine(String lineCode, int updown);
 	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
@@ -47,8 +47,8 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	List<Ylb> listMaxRqJcsx(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
 	@Query(value="select * from bsth_c_ylb where "
-			+ " DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= rq "
-			+ " and rq< ?1 and ssgsdm like %?2%"
+			+ " rq >= str_to_date(?1, '%Y-%m-%d') - INTERVAL 90 DAY "
+			+ " and rq< ?1 and ssgsdm like %?2% "
 			+ " and fgsdm like %?3% and xlbm like %?4% and nbbm like %?5% "
 			+ " order by nbbm , rq desc,jcsx desc,lp desc",nativeQuery=true)
 	List<Ylb> listByRqJcsx(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
@@ -47,6 +47,7 @@ public interface TTInfoDetailRepository extends BaseRepository&lt;TTInfoDetail, Lon
     @Query(value = "select tt from TTInfoDetail tt where tt.ttinfo.id = ?1 and tt.lp.id = ?2 order by tt.fcno asc")
     List<TTInfoDetail> findBcdetails(Long ttinfoId, Long lpId);
+    @Query(value = "select tt from TTInfoDetail tt left join fetch tt.lp where tt.ttinfo.id = ?1 ")
     List<TTInfoDetail> findByTtinfoId(Long id);
     @Modifying
+package com.bsth.service;
+
+import com.bsth.entity.LsStationRoute;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.StationRouteCache;
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+public interface InoutCarparkService {
+
+	Map<String, Object> getStartEndByLine(int lineId, int version);
+
+	Map<String, Object> getRouteByStartEnd(int lineId, int version, String start, String end);
+
+	Map<String, Object> sectionSave(Map<String, Object> map);
+
+    Map<String, Object> sectionUpdate(Map<String, Object> map);
+
+    Map<String, Object> destroy(Map<String, Object> map);
+
+    void pathPlaningByHistory(long schId, int versions) throws JsonProcessingException;
+}
-package com.bsth.service;
-
-/**
- *
- * @Interface: LineService(线路service业务层实现接口)
- *
- * @extends : BaseService
- *
- * @Description: TODO(线路service业务层实现接口)
- *
- * @Author bsth@lq
- *
- * @Date 2016年4月28日 上午9:21:17
- *
- * @Version 公交调度系统BS版 0.1
- *
- */
-public interface TrafficManageService {
-
-	/**
-	 * 上传线路信息
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setXL(String ids);
-
-	/**
-	 * 上传线路信息
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setXLByInUse(String ids);
-
-	/**
-	 * 上传车辆信息
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setCL();
-
-	/**
-	 * 上传司机信息
-	 * @return 调用接口返回信息
-	 */
-	String setSJ();
-
-	/**
-	 * 上传超速数据
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setCS();
-
-	/**
-	 * 上传线路班次时刻表数据
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setSKB(String ids);
-
-	/**
-	 * 线路人员车辆配置信息
-	 * @return 调用接口返回信息
-	 */
-	String setXLPC();
-
-	/**
-	 * 线路计划班次表
-	 * @return 调用接口返回信息
-	 */
-	String setJHBC();
-
-	String setJHBC(String theDate);
-
-	String setLD(String theDate);
-
-	String setLD();
-
-	String setLDFile();
-
-	String setLCYH();
-
-	String setDDRB();
-
-	/**
-	 * 下载全量的公交基础数据
-	 * @return
-	 */
-	String getDownLoadAllDataFile();
-
-	/**
-	 * 下载增量的公交基础数据
-	 * @return
-	 */
-	String getDownLoadIncreaseDataFile();
-
-	/**
-	 * 指定线路查询方式公交基础数据下载
-	 * @return
-	 */
-	String getDownLoadWarrantsBusLineStation();
-}
+package com.bsth.service;
+
+/**
+ *
+ * @Interface: LineService(线路service业务层实现接口)
+ *
+ * @extends : BaseService
+ *
+ * @Description: TODO(线路service业务层实现接口)
+ *
+ * @Author bsth@lq
+ *
+ * @Date 2016年4月28日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ *
+ */
+public interface TrafficManageService {
+
+	/**
+	 * 上传线路信息
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setXL(String ids);
+
+	/**
+	 * 上传线路信息
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setXLByInUse(String ids);
+
+	/**
+	 * 上传车辆信息
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setCL();
+
+	/**
+	 * 上传司机信息
+	 * @return 调用接口返回信息
+	 */
+	String setSJ();
+
+	/**
+	 * 上传超速数据
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setCS();
+
+	/**
+	 * 上传线路班次时刻表数据
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setSKB(String ids, String qyrqs);
+
+	/**
+	 * 线路人员车辆配置信息
+	 * @return 调用接口返回信息
+	 */
+	String setXLPC();
+
+	/**
+	 * 线路计划班次表
+	 * @return 调用接口返回信息
+	 */
+	String setJHBC();
+
+	String setJHBC(String theDate);
+
+	String setLD(String theDate);
+
+	String setLD();
+
+	String setLDFile();
+
+	String setLCYH();
+
+	String setDDRB();
+
+	/**
+	 * 下载全量的公交基础数据
+	 * @return
+	 */
+	String getDownLoadAllDataFile();
+
+	/**
+	 * 下载增量的公交基础数据
+	 * @return
+	 */
+	String getDownLoadIncreaseDataFile();
+
+	/**
+	 * 指定线路查询方式公交基础数据下载
+	 * @return
+	 */
+	String getDownLoadWarrantsBusLineStation();
+}
@@ -150,7 +150,6 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 			for(int i = 0; i < textList.size(); i++){
 				String text = textList.get(i);
-//				System.out.println(text);
 				String[] split = text.split(",");
 				int rowNo = Integer.valueOf(split[0].trim());
 				String year = split[1].trim();
@@ -229,11 +228,11 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 						Budget bud = budgets.get(0);
 						if(b.getFormalPerson() != null){
 							if(bud.getBudgetMileage() != null){
-								bud.setChangeMileage(b.getFormalPerson());
+								bud.setChangeMileage(b.getFormalMileage());
 							} else {
-								bud.setBudgetMileage(b.getFormalPerson());
+								bud.setBudgetMileage(b.getFormalMileage());
 							}
-							bud.setFormalMileage(b.getFormalPerson());
+							bud.setFormalMileage(b.getFormalMileage());
 						}
 						if(b.getFormalPerson() != null){
 							if(bud.getBudgetPerson() != null){
@@ -251,11 +250,11 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 							}
 							bud.setFormalAmounts(b.getFormalAmounts());
 						}
-						repository.update(bud.getBudgetMileage(), bud.getChangeMileage(), bud.getFormalPerson(), 
+						repository.update(bud.getBudgetMileage(), bud.getChangeMileage(), bud.getFormalMileage(), 
 								bud.getBudgetPerson(), bud.getChangePerson(), bud.getFormalPerson(), 
 								bud.getBudgetAmounts(), bud.getChangeAmounts(), bud.getFormalAmounts(), bud.getId());
 					} else {
-						b.setBudgetMileage(b.getFormalPerson());
+						b.setBudgetMileage(b.getFormalMileage());
 						b.setBudgetPerson(b.getFormalPerson());
 						b.setBudgetAmounts(b.getFormalAmounts());
 						insertList.add(b);
@@ -380,7 +379,6 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 								r.setXlName(lineAllMap.get(name).getName());
 							}
 						} else {
-							boolean flag = true;
 							for(String key : lineAllMap.keySet()){
 								Line l = lineAllMap.get(key);
 								String name = l.getName();
@@ -388,15 +386,11 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 									name = name.replaceAll("区间", "") + l.getStartStationName().substring(0, 1);
 								}
 								if(l.getName().equals(lineName) || name.equals(lineName)){
-									flag = false;
 									r.setXlBm(l.getLineCode());
 									r.setXlName(l.getName());
 									break;
 								}
 							}
-//							if(flag){
-//								System.out.println(m.get("lineName").toString() + " >> " + lineName);
-//							}
 						}
 						if(r.getXlBm() != null){
@@ -432,6 +426,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 		// TODO Auto-generated method stub
 		SimpleDateFormat sdfYY = new SimpleDateFormat("YYYY");
 		SimpleDateFormat sdfMM = new SimpleDateFormat("MM");
+		DecimalFormat df = new DecimalFormat("0.###");
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
 		Map<String, Boolean> lineNature = lineService.lineNature();
@@ -474,9 +469,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				m.put("xlName", xlName);
 				m.put("sfyy", sfyy);
 				m.put("sfjc", sfjc);
-				m.put("budget", b.getBudgetMileage()!=null?b.getBudgetMileage():"");
-				m.put("change", b.getChangeMileage()!=null?b.getChangeMileage():"");
-				m.put("formal", b.getFormalMileage()!=null?b.getFormalMileage():"");
+				m.put("budget", b.getBudgetMileage()!=null?df.format(b.getBudgetMileage()):"");
+				m.put("change", b.getChangeMileage()!=null?df.format(b.getChangeMileage()):"");
+				m.put("formal", b.getFormalMileage()!=null?df.format(b.getFormalMileage()):"");
 				for(int i = 1; i <= 12; i++){
 					m.put("mon"+i, "");
 					m.put("bud"+i, "");
@@ -494,28 +489,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 				if(b.getBudgetMileage()!=null){
 					if(m.get("budget").toString().length() > 0){
-						m.put("budget", new BigDecimal(m.get("budget").toString()).add(
-								new BigDecimal(b.getBudgetMileage())).doubleValue());
+						m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
+								new BigDecimal(b.getBudgetMileage())).doubleValue()));
 					} else {
-						m.put("budget", b.getBudgetMileage());
+						m.put("budget", df.format(b.getBudgetMileage()));
 					}
 				}
 				if(b.getChangeMileage()!=null){
 					if(m.get("change").toString().length() > 0){
-						m.put("change", new BigDecimal(m.get("change").toString()).add(
-								new BigDecimal(b.getChangeMileage())).doubleValue());
+						m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
+								new BigDecimal(b.getChangeMileage())).doubleValue()));
 					} else {
-						m.put("change", b.getChangeMileage());
+						m.put("change", df.format(b.getChangeMileage()));
 					}
 				}
 				if(b.getFormalMileage()!=null){
 					if(m.get("formal").toString().length() > 0){
-						m.put("formal", new BigDecimal(m.get("formal").toString()).add(
-								new BigDecimal(b.getFormalMileage())).doubleValue());
+						m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
+								new BigDecimal(b.getFormalMileage())).doubleValue()));
 					} else {
-						m.put("formal", b.getFormalMileage());
+						m.put("formal", df.format(b.getFormalMileage()));
 					}
-					m.put(bud, b.getFormalMileage());
+					m.put(bud, df.format(b.getFormalMileage()));
 				}
 			}
 		}
@@ -611,6 +606,50 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 			}
 			strList.add(gsBm + "_all");
+			BigDecimal monAll = new BigDecimal("0");
+			BigDecimal preAll = new BigDecimal("0");
+			for(int i = 1; i <= 12; i++){
+				if(m.get("mon"+i).toString().length() > 0){
+					BigDecimal val = new BigDecimal(m.get("mon"+i).toString());
+					monAll = monAll.add(val);
+					val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
+					m.put("mon"+i, val.doubleValue());
+				}
+				if(m.get("pre"+i).toString().length() > 0){
+					BigDecimal val = new BigDecimal(m.get("pre"+i).toString());
+					preAll = preAll.add(val);
+					val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
+					m.put("pre"+i, val.doubleValue());
+					if(m.get("mon"+i).toString().length() > 0){
+						BigDecimal monVal = new BigDecimal(m.get("mon"+i).toString());
+						BigDecimal sub = monVal.subtract(val);
+						m.put("sub"+i, sub.doubleValue() > 0 ? "+" + sub.doubleValue() : sub.doubleValue());
+					} else {
+						m.put("sub"+i, "-" + val.doubleValue());
+					}
+				}
+			}
+			monAll = monAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
+			preAll = preAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
+			Double subAll = monAll.subtract(preAll).doubleValue();
+			m.put("monAll", monAll.doubleValue());
+			m.put("preAll", preAll.doubleValue());
+			m.put("subAll", subAll > 0 ? "+" + subAll : subAll);
+			
+			if(m.get("formal").toString().length() > 0 && m.get("monAll").toString().length() > 0
+					&& new BigDecimal(m.get("formal").toString()).doubleValue() > 0d){
+				BigDecimal formal = new BigDecimal(m.get("formal").toString());
+				m.put("complete", monAll.divide(
+						formal, 4, BigDecimal.ROUND_HALF_UP).multiply(
+						new BigDecimal(100)).divide(
+						new BigDecimal(1), 2, BigDecimal.ROUND_HALF_UP)+ "%");
+				BigDecimal diff = monAll.subtract(formal);
+				m.put("diff", diff.doubleValue() > 0 ? "+" + diff.doubleValue() : diff.doubleValue());
+			} else {
+				m.put("complete", "");
+				m.put("diff", "");
+			}
+			
 			for(String str : strList){
 				if(!keyMap.containsKey(str)){
 					continue;
@@ -652,7 +691,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					if(m.get(bud).toString().length() > 0){
 						if(map.get(bud).toString().length() > 0){
-							map.put(mon, new BigDecimal(m.get(bud).toString()).add(
+							map.put(bud, new BigDecimal(m.get(bud).toString()).add(
 									new BigDecimal(map.get(bud).toString())).doubleValue());
 						} else {
 							map.put(bud, new BigDecimal(m.get(bud).toString()).doubleValue());
@@ -670,50 +709,6 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				List<Map<String, Object>>dataList = (List<Map<String, Object>>)map.get("dataList");
 				dataList.add(m);
 			}
-			
-			BigDecimal monAll = new BigDecimal("0");
-			BigDecimal preAll = new BigDecimal("0");
-			for(int i = 1; i <= 12; i++){
-				if(m.get("mon"+i).toString().length() > 0){
-					BigDecimal val = new BigDecimal(m.get("mon"+i).toString());
-					monAll = monAll.add(val);
-					val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-					m.put("mon"+i, val.doubleValue());
-				}
-				if(m.get("pre"+i).toString().length() > 0){
-					BigDecimal val = new BigDecimal(m.get("pre"+i).toString());
-					preAll = preAll.add(val);
-					val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-					m.put("pre"+i, val.doubleValue());
-					if(m.get("mon"+i).toString().length() > 0){
-						BigDecimal monVal = new BigDecimal(m.get("mon"+i).toString());
-						BigDecimal sub = monVal.subtract(val);
-						m.put("sub"+i, sub.doubleValue() > 0 ? "+" + sub.doubleValue() : sub.doubleValue());
-					} else {
-						m.put("sub"+i, "-" + val.doubleValue());
-					}
-				}
-			}
-			monAll = monAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-			preAll = preAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-			Double subAll = monAll.subtract(preAll).doubleValue();
-			m.put("monAll", monAll.doubleValue());
-			m.put("preAll", preAll.doubleValue());
-			m.put("subAll", subAll > 0 ? "+" + subAll : subAll);
-			
-			if(m.get("formal").toString().length() > 0 && m.get("monAll").toString().length() > 0
-					&& new BigDecimal(m.get("formal").toString()).doubleValue() > 0d){
-				BigDecimal formal = new BigDecimal(m.get("formal").toString());
-				m.put("complete", monAll.divide(
-						formal, 4, BigDecimal.ROUND_HALF_UP).multiply(
-						new BigDecimal(100)).divide(
-						new BigDecimal(1), 2, BigDecimal.ROUND_HALF_UP)+ "%");
-				BigDecimal diff = monAll.subtract(formal);
-				m.put("diff", diff.doubleValue() > 0 ? "+" + diff.doubleValue() : diff.doubleValue());
-			} else {
-				m.put("complete", "");
-				m.put("diff", "");
-			}
 		}
 		for(String key : strs){
@@ -764,14 +759,10 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				if(m.get("mon"+i).toString().length() > 0){
 					BigDecimal val = new BigDecimal(m.get("mon"+i).toString());
 					monAll = monAll.add(val);
-					val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-					m.put("mon"+i, val.doubleValue());
 				}
 				if(m.get("pre"+i).toString().length() > 0){
 					BigDecimal val = new BigDecimal(m.get("pre"+i).toString());
 					preAll = preAll.add(val);
-					val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-					m.put("pre"+i, val.doubleValue());
 					if(m.get("mon"+i).toString().length() > 0){
 						BigDecimal monVal = new BigDecimal(m.get("mon"+i).toString());
 						BigDecimal sub = monVal.subtract(val);
@@ -781,8 +772,6 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 				}
 			}
-			monAll = monAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-			preAll = preAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
 			Double subAll = monAll.subtract(preAll).doubleValue();
 			m.put("monAll", monAll.doubleValue());
 			m.put("preAll", preAll.doubleValue());
@@ -869,6 +858,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 		// TODO Auto-generated method stub
 		SimpleDateFormat sdfYY = new SimpleDateFormat("YYYY");
 		SimpleDateFormat sdfMM = new SimpleDateFormat("MM");
+		DecimalFormat df = new DecimalFormat("0.###");
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
 		Map<String, Boolean> lineNature = lineService.lineNature();
@@ -911,9 +901,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				m.put("xlName", xlName);
 				m.put("sfyy", sfyy);
 				m.put("sfjc", sfjc);
-				m.put("budget", b.getBudgetPerson()!=null?b.getBudgetPerson():"");
-				m.put("change", b.getChangePerson()!=null?b.getChangePerson():"");
-				m.put("formal", b.getFormalPerson()!=null?b.getFormalPerson():"");
+				m.put("budget", b.getBudgetPerson()!=null?df.format(b.getBudgetPerson()):"");
+				m.put("change", b.getChangePerson()!=null?df.format(b.getChangePerson()):"");
+				m.put("formal", b.getFormalPerson()!=null?df.format(b.getFormalPerson()):"");
 				for(int i = 1; i <= 12; i++){
 					m.put("mon"+i, "");
 					m.put("bud"+i, "");
@@ -931,28 +921,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 				if(b.getBudgetPerson()!=null){
 					if(m.get("budget").toString().length() > 0){
-						m.put("budget", new BigDecimal(m.get("budget").toString()).add(
-								new BigDecimal(b.getBudgetPerson())).doubleValue());
+						m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
+								new BigDecimal(b.getBudgetPerson())).doubleValue()));
 					} else {
-						m.put("budget", b.getBudgetPerson());
+						m.put("budget", df.format(b.getBudgetPerson()));
 					}
 				}
 				if(b.getChangePerson()!=null){
 					if(m.get("change").toString().length() > 0){
-						m.put("change", new BigDecimal(m.get("change").toString()).add(
-								new BigDecimal(b.getChangePerson())).doubleValue());
+						m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
+								new BigDecimal(b.getChangePerson())).doubleValue()));
 					} else {
-						m.put("change", b.getChangePerson());
+						m.put("change", df.format(b.getChangePerson()));
 					}
 				}
 				if(b.getFormalPerson()!=null){
 					if(m.get("formal").toString().length() > 0){
-						m.put("formal", new BigDecimal(m.get("formal").toString()).add(
-								new BigDecimal(b.getFormalPerson())).doubleValue());
+						m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
+								new BigDecimal(b.getFormalPerson())).doubleValue()));
 					} else {
-						m.put("formal", b.getFormalPerson());
+						m.put("formal", df.format(b.getFormalPerson()));
 					}
-					m.put(bud, b.getFormalPerson());
+					m.put(bud, df.format(b.getFormalPerson()));
 				}
 			}
 		}
@@ -1091,7 +1081,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					if(m.get(bud).toString().length() > 0){
 						if(map.get(bud).toString().length() > 0){
-							map.put(mon, new BigDecimal(m.get(bud).toString()).add(
+							map.put(bud, new BigDecimal(m.get(bud).toString()).add(
 									new BigDecimal(map.get(bud).toString())).doubleValue());
 						} else {
 							map.put(bud, new BigDecimal(m.get(bud).toString()).doubleValue());
@@ -1308,6 +1298,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 		// TODO Auto-generated method stub
 		SimpleDateFormat sdfYY = new SimpleDateFormat("YYYY");
 		SimpleDateFormat sdfMM = new SimpleDateFormat("MM");
+		DecimalFormat df = new DecimalFormat("0.###");
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
 		Map<String, Boolean> lineNature = lineService.lineNature();
@@ -1351,9 +1342,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				m.put("xlName", xlName);
 				m.put("sfyy", sfyy);
 				m.put("sfjc", sfjc);
-				m.put("budget", b.getBudgetAmounts()!=null?b.getBudgetAmounts():"");
-				m.put("change", b.getChangeAmounts()!=null?b.getChangeAmounts():"");
-				m.put("formal", b.getFormalAmounts()!=null?b.getFormalAmounts():"");
+				m.put("budget", b.getBudgetAmounts()!=null?df.format(b.getBudgetAmounts()):"");
+				m.put("change", b.getChangeAmounts()!=null?df.format(b.getChangeAmounts()):"");
+				m.put("formal", b.getFormalAmounts()!=null?df.format(b.getFormalAmounts()):"");
 				for(int i = 1; i <= 12; i++){
 					m.put("mon"+i, "");
 					m.put("bud"+i, "");
@@ -1372,28 +1363,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 				if(b.getBudgetAmounts()!=null){
 					if(m.get("budget").toString().length() > 0){
-						m.put("budget", new BigDecimal(m.get("budget").toString()).add(
-								new BigDecimal(b.getBudgetAmounts())).doubleValue());
+						m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
+								new BigDecimal(b.getBudgetAmounts())).doubleValue()));
 					} else {
-						m.put("budget", b.getBudgetAmounts());
+						m.put("budget", df.format(b.getBudgetAmounts()));
 					}
 				}
 				if(b.getChangeAmounts()!=null){
 					if(m.get("change").toString().length() > 0){
-						m.put("change", new BigDecimal(m.get("change").toString()).add(
-								new BigDecimal(b.getChangeAmounts())).doubleValue());
+						m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
+								new BigDecimal(b.getChangeAmounts())).doubleValue()));
 					} else {
-						m.put("change", b.getChangeAmounts());
+						m.put("change", df.format(b.getChangeAmounts()));
 					}
 				}
 				if(b.getFormalAmounts()!=null){
 					if(m.get("formal").toString().length() > 0){
-						m.put("formal", new BigDecimal(m.get("formal").toString()).add(
-								new BigDecimal(b.getFormalAmounts())).doubleValue());
+						m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
+								new BigDecimal(b.getFormalAmounts())).doubleValue()));
 					} else {
-						m.put("formal", b.getFormalAmounts());
+						m.put("formal", df.format(b.getFormalAmounts()));
 					}
-					m.put(bud, b.getFormalAmounts());
+					m.put(bud, df.format(b.getFormalAmounts()));
 				}
 			}
 		}
@@ -1529,7 +1520,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 				}
 				for(int i = 1; i <= 12; i++){
-					String mon = "mon"+i, bud = "bud"+i;
+					String mon = "mon"+i, bud = "bud"+i, pre = "pre"+i;
 					if(m.get(mon).toString().length() > 0){
 						if(map.get(mon).toString().length() > 0){
 							map.put(mon, new BigDecimal(m.get(mon).toString()).add(
@@ -1540,12 +1531,20 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					if(m.get(bud).toString().length() > 0){
 						if(map.get(bud).toString().length() > 0){
-							map.put(mon, new BigDecimal(m.get(bud).toString()).add(
+							map.put(bud, new BigDecimal(m.get(bud).toString()).add(
 									new BigDecimal(map.get(bud).toString())).doubleValue());
 						} else {
 							map.put(bud, new BigDecimal(m.get(bud).toString()).doubleValue());
 						}
 					}
+					if(m.get(pre).toString().length() > 0){
+						if(map.get(pre).toString().length() > 0){
+							map.put(pre, new BigDecimal(m.get(pre).toString()).add(
+									new BigDecimal(map.get(pre).toString())).doubleValue());
+						} else {
+							map.put(pre, new BigDecimal(m.get(pre).toString()).doubleValue());
+						}
+					}
 				}
 				if(m.containsKey("num") && m.get("num").toString().length() > 0){
 					if(map.containsKey("num") && map.get("num").toString().length() > 0){
@@ -1582,10 +1581,10 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 				}
 			}
-			BigDecimal monAll_ = monAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
+			monAll = monAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
 			preAll = preAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
-			Double subAll = monAll_.subtract(preAll).doubleValue();
-			m.put("monAll", monAll_.doubleValue());
+			Double subAll = monAll.subtract(preAll).doubleValue();
+			m.put("monAll", monAll.doubleValue());
 			m.put("preAll", preAll.doubleValue());
 			m.put("subAll", subAll > 0 ? "+" + subAll : subAll);
@@ -1687,10 +1686,10 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 				}
 			}
-			BigDecimal monAll_ = monAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
+			monAll = monAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
 			preAll = preAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
-			Double subAll = monAll_.subtract(preAll).doubleValue();
-			m.put("monAll", monAll_.doubleValue());
+			Double subAll = monAll.subtract(preAll).doubleValue();
+			m.put("monAll", monAll.doubleValue());
 			m.put("preAll", preAll.doubleValue());
 			m.put("subAll", subAll > 0 ? "+" + subAll : subAll);
@@ -1784,6 +1783,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 		// TODO Auto-generated method stub
 		SimpleDateFormat sdfYY = new SimpleDateFormat("YYYY");
 		SimpleDateFormat sdfMM = new SimpleDateFormat("MM");
+		DecimalFormat df = new DecimalFormat("0.###");
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
 		List<Budget> findByYear = repository.findByYear(year);
@@ -1834,9 +1834,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					m.put("xlBm", xlBm);
 					m.put("xlName", xlName);
 					m.put("type", "公里");
-					m.put("budget", b.getBudgetMileage()!=null?b.getBudgetMileage():"");
-					m.put("change", b.getChangeMileage()!=null?b.getChangeMileage():"");
-					m.put("formal", b.getFormalMileage()!=null?b.getFormalMileage():"");
+					m.put("budget", b.getBudgetMileage()!=null?df.format(b.getBudgetMileage()):"");
+					m.put("change", b.getChangeMileage()!=null?df.format(b.getChangeMileage()):"");
+					m.put("formal", b.getFormalMileage()!=null?df.format(b.getFormalMileage()):"");
 					for(int i = 1; i <= 12; i++){
 						m.put("mon"+i, "");
 						m.put("bud"+i, "");
@@ -1844,7 +1844,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 					if(b.getFormalMileage()!=null){
-						m.put(bud, b.getFormalMileage());
+						m.put(bud, df.format(b.getFormalMileage()));
 					}
 					m.put("monAll", "0");
 					xlMap.put(key1, m);
@@ -1854,28 +1854,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 					if(b.getBudgetMileage()!=null){
 						if(m.get("budget").toString().length() > 0){
-							m.put("budget", new BigDecimal(m.get("budget").toString()).add(
-									new BigDecimal(b.getBudgetMileage())).doubleValue());
+							m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
+									new BigDecimal(b.getBudgetMileage())).doubleValue()));
 						} else {
-							m.put("budget", b.getBudgetMileage());
+							m.put("budget", df.format(b.getBudgetMileage()));
 						}
 					}
 					if(b.getChangeMileage()!=null){
 						if(m.get("change").toString().length() > 0){
-							m.put("change", new BigDecimal(m.get("change").toString()).add(
-									new BigDecimal(b.getChangeMileage())).doubleValue());
+							m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
+									new BigDecimal(b.getChangeMileage())).doubleValue()));
 						} else {
-							m.put("change", b.getChangeMileage());
+							m.put("change", df.format(b.getChangeMileage()));
 						}
 					}
 					if(b.getFormalMileage()!=null){
 						if(m.get("formal").toString().length() > 0){
-							m.put("formal", new BigDecimal(m.get("formal").toString()).add(
-									new BigDecimal(b.getFormalMileage())).doubleValue());
+							m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
+									new BigDecimal(b.getFormalMileage())).doubleValue()));
 						} else {
-							m.put("formal", b.getFormalMileage());
+							m.put("formal", df.format(b.getFormalMileage()));
 						}
-						m.put(bud, b.getFormalMileage());
+						m.put(bud, df.format(b.getFormalMileage()));
 					}
 				}
 			}
@@ -1888,9 +1888,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					m.put("xlBm", xlBm);
 					m.put("xlName", xlName);
 					m.put("type", "人次");
-					m.put("budget", b.getBudgetPerson()!=null?b.getBudgetPerson():"");
-					m.put("change", b.getChangePerson()!=null?b.getChangePerson():"");
-					m.put("formal", b.getFormalPerson()!=null?b.getFormalPerson():"");
+					m.put("budget", b.getBudgetPerson()!=null?df.format(b.getBudgetPerson()):"");
+					m.put("change", b.getChangePerson()!=null?df.format(b.getChangePerson()):"");
+					m.put("formal", b.getFormalPerson()!=null?df.format(b.getFormalPerson()):"");
 					for(int i = 1; i <= 12; i++){
 						m.put("mon"+i, "");
 						m.put("bud"+i, "");
@@ -1898,7 +1898,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 					if(b.getFormalPerson()!=null){
-						m.put(bud, b.getFormalPerson());
+						m.put(bud, df.format(b.getFormalPerson()));
 					}
 					m.put("monAll", "0");
 					xlMap.put(key2, m);
@@ -1908,28 +1908,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 					if(b.getBudgetPerson()!=null){
 						if(m.get("budget").toString().length() > 0){
-							m.put("budget", new BigDecimal(m.get("budget").toString()).add(
-									new BigDecimal(b.getBudgetPerson())).doubleValue());
+							m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
+									new BigDecimal(b.getBudgetPerson())).doubleValue()));
 						} else {
-							m.put("budget", b.getBudgetPerson());
+							m.put("budget", df.format(b.getBudgetPerson()));
 						}
 					}
 					if(b.getChangePerson()!=null){
 						if(m.get("change").toString().length() > 0){
-							m.put("change", new BigDecimal(m.get("change").toString()).add(
-									new BigDecimal(b.getChangePerson())).doubleValue());
+							m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
+									new BigDecimal(b.getChangePerson())).doubleValue()));
 						} else {
-							m.put("change", b.getChangePerson());
+							m.put("change", df.format(b.getChangePerson()));
 						}
 					}
 					if(b.getFormalPerson()!=null){
 						if(m.get("formal").toString().length() > 0){
-							m.put("formal", new BigDecimal(m.get("formal").toString()).add(
-									new BigDecimal(b.getFormalPerson())).doubleValue());
+							m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
+									new BigDecimal(b.getFormalPerson())).doubleValue()));
 						} else {
-							m.put("formal", b.getFormalPerson());
+							m.put("formal", df.format(b.getFormalPerson()));
 						}
-						m.put(bud, b.getFormalPerson());
+						m.put(bud, df.format(b.getFormalPerson()));
 					}
 				}
 			}
@@ -1942,9 +1942,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					m.put("xlBm", xlBm);
 					m.put("xlName", xlName);
 					m.put("type", "营收");
-					m.put("budget", b.getBudgetAmounts()!=null?b.getBudgetAmounts():"");
-					m.put("change", b.getChangeAmounts()!=null?b.getChangeAmounts():"");
-					m.put("formal", b.getFormalAmounts()!=null?b.getFormalAmounts():"");
+					m.put("budget", b.getBudgetAmounts()!=null?df.format(b.getBudgetAmounts()):"");
+					m.put("change", b.getChangeAmounts()!=null?df.format(b.getChangeAmounts()):"");
+					m.put("formal", b.getFormalAmounts()!=null?df.format(b.getFormalAmounts()):"");
 					for(int i = 1; i <= 12; i++){
 						m.put("mon"+i, "");
 						m.put("bud"+i, "");
@@ -1952,7 +1952,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 					if(b.getFormalAmounts()!=null){
-						m.put(bud, b.getFormalAmounts());
+						m.put(bud, df.format(b.getFormalAmounts()));
 					}
 					m.put("monAll", "0");
 					xlMap.put(key3, m);
@@ -1962,28 +1962,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 					if(b.getBudgetAmounts()!=null){
 						if(m.get("budget").toString().length() > 0){
-							m.put("budget", new BigDecimal(m.get("budget").toString()).add(
-									new BigDecimal(b.getBudgetAmounts())).doubleValue());
+							m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
+									new BigDecimal(b.getBudgetAmounts())).doubleValue()));
 						} else {
-							m.put("budget", b.getBudgetAmounts());
+							m.put("budget", df.format(b.getBudgetAmounts()));
 						}
 					}
 					if(b.getChangeAmounts()!=null){
 						if(m.get("change").toString().length() > 0){
-							m.put("change", new BigDecimal(m.get("change").toString()).add(
-									new BigDecimal(b.getChangeAmounts())).doubleValue());
+							m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
+									new BigDecimal(b.getChangeAmounts())).doubleValue()));
 						} else {
-							m.put("change", b.getChangeAmounts());
+							m.put("change", df.format(b.getChangeAmounts()));
 						}
 					}
 					if(b.getFormalAmounts()!=null){
 						if(m.get("formal").toString().length() > 0){
-							m.put("formal", new BigDecimal(m.get("formal").toString()).add(
-									new BigDecimal(b.getFormalAmounts())).doubleValue());
+							m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
+									new BigDecimal(b.getFormalAmounts())).doubleValue()));
 						} else {
-							m.put("formal", b.getFormalAmounts());
+							m.put("formal", df.format(b.getFormalAmounts()));
 						}
-						m.put(bud, b.getFormalAmounts());
+						m.put(bud, df.format(b.getFormalAmounts()));
 					}
 				}
 			}
@@ -2298,7 +2298,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					if(m.get(bud).toString().length() > 0){
 						if(map.get(bud).toString().length() > 0){
-							map.put(mon, new BigDecimal(m.get(bud).toString()).add(
+							map.put(bud, new BigDecimal(m.get(bud).toString()).add(
 									new BigDecimal(map.get(bud).toString())).doubleValue());
 						} else {
 							map.put(bud, new BigDecimal(m.get(bud).toString()).doubleValue());
@@ -40,13 +40,13 @@ public class RevenueLoader {
      */
     public static List<Map<String, Object>> load(String date, String gsBm){
         try {
-        	url = ConfigUtil.get("http.ticketing.interface") + "?txnType=getLineRevenue&busiDate="+date+"&companyCode="+gsBm;
+        	url = ConfigUtil.get("http.ticketing.interface") + "?revenueFlag=1&txnType=getLineRevenue&busiDate="+date+"&companyCode="+gsBm;
             list = new ArrayList<>();
             httpClient = HttpClients.createDefault();
             get = new HttpGet(url);
             requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
-                    .setSocketTimeout(2500).build();
+                    .setConnectTimeout(10000).setConnectionRequestTimeout(10000)
+                    .setSocketTimeout(60000).build();
             get.setConfig(requestConfig);
             if(list.size() > 0)
                 list.clear();
+package com.bsth.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
+import com.bsth.entity.*;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.*;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.InoutCarparkService;
+import com.bsth.service.gps.GpsService;
+import com.bsth.util.TransGPS;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.EntityManager;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @author Hill
+ */
+@Service
+public class InoutCarparkServiceImpl extends BaseServiceImpl<LsInoutSectionRoute, Long> implements InoutCarparkService {
+
+	private final static Logger logger = LoggerFactory.getLogger(InoutCarparkServiceImpl.class);
+
+	@Autowired
+	private LsStationRouteRepository lsStationRouteRepository;
+
+	@Autowired
+	private CarParkRepository carParkRepository;
+
+	@Autowired
+	private LsInoutSectionRouteRepository lsInoutSectionRouteRepository;
+
+	@Autowired
+	private SectionRepository sectionRepository;
+
+	@Autowired
+	LineRepository lineRepository;
+
+	@Autowired
+	private ScheduleRealInfoRepository scheduleRealInfoRepository;
+
+	@Autowired
+	private GpsService gpsService;
+
+	@Override
+	public Map<String, Object> getStartEndByLine(int lineId, int version) {
+		Map<String, Object> result = new HashMap<>(), data = new HashMap<>();
+		result.put("code", 0);
+		result.put("msg", "");
+		result.put("data", data);
+
+		List<LsStationRoute> upRoutes = lsStationRouteRepository.findByLineVersion(lineId, version, 0), downRoutes = lsStationRouteRepository.findByLineVersion(lineId, version, 1);
+		CarPark carPark = carParkRepository.findByLineId(lineId);
+		if (carPark == null) {
+			result.put("code", 500);
+			result.put("msg", "线路标准信息中无相应的停车场信息");
+
+			return  result;
+		}
+		if (upRoutes.size() < 2) {
+			result.put("code", 500);
+			result.put("msg", "线路上行站级少于2");
+
+			return result;
+		}
+		LsStationRoute upFirst = upRoutes.get(0), upLast = upRoutes.get(upRoutes.size() - 1);
+		LsStationRoute downFirst = downRoutes.get(0), downLast = downRoutes.get(downRoutes.size() - 1);
+		// 环线或双环线只需提取一个起点站
+		if (upFirst.getStationCode().equals(upLast.getStationCode())) {
+			data.put("start", new LsStationRoute[]{ upFirst });
+			data.put("end", new LsStationRoute[]{ upFirst });
+		} else {
+			if (downRoutes.size() < 2) {
+				result.put("code", 500);
+				result.put("msg", "非环线线路下行站级少于2");
+
+				return result;
+			}
+			data.put("start", new LsStationRoute[]{ upFirst, downFirst });
+			data.put("end", new LsStationRoute[]{ upLast, downLast });
+		}
+		data.put("carpark", carPark);
+
+		return result;
+	}
+
+	@Override
+	public Map<String, Object> getRouteByStartEnd(int lineId, int version, String start, String end) {
+		Map<String, Object> result = new HashMap<>(), data = new HashMap<>();
+		result.put("code", 0);
+		result.put("msg", "");
+		result.put("data", data);
+		data.put("routes", lsInoutSectionRouteRepository.getRouteByStartEnd(lineId, version, start, end));
+
+		return result;
+	}
+
+	/**
+	 * 新增路段信息
+	 *
+	 * @param map：<bsectionVector：折线百度坐标集合；dbType：圆坐标类型；descriptions：描述与说明；destroy：是否撤销；directions：方向；lineId：线路ID
+	 *
+	 * 			   lineCode ：线路编码；roadCoding：道路编码；sectionCode：路段编码；sectionDistance：路段长度；sectionName：路段名称；sectionTime：路段时长；
+	 *
+	 * 			   sectionrouteCode：路段序号；speedLimit：路段限速>
+	 *
+	 * @return map<SUCCESS：成功；ERROR：异常>
+	 */
+	@Override
+	@Transactional
+	public Map<String, Object> sectionSave(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			// 线路ID.
+			Integer lineId = map.get("lineId").equals("") ? null : Integer.valueOf(map.get("lineId").toString());
+			// 线路编码.
+			String lineCode = map.get("lineCode").equals("") ? "" : map.get("lineCode").toString();
+			// 路段名称.
+			String sectionName = map.get("sectionName").equals("") ? "" : map.get("sectionName").toString();
+			// 路段编码.
+			String sectionCode = map.get("sectionCode").equals("") ? "" : map.get("sectionCode").toString();
+			// 道路编码.
+			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
+			// 原始坐标类型.
+			String dbType = map.get("dbType").equals("") ? "" :map.get("dbType").toString();
+			// 路段几何图形坐标.
+			String sectionJSON = map.get("bsectionVector").equals("") ? "" : map.get("bsectionVector").toString();
+			// 路段序号
+			String sectionrouteCode = map.get("sectionrouteCode").equals("") ? "" : map.get("sectionrouteCode").toString();
+			// 路段时长.
+			Double sectionTime = map.get("sectionTime").equals("") ? 0.0d : Double.valueOf(map.get("sectionTime").toString());
+			// 路段距离.
+			Double sectionDistance = map.get("sectionDistance").equals("") ? 0.0d : Double.valueOf(map.get("sectionDistance").toString());
+			// 路段限速.
+			Double speedLimit = map.get("speedLimit").equals("") ? 0.0d : Double.valueOf(map.get("speedLimit").toString());
+			// 版本.
+			Integer versions = map.get("versions").equals("") ? 1 : Integer.valueOf(map.get("versions").toString());
+			// 是否撤销.
+			Integer destroy = map.get("destroy").equals("") ? 0 : Integer.valueOf(map.get("destroy").toString());
+			// 路段方向.
+			Integer directions = map.get("directions").equals("") ? 0 : Integer.valueOf(map.get("directions").toString());
+			// 描述与说明.
+			String descriptions = map.get("descriptions").equals("")? "" : map.get("descriptions").toString();
+			// 起始
+			String start = map.get("start").equals("")? "" : map.get("start").toString();
+			// 结束
+			String end = map.get("end").equals("")? "" : map.get("end").toString();
+			// 原始线状图形坐标集合
+			String sectionsBpoints = "";
+			// WGS线状图形坐标集合
+			String sectionsWJPpoints = "";
+			if(!sectionJSON.equals("")) {
+				// 转换成JSON数组
+				JSONArray sectionsArray = JSONArray.parseArray(sectionJSON);
+				// 遍历
+				for(int s = 0 ;s<sectionsArray.size();s++) {
+					String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
+					String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
+					String WGSLngStr = "";
+					String WGSLatStr = "";
+					TransGPS.Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
+					WGSLngStr = String.valueOf(resultPoint.getLng());
+					WGSLatStr = String.valueOf(resultPoint.getLat());
+					if(s==0) {
+						sectionsBpoints = pointsLngStr + " " + pointsLatStr;
+						sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
+					}else {
+						sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
+						sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
+					}
+				}
+			}
+			// WGS坐标点集合
+			String gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+			// 原坐标点集合
+			String bsectionVector = "LINESTRING(" + sectionsBpoints + ")";
+			String crosesRoad="";
+			String endNode ="";
+			String startNode="";
+			String middleNode="";
+			String sectionType="";
+			String csectionVector=null;
+			Integer id = Integer.valueOf(sectionCode);
+			sectionRepository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, gsectionVector, bsectionVector, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, versions, id);
+			Section section = sectionRepository.findById(id).get();
+
+			Line line = lineRepository.findById(lineId).get();
+
+
+			if (map.get("status") == null || Integer.parseInt(map.get("status").toString()) != 0) {
+
+				LsInoutSectionRoute sectionRoute = new LsInoutSectionRoute();
+				Integer routeCode = null;
+				if(!sectionrouteCode.equals("")){
+					String sectionrouteCodeArray[] =  sectionrouteCode.split("_");
+					routeCode = Integer.valueOf(sectionrouteCodeArray[0])+1;
+				}else {
+					routeCode = 1;
+				}
+				sectionRoute.setSectionrouteCode(routeCode);
+				sectionRoute.setLineCode(lineCode);
+				sectionRoute.setSection(section);
+				sectionRoute.setSectionCode(sectionCode);
+				sectionRoute.setDirections(directions);
+				sectionRoute.setDescriptions(descriptions);
+				sectionRoute.setDestroy(destroy);
+				sectionRoute.setVersions(versions);
+				sectionRoute.setLine(line);
+				sectionRoute.setStart(start);
+				sectionRoute.setEnd(end);
+				lsInoutSectionRouteRepository.save(sectionRoute);
+			}
+
+
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
+
+	/** 百度坐标转WGS坐标 */
+	public TransGPS.Location FromBDPointToWGSPoint(String bLonx, String bLatx) {
+
+		double lng = Double.parseDouble(bLonx);
+
+		double lat = Double.parseDouble(bLatx);
+
+		TransGPS.Location bdLoc = TransGPS.LocationMake(lng, lat);
+
+		TransGPS.Location location = TransGPS.bd_decrypt(bdLoc);
+
+		TransGPS.Location WGSPoint = TransGPS.transformFromGCJToWGS(location);
+
+		return WGSPoint;
+
+	}
+
+	/**
+	 * @Description :TODO(编辑线路走向)
+	 *
+	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
+	 *
+	 * @return Map<String, Object> <SUCCESS ; ERROR>
+	 */
+	@Override
+	@Transactional
+	public Map<String, Object> sectionUpdate(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			String bsectionVector = map.get("bsectionVector").equals("") ? "" :map.get("bsectionVector").toString();
+			// 原始线状图形坐标集合
+			String sectionsBpoints = "";
+			// WGS线状图形坐标集合
+			String sectionsWJPpoints = "";
+			if(!bsectionVector.equals("")) {
+				// 转换成JSON数组
+				JSONArray sectionsArray = JSONArray.parseArray(bsectionVector);
+				// 遍历
+				for(int s = 0 ;s<sectionsArray.size();s++) {
+					String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
+					String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
+					/** to WGS坐标 */
+					TransGPS.Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
+					String WGSLngStr = String.valueOf(resultPoint.getLng());
+					String WGSLatStr = String.valueOf(resultPoint.getLat());
+					if(s==0) {
+						sectionsBpoints = pointsLngStr + " " + pointsLatStr;
+						sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
+					}else {
+						sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
+						sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
+					}
+				}
+			}
+			// 原坐标类型
+			String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
+			// 说明
+			String descriptions = "";
+			// 是否撤销
+			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
+			// 方向
+			Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
+			// 线路ID
+			Integer sectionRouteLine = map.get("sectionRouteLine").equals("") ? null : Integer.parseInt(map.get("sectionRouteLine").toString());
+			// 道路编码
+			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
+			// 路段编码
+			String sectionCode = map.get("sectionCode").equals("") ? "" : map.get("sectionCode").toString();
+			// 路段长度
+			Double sectionDistance = map.get("sectionDistance").equals("") ? null : Double.valueOf(map.get("sectionDistance").toString());
+			// 路段ID
+			Integer sectionId = map.get("sectionId").equals("") ? 0 : Integer.parseInt(map.get("sectionId").toString());
+			// 路段名称
+			String sectionName = map.get("sectionName").equals("") ? "" : map.get("sectionName").toString();
+			// 路段路由Id
+			Long sectionRouteId = map.get("sectionRouteId").equals("") ? null : Long.valueOf(map.get("sectionRouteId").toString());
+			// 线路编码
+			String lineCode =map.get("lineCode").equals("") ? "" : map.get("lineCode").toString();
+			// 路段时长
+			Double  sectionTime = map.get("sectionTime").equals("") ? null : Double.valueOf(map.get("sectionTime").toString());
+			// 路段路由
+			Integer sectionrouteCode = "".equals(map.get("sectionrouteCode")) ? null : Integer.valueOf(map.get("sectionrouteCode").toString());
+			// 限速
+			Double speedLimit = map.get("speedLimit").equals("") ? null : Double.valueOf(map.get("speedLimit").toString());
+			// 版本
+			Integer version = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
+			// 起始
+			String start = map.get("start").equals("")? "" : map.get("start").toString();
+			// 结束
+			String end = map.get("end").equals("")? "" : map.get("end").toString();
+			// WGS坐标点集合
+			String gsectionVector = null;
+			if(!sectionsWJPpoints.equals("")) {
+				gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+			}
+			// 原坐标点集合
+			String bsectionVectorS = null;
+			if(!sectionsBpoints.equals("")) {
+				bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";
+			}
+			Integer createBy = map.get("createBy").equals("") ? null : Integer.valueOf(map.get("createBy").toString());
+			String createDate = map.get("createDate").equals("") ? null : map.get("createDate").toString();
+			Integer updateBy = map.get("updateBy").equals("") ?null : Integer.valueOf(map.get("updateBy").toString());
+			SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
+			Date date = new Date();
+			// 修改日期
+			String updateDate = formatter.format(date);
+			String crosesRoad="";
+			String endNode="";
+			String startNode="";
+			String middleNode="";
+			String sectionType="";
+			// 更新
+			sectionRepository.sectionUpdate(sectionId, gsectionVector, bsectionVectorS, sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, sectionType, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, version, createBy, createDate, updateBy, updateDate);
+
+			Line line = lineRepository.findById(sectionRouteLine).get();
+			Section section = sectionRepository.findById(sectionId).get();
+
+			if(map.get("status") == null || Integer.parseInt(map.get("status").toString()) != 0) {
+
+				LsInoutSectionRoute resultS = lsInoutSectionRouteRepository.findById(sectionRouteId).get();
+				int old_code = resultS.getSectionrouteCode();
+				// 是否修改路段序号标记
+				boolean type = false;
+				if(sectionrouteCode!=null) {
+					if(++sectionrouteCode == old_code) {
+						type = true;
+					}
+					// 默认是最前面路段
+				}else {
+					sectionrouteCode = 1;
+				}
+				if(!type)
+					lsInoutSectionRouteRepository.sectionUpdSectionRouteCode(lineCode, version, start, end,sectionrouteCode);
+				LsInoutSectionRoute route = new LsInoutSectionRoute();
+				route.setId(sectionRouteId);
+				route.setSectionrouteCode(sectionrouteCode);
+				route.setLineCode(lineCode);
+				route.setSectionCode(sectionCode);
+				route.setDirections(directions);
+				route.setVersions(version);
+				route.setDestroy(destroy);
+				route.setCreateBy(createBy);
+				route.setUpdateBy(updateBy);
+				route.setSection(section);
+				route.setLine(line);
+				route.setStart(start);
+				route.setEnd(end);
+				lsInoutSectionRouteRepository.save(route);
+			}
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
+
+	@Override
+	public Map<String, Object> destroy(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			long id = Long.parseLong(map.get("id").toString());
+
+			if(map.get("status") == null || Integer.parseInt(map.get("status").toString()) != 0) {
+				lsInoutSectionRouteRepository.deleteById(id);
+			}
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("destroy erro.", e);
+		}
+		return resultMap;
+	}
+
+	@Override
+	@Transactional
+	public void pathPlaningByHistory(long schId, int versions) throws JsonProcessingException {
+		ScheduleRealInfo scheduleRealInfo = scheduleRealInfoRepository.findById(schId).get();
+		DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+		DateTime start = formatter.parseDateTime(scheduleRealInfo.getRealExecDate() + scheduleRealInfo.getFcsjActual());
+		DateTime end = formatter.parseDateTime(scheduleRealInfo.getRealExecDate() + scheduleRealInfo.getZdsjActual());
+		if (start.isAfter(end)) {
+			end = end.plusDays(1);
+		}
+		Map<String, Object> map = gpsService.history(new String[]{ scheduleRealInfo.getClZbh() }, start.getMillis() / 1000 - 20, end.getMillis() / 1000 + 20);
+		List<Map<String, Object>> list = (List<Map<String, Object>>)map.get("list");
+		List<Map<String, Object>> bsectionVector = new ArrayList<>();
+		for (Map<String, Object> m : list) {
+			Map<String, Object> m1 = new HashMap<>();
+			Float lng = (Float)m.get("lon"), lat = (Float)m.get("lat");
+			if (lng == 0 || lat == 0) {
+				continue;
+			}
+			m1.put("lng", m.get("bd_lon"));
+			m1.put("lat", m.get("bd_lat"));
+			bsectionVector.add(m1);
+		}
+		map.clear();
+		map.put("lineId", scheduleRealInfo.getXlBm());
+		map.put("lineCode", scheduleRealInfo.getXlBm());
+		map.put("sectionName", scheduleRealInfo.getQdzName() + "-" + scheduleRealInfo.getZdzName());
+		map.put("sectionCode", sectionRepository.sectionMaxId() + 1);
+		map.put("roadCoding", "");
+		map.put("dbType", "b");
+		map.put("sectionrouteCode", "1");
+		map.put("sectionTime", "");
+		map.put("sectionDistance", "");
+		map.put("speedLimit", "60");
+		map.put("versions", versions);
+		map.put("destroy", 0);
+		map.put("directions", 3);
+		map.put("descriptions", "");
+		map.put("start", scheduleRealInfo.getQdzCode());
+		map.put("end", scheduleRealInfo.getZdzCode());
+		map.put("bsectionVector", new ObjectMapper().writeValueAsString(bsectionVector));
+
+		lsInoutSectionRouteRepository.destroy(scheduleRealInfo.getXlBm(), versions, scheduleRealInfo.getQdzCode(), scheduleRealInfo.getZdzCode());
+		sectionSave(map);
+	}
+}