12312

youxiw2000
2 parents 02362ca0 8c415bd1
Showing 71 changed files with 11096 additions and 8689 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);
+	}
+}
-package com.bsth.service.impl;
-
-import com.bsth.data.BasicData;
-import com.bsth.email.SendEmailController;
-import com.bsth.email.entity.EmailBean;
-import com.bsth.entity.*;
-import com.bsth.entity.realcontrol.ChildTaskPlan;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.entity.schedule.TTInfo;
-import com.bsth.entity.schedule.TTInfoDetail;
-import com.bsth.entity.search.CustomerSpecs;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.entity.traffic.SKBUploadLogger;
-import com.bsth.repository.*;
-import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-import com.bsth.repository.schedule.*;
-import com.bsth.repository.traffic.SKBUploadLoggerRepository;
-import com.bsth.security.util.SecurityUtils;
-import com.bsth.service.TrafficManageService;
-import com.bsth.service.traffic.YgcBasicDataService;
-import com.bsth.util.TimeUtils;
-import com.bsth.util.db.DBUtils_MS;
-import com.bsth.webService.trafficManage.org.tempuri.Results;
-import com.bsth.webService.trafficManage.org.tempuri.WebServiceLocator;
-import com.bsth.webService.trafficManage.org.tempuri.WebServiceSoap;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Service;
-
-import java.io.*;
-import java.net.InetAddress;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- *
- * @ClassName: TrafficManageServiceImpl(运管处接口service业务层实现类)
- *
- * @Extends : BaseService
- *
- * @Description: TODO(运管处接口service业务层)
- *
- * @Author bsth@zq
- *
- * @Date 2016年10月28日 上午9:21:17
- *
- * @Version 公交调度系统BS版 0.1
- *
- */
-
-@Service
-public class TrafficManageServiceImpl  implements TrafficManageService{
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-	// 运管处上传日志类型
-	public static final String UPLOAD_TYPE_SKB = "1";
-	public static final String UPLOAD_TYPE_XL = "2";
-	public static final String UPLOAD_TYPE_LD = "3";
-
-	// 线路repository
-	@Autowired
-	private LineRepository lineRepository;
-
-	@Autowired
-	private LineInformationRepository lineInformationRepository;
-
-	// 站点路由repository
-	@Autowired
-	private StationRouteRepository stationRouteRepository;
-
-	// 历史站点路由repository
-	@Autowired
-	private LsStationRouteRepository lsStationRouteRepository;
-
-	@Autowired
-	private SectionRepository sectionRepository;
-
-	// 车辆repository
-	@Autowired
-	private CarsRepository carsRepository;
-
-	// 人员repository
-	@Autowired
-	private PersonnelRepository personnelRepository;
-
-	// 时刻模板repository
-	@Autowired
-	private TTInfoRepository ttInfoRepository;
-
-	// 时刻模板明细repository
-	@Autowired
-	private TTInfoDetailRepository ttInfoDetailRepository;
-
-	// 排班计划明细repository
-	@Autowired
-	private SchedulePlanInfoRepository schedulePlanInfoRepository;
-
-	// 实际排班计划明细repository
-	@Autowired
-	private ScheduleRealInfoRepository scheduleRealInfoRepository;
-
-	// 时刻表上传记录repository
-	@Autowired
-	private SKBUploadLoggerRepository skbUploadLoggerRepository;
-
-	// 线路站点repository
-	@Autowired
-	private YgcBasicDataService ygcBasicDataService;
-
-	// 发送邮件
-	@Autowired
-	private SendEmailController sendEmailController;
-
-	/**
-	 * 线路版本repository
-	 */
-	@Autowired
-	private LineVersionsRepository lineVersionsRepository;
-
-	// 运管处上传接口
-	private com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap webServiceSoapUp;
-	private WebServiceSoap ssop ;
-	{
-		try {
-			ssop = new WebServiceLocator().getWebServiceSoap();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	// 格式化 年月日时分秒 nyrsfm是年月日时分秒的拼音首字母
-	private SimpleDateFormat sdfnyrsfm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-	// 格式化  年月日
-	private SimpleDateFormat sdfnyr = new SimpleDateFormat("yyyy-MM-dd");
-
-	// 数字格式化
-	DecimalFormat format = new DecimalFormat("0.00");
-
-	// 用户名
-	private final String userNameOther = "user";
-	// 密码
-	private final String passwordOther = "user";
-
-	// 用户名
-	private final String userNameUp = "user";
-	// 密码
-	private final String passwordUp = "user";
-	// 接收邮件人
-	private final String emailSendToAddress = "113252620@qq.com";
-	// 记录路单上线的成功、失败线路数
-	private Integer countSuccess,countFailure;
-
-	private synchronized com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap  getWebServiceSoapUp(){
-		try {
-			if(webServiceSoapUp == null){
-				webServiceSoapUp = new com.bsth.webService.trafficManage.up.org.tempuri.WebServiceLocator().getWebServiceSoap();
-			}
-		}catch (Exception e){
-			e.printStackTrace();
-		}finally {
-			return webServiceSoapUp;
-		}
-	}
-	/**
-	 * 上传线路信息
-	 */
-	@Override
-	public String setXL(String ids) {
-		String result = "failure";
-		String xml ;
-		String[] idArray = ids.split(",");
-		try {
-			for (String id : idArray) {
-				if(id == null || id.trim().equals("")){
-					continue;
-				}
-				Map<String,Object> map = new HashMap<>();
-				map.put("lineCode_eq", id);
-				Line line ;
-				LineInformation lineInformation;
-				Optional<Line> optionalLine = lineRepository.findOne(new CustomerSpecs<Line>(map));
-				line = optionalLine.isPresent() ? optionalLine.get() : null;
-				if(line == null){
-					continue;
-				}
-				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null){
-					return result;
-				}
-				map = new HashMap<>();
-				map.put("line.id_eq",line.getId());
-				Optional<LineInformation> optionalLineInformation = lineInformationRepository.findOne(new CustomerSpecs<LineInformation>(map));
-				lineInformation = optionalLineInformation.isPresent() ? optionalLineInformation.get() : null;
-				if(lineInformation == null){
-					continue;
-				}
-				// 取得封装好的xml
-				xml = getSetXlXml(line,lineInformation);
-				// 站点序号不能为0，如果为0，则返回错误
-				if(xml.indexOf("<ZDXH>0</ZDXH>") != -1){
-					return "0";
-				}
-				String state;// 是否上传成功
-				// 调用上传方法
-				if(getWebServiceSoapUp().setXL(userNameUp,passwordUp,xml).isSuccess()){
-					result = "success";
-					state = "1";
-				}else{
-					result = "failure";
-					state = "0";
-				}
-				logger.info("setXL:"+xml);
-				logger.info("setXL:"+result);
-				// 保存运管处上传记录
-				saveYgcUploadLog(line,xml,TrafficManageServiceImpl.UPLOAD_TYPE_XL,state);
-			}
-		} catch (Exception e) {
-			logger.error("setXL:",e);
-			e.printStackTrace();
-		}
-		return result;
-	}
-
-	/**
-	 * 加载运管处的站点及序号
-	 * 上行从1开始，下行顺序续编
-	 */
-	private Map<String, Integer> getStationName2YgcNumberMap (String lineCode){
-		Map<String, Integer> resultMap = new HashMap<>();
-		List<Map<String, String>> ygcLines = stationRouteRepository.findLineWithYgcByLine(lineCode);
-		if(ygcLines != null && ygcLines.size() > 0){
-			int size = ygcLines.size();
-			Map<String, String> tempMap ;
-			int num = 1;
-			String key;
-			for (int i = 0; i < size; i ++){
-				tempMap = ygcLines.get(i);
-				key = tempMap.get("lineCode") + "_"+String.valueOf(tempMap.get("directions"))
-						+ "_"+tempMap.get("stationCode")+ "_"+tempMap.get("stationMark");
-				resultMap.put(key,num++);
-			}
-		}
-		return resultMap;
-	}
-
-	/**
-	 * 上传线路信息(按in_use上传)
-	 */
-	@Override
-	public String setXLByInUse(String inUse) {
-		StringBuffer result = new StringBuffer();
-		try {
-			Map<String,Object> map = new HashMap<>();
-			if(inUse != null && inUse.equals("1")){
-				map.put("inUse_eq", inUse);
-			}
-			List<Line> lines ;
-			Line line;
-			lines = lineRepository.findAll(new CustomerSpecs<Line>(map));
-			if(lines != null && lines.size() > 0){
-				for(int i = 0 ; i < lines.size() ; i ++){
-					line = lines.get(i);
-					if(line != null && line.getId() != null){
-						result.append(line.getLineCode()).append(":").append(setXL(line.getLineCode())).append(";");
-					}
-				}
-			}
-		} catch (Exception e) {
-			result.append("failure");
-			logger.error("setXLByInUse:",e);
-			e.printStackTrace();
-		}
-		return result.toString();
-	}
-
-	/**
-	 * 上传车辆信息
-	 */
-	@Override
-	public String setCL() {
-		String result = "failure";
-		StringBuffer sBuffer =new StringBuffer();
-		try {
-			sBuffer.append("<CLs>");
-			Cars cars = null;
-			String company;
-			Iterator<Cars> carsIterator = carsRepository.findAll().iterator();
-			while(carsIterator.hasNext()){
-				cars = carsIterator.next();
-				sBuffer.append("<CL>");
-				company = cars.getCompany();
-				setCompanyName(company);// 统一公司名称
-				sBuffer.append("<GSJC>").append(company).append("</GSJC>");
-				sBuffer.append("<NBH>").append(cars.getInsideCode()).append("</NBH>");
-				sBuffer.append("<CPH>").append(cars.getCarPlate()).append("</CPH>");
-				sBuffer.append("<YYZBH>").append(cars.getServiceNo()).append("</YYZBH>");
-				sBuffer.append("<CZCPH>").append(cars.getCarPlate()).append("</CZCPH>");//******这个数据没有***********
-				sBuffer.append("<CZZDBH>").append(cars.getEquipmentCode()).append("</CZZDBH>");
-				sBuffer.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
-				sBuffer.append("</CL>");
-			}
-			sBuffer.append("</CLs>");
-			if(ssop.setCL(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
-				result = "success";
-			}
-		} catch (Exception e) {
-			logger.error("setCL:",e);
-			e.printStackTrace();
-		}finally{
-			logger.info("setCL:"+sBuffer.toString());
-			logger.info("setCL:"+result);
-		}
-		return result;
-	}
-
-	/**
-	 * 上传司机信息
-	 */
-	@Override
-	public String setSJ() {
-		String result = "failure";
-		StringBuffer sBuffer =new StringBuffer();
-		try {
-			sBuffer.append("<SJs>");
-			Personnel personnel = null;
-			String company;
-			Iterator<Personnel> personIterator = personnelRepository.findAll().iterator();
-			while(personIterator.hasNext()){
-				personnel = personIterator.next();
-				sBuffer.append("<SJ>");
-				company = personnel.getCompany();
-				setCompanyName(company);// 统一公司名称
-				sBuffer.append("<GSJC>").append(company).append("</GSJC>");
-				sBuffer.append("<SJGH>").append(personnel.getJobCode()).append("</SJGH>");
-				sBuffer.append("<CYZGZH>").append(personnel.getPapersCode()).append("</CYZGZH>");//***********
-				sBuffer.append("<XM>").append(personnel.getPersonnelName()).append("</XM>");
-				sBuffer.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
-				sBuffer.append("</SJ>");
-			}
-			sBuffer.append("</SJs>");
-			if(ssop.setSJ(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
-				result = "success";
-			};
-		} catch (Exception e) {
-			logger.error("setSJ:",e);
-			e.printStackTrace();
-		}finally{
-			logger.info("setSJ:"+sBuffer.toString());
-			logger.info("setSJ:"+result);
-		}
-		return result;
-	}
-
-	/**
-	 * 上传路单 指定日期 yyyy-MM-dd
-	 * @param theDate
-	 * @return
-	 */
-	public String setLD(String theDate){
-		return uploadLD(theDate);
-	}
-
-	/**
-	 * 上传路单 上传前一天的路单
-	 * @return
-	 */
-	public String setLD(){
-		return uploadLD(null);
-	}
-	/**
-	 * 上传路单
-	 * @return 上传成功标识
-	 */
-	private String uploadLD(String theDate){
-		// 取昨天 的日期
-		String date = theDate == null ?sdfnyr.format(DateUtils.addDays(new Date(), -1)) : theDate;
-		StringBuffer sf = new StringBuffer();
-		Results results = null;
-		String str = "", xlbm = null, oldXlbm = null;
-		List<Map<String,Object>> listGroup = null;
-		int scount = 0, ccount = 0;
-		long start = System.currentTimeMillis();
-		try {
-			// 计数器
-			int counter = 0;
-			// 每几条线路上传一次路单
-			int per = 10;
-			List<ScheduleRealInfo> list = scheduleRealInfoRepository.setLD(date);
-			listGroup = scheduleRealInfoRepository.setLDGroup(date);
-			Map<String,Object> map = new HashMap();
-			HashMap<String,String> paramMap;
-			HashMap<String,String> otherMap = new HashMap();
-
-			// 车辆内部编码和车牌做映射
-			Map<String, String> inside2plate = new HashMap<>();
-			Iterable<Cars> cars = carsRepository.findAll();
-			for (Cars car : cars)  {
-				inside2plate.put(car.getInsideCode(), car.getCarPlate());
-			}
-
-			// 线路编码和线路信息映射
-			Map<String, Line> code2line = new HashMap<>();
-			Iterable<Line> lines = lineRepository.findAll();
-			for (Line line : lines) {
-				code2line.put(line.getLineCode(), line);
-			}
-
-			// 线路编码和线路版本映射(电子路单日期)
-			Map<String, Integer> code2version = new HashMap<>();
-			Iterable<LineVersions> versions = lineVersionsRepository.findLineVersionsByDate((int)(DateTime.parse(date).getMillis() / 1000));
-			for (LineVersions version : versions) {
-				code2version.put(version.getLineCode(), version.getVersions());
-			}
-
-			Map<String, Integer> stationNumMap = null;
-			for(Map<String,Object> schRealInfo:listGroup){
-				if(schRealInfo != null){
-					// 获取线路是否使用标识，如果未使用，则不查该线路数据
-					String lineCode = schRealInfo.get("xlBm")+"";
-					Line line = code2line.get(lineCode);
-					if(line == null || line.getInUse() == null || line.getInUse() == 0){
-						ccount++;
-						continue;
-					}
-					if(counter % per == 0){
-						sf = new StringBuffer();
-						sf.append("<DLDS>");
-					}
-					counter ++;
-					xlbm = BasicData.lineCode2ShangHaiCodeMap.get(lineCode);
-					if (!xlbm.equals(oldXlbm)) {
-						oldXlbm = xlbm;
-						Integer ver = code2version.get(lineCode);
-						if (ver != null) {
-							stationNumMap = getLsStationRoute(lineCode, ver);
-						}
-					}
-
-					sf.append("<DLD>");
-					sf.append("<RQ>").append(date).append("</RQ>");
-					sf.append("<XLBM>").append(xlbm).append("</XLBM>");
-					sf.append("<LPBH>").append(schRealInfo.get("lpName")).append("</LPBH>");
-					sf.append("<CPH>").append(inside2plate.get(schRealInfo.get("clZbh"))).append("</CPH>");
-					sf.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
-					sf.append("<LDList>");
-					for(ScheduleRealInfo scheduleRealInfo:list){
-						if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("lpName")+"")
-								.equals(scheduleRealInfo.getLpName())
-								&& (schRealInfo.get("clZbh")+"").equals(scheduleRealInfo.getClZbh())){
-
-							if(scheduleRealInfo.isDestroy()){
-								if(scheduleRealInfo.isReissue()){
-									scheduleRealInfo.setFcsjActualAll(scheduleRealInfo.getDfsj());
-									scheduleRealInfo.setZdsjActualAll(scheduleRealInfo.getZdsj());
-								}
-								else
-									continue;
-							}
-
-							if(scheduleRealInfo.getBcType().equals("in")
-									|| scheduleRealInfo.getBcType().equals("out")){
-								continue;
-							}
-
-							sf.append("<LD>");
-							sf.append("<SJGH>").append(scheduleRealInfo.getjGh()).append("</SJGH>");
-							sf.append("<SXX>").append(scheduleRealInfo.getXlDir()).append("</SXX>");
-							sf.append("<FCZDMC>").append(scheduleRealInfo.getQdzName()).append("</FCZDMC>");
-							// 起点站的参数
-							otherMap.put("stationMark","B");
-							paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
-							sf.append("<FCZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,stationNumMap)).append("</FCZDXH>");
-							sf.append("<FCZDBM>").append(scheduleRealInfo.getQdzCode()).append("</FCZDBM>");
-							sf.append("<JHFCSJ>").append(scheduleRealInfo.getFcsj()).append("</JHFCSJ>");
-							sf.append("<DFSJ>").append(scheduleRealInfo.getDfsj()).append("</DFSJ>");
-							sf.append("<SJFCSJ>").append(scheduleRealInfo.getFcsjActual()).append("</SJFCSJ>");
-							sf.append("<FCZDLX></FCZDLX>");
-							sf.append("<DDZDMC>").append(scheduleRealInfo.getZdzName()).append("</DDZDMC>");
-							// 终点站的参数
-							otherMap.put("stationMark","E");
-							paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
-							sf.append("<DDZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,stationNumMap)).append("</DDZDXH>");
-							sf.append("<DDZDBM>").append(scheduleRealInfo.getZdzCode()).append("</DDZDBM>");
-							sf.append("<JHDDSJ>").append(scheduleRealInfo.getZdsj()).append("</JHDDSJ>");
-							sf.append("<SJDDSJ>").append(scheduleRealInfo.getZdsjActual()).append("</SJDDSJ>");
-							sf.append("<DDZDLX></DDZDLX>");
-							sf.append("<LDSCBZ>0</LDSCBZ>");
-							sf.append("<DDBZ>").append("").append("</DDBZ>");
-							sf.append("</LD>");
-						}
-					}
-					sf.append("</LDList>");
-					sf.append("</DLD>");
-				}
-				if(counter % per == per - 1){
-					sf.append("</DLDS>");
-					// 去掉'号
-					str = sf.toString().replace("'","");
-					scount += invokeSetLD(str, counter);
-					counter = 0;
-				}
-			}
-			// 每per条线路上传后剩下的数据再上传
-			if(counter > 0){
-				sf.append("</DLDS>");
-				// 去掉'号
-				str = sf.toString().replace("'","");
-				scount += invokeSetLD(str, counter);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			logger.error("setLD:", e);
-		} finally {
-			try {
-				//发送邮件
-				EmailBean mail = new EmailBean();
-				mail.setSubject(InetAddress.getLocalHost().getHostAddress()+":路单日志数据"+date);
-				mail.setContent("总数：" + (listGroup == null ? 0 : listGroup.size()) + "<br/>成功数：" + scount + "<br/>跳过数：" + ccount + "<br/>耗时：" + (System.currentTimeMillis() - start));
-				sendEmailController.sendMail(emailSendToAddress, mail);
-				logger.info("setLD-sendMail:邮件发送成功！");
-			} catch (Exception e) {
-				e.printStackTrace();
-				logger.error("setLD-sendMail:",e);
-			}
-		}
-		return "success";
-	}
-
-	/**
-	 * 调用运管处电子路单接口，如果上传失败或有网络问题，最多执行10次
-	 * @param xml 拼接的xml字符串
-	 * @param counter 分组数
-	 * @return 成功返回counter 失败返回0
-	 */
-	private int invokeSetLD(String xml, int counter) {
-		for (int i = 0;i < 10;i++) {
-			try {
-				Results results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(xml));
-				if (results.isSuccess()) {
-					logger.info("setLD: " + xml);
-					logger.info("setLD: 成功");
-					return counter;
-				} else if (i == 9) {
-					logger.error("setLD: " + xml);
-					logger.error("setLD: 失败，" + results.getMessage());
-				}
-				Thread.sleep(2000);
-			} catch (Exception e) {
-				logger.error("运管处接口调用异常", e);
-				try {
-					Thread.sleep(2000);
-				} catch (InterruptedException ex) {
-					ex.printStackTrace();
-				}
-			}
-		}
-
-		return 0;
-	}
-
-	/**
-	 * 上传路单 xml来自文件
-	 * @return 上传成功标识
-	 */
-	public String setLDFile(){
-		String result = "failure";
-		try {
-			String tmp = readXmlFromFile("E:/ld.txt");
-			Results rss = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(tmp));
-			if(rss.isSuccess()){
-				result = "success";
-			}
-		} catch (Exception e) {
-			logger.error("setLD:",e);
-			e.printStackTrace();
-		}finally{
-
-		}
-		return result;
-	}
-
-	/**
-	 * 从文件中读取xml
-	 * @param fileName  例：D:/test.txt
-	 * @return
-	 * @throws Exception
-	 */
-	private String readXmlFromFile(String fileName) throws Exception {
-		StringBuffer sf = new StringBuffer("");
-		File file = new File(fileName);
-		InputStreamReader reader = new InputStreamReader(new FileInputStream(file),"GBK");
-		BufferedReader bufferedReader = new BufferedReader(reader);
-		String lineTxt = "";
-		while((lineTxt = bufferedReader.readLine()) != null){
-			sf.append(lineTxt);
-		}
-		reader.close();
-		return sf.toString().replaceAll("\t","");
-	}
-	/**
-	 * 上传里程油耗
-	 * @return 上传成功标识
-	 */
-	public String setLCYH(){
-		String result = "failure";
-		// 取昨天 的日期
-		String date = sdfnyr.format(DateUtils.addDays(new Date(), -1));
-		StringBuffer sf = new StringBuffer();
-		try {
-			sf.append("<LCYHS>");
-			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setLCYHGroup(date);
-			List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date);
-			Map<String,Object> map = new HashMap<String,Object>();
-			for(Map<String,Object> schRealInfo:listGroup){
-				if(schRealInfo != null){
-					map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
-					Optional<Cars> optionalCars = carsRepository.findOne(new CustomerSpecs<Cars>(map));
-					Cars car = optionalCars.isPresent() ? optionalCars.get() : null;
-					/**
-					 * 如果car==null，则说明该车辆是从线调中换车功能中加进去的，
-					 * 在cars基础信息中查不到车辆的信息，所以忽略该车辆
- 					 */
-					if(car == null){
-						continue;
-					}
-					//计算总公里和空驶公里，营运公里=总公里-空驶公里
-					double totalKilometers = 0,emptyKilometers =0;
-					sf.append("<LCYH>");
-					sf.append("<RQ>"+date+"</RQ>");
-					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm"))+"</XLBM>");
-					sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
-					if(list != null && list.size() > 0){
-						for(ScheduleRealInfo scheduleRealInfo:list){
-							if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("clZbh")+"")
-									.equals(scheduleRealInfo.getClZbh())){
-								Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-								//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
-								if(childTaskPlans.isEmpty()){
-									if(scheduleRealInfo.getStatus() == 2){
-										totalKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
-										if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-												|| scheduleRealInfo.getBcType().equals("venting")){
-											emptyKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
-										}
-									}
-								}else{
-									Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-									while(it.hasNext()){
-										ChildTaskPlan childTaskPlan = it.next();
-										if(!childTaskPlan.isDestroy()){
-											totalKilometers += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();
-											if(childTaskPlan.getMileageType().equals("empty")){
-												emptyKilometers += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();;
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-					sf.append("<ZLC>"+totalKilometers+"</ZLC>");
-					sf.append("<YYLC>"+emptyKilometers+"</YYLC>");
-					sf.append("<YH>"+""+"</YH>");
-					sf.append("<JZYL>"+""+"</JZYL>");
-					sf.append("<DH>"+""+"</DH>");
-					sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
-					sf.append("<BBSCBZ>"+0+"</BBSCBZ>");
-					sf.append("</LCYH>");
-				}
-			}
-			sf.append("</LCYHS>");
-			if(ssop.setLCYH(userNameOther, passwordOther, sf.toString()).isSuccess()){
-				result = "success";
-			}
-		} catch (Exception e) {
-			logger.error("setLCYH:",e);
-			e.printStackTrace();
-		}finally{
-			logger.info("setLCYH:"+sf.toString());
-			logger.info("setLCYH:"+result);
-		}
-		return result;
-	}
-
-	/**
-	 * 上传线路调度日报
-	 * @return
-	 */
-	public String setDDRB(){
-		String result = "failure";
-		// 取昨天 的日期
-		String date = sdfnyr.format(DateUtils.addDays(new Date(), -1));
-		StringBuffer sf = new StringBuffer();
-		try {
-			sf.append("<DDRBS>");
-			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setDDRBGroup(date);
-			List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date);
-			for(Map<String,Object> schRealInfo:listGroup){
-				if(schRealInfo != null){
-					double jhlc = 0,zlc = 0,jhkslc = 0,sjkslc = 0;
-					int jhbc = 0,sjbc = 0,jhzgfbc = 0,sjzgfbc = 0,jhwgfbc = 0,sjwgfbc = 0;
-					sf.append("<DDRB>");
-					sf.append("<RQ>"+date+"</RQ>");
-					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm"))+"</XLBM>");
-					for(ScheduleRealInfo scheduleRealInfo:list){
-						if(scheduleRealInfo != null){
-							if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm())){
-								//计划
-								if(!scheduleRealInfo.isSflj()){
-									jhlc += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
-									//计划空驶
-									if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")){
-										jhkslc += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
-									}
-									//计划早高峰,计划晚高峰
-									if(TimeUtils.morningPeak(scheduleRealInfo.getFcsj())){
-										jhzgfbc++;
-									} else if(TimeUtils.evenignPeak(scheduleRealInfo.getFcsj())){
-										jhwgfbc++;
-									}
-								}
-								jhbc++;
-
-								//实际
-								Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-								//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
-								if(childTaskPlans.isEmpty()){
-									if(scheduleRealInfo.getStatus() == 2){
-										sjbc++;
-										zlc += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
-										if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-												|| scheduleRealInfo.getBcType().equals("venting")){
-											sjkslc += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();;
-										}
-									}
-								}else{
-									sjbc++;
-									Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-									while(it.hasNext()){
-										ChildTaskPlan childTaskPlan = it.next();
-										if(!childTaskPlan.isDestroy()){
-											zlc += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();
-											if(childTaskPlan.getMileageType().equals("empty")){
-												sjkslc += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();;
-											}
-										}
-									}
-								}
-								//实际早高峰,计划晚高峰
-								if(scheduleRealInfo.getFcsjActual() != null){
-									if(TimeUtils.morningPeak(scheduleRealInfo.getFcsj())){
-										sjzgfbc++;
-									} else if(TimeUtils.evenignPeak(scheduleRealInfo.getFcsj())){
-										sjwgfbc++;
-									}
-								}
-							}
-						}
-					}
-					sf.append("<JHLC>"+format.format(jhlc)+"</JHLC>");
-					sf.append("<SSLC>"+format.format((zlc-sjkslc))+"</SSLC>");
-					sf.append("<JHKSLC>"+format.format(jhkslc)+"</JHKSLC>");
-					sf.append("<SJKSLC>"+format.format(sjkslc)+"</SJKSLC>");
-					sf.append("<JHBC>"+jhbc+"</JHBC>");
-					sf.append("<SJBC>"+sjbc+"</SJBC>");
-					sf.append("<JHZGFBC>"+jhzgfbc+"</JHZGFBC>");
-					sf.append("<SJZGFBC>"+sjzgfbc+"</SJZGFBC>");
-					sf.append("<JHWGFBC>"+jhwgfbc+"</JHWGFBC>");
-					sf.append("<SJWGFBC>"+sjwgfbc+"</SJWGFBC>");
-					sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
-					sf.append("<RBSCBZ>"+0+"</RBSCBZ>");
-					sf.append("</DDRB>");
-				}
-			}
-			sf.append("</DDRBS>");
-			if(ssop.setDDRB(userNameOther, passwordOther, sf.toString()).isSuccess()){
-				result = "success";
-			}
-		} catch (Exception e) {
-			logger.error("setDDRB:",e);
-			e.printStackTrace();
-		}finally{
-			logger.info("setDDRB:"+sf.toString());
-			logger.info("setDDRB:"+result);
-		}
-		return result;
-	}
-
-	/**
-	 * 上传计划班次 指定日期 yyyy-MM-dd
-	 * @param theDate
-	 * @return
-	 */
-	public String setJHBC(String theDate){
-		return uploadJHBC(theDate);
-	}
-
-	/**
-	 * 上传计划班次
-	 * @return
-	 */
-	public String setJHBC(){
-		return uploadJHBC(null);
-	}
-	/**
-	 * 上传线路计划班次表
-	 */
-
-	private String uploadJHBC(String theDate) {
-		String result = "failure";
-		Line line;
-		StringBuffer sBuffer =new StringBuffer();
-		try {
-			sBuffer.append("<JHBCs>");
-			// 声明变量
-			SchedulePlanInfo schedulePlanInfo;
-			String xlbm,zbh = "";
-			Long lp = 0L;
-			// 取得计划班次时间
-			String tomorrow = theDate == null ? sdfnyr.format(DateUtils.addDays(new Date(), +1)) : theDate;
-			// 查询所有班次
-			List<SchedulePlanInfo> schedulePlanList = schedulePlanInfoRepository.findLineScheduleBc(tomorrow);
-			int j = 0; // 初始化标识
-			if(schedulePlanList != null ){
-				HashMap<String,String> paramMap;
-				HashMap<String,String> otherMap = new HashMap<String, String>();
-				int size = schedulePlanList.size();
-				for (int i = 0; i < size; i++) {
-					schedulePlanInfo = schedulePlanList.get(i);
-					xlbm = schedulePlanInfo.getXlBm();
-					// 获取线路是否使用标识，如果未使用，则不查该线路数据
-					line = lineRepository.findByLineCode(xlbm);
-					if(line.getInUse() == null || line.getInUse() == 0){
-						continue;
-					}
-					if(++j == 1){// 第一次，则初始化值
-						zbh = schedulePlanInfo.getClZbh();
-						lp = schedulePlanInfo.getLp();
-						// 拼装XML
-						assembleJHBC(sBuffer, schedulePlanInfo, xlbm, zbh, lp);
-					}
-					// 比较是否为同一条线路同一辆车
-					if(xlbm.equals(schedulePlanInfo.getXlBm())
-							&& zbh.equals(schedulePlanInfo.getClZbh())
-							&& lp == schedulePlanInfo.getLp()){
-						if(schedulePlanInfo.getBcType().equals("in") || schedulePlanInfo.getBcType().equals("out")){
-							continue;
-						}
-						sBuffer.append("<BC>");
-						sBuffer.append("<SJGH>").append(schedulePlanInfo.getjGh()).append("</SJGH>");
-						sBuffer.append("<SXX>").append(schedulePlanInfo.getXlDir()).append("</SXX>");
-						sBuffer.append("<FCZDMC>").append(schedulePlanInfo.getQdzName()).append("</FCZDMC>");
-						// 起点站的参数
-						otherMap.put("stationMark","B");
-						paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
-						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</ZDXH>");
-						sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>");
-						sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>");
-						// 起点站的参数
-						otherMap.put("stationMark","E");
-						paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
-						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</DDXH>");
-						sBuffer.append("<JHDDSJ>").append(calcDdsj(schedulePlanInfo.getFcsj(),schedulePlanInfo.getBcsj()))
-								.append("</JHDDSJ>");
-						sBuffer.append("</BC>");
-						if(i == size -1 ){
-							sBuffer.append("</BCList>");
-							sBuffer.append("</JHBC>");
-						}
-					}else{
-						zbh = schedulePlanInfo.getClZbh();
-						lp = schedulePlanInfo.getLp();
-						sBuffer.append("</BCList>");
-						sBuffer.append("</JHBC>");
-						// 拼装XML
-						assembleJHBC(sBuffer, schedulePlanInfo, xlbm, zbh, lp);
-					}
-				}
-			}
-			// 判断XML是否以</BCList>结尾，如果不是，则加上
-			String regex = "^*</JHBC>$";
-			Pattern p = Pattern.compile(regex);
-			Matcher m = p.matcher(sBuffer);
-			boolean isEndWithTrueFlag = false;
-			while (m.find()) {
-				isEndWithTrueFlag = true;
-			}
-			// 加上缺失的标签
-			if(!isEndWithTrueFlag){
-				sBuffer.append("</BCList>");
-				sBuffer.append("</JHBC>");
-			}
-			sBuffer.append("</JHBCs>");
-			if(ssop.setJHBC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
-				result = "success";
-			}
-		} catch (Exception e) {
-			logger.error("setJHBC:",e);
-			e.printStackTrace();
-		}finally{
-			logger.info("setJHBC:"+sBuffer.toString());
-			logger.info("setJHBC:"+result);
-		}
-		return result;
-	}
-
-	/**
-	 * 上传线路班次时刻表数据
-	 */
-	@Override
-	public String setSKB(String ids) {
-		String result = "上传失败，";
-		StringBuffer sBuffer = new StringBuffer("<SKBs>");
-		DecimalFormat df = new DecimalFormat("######0.000");
-		Map<String,String> lsStationCode2NameMap = null;
-		Map<String, Integer> lsStationName2YgcNumber = null;
-		try {
-			String[] idArray = ids.split(",");
-			StringBuffer sBufferA ,sBufferB ,sBufferC ;
-			double zlc,yylc,singleLc,emptyLc;// 总里程、营运里程、单程、空放里程
-			String bcType,sxx;// 班次类型、上下行
-			// 上传的时刻表集合
-			List<TTInfo> ttinfoList = new ArrayList<>();
-			TTInfo ttInfo;
-			TTInfoDetail ttInfoDetail;
-			LineInformation lineInformation;
-			Iterator<TTInfoDetail> ttInfoDetailIterator;
-			HashMap<String,Object> param ;
-			HashMap<String,String> paramMap;
-			HashMap<String,String> otherMap = new HashMap<>();
-			// 线路编码、周几执行、发车站点名称、发车站点序号、到达站点名称、到达站点序号
-			String xlbm,zjzx,fczdmc,zdxh,ddzdmc,ddxh;
-			// 得到时刻表版本号
-			int lineVersion;
-			long ttinfoId;
-			// 是否输出站点信息
-			boolean isLogStation;
-			for (int i = 0; i < idArray.length; i++) {
-				ttinfoId = Long.valueOf(idArray[i]);
-				Optional<TTInfo> optionalTTInfo = ttInfoRepository.findById(ttinfoId);
-				ttInfo = optionalTTInfo.isPresent() ? optionalTTInfo.get() : null;
-				if(ttInfo == null)
-					continue;
-				ttinfoList.add(ttInfo); // 保存时刻表
-				// 得到时刻表版本号
-				lineVersion = ttInfo.getLineVersion();
-				// 查询历史站点路由
-				lsStationCode2NameMap = getLsStationCode(ttInfo.getXl().getLineCode(),lineVersion);
-				// 查询历史站点路由
-				lsStationName2YgcNumber = getLsStationRoute(ttInfo.getXl().getLineCode(),lineVersion);
-				zlc = 0.0f;
-				yylc = 0.0f;
-				// 获得时刻表
-				param = new HashMap();
-				param.put("ttinfo.id_eq", ttInfo.getId());
-				ttInfoDetailIterator = ttInfoDetailRepository.findAll(new CustomerSpecs<TTInfoDetail>(param),
-						new Sort(Direction.ASC, "xlDir")).iterator();
-				// 获得lineInformation
-				param = new HashMap();
-				param.put("line.id_eq", ttInfo.getXl().getId());
-				Optional<LineInformation> optionalLineInformation = lineInformationRepository.findOne(new CustomerSpecs<LineInformation>(param));
-				lineInformation = optionalLineInformation.isPresent() ? optionalLineInformation.get() : null;
-				// 初始化
-				isLogStation = true;
-				if(ttInfoDetailIterator.hasNext()){
-					// 得到线路信息
-					Optional<Line> optionalLine = lineRepository.findById(ttInfo.getXl().getId());
-					Line line = optionalLine.isPresent() ? optionalLine.get() : null;
-					if(line == null){
-						result += "未找到相应的线路信息，请设置线路信息后再上传";
-						return result;
-					}
-					// 得到上海市线路编码
-					xlbm = line.getShanghaiLinecode();
-					if("".equals(xlbm) || "null".equals(xlbm)){
-						result += "线路编码为空，请设置线路编码后再上传";
-						return result;
-					}
-					// 拿到周几执行
-					zjzx = changeRuleDay(ttInfo.getRule_days());
-					if("".equals(zjzx) || "null".equals(zjzx)){
-						result += "时刻表执行时间为空，请设置执行时间后再上传";
-						return result;
-					}
-					sBuffer.append("<SKB>");
-					sBuffer.append("<XLBM>").append(xlbm).append("</XLBM>");
-					sBufferB = new StringBuffer();
-					sBufferC = new StringBuffer();
-					sBufferB.append("<KSRQ>").append(sdfnyr.format(ttInfo.getQyrq())).append("</KSRQ>");
-					// 结束日期暂时不要，节假日的班次表才需要，如春节的班次表
-					sBufferB.append("<JSRQ>").append("").append("</JSRQ>");
-					sBufferB.append("<ZJZX>").append(zjzx).append("</ZJZX>");
-					sBufferB.append("<TBYY>").append("").append("</TBYY>");
-					sBufferB.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
-					sBufferB.append("<BCList>");
-					while (ttInfoDetailIterator.hasNext()) {
-						ttInfoDetail = ttInfoDetailIterator.next();
-						bcType = ttInfoDetail.getBcType();
-						sxx = ttInfoDetail.getXlDir();
-						// 进出场班次的里程，加入总里程
-						if(bcType.equals("in") || bcType.equals("out")){
-							// 进出班次的计划里程，算空驶里程
-							emptyLc = ttInfoDetail.getJhlc();
-							// 总里程需要加上空驶里程
-							zlc += emptyLc;
-							continue;
-						}
-						// 不是正常班次，不传到运管处
-						if(!bcType.equals("normal")){
-							continue;
-						}
-						// 如果发车时间格式错误，忽略此条
-						if(changeTimeFormat(ttInfoDetail) == null){
-							continue;
-						}
-						// 发生站点名称
-						fczdmc = lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()+"_"+ttInfoDetail.getQdzCode());
-						if("".equals(fczdmc) || "null".equals(fczdmc)){
-							result += "发车站点名称为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
-							return result;
-						}
-						sBufferC.append("<BC>");
-						sBufferC.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
-						sBufferC.append("<SXX>").append(sxx).append("</SXX>");
-						sBufferC.append("<FCZDMC>").append(fczdmc).append("</FCZDMC>");
-						// 起点站的参数
-						otherMap.put("stationMark","B");
-						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						if(isLogStation){// 输出起点站信息
-							logger.info("setSKB:"+"起点站信息："+paramMap);
-						}
-						// 发车站点序号
-						zdxh = String.valueOf(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber));
-						if("".equals(zdxh) || "null".equals(zdxh) || "0".equals(zdxh)){
-							result += "发车站点序号为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
-							return result;
-						}
-						// 到达站点名称
-						ddzdmc = lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()+"_"+ttInfoDetail.getZdzCode());
-						if("".equals(ddzdmc) || "null".equals(ddzdmc)){
-							result += "到达站点名称为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
-							return result;
-						}
-						sBufferC.append("<ZDXH>").append(zdxh).append("</ZDXH>");
-						sBufferC.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
-						sBufferC.append("<DDZDMC>").append(ddzdmc).append("</DDZDMC>");
-						// 终点站的参数
-						otherMap.put("stationMark","E");
-						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						if(isLogStation){// 输出终点站信息
-							logger.info("setSKB:"+"终点站信息："+paramMap);
-						}
-						// 到达站点序号
-						ddxh = String.valueOf(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber));
-						if("".equals(ddxh) || "null".equals(ddxh) || "0".equals(ddxh)){
-							result += "到达站点序号为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
-							return result;
-						}
-						isLogStation = false; // 一条线路只输出一次，后面的不输出了
-						sBufferC.append("<DDXH>").append(ddxh).append("</DDXH>");
-						sBufferC.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
-						sBufferC.append("</BC>");
-						// 0：上行；1：下行
-						if("0".equals(sxx)){
-							singleLc = lineInformation.getUpMileage();
-						}else{
-							singleLc = lineInformation.getDownMileage();
-						}
-						zlc += singleLc ;
-						yylc += singleLc;
-					}
-					sBufferC.append("</BCList>");
-					sBufferC.append("</SKB>");
-					sBufferA = new StringBuffer();
-					sBufferA.append("<JHZLC>").append(df.format(zlc)).append("</JHZLC>");
-					sBufferA.append("<JHYYLC>").append(df.format(yylc)).append("</JHYYLC>");
-					sBuffer.append(sBufferA).append(sBufferB).append(sBufferC);
-				}
-				logger.info("setSKB:"+"ttinfoId:"+ttinfoId+";当前站点版本号："+lineVersion+"；查询历史站点路由:"+lsStationCode2NameMap+";查询历史站点编号:"+lsStationName2YgcNumber);
-			}
-			sBuffer.append("</SKBs>");
-            String state;// 是否上传成功
-            if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
-                result = "上传成功";
-                state = "1";
-            }else{// 上传失败
-                result = "上传失败";
-                state = "0";
-            }
-            // 保存运管处上传记录
-            saveYgcUploadLog(ttinfoList,sBuffer.toString(),TrafficManageServiceImpl.UPLOAD_TYPE_SKB,state);
-		} catch (Exception e) {
-			logger.error("setSKB:", e);
-			e.printStackTrace();
-		}finally{
-            logger.info("setSKB:"+sBuffer.toString());
-            logger.info("setSKB:"+result);
-		}
-		return result;
-	}
-
-	/**
-	 * 保存上传运管处的日志
-	 * @param obj 参数
-	 * @param type 日志类型
-	 * @param xml 上传参数
-	 */
-	private void saveYgcUploadLog(Object obj,String xml,String type,String state){
-		SKBUploadLogger skbUploadLogger  = new SKBUploadLogger();
-		SysUser user;
-		// 如果不是人为上传，SysUser则为空，设置上传人员为管理员
-		if(SecurityContextHolder.getContext() == null || SecurityContextHolder.getContext().getAuthentication() == null){
-			user = new SysUser();
-			user.setId(1);
-		}else{// 获取上传人员
-			user = SecurityUtils.getCurrentUser();
-		}
-		// 最大的字符长度
-		int maxLength = 60000;
-		int cutLength = 50000;// 需要截取的字符长度
-		String xml_sub = null;
-		skbUploadLogger.setType(type);// 设置类型
-		// 判断xml是否超长，如果超长，则截取
-		if(xml != null && xml.length() > maxLength){
-			int xmlLength = xml.length();
-			int cutCount = xmlLength / cutLength + (xmlLength % cutLength > 0 ? 1 : 0);
-			if(cutCount > 2){
-				xml = "由于上传参数内容超长，请查看服务器的系统日志";
-			}else if(cutCount == 2){
-				xml_sub =xml.substring(cutLength);
-				xml = xml.substring(0,cutLength);
-			}else{
-				// 不做处理
-			}
-		}
-//		skbUploadLogger.setUploadXml(xml);// 上传的参数
-//		skbUploadLogger.setUploadXmlSub(xml_sub);
-		skbUploadLogger.setState(state);// 状态：是否成功
-		skbUploadLogger.setUser(user);
-		// 时刻表
-		if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_SKB)){
-			List<TTInfo> ttInfoList = (List<TTInfo>)obj;
-			String name = "";
-			Line line = null;
-			for(TTInfo ttInfo : ttInfoList){
-				name += ttInfo.getName() + " ";
-				line = ttInfo.getXl();
-			}
-			skbUploadLogger.setLine(line);
-			skbUploadLogger.setUser(user);
-			skbUploadLogger.setName(name);
-			skbUploadLoggerRepository.save(skbUploadLogger);
-		}else{
-			if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_XL)){
-				Line line = (Line) obj;
-				String name = line.getName() + "线路停靠站上传";
-				skbUploadLogger.setLine(line);
-				skbUploadLogger.setName(name);
-				skbUploadLoggerRepository.save(skbUploadLogger);
-			}else if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_LD)){
-				Map<String ,Line>  logLineMap = (Map<String ,Line> )obj;
-				for (String key : logLineMap.keySet()) {
-					Line line = logLineMap.get(key);
-					String name = line.getName() + "路单上传";
-					skbUploadLogger  = new SKBUploadLogger();
-					skbUploadLogger.setType(type);// 设置类型
-//					skbUploadLogger.setUploadXml(xml);// 上传的参数
-//					skbUploadLogger.setUploadXmlSub(xml_sub);
-					skbUploadLogger.setState(state);// 状态：是否成功
-					skbUploadLogger.setUser(user);
-					skbUploadLogger.setLine(line);
-					skbUploadLogger.setName(name);
-//					skbUploadLoggerRepository.save(skbUploadLogger);
-				}
-			}
-		}
-	}
-	/**
-	 * 上传线路人员车辆配置信息
-	 */
-	@Override
-	public String setXLPC() {
-		String result = "failure";
-		StringBuffer sBuffer =new StringBuffer();
-		try {
-			sBuffer.append("<XLPCs>");
-			// 声明变量
-			Line line = null;
-			Cars cars = null;
-			List<Personnel> personnelList = null;
-			List<Cars> carsList = null;
-			int totalPersonnel,totalCar ;// 人员数量。车辆数量
-			// 查询所有线路
-			Iterator<Line> lineIterator = lineRepository.findAll().iterator();
-			// 循环查找线路下的信息
-			while(lineIterator.hasNext()){
-				line = lineIterator.next();
-				sBuffer.append("<XLPC>");
-				sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</XLBM>");
-				// 查询驾驶员数量
-				personnelList = personnelRepository.findJsysByLineId(line.getId());
-				totalPersonnel = personnelList != null ? personnelList.size():0;
-				sBuffer.append("<SJRS>").append(totalPersonnel).append("</SJRS>");
-				// 查询售票员人员数量
-				personnelList = personnelRepository.findSpysByLineId(line.getId());
-				totalPersonnel = personnelList != null ? personnelList.size():0;
-				sBuffer.append("<SPYRS>").append(totalPersonnel).append("</SPYRS>");
-				// 查询车辆
-				carsList = carsRepository.findCarsByLineId(line.getId());
-				totalCar = carsList != null ? carsList.size():0;
-				sBuffer.append("<PCSL>").append(totalCar).append("</PCSL>");
-				sBuffer.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
-				int carsNum = 0;
-				// 取车牌号
-				if(carsList != null){
-					carsNum = carsList.size();
-					sBuffer.append("<CPHList>");
-					for (int i = 0; i < carsNum; i++) {
-						cars = carsList.get(i);
-						sBuffer.append("<CPH>").append("沪").append(cars.getCarCode()).append("</CPH>");
-					}
-					sBuffer.append("</CPHList>");
-				}
-				sBuffer.append("</XLPC>");
-			}
-			sBuffer.append("</XLPCs>");
-			if(ssop.setXLPC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
-				result = "success";
-			}
-		} catch (Exception e) {
-			logger.error("setXLPC:",e);
-			e.printStackTrace();
-		}finally{
-			logger.info("setXLPC:"+sBuffer.toString());
-			logger.info("setXLPC:"+result);
-		}
-		return result;
-	}
-
-
-	/**
-	 * 上传超速数据
-	 */
-	@Override
-	public String setCS() {
-		String result = "failure";
-		StringBuffer sBuffer =new StringBuffer();
-		sBuffer.append("<CSs>");
-		String sql = "SELECT * FROM bsth_c_speeding where DATE_FORMAT(create_date,'%Y-%m-%d') = ? order by create_date ";
-		Connection conn = null;
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-		// 取昨天 的日期
-		String yesterday = sdfnyr.format(DateUtils.addDays(new Date(), -1));
-		try {
-			conn = DBUtils_MS.getConnection();
-			ps = conn.prepareStatement(sql);
-			ps.setString(1, yesterday);
-			rs = ps.executeQuery();
-			Float lon, lat;
-			String kssk;
-			String speed;
-			while (rs.next()) {
-				kssk = sdfnyrsfm.format(rs.getLong("TIMESTAMP"));
-				speed = rs.getString("SPEED");
-				// 经纬度
-				lon = rs.getFloat("LON");
-				lat = rs.getFloat("LAT");
-				sBuffer.append("<CS>");
-				sBuffer.append("<RQ>").append(sdfnyr.format(rs.getDate("CREATE_DATE"))).append("</RQ>");
-				sBuffer.append("<XLBM>").append(BasicData.lineCode2ShangHaiCodeMap.get(rs.getString("LINE"))).append("</XLBM>");////////
-				sBuffer.append("<CPH>").append(rs.getString("VEHICLE")).append("</CPH>");
-				sBuffer.append("<KSSK>").append(kssk).append("</KSSK>");
-				sBuffer.append("<KSDDJD>").append(lon).append("</KSDDJD>");
-				sBuffer.append("<KSDDWD>").append(lat).append("</KSDDWD>");
-				sBuffer.append("<KSLD>").append("").append("</KSLD>");//**********************
-				sBuffer.append("<JSSK>").append(kssk).append("</JSSK>");
-				sBuffer.append("<JSDDJD>").append(lon).append("</JSDDJD>");
-				sBuffer.append("<JSDDWD>").append(lat).append("</JSDDWD>");
-				sBuffer.append("<JSLD>").append("").append("</JSLD>");//**********************
-				sBuffer.append("<PJSD>").append(speed).append("</PJSD>");
-				sBuffer.append("<ZGSS>").append(speed).append("</ZGSS>");
-				sBuffer.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
-				sBuffer.append("</CS>");
-			}
-			sBuffer.append("</CSs>");
-			if(ssop.setCS(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
-				result = "success";
-			}
-		} catch (Exception e) {
-			logger.error("setCS:",e);
-			e.printStackTrace();
-		} finally {
-			logger.info("setCS:"+sBuffer.toString());
-			logger.info("setCS:"+result);
-			DBUtils_MS.close(rs, ps, conn);
-		}
-		return result;
-	}
-
-
-	/**
-	 * 下载全量的公交基础数据
-	 */
-	public String getDownLoadAllDataFile() {
-		String result = "failure";
-		try {
-			try {
-				if(ygcBasicDataService.download("admin","000000","abc.zip")){
-					result = "success";
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		return result;
-	}
-
-	/**
-	 * 下载增量的公交基础数据
-	 */
-	public String getDownLoadIncreaseDataFile() {
-		String result = "success";
-		try {
-			//System.out.println(portType.downloadIncreaseDataFile(args0, args1, args2));
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		return result;
-	}
-
-	/**
-	 *  指定线路查询方式公交基础数据下载
-	 */
-	public String getDownLoadWarrantsBusLineStation() {
-		String result = "success";
-		try {
-
-			//portType.setXL(userNameXl, passwordXl, sBuffer.toString());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		return result;
-	}
-
-	/**
-	 * 计算结束时间
-	 * @param fcsj 发车时间
-	 * @param bcsj 班次历时
-	 * @return
-	 */
-	private String calcDdsj(String fcsj,Integer bcsj){
-		String result = "";
-		if(fcsj.indexOf(":") != -1){
-			if(bcsj == null){
-				return fcsj;
-			}
-			// 时和分隔开
-			String[] fcsjArray = fcsj.split(":");
-			// 分和历时时间相加
-			Integer fullTime = Integer.valueOf(fcsjArray[1])+ bcsj;
-			int hour,min,sumHour;
-			hour = fullTime / 60;
-			min = fullTime % 60;
-			sumHour = Integer.valueOf(fcsjArray[0])+hour;
-			if(sumHour >= 24){
-				result = String.format("%02d",sumHour - 24);
-			}else{
-				result = String.format("%02d",sumHour);;
-			}
-			result +=":"+String.format("%02d", min);
-		}else{
-			result = fcsj;
-		}
-		return result;
-	}
-
-	/**
-	 * 改变时间格式
-	 * @param ttInfoDetail 时刻表详细
-	 * @return xx:yy
-	 */
-	private String changeTimeFormat(TTInfoDetail ttInfoDetail){
-		String result = "00:00";
-		String fcsj = ttInfoDetail.getFcsj();
-		if(fcsj.indexOf(":") != -1){
-			// 时和分隔开
-			String[] fcsjArray = fcsj.split(":");
-			result = String.format("%02d", Integer.valueOf(fcsjArray[0]))+":";
-			result +=String.format("%02d", Integer.valueOf(fcsjArray[1]));
-		}else{
-			result = null;
-			logger.info("setSKB:发车时间错误：ttInfoDetail.id="+ttInfoDetail.getId());
-		}
-		return result;
-	}
-
-	/**
-	 * 拼装线路计划班次表的XML
-	 * @param sBuffer
-	 * @param schedulePlanInfo
-	 * @param xlbm
-	 * @param zbh
-	 * @param lp
-	 */
-	private void assembleJHBC(StringBuffer sBuffer,SchedulePlanInfo schedulePlanInfo,String xlbm,String zbh,Long lp){
-		sBuffer.append("<JHBC>");
-		sBuffer.append("<RQ>").append(sdfnyr.format(schedulePlanInfo.getScheduleDate())).append("</RQ>");
-		sBuffer.append("<XLBM>").append(BasicData.lineCode2ShangHaiCodeMap.get(xlbm)).append("</XLBM>");
-		sBuffer.append("<CPH>").append("沪"+zbh).append("</CPH>");
-		sBuffer.append("<LPBH>").append(lp).append("</LPBH>");
-		sBuffer.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
-		sBuffer.append("<BCList>");
-	}
-	/**
-	 * 转换排班规则
-	 * @param ruleDay
-	 * @return
-	 */
-	private String changeRuleDay(String ruleDay){
-		String result = "";
-		int flag ;
-		String[] ruleDayArray = ruleDay.split(",");
-		for (int i = 0; i < ruleDayArray.length; i++) {
-			if(ruleDayArray[i].equals("1")){
-				flag = i+1;
-			}else{
-				flag = 0;
-			}
-			if(flag > 0){
-				result += flag + ",";
-			}
-		}
-		// 去掉最后一个字符
-		if(StringUtils.endsWith(result,",")){
-			result = StringUtils.removeEnd(result,",");
-		}
-		return result;
-	}
-	/**
-	 * 设置统一的公司名称
-	 * @param company
-	 */
-	private void setCompanyName(String company){
-		if(company.equals("闵行公司")){
-			company = "浦东闵行公交公司";
-		}else if(company.equals("杨高公司")){
-			company = "浦东杨高公交公司";
-		}else if(company.equals("上南公司")){
-			company = "浦东上南公交公司";
-		}else if(company.equals("金高公司")){
-			company = "浦东金高公交公司";
-		}else if(company.equals("南汇公司")){
-			company = "浦东南汇公交公司";
-		}else if(company.equals("青浦公交")){
-			company = "浦东青浦公交公司";
-		}
-	}
-	/**
-	 * @param stationsList 站点路由集
-	 * @param sBuffer sBuffer
-	 * @param startId 站点序号起始ID
-	 *
-	 * @return 站点序号累加后的ID
-	 */
-	private int packagStationXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId,Map<String, Integer> stationNumMap){
-		int size = stationsList.size();
-		StationRoute srRoute;
-		HashMap<String,String> paraMap;
-		String zdlx ;// 站点类型：0：起点站、1：终点站、2：中途站
-		for (int i = 0; i < size; i++) {
-			srRoute = stationsList.get(i);
-			zdlx = srRoute.getStationMark();
-			if(zdlx.equals("B")){
-				zdlx = "0";
-			}else if(zdlx.equals("E")){
-				zdlx = "1";
-			}else{
-				zdlx = "2";
-			}
-			paraMap = packageYgcStationNumParam(srRoute,null);
-			sBuffer.append("<Station>");
-			sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap,stationNumMap)).append("</ZDXH>");
-			sBuffer.append("<SXX>").append(srRoute.getDirections()).append("</SXX>");
-			sBuffer.append("<ZDMC>").append(srRoute.getStationName()).append("</ZDMC>");
-			sBuffer.append("<ZDBM>").append(srRoute.getStationCode()).append("</ZDBM>");
-			sBuffer.append("<ZDJD>").append(srRoute.getStation().getgLonx()).append("</ZDJD>");
-			sBuffer.append("<ZDWD>").append(srRoute.getStation().getgLaty()).append("</ZDWD>");
-			sBuffer.append("<ZZ>").append(srRoute.getStation().getAddr() == null ? "" : srRoute.getStation().getAddr()).append("</ZZ>");
-			sBuffer.append("<ZDLX>").append(zdlx).append("</ZDLX>");
-			sBuffer.append("<ZJLC>").append(srRoute.getDistances()).append("</ZJLC>");
-			sBuffer.append("</Station>");
-			startId++;
-		}
-		return startId;
-	}
-
-	/**
-	 * @param pointList 站点点位集
-	 * @param sBuffer sBuffer
-	 * @param startId 站点序号起始ID
-	 *
-	 * @return 站点序号累加后的ID
-	 */
-	private int packagStationPointXml(List<Object[]> pointList,StringBuffer sBuffer,int startId){
-		int size = pointList.size();
-		Object[] objs;
-		String bsection,dir,section;
-		String[] sections ;
-		for (int i = 0; i < size; i++) {
-			objs = pointList.get(i);
-			bsection = objs[0]+"";
-			dir = objs[1]+"";
-			// 取括号内的内容
-			Pattern pattern = Pattern.compile("(?<=\\()(.+?)(?=\\))");
-			Matcher matcher = pattern.matcher(bsection);
-			if(matcher.find()){
-				sections = matcher.group().split(",");
-				for (int j = 0 ; j < sections.length ; j ++){
-					section = sections[j];
-					sBuffer.append("<LinePoint>");
-					sBuffer.append("<ZDXH>").append(startId).append("</ZDXH>");
-					sBuffer.append("<SXX>").append(dir).append("</SXX>");
-					sBuffer.append("<ZDJD>").append(section.split(" ")[0]).append("</ZDJD>");
-					sBuffer.append("<ZDWD>").append(section.split(" ")[1]).append("</ZDWD>");
-					sBuffer.append("</LinePoint>");
-					startId++;
-				}
-			}
-		}
-		return startId;
-	}
-
-	/**
-	 *  获取运管处站点序号
-	 * @param map
-	 * @return 运管处站点序号
-	 */
-	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(HashMap<String,String> map,Map<String, Integer> stationNumMap){
-		// 线路编码
-		String lineCode = map.get("lineCode");
-		// 线路走向 0：上行  1：下行
-		String direction = map.get("direction");
-		// 站点编码
-		String stationCode = map.get("stationCode");
-		// 站点类型：B：起点站 Z：中途站 E：终点站 T：停车场
-		String stationMark = map.get("stationMark");
-		String[] marks = null;
-		// 起点站，先从起点找，找不到再从中途站找，最后从终点找
-		if(stationMark.equals("B")){
-			marks= new String[]{"B","Z","E"};
-		}else if(stationMark.equals("E")){// 终点站相反
-			marks= new String[]{"E","Z","B"};
-		}else if(stationMark.equals("Z")){
-			marks= new String[]{"Z"};
-		}
-		// 默认从缓存BasicData.stationName2YgcNumber
-		Map<String, Integer> tempMap = BasicData.stationName2YgcNumber;
-		// 如果传入的stationNumMap不为空，则不是缓存取，而从stationNumMap取
-		if(stationNumMap != null){
-			tempMap = stationNumMap;
-		}
-		Integer number = null;
-		for (int i = 0 ;i < marks.length ; i ++){
-			number = tempMap.get(lineCode+"_"+direction+"_"+stationCode+"_"+marks[i]);
-			if(number != null){
-				break;
-			}
-		}
-		return number == null ? 0 : number;
-	}
-
-	/**
-	 * 封装查询站序条件
-	 * @param obj
-	 * @return
-	 */
-	private HashMap packageYgcStationNumParam(Object obj,HashMap<String,String> otherParam){
-		HashMap<String,String> map = new HashMap<String,String>();
-		String lineCode = "",direction = "",stationCode = "",stationMark = "";
-		// 站点路由
-		if(obj instanceof StationRoute){
-			StationRoute sr = (StationRoute)obj;
-			lineCode = sr.getLineCode();
-			direction = String.valueOf(sr.getDirections());
-			stationCode = sr.getStationCode();
-			stationMark = sr.getStationMark();
-		}else if(obj instanceof ScheduleRealInfo){ //实际排班计划明细。
-			ScheduleRealInfo sri = (ScheduleRealInfo)obj;
-			lineCode = sri.getXlBm();
-			direction = sri.getXlDir();
-			if(otherParam != null && otherParam.get("stationMark") != null){
-				stationMark = otherParam.get("stationMark");
-				if(stationMark.equals("B")){ // 起点站
-					stationCode = sri.getQdzCode();
-				}else if(stationMark.equals("E")){ // 终点站
-					stationCode = sri.getZdzCode();
-				}
-			}
-		}else if(obj instanceof SchedulePlanInfo){ //排班计划明细
-			SchedulePlanInfo spi = (SchedulePlanInfo)obj;
-			lineCode = spi.getXlBm();
-			direction = spi.getXlDir();
-			if(otherParam != null && otherParam.get("stationMark") != null){
-				stationMark = otherParam.get("stationMark");
-				if(stationMark.equals("B")){ // 起点站
-					stationCode = spi.getQdzCode();
-				}else if(stationMark.equals("E")){ // 终点站
-					stationCode = spi.getZdzCode();
-				}
-			}
-		}else if(obj instanceof TTInfoDetail){ //时刻表明细
-			TTInfoDetail ttid = (TTInfoDetail)obj;
-			lineCode = ttid.getXl().getLineCode();
-			direction = ttid.getXlDir();
-			if(otherParam != null && otherParam.get("stationMark") != null){
-				stationMark = otherParam.get("stationMark");
-				if(stationMark.equals("B")){ // 起点站
-					stationCode = ttid.getQdzCode();
-				}else if(stationMark.equals("E")){ // 终点站
-					stationCode = ttid.getZdzCode();
-				}
-			}
-		}
-		map.put("lineCode",lineCode);// 站点编码
-		map.put("direction",direction); // 上下行
-		map.put("stationCode",stationCode); // 站点编号
-		map.put("stationMark",stationMark); // 站点类型
-		return map;
-	}
-
-	/**
-	 * 取得历史站点编码和站点名称的对应关系
-	 * @return
-	 */
-	private Map<String, String> getLsStationCode(String lineCode,int lineVersion){
-		Map<String,Object> map = new HashMap<>();
-		map.put("lineCode_eq", lineCode);
-		map.put("versions_eq",lineVersion);
-		LsStationRoute lsroute;
-		Iterator<LsStationRoute> iterator = lsStationRouteRepository.findAll(new CustomerSpecs<LsStationRoute>(map)).iterator();
-		Map<String, String> stationCode2Name = new HashMap<>();
-		while (iterator.hasNext()) {
-			lsroute = iterator.next();
-			stationCode2Name.put(lsroute.getLineCode() + "_" + lsroute.getDirections() + "_" + lsroute.getStationCode(), lsroute.getStationName());
-		}
-		return stationCode2Name;
-	}
-
-	private Map<String, Integer> getLsStationRoute(String xlbm,int lineVersion){
-		Map<String, Integer> tempStationName2YgcNumber = new HashMap<String, Integer>();
-		/**
-		 * 加载运管处的站点及序号
-		 * 上行从1开始，下行顺序续编
-		 */
-		List<Map<String, String>> ygcLines = lsStationRouteRepository.findLineWithLineCode4Ygc(xlbm,lineVersion);
-		if(ygcLines != null && ygcLines.size() > 0){
-			int size = ygcLines.size();
-			Map<String, String> tempMap ;
-			int num = 1;
-			String key;
-			String lineCode = "";
-			for (int i = 0; i < size; i ++){
-				tempMap = ygcLines.get(i);
-				if(lineCode.equals("")){
-					lineCode = tempMap.get("lineCode");
-				}else if(!lineCode.equals(tempMap.get("lineCode"))){
-					num = 1;
-					lineCode = tempMap.get("lineCode");
-				}
-				key = tempMap.get("lineCode") + "_"+String.valueOf(tempMap.get("directions"))
-						+ "_"+tempMap.get("stationCode")+ "_"+tempMap.get("stationMark");
-				tempStationName2YgcNumber.put(key,num++);
-			}
-		}
-		return tempStationName2YgcNumber;
-	}
-
-	private String getSetXlXml(Line line,LineInformation lineInformation){
-		StringBuffer sBuffer = new StringBuffer();
-		List<StationRoute> upStationsList ;// 上行站点路由集
-		List<StationRoute> downStationsList;// 下行站点路由集
-		List<Object[]> downPointList;// 下行站点集
-		List<Object[]> upPointList;// 上行站点集
-		sBuffer.append("<XLs>");
-		sBuffer.append("<XL>");
-		sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</XLBM>");
-		sBuffer.append("<XLMC>").append(line.getName()).append("</XLMC>");
-		sBuffer.append("<QDZ>").append(line.getStartStationName()).append("</QDZ>");
-		sBuffer.append("<ZDZ>").append(line.getEndStationName()).append("</ZDZ>");
-		sBuffer.append("<QZLC>").append(lineInformation.getUpMileage()).append("</QZLC>");
-		sBuffer.append("<ZQLC>").append(lineInformation.getDownMileage()).append("</ZQLC>");
-		sBuffer.append("<XLGH>").append(line.getLinePlayType()).append("</XLGH>");
-		sBuffer.append("<UPDATE_DATE>").append(sdfnyr.format(new Date())).append("</UPDATE_DATE>");
-		// 循环添加站点信息
-		sBuffer.append("<StationList>");
-		// 先查上行
-		upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
-		Map<String, Integer> stationNumMap = getStationName2YgcNumberMap(line.getLineCode());
-		int startId = 1;
-		startId = packagStationXml(upStationsList, sBuffer, startId,stationNumMap);
-		// 环线不查下行
-		if(line.getLinePlayType() != 1){
-			// 再查下行
-			downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
-			packagStationXml(downStationsList, sBuffer, startId,stationNumMap);
-		}
-		sBuffer.append("</StationList>");
-		// 循环添加站点点位信息
-		sBuffer.append("<LinePointList>");
-		upPointList = sectionRepository.getSectionDirByLineId(line.getId(),0);
-		startId = 1;
-		startId = packagStationPointXml(upPointList, sBuffer, startId);
-		// 环线不查下行
-		if(line.getLinePlayType() != 1){
-			downPointList = sectionRepository.getSectionDirByLineId(line.getId(),1);
-			packagStationPointXml(downPointList, sBuffer, startId);
-		}
-		sBuffer.append("</LinePointList>");
-		sBuffer.append("</XL>");
-		sBuffer.append("</XLs>");
-		return sBuffer.toString();
-	}
-}
+package com.bsth.service.impl;
+
+import com.bsth.data.BasicData;
+import com.bsth.email.SendEmailController;
+import com.bsth.email.entity.EmailBean;
+import com.bsth.entity.*;
+import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.entity.schedule.TTInfo;
+import com.bsth.entity.schedule.TTInfoDetail;
+import com.bsth.entity.search.CustomerSpecs;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.traffic.SKBUploadLogger;
+import com.bsth.repository.*;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.repository.schedule.*;
+import com.bsth.repository.traffic.SKBUploadLoggerRepository;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.TrafficManageService;
+import com.bsth.service.traffic.YgcBasicDataService;
+import com.bsth.util.IpUtils;
+import com.bsth.util.TimeUtils;
+import com.bsth.util.db.DBUtils_MS;
+import com.bsth.webService.trafficManage.org.tempuri.Results;
+import com.bsth.webService.trafficManage.org.tempuri.WebServiceLocator;
+import com.bsth.webService.trafficManage.org.tempuri.WebServiceSoap;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Service;
+
+import java.io.*;
+import java.net.InetAddress;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ *
+ * @ClassName: TrafficManageServiceImpl(运管处接口service业务层实现类)
+ *
+ * @Extends : BaseService
+ *
+ * @Description: TODO(运管处接口service业务层)
+ *
+ * @Author bsth@zq
+ *
+ * @Date 2016年10月28日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ *
+ */
+
+@Service
+public class TrafficManageServiceImpl  implements TrafficManageService{
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	// 运管处上传日志类型
+	public static final String UPLOAD_TYPE_SKB = "1";
+	public static final String UPLOAD_TYPE_XL = "2";
+	public static final String UPLOAD_TYPE_LD = "3";
+
+	// 线路repository
+	@Autowired
+	private LineRepository lineRepository;
+
+	@Autowired
+	private LineInformationRepository lineInformationRepository;
+
+	// 站点路由repository
+	@Autowired
+	private StationRouteRepository stationRouteRepository;
+
+	// 历史站点路由repository
+	@Autowired
+	private LsStationRouteRepository lsStationRouteRepository;
+
+	@Autowired
+	private SectionRepository sectionRepository;
+
+	// 车辆repository
+	@Autowired
+	private CarsRepository carsRepository;
+
+	// 人员repository
+	@Autowired
+	private PersonnelRepository personnelRepository;
+
+	// 时刻模板repository
+	@Autowired
+	private TTInfoRepository ttInfoRepository;
+
+	// 时刻模板明细repository
+	@Autowired
+	private TTInfoDetailRepository ttInfoDetailRepository;
+
+	// 排班计划明细repository
+	@Autowired
+	private SchedulePlanInfoRepository schedulePlanInfoRepository;
+
+	// 实际排班计划明细repository
+	@Autowired
+	private ScheduleRealInfoRepository scheduleRealInfoRepository;
+
+	// 时刻表上传记录repository
+	@Autowired
+	private SKBUploadLoggerRepository skbUploadLoggerRepository;
+
+	// 线路站点repository
+	@Autowired
+	private YgcBasicDataService ygcBasicDataService;
+
+	// 发送邮件
+	@Autowired
+	private SendEmailController sendEmailController;
+
+	/**
+	 * 线路版本repository
+	 */
+	@Autowired
+	private LineVersionsRepository lineVersionsRepository;
+
+	// 运管处上传接口
+	private com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap webServiceSoapUp;
+	private WebServiceSoap ssop ;
+	{
+		try {
+			ssop = new WebServiceLocator().getWebServiceSoap();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	// 格式化 年月日时分秒 nyrsfm是年月日时分秒的拼音首字母
+	private SimpleDateFormat sdfnyrsfm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+	// 格式化  年月日
+	private SimpleDateFormat sdfnyr = new SimpleDateFormat("yyyy-MM-dd");
+
+	// 数字格式化
+	DecimalFormat format = new DecimalFormat("0.00");
+
+	// 用户名
+	private final String userNameOther = "user";
+	// 密码
+	private final String passwordOther = "user";
+
+	// 用户名
+	private final String userNameUp = "user";
+	// 密码
+	private final String passwordUp = "user";
+	// 接收邮件人
+	private final String emailSendToAddress = "113252620@qq.com";
+	// 记录路单上线的成功、失败线路数
+	private Integer countSuccess,countFailure;
+
+	private synchronized com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap  getWebServiceSoapUp(){
+		try {
+			if(webServiceSoapUp == null){
+				webServiceSoapUp = new com.bsth.webService.trafficManage.up.org.tempuri.WebServiceLocator().getWebServiceSoap();
+			}
+		}catch (Exception e){
+			e.printStackTrace();
+		}finally {
+			return webServiceSoapUp;
+		}
+	}
+	/**
+	 * 上传线路信息
+	 */
+	@Override
+	public String setXL(String ids) {
+		String result = "failure";
+		String xml ;
+		String[] idArray = ids.split(",");
+		try {
+			for (String id : idArray) {
+				if(id == null || id.trim().equals("")){
+					continue;
+				}
+				Map<String,Object> map = new HashMap<>();
+				map.put("lineCode_eq", id);
+				Line line ;
+				LineInformation lineInformation;
+				Optional<Line> optionalLine = lineRepository.findOne(new CustomerSpecs<Line>(map));
+				line = optionalLine.isPresent() ? optionalLine.get() : null;
+				if(line == null){
+					continue;
+				}
+				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null){
+					return result;
+				}
+				map = new HashMap<>();
+				map.put("line.id_eq",line.getId());
+				Optional<LineInformation> optionalLineInformation = lineInformationRepository.findOne(new CustomerSpecs<LineInformation>(map));
+				lineInformation = optionalLineInformation.isPresent() ? optionalLineInformation.get() : null;
+				if(lineInformation == null){
+					continue;
+				}
+				// 取得封装好的xml
+				xml = getSetXlXml(line,lineInformation);
+				// 站点序号不能为0，如果为0，则返回错误
+				if(xml.indexOf("<ZDXH>0</ZDXH>") != -1){
+					return "0";
+				}
+				String state;// 是否上传成功
+				// 调用上传方法
+				if(getWebServiceSoapUp().setXL(userNameUp,passwordUp,xml).isSuccess()){
+					result = "success";
+					state = "1";
+				}else{
+					result = "failure";
+					state = "0";
+				}
+				logger.info("setXL:"+xml);
+				logger.info("setXL:"+result);
+				// 保存运管处上传记录
+				saveYgcUploadLog(line,xml,TrafficManageServiceImpl.UPLOAD_TYPE_XL,state);
+			}
+		} catch (Exception e) {
+			logger.error("setXL:",e);
+			e.printStackTrace();
+		}
+		return result;
+	}
+
+	/**
+	 * 加载运管处的站点及序号
+	 * 上行从1开始，下行顺序续编
+	 */
+	private Map<String, Integer> getStationName2YgcNumberMap (String lineCode){
+		Map<String, Integer> resultMap = new HashMap<>();
+		List<Map<String, String>> ygcLines = stationRouteRepository.findLineWithYgcByLine(lineCode);
+		if(ygcLines != null && ygcLines.size() > 0){
+			int size = ygcLines.size();
+			Map<String, String> tempMap ;
+			int num = 1;
+			String key;
+			for (int i = 0; i < size; i ++){
+				tempMap = ygcLines.get(i);
+				key = tempMap.get("lineCode") + "_"+String.valueOf(tempMap.get("directions"))
+						+ "_"+tempMap.get("stationCode")+ "_"+tempMap.get("stationMark");
+				resultMap.put(key,num++);
+			}
+		}
+		return resultMap;
+	}
+
+	/**
+	 * 上传线路信息(按in_use上传)
+	 */
+	@Override
+	public String setXLByInUse(String inUse) {
+		StringBuffer result = new StringBuffer();
+		try {
+			Map<String,Object> map = new HashMap<>();
+			if(inUse != null && inUse.equals("1")){
+				map.put("inUse_eq", inUse);
+			}
+			List<Line> lines ;
+			Line line;
+			lines = lineRepository.findAll(new CustomerSpecs<Line>(map));
+			if(lines != null && lines.size() > 0){
+				for(int i = 0 ; i < lines.size() ; i ++){
+					line = lines.get(i);
+					if(line != null && line.getId() != null){
+						result.append(line.getLineCode()).append(":").append(setXL(line.getLineCode())).append(";");
+					}
+				}
+			}
+		} catch (Exception e) {
+			result.append("failure");
+			logger.error("setXLByInUse:",e);
+			e.printStackTrace();
+		}
+		return result.toString();
+	}
+
+	/**
+	 * 上传车辆信息
+	 */
+	@Override
+	public String setCL() {
+		String result = "failure";
+		StringBuffer sBuffer =new StringBuffer();
+		try {
+			sBuffer.append("<CLs>");
+			Cars cars = null;
+			String company;
+			Iterator<Cars> carsIterator = carsRepository.findAll().iterator();
+			while(carsIterator.hasNext()){
+				cars = carsIterator.next();
+				sBuffer.append("<CL>");
+				company = cars.getCompany();
+				setCompanyName(company);// 统一公司名称
+				sBuffer.append("<GSJC>").append(company).append("</GSJC>");
+				sBuffer.append("<NBH>").append(cars.getInsideCode()).append("</NBH>");
+				sBuffer.append("<CPH>").append(cars.getCarPlate()).append("</CPH>");
+				sBuffer.append("<YYZBH>").append(cars.getServiceNo()).append("</YYZBH>");
+				sBuffer.append("<CZCPH>").append(cars.getCarPlate()).append("</CZCPH>");//******这个数据没有***********
+				sBuffer.append("<CZZDBH>").append(cars.getEquipmentCode()).append("</CZZDBH>");
+				sBuffer.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
+				sBuffer.append("</CL>");
+			}
+			sBuffer.append("</CLs>");
+			if(ssop.setCL(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
+				result = "success";
+			}
+		} catch (Exception e) {
+			logger.error("setCL:",e);
+			e.printStackTrace();
+		}finally{
+			logger.info("setCL:"+sBuffer.toString());
+			logger.info("setCL:"+result);
+		}
+		return result;
+	}
+
+	/**
+	 * 上传司机信息
+	 */
+	@Override
+	public String setSJ() {
+		String result = "failure";
+		StringBuffer sBuffer =new StringBuffer();
+		try {
+			sBuffer.append("<SJs>");
+			Personnel personnel = null;
+			String company;
+			Iterator<Personnel> personIterator = personnelRepository.findAll().iterator();
+			while(personIterator.hasNext()){
+				personnel = personIterator.next();
+				sBuffer.append("<SJ>");
+				company = personnel.getCompany();
+				setCompanyName(company);// 统一公司名称
+				sBuffer.append("<GSJC>").append(company).append("</GSJC>");
+				sBuffer.append("<SJGH>").append(personnel.getJobCode()).append("</SJGH>");
+				sBuffer.append("<CYZGZH>").append(personnel.getPapersCode()).append("</CYZGZH>");//***********
+				sBuffer.append("<XM>").append(personnel.getPersonnelName()).append("</XM>");
+				sBuffer.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
+				sBuffer.append("</SJ>");
+			}
+			sBuffer.append("</SJs>");
+			if(ssop.setSJ(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
+				result = "success";
+			};
+		} catch (Exception e) {
+			logger.error("setSJ:",e);
+			e.printStackTrace();
+		}finally{
+			logger.info("setSJ:"+sBuffer.toString());
+			logger.info("setSJ:"+result);
+		}
+		return result;
+	}
+
+	/**
+	 * 上传路单 指定日期 yyyy-MM-dd
+	 * @param theDate
+	 * @return
+	 */
+	public String setLD(String theDate){
+		return uploadLD(theDate);
+	}
+
+	/**
+	 * 上传路单 上传前一天的路单
+	 * @return
+	 */
+	public String setLD(){
+		return uploadLD(null);
+	}
+	/**
+	 * 上传路单
+	 * @return 上传成功标识
+	 */
+	private String uploadLD(String theDate){
+		// 取昨天 的日期
+		String date = theDate == null ?sdfnyr.format(DateUtils.addDays(new Date(), -1)) : theDate;
+		StringBuffer sf = new StringBuffer();
+		Results results = null;
+		String str = "", xlbm = null, oldXlbm = null;
+		List<Map<String,Object>> listGroup = null;
+		int scount = 0, ccount = 0;
+		long start = System.currentTimeMillis();
+		try {
+			// 计数器
+			int counter = 0;
+			// 每几条线路上传一次路单
+			int per = 10;
+			List<ScheduleRealInfo> list = scheduleRealInfoRepository.setLD(date);
+			listGroup = scheduleRealInfoRepository.setLDGroup(date);
+			Map<String,Object> map = new HashMap();
+			HashMap<String,String> paramMap;
+			HashMap<String,String> otherMap = new HashMap();
+
+			// 车辆内部编码和车牌做映射
+			Map<String, String> inside2plate = new HashMap<>();
+			Iterable<Cars> cars = carsRepository.findAll();
+			for (Cars car : cars)  {
+				inside2plate.put(car.getInsideCode(), car.getCarPlate());
+			}
+
+			// 线路编码和线路信息映射
+			Map<String, Line> code2line = new HashMap<>();
+			Iterable<Line> lines = lineRepository.findAll();
+			for (Line line : lines) {
+				code2line.put(line.getLineCode(), line);
+			}
+
+			// 线路编码和线路版本映射(电子路单日期)
+			Map<String, Integer> code2version = new HashMap<>();
+			Iterable<LineVersions> versions = lineVersionsRepository.findLineVersionsByDate((int)(DateTime.parse(date).getMillis() / 1000));
+			for (LineVersions version : versions) {
+				code2version.put(version.getLineCode(), version.getVersions());
+			}
+
+			Map<String, Integer> stationNumMap = null;
+			for(Map<String,Object> schRealInfo:listGroup){
+				if(schRealInfo != null){
+					// 获取线路是否使用标识，如果未使用，则不查该线路数据
+					String lineCode = schRealInfo.get("xlBm")+"";
+					Line line = code2line.get(lineCode);
+					if(line == null || line.getInUse() == null || line.getInUse() == 0){
+						ccount++;
+						continue;
+					}
+					if(counter % per == 0){
+						sf = new StringBuffer();
+						sf.append("<DLDS>");
+					}
+					counter ++;
+					xlbm = BasicData.lineCode2ShangHaiCodeMap.get(lineCode);
+					if (!xlbm.equals(oldXlbm)) {
+						oldXlbm = xlbm;
+						Integer ver = code2version.get(lineCode);
+						if (ver != null) {
+							stationNumMap = getLsStationRoute(lineCode, ver);
+						}
+					}
+
+					sf.append("<DLD>");
+					sf.append("<RQ>").append(date).append("</RQ>");
+					sf.append("<XLBM>").append(xlbm).append("</XLBM>");
+					sf.append("<LPBH>").append(schRealInfo.get("lpName")).append("</LPBH>");
+					sf.append("<CPH>").append(inside2plate.get(schRealInfo.get("clZbh"))).append("</CPH>");
+					sf.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
+					sf.append("<LDList>");
+					for(ScheduleRealInfo scheduleRealInfo:list){
+						if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("lpName")+"")
+								.equals(scheduleRealInfo.getLpName())
+								&& (schRealInfo.get("clZbh")+"").equals(scheduleRealInfo.getClZbh())){
+
+							if(scheduleRealInfo.isDestroy()){
+								if(scheduleRealInfo.isReissue()){
+									scheduleRealInfo.setFcsjActualAll(scheduleRealInfo.getDfsj());
+									scheduleRealInfo.setZdsjActualAll(scheduleRealInfo.getZdsj());
+								}
+								else
+									continue;
+							}
+
+							if(scheduleRealInfo.getBcType().equals("in")
+									|| scheduleRealInfo.getBcType().equals("out")){
+								continue;
+							}
+
+							sf.append("<LD>");
+							sf.append("<SJGH>").append(scheduleRealInfo.getjGh()).append("</SJGH>");
+							sf.append("<SXX>").append(scheduleRealInfo.getXlDir()).append("</SXX>");
+							sf.append("<FCZDMC>").append(scheduleRealInfo.getQdzName()).append("</FCZDMC>");
+							// 起点站的参数
+							otherMap.put("stationMark","B");
+							paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
+							sf.append("<FCZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,stationNumMap)).append("</FCZDXH>");
+							sf.append("<FCZDBM>").append(scheduleRealInfo.getQdzCode()).append("</FCZDBM>");
+							sf.append("<JHFCSJ>").append(scheduleRealInfo.getFcsj()).append("</JHFCSJ>");
+							sf.append("<DFSJ>").append(scheduleRealInfo.getDfsj()).append("</DFSJ>");
+							sf.append("<SJFCSJ>").append(scheduleRealInfo.getFcsjActual()).append("</SJFCSJ>");
+							sf.append("<FCZDLX></FCZDLX>");
+							sf.append("<DDZDMC>").append(scheduleRealInfo.getZdzName()).append("</DDZDMC>");
+							// 终点站的参数
+							otherMap.put("stationMark","E");
+							paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
+							sf.append("<DDZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,stationNumMap)).append("</DDZDXH>");
+							sf.append("<DDZDBM>").append(scheduleRealInfo.getZdzCode()).append("</DDZDBM>");
+							sf.append("<JHDDSJ>").append(scheduleRealInfo.getZdsj()).append("</JHDDSJ>");
+							sf.append("<SJDDSJ>").append(scheduleRealInfo.getZdsjActual()).append("</SJDDSJ>");
+							sf.append("<DDZDLX></DDZDLX>");
+							sf.append("<LDSCBZ>0</LDSCBZ>");
+							sf.append("<DDBZ>").append("").append("</DDBZ>");
+							sf.append("</LD>");
+						}
+					}
+					sf.append("</LDList>");
+					sf.append("</DLD>");
+				}
+				if(counter % per == per - 1){
+					sf.append("</DLDS>");
+					// 去掉'号
+					str = sf.toString().replace("'","");
+					scount += invokeSetLD(str, counter);
+					counter = 0;
+				}
+			}
+			// 每per条线路上传后剩下的数据再上传
+			if(counter > 0){
+				sf.append("</DLDS>");
+				// 去掉'号
+				str = sf.toString().replace("'","");
+				scount += invokeSetLD(str, counter);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.error("setLD:", e);
+		} finally {
+			try {
+				//发送邮件
+				EmailBean mail = new EmailBean();
+				mail.setSubject(IpUtils.getLocalIpAddress() +":路单日志数据"+date);
+				mail.setContent("总数：" + (listGroup == null ? 0 : listGroup.size()) + "<br/>成功数：" + scount + "<br/>跳过数：" + ccount + "<br/>耗时：" + (System.currentTimeMillis() - start));
+				sendEmailController.sendMail(emailSendToAddress, mail);
+				logger.info("setLD-sendMail:邮件发送成功！");
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.error("setLD-sendMail:",e);
+			}
+		}
+		return "success";
+	}
+
+	/**
+	 * 调用运管处电子路单接口，如果上传失败或有网络问题，最多执行10次
+	 * @param xml 拼接的xml字符串
+	 * @param counter 分组数
+	 * @return 成功返回counter 失败返回0
+	 */
+	private int invokeSetLD(String xml, int counter) {
+		for (int i = 0;i < 10;i++) {
+			try {
+				Results results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(xml));
+				if (results.isSuccess()) {
+					logger.info("setLD: " + xml);
+					logger.info("setLD: 成功");
+					return counter;
+				} else if (i == 9) {
+					logger.error("setLD: " + xml);
+					logger.error("setLD: 失败，" + results.getMessage());
+				}
+				Thread.sleep(2000);
+			} catch (Exception e) {
+				logger.error("运管处接口调用异常", e);
+				try {
+					Thread.sleep(2000);
+				} catch (InterruptedException ex) {
+					ex.printStackTrace();
+				}
+			}
+		}
+
+		return 0;
+	}
+
+	/**
+	 * 上传路单 xml来自文件
+	 * @return 上传成功标识
+	 */
+	public String setLDFile(){
+		String result = "failure";
+		try {
+			String tmp = readXmlFromFile("E:/ld.txt");
+			Results rss = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(tmp));
+			if(rss.isSuccess()){
+				result = "success";
+			}
+		} catch (Exception e) {
+			logger.error("setLD:",e);
+			e.printStackTrace();
+		}finally{
+
+		}
+		return result;
+	}
+
+	/**
+	 * 从文件中读取xml
+	 * @param fileName  例：D:/test.txt
+	 * @return
+	 * @throws Exception
+	 */
+	private String readXmlFromFile(String fileName) throws Exception {
+		StringBuffer sf = new StringBuffer("");
+		File file = new File(fileName);
+		InputStreamReader reader = new InputStreamReader(new FileInputStream(file),"GBK");
+		BufferedReader bufferedReader = new BufferedReader(reader);
+		String lineTxt = "";
+		while((lineTxt = bufferedReader.readLine()) != null){
+			sf.append(lineTxt);
+		}
+		reader.close();
+		return sf.toString().replaceAll("\t","");
+	}
+	/**
+	 * 上传里程油耗
+	 * @return 上传成功标识
+	 */
+	public String setLCYH(){
+		String result = "failure";
+		// 取昨天 的日期
+		String date = sdfnyr.format(DateUtils.addDays(new Date(), -1));
+		StringBuffer sf = new StringBuffer();
+		try {
+			sf.append("<LCYHS>");
+			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setLCYHGroup(date);
+			List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date);
+			Map<String,Object> map = new HashMap<String,Object>();
+			for(Map<String,Object> schRealInfo:listGroup){
+				if(schRealInfo != null){
+					map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
+					Optional<Cars> optionalCars = carsRepository.findOne(new CustomerSpecs<Cars>(map));
+					Cars car = optionalCars.isPresent() ? optionalCars.get() : null;
+					/**
+					 * 如果car==null，则说明该车辆是从线调中换车功能中加进去的，
+					 * 在cars基础信息中查不到车辆的信息，所以忽略该车辆
+ 					 */
+					if(car == null){
+						continue;
+					}
+					//计算总公里和空驶公里，营运公里=总公里-空驶公里
+					double totalKilometers = 0,emptyKilometers =0;
+					sf.append("<LCYH>");
+					sf.append("<RQ>"+date+"</RQ>");
+					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm"))+"</XLBM>");
+					sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
+					if(list != null && list.size() > 0){
+						for(ScheduleRealInfo scheduleRealInfo:list){
+							if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("clZbh")+"")
+									.equals(scheduleRealInfo.getClZbh())){
+								Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+								//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
+								if(childTaskPlans.isEmpty()){
+									if(scheduleRealInfo.getStatus() == 2){
+										totalKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
+										if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+												|| scheduleRealInfo.getBcType().equals("venting")){
+											emptyKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
+										}
+									}
+								}else{
+									Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+									while(it.hasNext()){
+										ChildTaskPlan childTaskPlan = it.next();
+										if(!childTaskPlan.isDestroy()){
+											totalKilometers += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();
+											if(childTaskPlan.getMileageType().equals("empty")){
+												emptyKilometers += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();;
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+					sf.append("<ZLC>"+totalKilometers+"</ZLC>");
+					sf.append("<YYLC>"+emptyKilometers+"</YYLC>");
+					sf.append("<YH>"+""+"</YH>");
+					sf.append("<JZYL>"+""+"</JZYL>");
+					sf.append("<DH>"+""+"</DH>");
+					sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
+					sf.append("<BBSCBZ>"+0+"</BBSCBZ>");
+					sf.append("</LCYH>");
+				}
+			}
+			sf.append("</LCYHS>");
+			if(ssop.setLCYH(userNameOther, passwordOther, sf.toString()).isSuccess()){
+				result = "success";
+			}
+		} catch (Exception e) {
+			logger.error("setLCYH:",e);
+			e.printStackTrace();
+		}finally{
+			logger.info("setLCYH:"+sf.toString());
+			logger.info("setLCYH:"+result);
+		}
+		return result;
+	}
+
+	/**
+	 * 上传线路调度日报
+	 * @return
+	 */
+	public String setDDRB(){
+		String result = "failure";
+		// 取昨天 的日期
+		String date = sdfnyr.format(DateUtils.addDays(new Date(), -1));
+		StringBuffer sf = new StringBuffer();
+		try {
+			sf.append("<DDRBS>");
+			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setDDRBGroup(date);
+			List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date);
+			for(Map<String,Object> schRealInfo:listGroup){
+				if(schRealInfo != null){
+					double jhlc = 0,zlc = 0,jhkslc = 0,sjkslc = 0;
+					int jhbc = 0,sjbc = 0,jhzgfbc = 0,sjzgfbc = 0,jhwgfbc = 0,sjwgfbc = 0;
+					sf.append("<DDRB>");
+					sf.append("<RQ>"+date+"</RQ>");
+					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm"))+"</XLBM>");
+					for(ScheduleRealInfo scheduleRealInfo:list){
+						if(scheduleRealInfo != null){
+							if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm())){
+								//计划
+								if(!scheduleRealInfo.isSflj()){
+									jhlc += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
+									//计划空驶
+									if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")){
+										jhkslc += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
+									}
+									//计划早高峰,计划晚高峰
+									if(TimeUtils.morningPeak(scheduleRealInfo.getFcsj())){
+										jhzgfbc++;
+									} else if(TimeUtils.evenignPeak(scheduleRealInfo.getFcsj())){
+										jhwgfbc++;
+									}
+								}
+								jhbc++;
+
+								//实际
+								Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+								//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
+								if(childTaskPlans.isEmpty()){
+									if(scheduleRealInfo.getStatus() == 2){
+										sjbc++;
+										zlc += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
+										if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+												|| scheduleRealInfo.getBcType().equals("venting")){
+											sjkslc += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();;
+										}
+									}
+								}else{
+									sjbc++;
+									Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+									while(it.hasNext()){
+										ChildTaskPlan childTaskPlan = it.next();
+										if(!childTaskPlan.isDestroy()){
+											zlc += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();
+											if(childTaskPlan.getMileageType().equals("empty")){
+												sjkslc += childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage();;
+											}
+										}
+									}
+								}
+								//实际早高峰,计划晚高峰
+								if(scheduleRealInfo.getFcsjActual() != null){
+									if(TimeUtils.morningPeak(scheduleRealInfo.getFcsj())){
+										sjzgfbc++;
+									} else if(TimeUtils.evenignPeak(scheduleRealInfo.getFcsj())){
+										sjwgfbc++;
+									}
+								}
+							}
+						}
+					}
+					sf.append("<JHLC>"+format.format(jhlc)+"</JHLC>");
+					sf.append("<SSLC>"+format.format((zlc-sjkslc))+"</SSLC>");
+					sf.append("<JHKSLC>"+format.format(jhkslc)+"</JHKSLC>");
+					sf.append("<SJKSLC>"+format.format(sjkslc)+"</SJKSLC>");
+					sf.append("<JHBC>"+jhbc+"</JHBC>");
+					sf.append("<SJBC>"+sjbc+"</SJBC>");
+					sf.append("<JHZGFBC>"+jhzgfbc+"</JHZGFBC>");
+					sf.append("<SJZGFBC>"+sjzgfbc+"</SJZGFBC>");
+					sf.append("<JHWGFBC>"+jhwgfbc+"</JHWGFBC>");
+					sf.append("<SJWGFBC>"+sjwgfbc+"</SJWGFBC>");
+					sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
+					sf.append("<RBSCBZ>"+0+"</RBSCBZ>");
+					sf.append("</DDRB>");
+				}
+			}
+			sf.append("</DDRBS>");
+			if(ssop.setDDRB(userNameOther, passwordOther, sf.toString()).isSuccess()){
+				result = "success";
+			}
+		} catch (Exception e) {
+			logger.error("setDDRB:",e);
+			e.printStackTrace();
+		}finally{
+			logger.info("setDDRB:"+sf.toString());
+			logger.info("setDDRB:"+result);
+		}
+		return result;
+	}
+
+	/**
+	 * 上传计划班次 指定日期 yyyy-MM-dd
+	 * @param theDate
+	 * @return
+	 */
+	public String setJHBC(String theDate){
+		return uploadJHBC(theDate);
+	}
+
+	/**
+	 * 上传计划班次
+	 * @return
+	 */
+	public String setJHBC(){
+		return uploadJHBC(null);
+	}
+	/**
+	 * 上传线路计划班次表
+	 */
+
+	private String uploadJHBC(String theDate) {
+		String result = "failure";
+		Line line;
+		StringBuffer sBuffer =new StringBuffer();
+		try {
+			sBuffer.append("<JHBCs>");
+			// 声明变量
+			SchedulePlanInfo schedulePlanInfo;
+			String xlbm,zbh = "";
+			Long lp = 0L;
+			// 取得计划班次时间
+			String tomorrow = theDate == null ? sdfnyr.format(DateUtils.addDays(new Date(), +1)) : theDate;
+			// 查询所有班次
+			List<SchedulePlanInfo> schedulePlanList = schedulePlanInfoRepository.findLineScheduleBc(tomorrow);
+			int j = 0; // 初始化标识
+			if(schedulePlanList != null ){
+				HashMap<String,String> paramMap;
+				HashMap<String,String> otherMap = new HashMap<String, String>();
+				int size = schedulePlanList.size();
+				for (int i = 0; i < size; i++) {
+					schedulePlanInfo = schedulePlanList.get(i);
+					xlbm = schedulePlanInfo.getXlBm();
+					// 获取线路是否使用标识，如果未使用，则不查该线路数据
+					line = lineRepository.findByLineCode(xlbm);
+					if(line.getInUse() == null || line.getInUse() == 0){
+						continue;
+					}
+					if(++j == 1){// 第一次，则初始化值
+						zbh = schedulePlanInfo.getClZbh();
+						lp = schedulePlanInfo.getLp();
+						// 拼装XML
+						assembleJHBC(sBuffer, schedulePlanInfo, xlbm, zbh, lp);
+					}
+					// 比较是否为同一条线路同一辆车
+					if(xlbm.equals(schedulePlanInfo.getXlBm())
+							&& zbh.equals(schedulePlanInfo.getClZbh())
+							&& lp == schedulePlanInfo.getLp()){
+						if(schedulePlanInfo.getBcType().equals("in") || schedulePlanInfo.getBcType().equals("out")){
+							continue;
+						}
+						sBuffer.append("<BC>");
+						sBuffer.append("<SJGH>").append(schedulePlanInfo.getjGh()).append("</SJGH>");
+						sBuffer.append("<SXX>").append(schedulePlanInfo.getXlDir()).append("</SXX>");
+						sBuffer.append("<FCZDMC>").append(schedulePlanInfo.getQdzName()).append("</FCZDMC>");
+						// 起点站的参数
+						otherMap.put("stationMark","B");
+						paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
+						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</ZDXH>");
+						sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>");
+						sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>");
+						// 起点站的参数
+						otherMap.put("stationMark","E");
+						paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
+						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</DDXH>");
+						sBuffer.append("<JHDDSJ>").append(calcDdsj(schedulePlanInfo.getFcsj(),schedulePlanInfo.getBcsj()))
+								.append("</JHDDSJ>");
+						sBuffer.append("</BC>");
+						if(i == size -1 ){
+							sBuffer.append("</BCList>");
+							sBuffer.append("</JHBC>");
+						}
+					}else{
+						zbh = schedulePlanInfo.getClZbh();
+						lp = schedulePlanInfo.getLp();
+						sBuffer.append("</BCList>");
+						sBuffer.append("</JHBC>");
+						// 拼装XML
+						assembleJHBC(sBuffer, schedulePlanInfo, xlbm, zbh, lp);
+					}
+				}
+			}
+			// 判断XML是否以</BCList>结尾，如果不是，则加上
+			String regex = "^*</JHBC>$";
+			Pattern p = Pattern.compile(regex);
+			Matcher m = p.matcher(sBuffer);
+			boolean isEndWithTrueFlag = false;
+			while (m.find()) {
+				isEndWithTrueFlag = true;
+			}
+			// 加上缺失的标签
+			if(!isEndWithTrueFlag){
+				sBuffer.append("</BCList>");
+				sBuffer.append("</JHBC>");
+			}
+			sBuffer.append("</JHBCs>");
+			if(ssop.setJHBC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
+				result = "success";
+			}
+		} catch (Exception e) {
+			logger.error("setJHBC:",e);
+			e.printStackTrace();
+		}finally{
+			logger.info("setJHBC:"+sBuffer.toString());
+			logger.info("setJHBC:"+result);
+		}
+		return result;
+	}
+
+	/**
+	 * 上传线路班次时刻表数据
+	 */
+	@Override
+	public String setSKB(String ids, String qyrqs) {
+		String result = "上传失败，";
+		StringBuffer sBuffer = new StringBuffer("<SKBs>");
+		DecimalFormat df = new DecimalFormat("######0.000");
+		Map<String,String> lsStationCode2NameMap = null;
+		Map<String, Integer> lsStationName2YgcNumber = null;
+		try {
+			String[] idArray = ids.split(","), qyrqArray = qyrqs.split(",");
+			StringBuffer sBufferA ,sBufferB ,sBufferC ;
+			double zlc,yylc,singleLc,emptyLc;// 总里程、营运里程、单程、空放里程
+			String bcType,sxx;// 班次类型、上下行
+			// 上传的时刻表集合
+			List<TTInfo> ttinfoList = new ArrayList<>();
+			TTInfo ttInfo;
+			TTInfoDetail ttInfoDetail;
+			LineInformation lineInformation;
+			Iterator<TTInfoDetail> ttInfoDetailIterator;
+			HashMap<String,Object> param ;
+			HashMap<String,String> paramMap;
+			HashMap<String,String> otherMap = new HashMap<>();
+			// 线路编码、周几执行、发车站点名称、发车站点序号、到达站点名称、到达站点序号
+			String xlbm,zjzx,fczdmc,zdxh,ddzdmc,ddxh;
+			// 得到时刻表版本号
+			int lineVersion;
+			long ttinfoId;
+			// 是否输出站点信息
+			boolean isLogStation;
+			for (int i = 0; i < idArray.length; i++) {
+				ttinfoId = Long.valueOf(idArray[i]);
+				Optional<TTInfo> optionalTTInfo = ttInfoRepository.findById(ttinfoId);
+				ttInfo = optionalTTInfo.isPresent() ? optionalTTInfo.get() : null;
+				if(ttInfo == null)
+					continue;
+				ttinfoList.add(ttInfo); // 保存时刻表
+				// 得到时刻表版本号
+				lineVersion = ttInfo.getLineVersion();
+				// 查询历史站点路由
+				lsStationCode2NameMap = getLsStationCode(ttInfo.getXl().getLineCode(),lineVersion);
+				// 查询历史站点路由
+				lsStationName2YgcNumber = getLsStationRoute(ttInfo.getXl().getLineCode(),lineVersion);
+				zlc = 0.0f;
+				yylc = 0.0f;
+				// 获得时刻表
+				param = new HashMap();
+				param.put("ttinfo.id_eq", ttInfo.getId());
+				ttInfoDetailIterator = ttInfoDetailRepository.findAll(new CustomerSpecs<TTInfoDetail>(param),
+						new Sort(Direction.ASC, "xlDir")).iterator();
+				// 获得lineInformation
+				param = new HashMap();
+				param.put("line.id_eq", ttInfo.getXl().getId());
+				Optional<LineInformation> optionalLineInformation = lineInformationRepository.findOne(new CustomerSpecs<LineInformation>(param));
+				lineInformation = optionalLineInformation.isPresent() ? optionalLineInformation.get() : null;
+				// 初始化
+				isLogStation = true;
+				if(ttInfoDetailIterator.hasNext()){
+					// 得到线路信息
+					Optional<Line> optionalLine = lineRepository.findById(ttInfo.getXl().getId());
+					Line line = optionalLine.isPresent() ? optionalLine.get() : null;
+					if(line == null){
+						result += "未找到相应的线路信息，请设置线路信息后再上传";
+						return result;
+					}
+					// 得到上海市线路编码
+					xlbm = line.getShanghaiLinecode();
+					if("".equals(xlbm) || "null".equals(xlbm)){
+						result += "线路编码为空，请设置线路编码后再上传";
+						return result;
+					}
+					// 拿到周几执行
+					zjzx = changeRuleDay(ttInfo.getRule_days());
+					if("".equals(zjzx) || "null".equals(zjzx)){
+						result += "时刻表执行时间为空，请设置执行时间后再上传";
+						return result;
+					}
+					sBuffer.append("<SKB>");
+					sBuffer.append("<XLBM>").append(xlbm).append("</XLBM>");
+					sBufferB = new StringBuffer();
+					sBufferC = new StringBuffer();
+					sBufferB.append("<KSRQ>").append(qyrqArray[i]).append("</KSRQ>");
+					// 结束日期暂时不要，节假日的班次表才需要，如春节的班次表
+					sBufferB.append("<JSRQ>").append("").append("</JSRQ>");
+					sBufferB.append("<ZJZX>").append(zjzx).append("</ZJZX>");
+					sBufferB.append("<TBYY>").append("").append("</TBYY>");
+					sBufferB.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
+					sBufferB.append("<BCList>");
+					while (ttInfoDetailIterator.hasNext()) {
+						ttInfoDetail = ttInfoDetailIterator.next();
+						bcType = ttInfoDetail.getBcType();
+						sxx = ttInfoDetail.getXlDir();
+						// 进出场班次的里程，加入总里程
+						if(bcType.equals("in") || bcType.equals("out")){
+							// 进出班次的计划里程，算空驶里程
+							emptyLc = ttInfoDetail.getJhlc();
+							// 总里程需要加上空驶里程
+							zlc += emptyLc;
+							continue;
+						}
+						// 不是正常班次，不传到运管处
+						if(!bcType.equals("normal")){
+							continue;
+						}
+						// 如果发车时间格式错误，忽略此条
+						if(changeTimeFormat(ttInfoDetail) == null){
+							continue;
+						}
+						// 发生站点名称
+						fczdmc = lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()+"_"+ttInfoDetail.getQdzCode());
+						if("".equals(fczdmc) || "null".equals(fczdmc)){
+							result += "发车站点名称为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
+							return result;
+						}
+						sBufferC.append("<BC>");
+						sBufferC.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
+						sBufferC.append("<SXX>").append(sxx).append("</SXX>");
+						sBufferC.append("<FCZDMC>").append(fczdmc).append("</FCZDMC>");
+						// 起点站的参数
+						otherMap.put("stationMark","B");
+						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
+						if(isLogStation){// 输出起点站信息
+							logger.info("setSKB:"+"起点站信息："+paramMap);
+						}
+						// 发车站点序号
+						zdxh = String.valueOf(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber));
+						if("".equals(zdxh) || "null".equals(zdxh) || "0".equals(zdxh)){
+							result += "发车站点序号为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
+							return result;
+						}
+						// 到达站点名称
+						ddzdmc = lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()+"_"+ttInfoDetail.getZdzCode());
+						if("".equals(ddzdmc) || "null".equals(ddzdmc)){
+							result += "到达站点名称为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
+							return result;
+						}
+						sBufferC.append("<ZDXH>").append(zdxh).append("</ZDXH>");
+						sBufferC.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
+						sBufferC.append("<DDZDMC>").append(ddzdmc).append("</DDZDMC>");
+						// 终点站的参数
+						otherMap.put("stationMark","E");
+						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
+						if(isLogStation){// 输出终点站信息
+							logger.info("setSKB:"+"终点站信息："+paramMap);
+						}
+						// 到达站点序号
+						ddxh = String.valueOf(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber));
+						if("".equals(ddxh) || "null".equals(ddxh) || "0".equals(ddxh)){
+							result += "到达站点序号为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
+							return result;
+						}
+						isLogStation = false; // 一条线路只输出一次，后面的不输出了
+						sBufferC.append("<DDXH>").append(ddxh).append("</DDXH>");
+						sBufferC.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
+						sBufferC.append("</BC>");
+						// 0：上行；1：下行
+						if("0".equals(sxx)){
+							singleLc = lineInformation.getUpMileage();
+						}else{
+							singleLc = lineInformation.getDownMileage();
+						}
+						zlc += singleLc ;
+						yylc += singleLc;
+					}
+					sBufferC.append("</BCList>");
+					sBufferC.append("</SKB>");
+					sBufferA = new StringBuffer();
+					sBufferA.append("<JHZLC>").append(df.format(zlc)).append("</JHZLC>");
+					sBufferA.append("<JHYYLC>").append(df.format(yylc)).append("</JHYYLC>");
+					sBuffer.append(sBufferA).append(sBufferB).append(sBufferC);
+				}
+				logger.info("setSKB:"+"ttinfoId:"+ttinfoId+";当前站点版本号："+lineVersion+"；查询历史站点路由:"+lsStationCode2NameMap+";查询历史站点编号:"+lsStationName2YgcNumber);
+			}
+			sBuffer.append("</SKBs>");
+            String state;// 是否上传成功
+            if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
+                result = "上传成功";
+                state = "1";
+            }else{// 上传失败
+                result = "上传失败";
+                state = "0";
+            }
+            // 保存运管处上传记录
+            saveYgcUploadLog(ttinfoList,sBuffer.toString(),TrafficManageServiceImpl.UPLOAD_TYPE_SKB,state);
+		} catch (Exception e) {
+			logger.error("setSKB:", e);
+			e.printStackTrace();
+		}finally{
+            logger.info("setSKB:"+sBuffer.toString());
+            logger.info("setSKB:"+result);
+		}
+		return result;
+	}
+
+	/**
+	 * 保存上传运管处的日志
+	 * @param obj 参数
+	 * @param type 日志类型
+	 * @param xml 上传参数
+	 */
+	private void saveYgcUploadLog(Object obj,String xml,String type,String state){
+		SKBUploadLogger skbUploadLogger  = new SKBUploadLogger();
+		SysUser user;
+		// 如果不是人为上传，SysUser则为空，设置上传人员为管理员
+		if(SecurityContextHolder.getContext() == null || SecurityContextHolder.getContext().getAuthentication() == null){
+			user = new SysUser();
+			user.setId(1);
+		}else{// 获取上传人员
+			user = SecurityUtils.getCurrentUser();
+		}
+		// 最大的字符长度
+		int maxLength = 60000;
+		int cutLength = 50000;// 需要截取的字符长度
+		String xml_sub = null;
+		skbUploadLogger.setType(type);// 设置类型
+		// 判断xml是否超长，如果超长，则截取
+		if(xml != null && xml.length() > maxLength){
+			int xmlLength = xml.length();
+			int cutCount = xmlLength / cutLength + (xmlLength % cutLength > 0 ? 1 : 0);
+			if(cutCount > 2){
+				xml = "由于上传参数内容超长，请查看服务器的系统日志";
+			}else if(cutCount == 2){
+				xml_sub =xml.substring(cutLength);
+				xml = xml.substring(0,cutLength);
+			}else{
+				// 不做处理
+			}
+		}
+//		skbUploadLogger.setUploadXml(xml);// 上传的参数
+//		skbUploadLogger.setUploadXmlSub(xml_sub);
+		skbUploadLogger.setState(state);// 状态：是否成功
+		skbUploadLogger.setUser(user);
+		// 时刻表
+		if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_SKB)){
+			List<TTInfo> ttInfoList = (List<TTInfo>)obj;
+			String name = "";
+			Line line = null;
+			for(TTInfo ttInfo : ttInfoList){
+				name += ttInfo.getName() + " ";
+				line = ttInfo.getXl();
+			}
+			skbUploadLogger.setLine(line);
+			skbUploadLogger.setUser(user);
+			skbUploadLogger.setName(name);
+			skbUploadLoggerRepository.save(skbUploadLogger);
+		}else{
+			if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_XL)){
+				Line line = (Line) obj;
+				String name = line.getName() + "线路停靠站上传";
+				skbUploadLogger.setLine(line);
+				skbUploadLogger.setName(name);
+				skbUploadLoggerRepository.save(skbUploadLogger);
+			}else if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_LD)){
+				Map<String ,Line>  logLineMap = (Map<String ,Line> )obj;
+				for (String key : logLineMap.keySet()) {
+					Line line = logLineMap.get(key);
+					String name = line.getName() + "路单上传";
+					skbUploadLogger  = new SKBUploadLogger();
+					skbUploadLogger.setType(type);// 设置类型
+//					skbUploadLogger.setUploadXml(xml);// 上传的参数
+//					skbUploadLogger.setUploadXmlSub(xml_sub);
+					skbUploadLogger.setState(state);// 状态：是否成功
+					skbUploadLogger.setUser(user);
+					skbUploadLogger.setLine(line);
+					skbUploadLogger.setName(name);
+//					skbUploadLoggerRepository.save(skbUploadLogger);
+				}
+			}
+		}
+	}
+	/**
+	 * 上传线路人员车辆配置信息
+	 */
+	@Override
+	public String setXLPC() {
+		String result = "failure";
+		StringBuffer sBuffer =new StringBuffer();
+		try {
+			sBuffer.append("<XLPCs>");
+			// 声明变量
+			Line line = null;
+			Cars cars = null;
+			List<Personnel> personnelList = null;
+			List<Cars> carsList = null;
+			int totalPersonnel,totalCar ;// 人员数量。车辆数量
+			// 查询所有线路
+			Iterator<Line> lineIterator = lineRepository.findAll().iterator();
+			// 循环查找线路下的信息
+			while(lineIterator.hasNext()){
+				line = lineIterator.next();
+				sBuffer.append("<XLPC>");
+				sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</XLBM>");
+				// 查询驾驶员数量
+				personnelList = personnelRepository.findJsysByLineId(line.getId());
+				totalPersonnel = personnelList != null ? personnelList.size():0;
+				sBuffer.append("<SJRS>").append(totalPersonnel).append("</SJRS>");
+				// 查询售票员人员数量
+				personnelList = personnelRepository.findSpysByLineId(line.getId());
+				totalPersonnel = personnelList != null ? personnelList.size():0;
+				sBuffer.append("<SPYRS>").append(totalPersonnel).append("</SPYRS>");
+				// 查询车辆
+				carsList = carsRepository.findCarsByLineId(line.getId());
+				totalCar = carsList != null ? carsList.size():0;
+				sBuffer.append("<PCSL>").append(totalCar).append("</PCSL>");
+				sBuffer.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
+				int carsNum = 0;
+				// 取车牌号
+				if(carsList != null){
+					carsNum = carsList.size();
+					sBuffer.append("<CPHList>");
+					for (int i = 0; i < carsNum; i++) {
+						cars = carsList.get(i);
+						sBuffer.append("<CPH>").append("沪").append(cars.getCarCode()).append("</CPH>");
+					}
+					sBuffer.append("</CPHList>");
+				}
+				sBuffer.append("</XLPC>");
+			}
+			sBuffer.append("</XLPCs>");
+			if(ssop.setXLPC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
+				result = "success";
+			}
+		} catch (Exception e) {
+			logger.error("setXLPC:",e);
+			e.printStackTrace();
+		}finally{
+			logger.info("setXLPC:"+sBuffer.toString());
+			logger.info("setXLPC:"+result);
+		}
+		return result;
+	}
+
+
+	/**
+	 * 上传超速数据
+	 */
+	@Override
+	public String setCS() {
+		String result = "failure";
+		StringBuffer sBuffer =new StringBuffer();
+		sBuffer.append("<CSs>");
+		String sql = "SELECT * FROM bsth_c_speeding where DATE_FORMAT(create_date,'%Y-%m-%d') = ? order by create_date ";
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		// 取昨天 的日期
+		String yesterday = sdfnyr.format(DateUtils.addDays(new Date(), -1));
+		try {
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setString(1, yesterday);
+			rs = ps.executeQuery();
+			Float lon, lat;
+			String kssk;
+			String speed;
+			while (rs.next()) {
+				kssk = sdfnyrsfm.format(rs.getLong("TIMESTAMP"));
+				speed = rs.getString("SPEED");
+				// 经纬度
+				lon = rs.getFloat("LON");
+				lat = rs.getFloat("LAT");
+				sBuffer.append("<CS>");
+				sBuffer.append("<RQ>").append(sdfnyr.format(rs.getDate("CREATE_DATE"))).append("</RQ>");
+				sBuffer.append("<XLBM>").append(BasicData.lineCode2ShangHaiCodeMap.get(rs.getString("LINE"))).append("</XLBM>");////////
+				sBuffer.append("<CPH>").append(rs.getString("VEHICLE")).append("</CPH>");
+				sBuffer.append("<KSSK>").append(kssk).append("</KSSK>");
+				sBuffer.append("<KSDDJD>").append(lon).append("</KSDDJD>");
+				sBuffer.append("<KSDDWD>").append(lat).append("</KSDDWD>");
+				sBuffer.append("<KSLD>").append("").append("</KSLD>");//**********************
+				sBuffer.append("<JSSK>").append(kssk).append("</JSSK>");
+				sBuffer.append("<JSDDJD>").append(lon).append("</JSDDJD>");
+				sBuffer.append("<JSDDWD>").append(lat).append("</JSDDWD>");
+				sBuffer.append("<JSLD>").append("").append("</JSLD>");//**********************
+				sBuffer.append("<PJSD>").append(speed).append("</PJSD>");
+				sBuffer.append("<ZGSS>").append(speed).append("</ZGSS>");
+				sBuffer.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
+				sBuffer.append("</CS>");
+			}
+			sBuffer.append("</CSs>");
+			if(ssop.setCS(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
+				result = "success";
+			}
+		} catch (Exception e) {
+			logger.error("setCS:",e);
+			e.printStackTrace();
+		} finally {
+			logger.info("setCS:"+sBuffer.toString());
+			logger.info("setCS:"+result);
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		return result;
+	}
+
+
+	/**
+	 * 下载全量的公交基础数据
+	 */
+	public String getDownLoadAllDataFile() {
+		String result = "failure";
+		try {
+			try {
+				if(ygcBasicDataService.download("admin","000000","abc.zip")){
+					result = "success";
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return result;
+	}
+
+	/**
+	 * 下载增量的公交基础数据
+	 */
+	public String getDownLoadIncreaseDataFile() {
+		String result = "success";
+		try {
+			//System.out.println(portType.downloadIncreaseDataFile(args0, args1, args2));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return result;
+	}
+
+	/**
+	 *  指定线路查询方式公交基础数据下载
+	 */
+	public String getDownLoadWarrantsBusLineStation() {
+		String result = "success";
+		try {
+
+			//portType.setXL(userNameXl, passwordXl, sBuffer.toString());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return result;
+	}
+
+	/**
+	 * 计算结束时间
+	 * @param fcsj 发车时间
+	 * @param bcsj 班次历时
+	 * @return
+	 */
+	private String calcDdsj(String fcsj,Integer bcsj){
+		String result = "";
+		if(fcsj.indexOf(":") != -1){
+			if(bcsj == null){
+				return fcsj;
+			}
+			// 时和分隔开
+			String[] fcsjArray = fcsj.split(":");
+			// 分和历时时间相加
+			Integer fullTime = Integer.valueOf(fcsjArray[1])+ bcsj;
+			int hour,min,sumHour;
+			hour = fullTime / 60;
+			min = fullTime % 60;
+			sumHour = Integer.valueOf(fcsjArray[0])+hour;
+			if(sumHour >= 24){
+				result = String.format("%02d",sumHour - 24);
+			}else{
+				result = String.format("%02d",sumHour);;
+			}
+			result +=":"+String.format("%02d", min);
+		}else{
+			result = fcsj;
+		}
+		return result;
+	}
+
+	/**
+	 * 改变时间格式
+	 * @param ttInfoDetail 时刻表详细
+	 * @return xx:yy
+	 */
+	private String changeTimeFormat(TTInfoDetail ttInfoDetail){
+		String result = "00:00";
+		String fcsj = ttInfoDetail.getFcsj();
+		if(fcsj.indexOf(":") != -1){
+			// 时和分隔开
+			String[] fcsjArray = fcsj.split(":");
+			result = String.format("%02d", Integer.valueOf(fcsjArray[0]))+":";
+			result +=String.format("%02d", Integer.valueOf(fcsjArray[1]));
+		}else{
+			result = null;
+			logger.info("setSKB:发车时间错误：ttInfoDetail.id="+ttInfoDetail.getId());
+		}
+		return result;
+	}
+
+	/**
+	 * 拼装线路计划班次表的XML
+	 * @param sBuffer
+	 * @param schedulePlanInfo
+	 * @param xlbm
+	 * @param zbh
+	 * @param lp
+	 */
+	private void assembleJHBC(StringBuffer sBuffer,SchedulePlanInfo schedulePlanInfo,String xlbm,String zbh,Long lp){
+		sBuffer.append("<JHBC>");
+		sBuffer.append("<RQ>").append(sdfnyr.format(schedulePlanInfo.getScheduleDate())).append("</RQ>");
+		sBuffer.append("<XLBM>").append(BasicData.lineCode2ShangHaiCodeMap.get(xlbm)).append("</XLBM>");
+		sBuffer.append("<CPH>").append("沪"+zbh).append("</CPH>");
+		sBuffer.append("<LPBH>").append(lp).append("</LPBH>");
+		sBuffer.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
+		sBuffer.append("<BCList>");
+	}
+	/**
+	 * 转换排班规则
+	 * @param ruleDay
+	 * @return
+	 */
+	private String changeRuleDay(String ruleDay){
+		String result = "";
+		int flag ;
+		String[] ruleDayArray = ruleDay.split(",");
+		for (int i = 0; i < ruleDayArray.length; i++) {
+			if(ruleDayArray[i].equals("1")){
+				flag = i+1;
+			}else{
+				flag = 0;
+			}
+			if(flag > 0){
+				result += flag + ",";
+			}
+		}
+		// 去掉最后一个字符
+		if(StringUtils.endsWith(result,",")){
+			result = StringUtils.removeEnd(result,",");
+		}
+		return result;
+	}
+	/**
+	 * 设置统一的公司名称
+	 * @param company
+	 */
+	private void setCompanyName(String company){
+		if(company.equals("闵行公司")){
+			company = "浦东闵行公交公司";
+		}else if(company.equals("杨高公司")){
+			company = "浦东杨高公交公司";
+		}else if(company.equals("上南公司")){
+			company = "浦东上南公交公司";
+		}else if(company.equals("金高公司")){
+			company = "浦东金高公交公司";
+		}else if(company.equals("南汇公司")){
+			company = "浦东南汇公交公司";
+		}else if(company.equals("青浦公交")){
+			company = "浦东青浦公交公司";
+		}
+	}
+	/**
+	 * @param stationsList 站点路由集
+	 * @param sBuffer sBuffer
+	 * @param startId 站点序号起始ID
+	 *
+	 * @return 站点序号累加后的ID
+	 */
+	private int packagStationXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId,Map<String, Integer> stationNumMap){
+		int size = stationsList.size();
+		StationRoute srRoute;
+		HashMap<String,String> paraMap;
+		String zdlx ;// 站点类型：0：起点站、1：终点站、2：中途站
+		for (int i = 0; i < size; i++) {
+			srRoute = stationsList.get(i);
+			zdlx = srRoute.getStationMark();
+			if(zdlx.equals("B")){
+				zdlx = "0";
+			}else if(zdlx.equals("E")){
+				zdlx = "1";
+			}else{
+				zdlx = "2";
+			}
+			paraMap = packageYgcStationNumParam(srRoute,null);
+			sBuffer.append("<Station>");
+			sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap,stationNumMap)).append("</ZDXH>");
+			sBuffer.append("<SXX>").append(srRoute.getDirections()).append("</SXX>");
+			sBuffer.append("<ZDMC>").append(srRoute.getStationName()).append("</ZDMC>");
+			sBuffer.append("<ZDBM>").append(srRoute.getStationCode()).append("</ZDBM>");
+			sBuffer.append("<ZDJD>").append(srRoute.getStation().getgLonx()).append("</ZDJD>");
+			sBuffer.append("<ZDWD>").append(srRoute.getStation().getgLaty()).append("</ZDWD>");
+			sBuffer.append("<ZZ>").append(srRoute.getStation().getAddr() == null ? "" : srRoute.getStation().getAddr()).append("</ZZ>");
+			sBuffer.append("<ZDLX>").append(zdlx).append("</ZDLX>");
+			sBuffer.append("<ZJLC>").append(srRoute.getDistances()).append("</ZJLC>");
+			sBuffer.append("</Station>");
+			startId++;
+		}
+		return startId;
+	}
+
+	/**
+	 * @param pointList 站点点位集
+	 * @param sBuffer sBuffer
+	 * @param startId 站点序号起始ID
+	 *
+	 * @return 站点序号累加后的ID
+	 */
+	private int packagStationPointXml(List<Object[]> pointList,StringBuffer sBuffer,int startId){
+		int size = pointList.size();
+		Object[] objs;
+		String bsection,dir,section;
+		String[] sections ;
+		for (int i = 0; i < size; i++) {
+			objs = pointList.get(i);
+			bsection = objs[0]+"";
+			dir = objs[1]+"";
+			// 取括号内的内容
+			Pattern pattern = Pattern.compile("(?<=\\()(.+?)(?=\\))");
+			Matcher matcher = pattern.matcher(bsection);
+			if(matcher.find()){
+				sections = matcher.group().split(",");
+				for (int j = 0 ; j < sections.length ; j ++){
+					section = sections[j];
+					sBuffer.append("<LinePoint>");
+					sBuffer.append("<ZDXH>").append(startId).append("</ZDXH>");
+					sBuffer.append("<SXX>").append(dir).append("</SXX>");
+					sBuffer.append("<ZDJD>").append(section.split(" ")[0]).append("</ZDJD>");
+					sBuffer.append("<ZDWD>").append(section.split(" ")[1]).append("</ZDWD>");
+					sBuffer.append("</LinePoint>");
+					startId++;
+				}
+			}
+		}
+		return startId;
+	}
+
+	/**
+	 *  获取运管处站点序号
+	 * @param map
+	 * @return 运管处站点序号
+	 */
+	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(HashMap<String,String> map,Map<String, Integer> stationNumMap){
+		// 线路编码
+		String lineCode = map.get("lineCode");
+		// 线路走向 0：上行  1：下行
+		String direction = map.get("direction");
+		// 站点编码
+		String stationCode = map.get("stationCode");
+		// 站点类型：B：起点站 Z：中途站 E：终点站 T：停车场
+		String stationMark = map.get("stationMark");
+		String[] marks = null;
+		// 起点站，先从起点找，找不到再从中途站找，最后从终点找
+		if(stationMark.equals("B")){
+			marks= new String[]{"B","Z","E"};
+		}else if(stationMark.equals("E")){// 终点站相反
+			marks= new String[]{"E","Z","B"};
+		}else if(stationMark.equals("Z")){
+			marks= new String[]{"Z"};
+		}
+		// 默认从缓存BasicData.stationName2YgcNumber
+		Map<String, Integer> tempMap = BasicData.stationName2YgcNumber;
+		// 如果传入的stationNumMap不为空，则不是缓存取，而从stationNumMap取
+		if(stationNumMap != null){
+			tempMap = stationNumMap;
+		}
+		Integer number = null;
+		for (int i = 0 ;i < marks.length ; i ++){
+			number = tempMap.get(lineCode+"_"+direction+"_"+stationCode+"_"+marks[i]);
+			if(number != null){
+				break;
+			}
+		}
+		return number == null ? 0 : number;
+	}
+
+	/**
+	 * 封装查询站序条件
+	 * @param obj
+	 * @return
+	 */
+	private HashMap packageYgcStationNumParam(Object obj,HashMap<String,String> otherParam){
+		HashMap<String,String> map = new HashMap<String,String>();
+		String lineCode = "",direction = "",stationCode = "",stationMark = "";
+		// 站点路由
+		if(obj instanceof StationRoute){
+			StationRoute sr = (StationRoute)obj;
+			lineCode = sr.getLineCode();
+			direction = String.valueOf(sr.getDirections());
+			stationCode = sr.getStationCode();
+			stationMark = sr.getStationMark();
+		}else if(obj instanceof ScheduleRealInfo){ //实际排班计划明细。
+			ScheduleRealInfo sri = (ScheduleRealInfo)obj;
+			lineCode = sri.getXlBm();
+			direction = sri.getXlDir();
+			if(otherParam != null && otherParam.get("stationMark") != null){
+				stationMark = otherParam.get("stationMark");
+				if(stationMark.equals("B")){ // 起点站
+					stationCode = sri.getQdzCode();
+				}else if(stationMark.equals("E")){ // 终点站
+					stationCode = sri.getZdzCode();
+				}
+			}
+		}else if(obj instanceof SchedulePlanInfo){ //排班计划明细
+			SchedulePlanInfo spi = (SchedulePlanInfo)obj;
+			lineCode = spi.getXlBm();
+			direction = spi.getXlDir();
+			if(otherParam != null && otherParam.get("stationMark") != null){
+				stationMark = otherParam.get("stationMark");
+				if(stationMark.equals("B")){ // 起点站
+					stationCode = spi.getQdzCode();
+				}else if(stationMark.equals("E")){ // 终点站
+					stationCode = spi.getZdzCode();
+				}
+			}
+		}else if(obj instanceof TTInfoDetail){ //时刻表明细
+			TTInfoDetail ttid = (TTInfoDetail)obj;
+			lineCode = ttid.getXl().getLineCode();
+			direction = ttid.getXlDir();
+			if(otherParam != null && otherParam.get("stationMark") != null){
+				stationMark = otherParam.get("stationMark");
+				if(stationMark.equals("B")){ // 起点站
+					stationCode = ttid.getQdzCode();
+				}else if(stationMark.equals("E")){ // 终点站
+					stationCode = ttid.getZdzCode();
+				}
+			}
+		}
+		map.put("lineCode",lineCode);// 站点编码
+		map.put("direction",direction); // 上下行
+		map.put("stationCode",stationCode); // 站点编号
+		map.put("stationMark",stationMark); // 站点类型
+		return map;
+	}
+
+	/**
+	 * 取得历史站点编码和站点名称的对应关系
+	 * @return
+	 */
+	private Map<String, String> getLsStationCode(String lineCode,int lineVersion){
+		Map<String,Object> map = new HashMap<>();
+		map.put("lineCode_eq", lineCode);
+		map.put("versions_eq",lineVersion);
+		LsStationRoute lsroute;
+		Iterator<LsStationRoute> iterator = lsStationRouteRepository.findAll(new CustomerSpecs<LsStationRoute>(map)).iterator();
+		Map<String, String> stationCode2Name = new HashMap<>();
+		while (iterator.hasNext()) {
+			lsroute = iterator.next();
+			stationCode2Name.put(lsroute.getLineCode() + "_" + lsroute.getDirections() + "_" + lsroute.getStationCode(), lsroute.getStationName());
+		}
+		return stationCode2Name;
+	}
+
+	private Map<String, Integer> getLsStationRoute(String xlbm,int lineVersion){
+		Map<String, Integer> tempStationName2YgcNumber = new HashMap<String, Integer>();
+		/**
+		 * 加载运管处的站点及序号
+		 * 上行从1开始，下行顺序续编
+		 */
+		List<Map<String, String>> ygcLines = lsStationRouteRepository.findLineWithLineCode4Ygc(xlbm,lineVersion);
+		if(ygcLines != null && ygcLines.size() > 0){
+			int size = ygcLines.size();
+			Map<String, String> tempMap ;
+			int num = 1;
+			String key;
+			String lineCode = "";
+			for (int i = 0; i < size; i ++){
+				tempMap = ygcLines.get(i);
+				if(lineCode.equals("")){
+					lineCode = tempMap.get("lineCode");
+				}else if(!lineCode.equals(tempMap.get("lineCode"))){
+					num = 1;
+					lineCode = tempMap.get("lineCode");
+				}
+				key = tempMap.get("lineCode") + "_"+String.valueOf(tempMap.get("directions"))
+						+ "_"+tempMap.get("stationCode")+ "_"+tempMap.get("stationMark");
+				tempStationName2YgcNumber.put(key,num++);
+			}
+		}
+		return tempStationName2YgcNumber;
+	}
+
+	private String getSetXlXml(Line line,LineInformation lineInformation){
+		StringBuffer sBuffer = new StringBuffer();
+		List<StationRoute> upStationsList ;// 上行站点路由集
+		List<StationRoute> downStationsList;// 下行站点路由集
+		List<Object[]> downPointList;// 下行站点集
+		List<Object[]> upPointList;// 上行站点集
+		sBuffer.append("<XLs>");
+		sBuffer.append("<XL>");
+		sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</XLBM>");
+		sBuffer.append("<XLMC>").append(line.getName()).append("</XLMC>");
+		sBuffer.append("<QDZ>").append(line.getStartStationName()).append("</QDZ>");
+		sBuffer.append("<ZDZ>").append(line.getEndStationName()).append("</ZDZ>");
+		sBuffer.append("<QZLC>").append(lineInformation.getUpMileage()).append("</QZLC>");
+		sBuffer.append("<ZQLC>").append(lineInformation.getDownMileage()).append("</ZQLC>");
+		sBuffer.append("<XLGH>").append(line.getLinePlayType()).append("</XLGH>");
+		sBuffer.append("<UPDATE_DATE>").append(sdfnyr.format(new Date())).append("</UPDATE_DATE>");
+		// 循环添加站点信息
+		sBuffer.append("<StationList>");
+		// 先查上行
+		upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
+		Map<String, Integer> stationNumMap = getStationName2YgcNumberMap(line.getLineCode());
+		int startId = 1;
+		startId = packagStationXml(upStationsList, sBuffer, startId,stationNumMap);
+		// 环线不查下行
+		if(line.getLinePlayType() != 1){
+			// 再查下行
+			downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
+			packagStationXml(downStationsList, sBuffer, startId,stationNumMap);
+		}
+		sBuffer.append("</StationList>");
+		// 循环添加站点点位信息
+		sBuffer.append("<LinePointList>");
+		upPointList = sectionRepository.getSectionDirByLineId(line.getId(),0);
+		startId = 1;
+		startId = packagStationPointXml(upPointList, sBuffer, startId);
+		// 环线不查下行
+		if(line.getLinePlayType() != 1){
+			downPointList = sectionRepository.getSectionDirByLineId(line.getId(),1);
+			packagStationPointXml(downPointList, sBuffer, startId);
+		}
+		sBuffer.append("</LinePointList>");
+		sBuffer.append("</XL>");
+		sBuffer.append("</XLs>");
+		return sBuffer.toString();
+	}
+}
@@ -20,6 +20,9 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
 	Map<String, Object> sumYlb(Map<String, Object> map);
 	String checkJsy(Map<String, Object> map);
 	String checkDate(Map<String, Object> map);
+	
+	String getModifyRights();
+	String modifyRightsChange();
 	List<Map<String, Object>> oilListMonth(Map<String, Object> map);
 	List<Ylb> listYlb(Map<String, Object> map);
-package com.bsth.service.oil.impl;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.transaction.Transactional;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.usermodel.Cell;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.common.ResponseCode;
-import com.bsth.data.BasicData;
-import com.bsth.entity.oil.Cwjy;
-import com.bsth.entity.oil.Cyl;
-import com.bsth.entity.oil.Ylb;
-import com.bsth.entity.oil.Ylxxb;
-import com.bsth.repository.oil.CwjyRepository;
-import com.bsth.repository.oil.YlxxbRepository;
-import com.bsth.service.impl.BaseServiceImpl;
-import com.bsth.service.oil.CwjyService;
-import com.bsth.util.Arith;
-import com.bsth.util.PageHelper;
-import com.bsth.util.PageObject;
-
-@Service
-public class CwjyServiceImpl extends BaseServiceImpl<Cwjy,Integer> implements CwjyService
-{
-	@Autowired
-	CwjyRepository repository;
-	@Autowired
-	YlxxbRepository ylxxbRepository;
-	
-	@Autowired
-	JdbcTemplate jdbcTemplate;
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-	/*@SuppressWarnings("unchecked")
-	public PageObject<Ylxxb> Pagequery(Map<String, Object> map) {
-		int page=Integer.parseInt(map.get("page").toString());
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-		
-		String rq=map.get("rq").toString();
-		String nbbm="";
-		if(map.get("nbbh")!=null){
-			nbbm=map.get("nbbh").toString();
-		}
-		
-		Object gsdmIn=map.get("gsdm_in");
-		Object fgsdmIn=map.get("fgsdm_in");
-		String addSql="";
-		String  gsdmLike="";
-		String  fgsdmLike="";
-		
-		//选择了公司 
-		if(gsdmIn==null){
-			gsdmLike=map.get("gsdm_like").toString();
-			addSql += " and a.gsdm = '"+gsdmLike+ "' ";
-			
-			//选择了分公司
-			if(fgsdmIn==null){
-				fgsdmLike=map.get("fgsdm_like").toString();;
-				addSql += " and a.fgsdm = '"+fgsdmLike+ "' ";
-			}else{
-				String fgsdmIns[]= fgsdmIn.toString().split(",");
-				addSql +=" and a.fgsdm in (";
-				for(int i=0;i<fgsdmIns.length;i++){
-					addSql +="'"+fgsdmIns[i]+"'";
-					if(i<fgsdmIns.length-1){
-						addSql +=",";
-					}
-				}
-				addSql +=")";
-			}
-		}else{
-			//没有选择公司 （分公司也没有选择）
-			String gsdmIns[]=gsdmIn.toString().split(",");
-			addSql += " and a.gsdm in (";
-			for(int i=0;i<gsdmIns.length;i++){
-				addSql +="'" +gsdmIns[i]+"'";
-				if(i<gsdmIns.length-1){
-					addSql+=",";
-				}
-			}
-			addSql +=")";
-			String fgsdmIns[]= fgsdmIn.toString().split(",");
-			addSql +=" and a.fgsdm in (";
-			for(int i=0;i<fgsdmIns.length;i++){
-				addSql +="'"+fgsdmIns[i]+"'";
-				if(i<fgsdmIns.length-1){
-					addSql +=",";
-				}
-			}
-			addSql +=")";
-			
-			
-		}
-		String countSql="SELECT ifnull(count(*),0) as countTs FROM  bsth_c_cwjy  a "+ 
-				   " left  join ( select * from bsth_c_ylxxb b where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1) b " +
-				  " on a.nbbm=b.nbbm left join (select nbbm,group_concat(jsy) as jsy  "
-				  + "from bsth_c_ylb where  to_days(rq)= to_days('"+rq+"' ) group by nbbm "+
-				   " ) c on a.nbbm=c.nbbm  where  a.nbbm like '%"+nbbm+"%' " +addSql ;
-		int listsize=jdbcTemplate.queryForObject(countSql, Integer.class);
-		// TODO Auto-generated method stub
-		String sql="SELECT a.gsdm as gsdm,a.fgsdm as fgsdm,a.nbbm as nbbm,b.jsy as jsy,b.jzl as jzl ,b.stationid as stationid,"
-				+ "b.nylx as nylx,b.yj as yj,b.bz as bz,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
-				   " left  join ( select * from bsth_c_ylxxb b where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1) b " +
-				  " on a.nbbm=b.nbbm left join (select nbbm,group_concat(jsy) as jsy  "
-				  + "from bsth_c_ylb where  to_days(rq)= to_days('"+rq+"' ) group by nbbm "+
-				   " ) c on a.nbbm=c.nbbm  where  a.nbbm like '%"+nbbm+"%' " +addSql+ "  limit "+page*10+","+10;
-		
-		
-		List<Ylxxb> yList= jdbcTemplate.query(sql,
-				 new RowMapper<Ylxxb>(){
-			 @Override
-			 public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 Ylxxb t=new Ylxxb();
-				 t.setGsdm(rs.getString("gsdm"));
-				 t.setFgsdm(rs.getString("fgsdm"));
-				 t.setNbbm(rs.getString("nbbm"));
-				 t.setJsy(rs.getString("jsy"));
-				 t.setJzl(rs.getDouble("jzl"));
-				 t.setStationid(rs.getString("stationid"));
-				 t.setNylx(rs.getInt("nylx"));
-				 t.setYj(rs.getDouble("yj"));
-				 t.setBz(rs.getString("bz"));
-				 t.setLdgh(rs.getString("ldgh"));
-				 return t;
-			 }
-		});
-		List<Object[]> list=repository.obtainCwjycl(rq,nbbm);
-		for (int i = 0; i < list.size(); i++) {
-			Ylxxb y=new Ylxxb();
-			y.setGsdm(list.get(i)[0]==null?"":list.get(i)[0].toString());
-			y.setNbbm(list.get(i)[1]==null?"":list.get(i)[1].toString());
-			y.setJsy(list.get(i)[2]==null?"":list.get(i)[2].toString());
-			y.setJzl(list.get(i)[3]==null?0.0:Double.parseDouble(list.get(i)[3].toString()));
-			y.setStationid(list.get(i)[4]==null?"":list.get(i)[4].toString());
-			y.setNylx(list.get(i)[5]==null?0:Integer.parseInt(list.get(i)[5].toString()));
-			y.setYj(list.get(i)[6]==null?0.0:Double.parseDouble(list.get(i)[6].toString()));
-			y.setBz(list.get(i)[7]==null?"":list.get(i)[7].toString());
-			y.setLdgh(list.get(i)[8]==null?"":list.get(i)[8].toString());
-			try {
-				y.setYyrq(sdf.parse(rq));
-			} catch (ParseException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			yList.add(y);
-		}
-		PageHelper pageHelper = new PageHelper(listsize, map);
-		pageHelper.getMap();
-		PageObject<Ylxxb> pageObject=pageHelper.getPageObject();
-		pageObject.setDataList(yList);
-		return pageObject;
-	}*/
-
-	@Override
-	public Ylxxb bynbbm(Map<String, Object> map) {
-		// TODO Auto-generated method stub
-		// TODO Auto-generated method stub
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		String rq = map.get("rq").toString();
-		String nbbm = "";
-		if (map.get("nbbm") != null) {
-			nbbm = map.get("nbbm").toString();
-		}
-		List<Object[]> list = repository.obtainCwjycl(rq, nbbm);
-		Ylxxb y = new Ylxxb();
-		if (list.size() > 0) {
-			y.setGsdm(list.get(0)[0] == null ? "" : list.get(0)[0].toString());
-			y.setNbbm(list.get(0)[1] == null ? "" : list.get(0)[1].toString());
-			y.setJsy(list.get(0)[2] == null ? "" : list.get(0)[2].toString());
-			y.setJzl(list.get(0)[3] == null ? 0.0 : Double.parseDouble(list.get(0)[3].toString()));
-			y.setStationid(list.get(0)[4] == null ? "" : list.get(0)[4].toString());
-			y.setNylx(list.get(0)[5] == null ? 0 : Integer.parseInt(list.get(0)[5].toString()));
-			y.setYj(list.get(0)[6] == null ? 0.0 : Double.parseDouble(list.get(0)[6].toString()));
-			y.setBz(list.get(0)[7] == null ? "" : list.get(0)[7].toString());
-			y.setLdgh(list.get(0)[8] == null ? "" : list.get(0)[8].toString());
-			try {
-				y.setYyrq(sdf.parse(rq));
-			} catch (ParseException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return y;
-	}
-
-	@Transactional 
-	@Override
-	public Map<String, Object> savejzl(Map<String, Object> maps) throws Exception {
-		// TODO Auto-generated method stub
-		Map<String, Object> map=new HashMap<String,Object>();
-		try {
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-//			String rq = sdf.format(t.getYyrq());
-//			String nbbm=t.getNbbm();
-//			List<Ylxxb> yList=ylxxbRepository.obtainYlxx2(rq,nbbm);
-//			if(yList.size()>0){
-//				t.setId(yList.get(0).getId());
-//				ylxxbRepository.save(t);
-//			}else{
-//				ylxxbRepository.save(t);
-//			}
-			String gsbm=maps.get("gsbm").toString();
-			String fgsbm=maps.get("fgsbm").toString();
-			String rq=maps.get("rq").toString();
-			Date date=sdf.parse(rq);
-			String json =StringEscapeUtils.unescapeHtml4(maps.get("ylbList").toString());
-			JSONArray jsonArray=JSONArray.parseArray(json);
-			JSONObject jsonObject;
-			// 获取车辆存油信息
-			for (int i = 0; i < jsonArray.size(); i++) {
-				jsonObject=jsonArray.getJSONObject(i);
-				Integer id =jsonObject.getInteger("id");
-				String jsy=jsonObject.getString("jsy");
-				double jzl=jsonObject.getDoubleValue("jzl");
-				String stationid=jsonObject.getString("stationid");
-				String nbbm=jsonObject.getString("nbbm");
-				int nylx=jsonObject.getIntValue("nylx");
-				String jyggh=jsonObject.getString("jyggh");
-				String bz=jsonObject.getString("bz");
-				Ylxxb y;
-				if(id>0){
-					y=ylxxbRepository.findById(id).get();
-					y.setJsy(jsy);
-					y.setJzl(jzl);
-					y.setStationid(stationid);
-					y.setJyggh(jyggh);
-					y.setBz(bz);
-					y.setCreatetime(new Date());
-					y.setYyrq(date);
-					ylxxbRepository.save(y);
-				}else{
-					if(jsy!="" && jzl>0){
-						y=new Ylxxb();
-						y.setGsdm(gsbm);
-						y.setJsy(jsy);
-						y.setNbbm(nbbm);
-						y.setJzl(jzl);
-						y.setStationid(stationid);
-						y.setJyggh(jyggh);
-						y.setBz(bz);
-						y.setCreatetime(new Date());
-						y.setYyrq(date);
-						y.setJylx(1);
-						y.setNylx(0);
-						ylxxbRepository.save(y);
-					}
-				}
-			}
-			map.put("status", ResponseCode.SUCCESS);
-			
-		} catch (Exception e) {
-			map.put("status", ResponseCode.ERROR);
-			logger.error("save erro.", e);
-			throw e;
-			// TODO: handle exception
-		}
-		return map;
-	}
-
-	
-	
-	@Override
-	public List<Ylxxb> Pagequery(Map<String, Object> map) {
-		// TODO Auto-generated method stub
-		String rq=map.get("rq").toString();
-		String nbbm=map.get("nbbh").toString();
-		String gsdm=map.get("gsdm_like").toString();
-		
-		String fgsdm=map.get("fgsdm_like").toString();
-		String line =map.get("line_like").toString().trim();
-		/*String sql="SELECT a.gsdm as gsdm,a.fgsdm as fgsdm,a.nbbm as nbbm,"
-				+ "b.jyggh as jyggh,b.jzl as jzl ,b.stationid as stationid,b.jsy as jsy,"
-				+ "b.nylx as nylx,b.yj as yj,b.bz as bz,b.id as id ,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
-				   " left  join ("
-				   + " select * from bsth_c_ylxxb b "
-				   + "where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1  "
-				   		+ " and gsdm = '"+gsdm+"') b " +
-				  " on a.nbbm=b.nbbm "
-				  + "left join (select nbbm,group_concat(jsy) as jsy  "
-				  + "from bsth_c_ylb where  to_days(rq)= to_days('"+rq+"' ) "
-				  		+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"'  group by nbbm "+
-				   " ) c on a.nbbm=c.nbbm  "
-				   + "where  a.nbbm like '%"+nbbm+"%' and a.gsdm='"+gsdm+"' and a.fgsdm ='"+fgsdm+"'"
-				   		+ " order by a.nbbm";*/
-		String sql= " select * from bsth_c_ylxxb b "
-				   + "where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1  "
-				   		+ " and gsdm = '"+gsdm+"'";
-		
-		List<Ylxxb> yList= jdbcTemplate.query(sql,
-				 new RowMapper<Ylxxb>(){
-			 @Override
-			 public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 Ylxxb t=new Ylxxb();
-				 t.setId(rs.getInt("id"));
-				 t.setGsdm(rs.getString("gsdm"));
-				 t.setFgsdm(rs.getString("fgsdm"));
-				 t.setNbbm(rs.getString("nbbm"));
-				 t.setJyggh(rs.getString("jyggh"));
-				 t.setJsy(rs.getString("jsy"));
-				 t.setJzl(rs.getDouble("jzl"));
-				 t.setStationid(rs.getString("stationid"));
-				 t.setNylx(rs.getInt("nylx"));
-				 t.setYj(rs.getDouble("yj"));
-				 t.setBz(rs.getString("bz"));
-				 return t;
-			 }
-		});
-		List<Cwjy> cwList=null;
-		if(line.equals("")){
-			cwList = repository.selectAll(nbbm, gsdm, fgsdm);
-		}else{
-			cwList = repository.selectAll_s(nbbm, gsdm, fgsdm, line);
-		}
-				
-		String sql_ylb="SELECT nbbm,group_concat(jsy) AS jsy FROM bsth_c_ylb WHERE "
-				+ " rq = '"+rq+"' AND ssgsdm = '"+gsdm+"' AND "
-				+ " fgsdm = '"+fgsdm+"' GROUP BY nbbm";
-		
-		List<Map<String, String>> ylbList= jdbcTemplate.query(sql_ylb,
-				 new RowMapper<Map<String, String>>(){
-			 @Override
-			 public Map<String, String>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 Map<String, String> maps =new HashMap<String, String>();
-				 maps.put("nbbm", rs.getString("nbbm"));
-				 maps.put("ldgh", rs.getString("jsy"));
-				 return maps;
-			 }
-		});
-		
-		List<Ylxxb> ylxxbList= new ArrayList<Ylxxb>();
-		Ylxxb y=null;
-		for (int i = 0; i < cwList.size(); i++) {
-			Cwjy cwjy=cwList.get(i);
-			y=new Ylxxb();
-			y.setNylx(0);
-			y.setId(0);
-			y.setJzl(0.0);
-			y.setGsdm(cwjy.getGsdm());
-			y.setFgsdm(cwjy.getFgsdm());
-			y.setNbbm(cwjy.getNbbm());
-			y.setLinename(cwjy.getLinename());
-			for (int j = 0; j < yList.size(); j++) {
-				Ylxxb ylxxb=yList.get(j);
-				if(y.getNbbm().equals(ylxxb.getNbbm())){
-					y.setId(ylxxb.getId());
-					y.setJyggh(ylxxb.getJyggh());
-				    y.setJsy(ylxxb.getJsy());
-				    y.setJzl(ylxxb.getJzl());
-				    y.setStationid(ylxxb.getStationid());
-				    y.setNylx(ylxxb.getNylx());
-				    y.setYj(ylxxb.getYj());
-				    y.setBz(ylxxb.getBz());
-				    break;
-				}
-			}
-			for (int j = 0; j < ylbList.size(); j++) {
-				Map<String, String> m=ylbList.get(j);
-				if(m.get("nbbm").toString().equals(cwjy.getNbbm())){
-					y.setLdgh(m.get("ldgh").toString());
-					break;
-				}
-				
-			}
-			
-			ylxxbList.add(y);
-			
-		}
-		
-		return ylxxbList;
-	}
-
-	@Override
-	public int checkNbbm(Cwjy t) {
-		// TODO Auto-generated method stub
-		String sql="select count(*) from bsth_c_cwjy where nbbm ='"+t.getNbbm()+"'"
-				+ " and gsdm ='"+t.getFgsdm()+"' and fgsdm ='"+t.getFgsdm()+"'";
-		int cs=jdbcTemplate.queryForObject(sql, Integer.class);
-		
-		return cs;
-	}
-
-	@Override
-	public List<Ylxxb> cwjyList(Map<String, Object> map) {
-		String rq=map.get("rq").toString();
-		String nbbm=map.get("nbbh").toString();
-		String gsdm=map.get("gsdm_like").toString();
-		
-		String fgsdm=map.get("fgsdm_like").toString();
-		String line =map.get("line_like").toString().trim();
-		boolean type=false;
-		if(map.get("type")!=null){
-			type=true;
-		}
-		String sql="select a.nbbm,a.gsdm,a.fgsdm,IFNULL(b.id,0) as id,IFNULL(b.jzl,0) as jzl,"
-		+ " IFNULL(b.jyggh,0) as jyggh,IFNULL(b.jsy,0) as jsy,IFNULL(b.stationid,0) as stationid ,"
-		+ " IFNULL(b.yj,0) as yj,IFNULL(b.nylx,0) as nylx,IFNULL(b.bz,'') as bz,IFNULL(c.jsy,'') as ldgh ,"
-		+ " IFNULL(c.xlname,c.linename) as xlname  from "
-		+ " (select * from bsth_c_cwjy where  gsdm='"+gsdm+"' and fgsdm='"+fgsdm+"') a "
-		+ " left join (select * from bsth_c_ylxxb where yyrq='"+rq+"' and gsdm='"+gsdm+"' and jylx=1) b"
-		+ " on a.nbbm=b.nbbm LEFT JOIN (select u.nbbm,u.jsy,v.linename,v.xlname,v.xlbm from(select a.nbbm,GROUP_CONCAT(a.jsy) as jsy "
-		+ " from (select nbbm,jsy from bsth_c_ylb x where x.rq='"+rq+"' "
-		+ " and x.ssgsdm='"+gsdm+"' and x.fgsdm='"+fgsdm+"' group by nbbm,jsy ) a  group by a.nbbm) u"
-		+ " LEFT JOIN(select o.nbbm,GROUP_CONCAT(o.xlbm) xlbm ,GROUP_CONCAT(o.linename) as xlname,"
-		+ " GROUP_CONCAT(p.`name`)  as linename from (select nbbm,xlbm,linename from bsth_c_ylb "
-		+ " where rq='"+rq+"' and ssgsdm='"+gsdm+"' and fgsdm='"+fgsdm+"' group by nbbm,xlbm,linename) o "
-		+ " LEFT JOIN bsth_c_line p on o.xlbm=p.line_code group by o.nbbm ) v on u.nbbm=v.nbbm) c "
-		+ " on a.nbbm=c.nbbm where 1=1 ";
-		if(!nbbm.equals("")){
-			sql +=" and a.nbbm like '%"+nbbm+"%'";
-		}
-		if(!line.equals("")){
-			sql += " and c.xlbm ='"+line+"'";
-		}
-		if(type){
-			sql +=" and c.xlbm is not null";
-		}
-		sql +=" order by xlname desc";
-		List<Ylxxb> yList= jdbcTemplate.query(sql,
-				 new RowMapper<Ylxxb>(){
-			 @Override
-			 public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 Ylxxb t=new Ylxxb();
-				 t.setId(rs.getInt("id"));
-				 t.setGsdm(rs.getString("gsdm"));
-				 t.setFgsdm(rs.getString("fgsdm"));
-				 t.setNbbm(rs.getString("nbbm"));
-				 t.setJyggh(rs.getString("jyggh"));
-				 t.setJsy(rs.getString("jsy"));
-				 t.setJzl(rs.getDouble("jzl"));
-				 t.setStationid(rs.getString("stationid"));
-				 t.setNylx(rs.getInt("nylx"));
-				 t.setYj(rs.getDouble("yj"));
-				 t.setBz(rs.getString("bz"));
-				 t.setLdgh(rs.getString("ldgh"));
-				 t.setLinename(rs.getString("xlname"));
-				 return t;
-			 }
-		});
-		return yList;
-	}
-	
-	
-	@Override
-	public String importExcel(File file, String gsbm, String gsName) {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		DecimalFormat df = new DecimalFormat("######0.00");
-		List<String> textList = new ArrayList<String>();
-		try {
-			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(file));
-			HSSFWorkbook wb = new HSSFWorkbook(fs);
-			HSSFSheet sheet = wb.getSheetAt(0);
-			// 取得总行数
-			int rowNum = sheet.getLastRowNum() + 1;
-			// 取得总列数
-			int cellNum = sheet.getRow(0).getLastCellNum();
-			HSSFRow row = null;
-			HSSFCell cell = null;
-			for(int i = 2; i < rowNum; i++){
-				row = sheet.getRow(i);
-				if (row == null){
-					continue;
-				}
-				String text = "";
-				for(int j = 0; j < cellNum; j++){
-					cell = row.getCell(j);
-					if(cell == null){
-						text += ",";
-						continue;
-					}
-						text += String.valueOf(cell) + ",";
-				}
-				String[] split = (text+";").split(",");
-				String str = "";
-				for(int j = 0; j < split.length && j < 5; j++){
-					str += split[j];
-				}
-				if(str.trim().length() == 0){
-					continue;
-				}
-				textList.add(text + ";");
-			}
-			for(int i = 0; i < textList.size(); i++){
-				String text = textList.get(i);
-				System.out.println(text);
-				String[] split = text.split(",");
-				String rq = split[0].trim();
-				String nbbm = split[1].trim();
-				String jsy = split[2].trim();
-				double jzl = Double.valueOf(split[3].trim().length()!=0?split[3]:"0");
-				String jyz = split[4].trim();
-				String remarks = split[5].trim();
-				if(rq.trim().length() == 0){
-					rq = sdf.format(new Date());
-				}
-				
-				List<Double> jzl_ = repository.import_queryBySame(gsbm, rq, nbbm);
-//				
-				if(jzl_.size() == 0){
-					repository.import_insertData(gsbm, rq, nbbm, jsy, 
-							df.format(jzl), jyz, remarks, sd.format(new Date()));
-				}else{
-					repository.import_UpdateJzl(df.format(jzl), jsy, jyz, remarks, gsbm, rq, nbbm);
-				}
-			}
-			
-			/** 以下为测试导入ylxxb用 */
-//			Date date = new Date();
-//			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//			for(int i = 1; i < rowNum; i++){
-//				row = sheet.getRow(i);
-//				if (row == null){
-//					continue;
-//				}
-//				String text = "";
-//				for(int j = 0; j < cellNum; j++){
-//					cell = row.getCell(j);
-//					if(cell == null){
-//						text += ",";
-//						continue;
-//					}
-//					if(j == 1 && cell.getCellType() == Cell.CELL_TYPE_NUMERIC){
-//						text += dateFormat.format(cell.getDateCellValue()) + ",";
-//					} else if(j == 4 || j == 7){
-//						text += "0,";
-////					} else if(j == 6 && String.valueOf(cell).contains("-")){
-////						String str = String.valueOf(cell);
-////						text += str.split("-")[1] + ",";
-//					} else {
-//						text += String.valueOf(cell) + ",";
-//					}
-//				}
-//				System.out.println(text);
-//				Ylxxb ylxxb = new Ylxxb();
-//				String[] split = text.split(",");
-//				ylxxb.setCreatetime(date);
-//				ylxxb.setYyrq(sdf.parse(split[0].trim()));
-//				ylxxb.setJlrq(dateFormat.parse(split[1]));
-//				ylxxb.setFromgsdm("22");
-//				ylxxb.setNbbm(split[2]);
-//				ylxxb.setJzl(Double.valueOf(split[3]));
-//				ylxxb.setNylx(Integer.valueOf(split[4]));
-//				ylxxb.setStationid(split[5]);
-//				if(split[6].contains("-")){
-//					ylxxb.setJsy(split[6].split("-")[1]);
-//				}
-//				ylxxb.setBz(split[6]);
-//				ylxxb.setJylx(Integer.valueOf(split[7]));
-//				ylxxbRepository.save(ylxxb);
-//			}
-			wb.close();
-			fs.close();
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			return "文件导入失败";
-		} finally {
-			file.delete();
-		}
-		return "文件导入成功";
-	}
-	
-	
+package com.bsth.service.oil.impl;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.transaction.Transactional;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.ss.usermodel.Cell;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
+import com.bsth.entity.oil.Cwjy;
+import com.bsth.entity.oil.Cyl;
+import com.bsth.entity.oil.Ylb;
+import com.bsth.entity.oil.Ylxxb;
+import com.bsth.repository.oil.CwjyRepository;
+import com.bsth.repository.oil.YlxxbRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.oil.CwjyService;
+import com.bsth.util.Arith;
+import com.bsth.util.PageHelper;
+import com.bsth.util.PageObject;
+
+@Service
+public class CwjyServiceImpl extends BaseServiceImpl<Cwjy,Integer> implements CwjyService
+{
+	@Autowired
+	CwjyRepository repository;
+	@Autowired
+	YlxxbRepository ylxxbRepository;
+	
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	/*@SuppressWarnings("unchecked")
+	public PageObject<Ylxxb> Pagequery(Map<String, Object> map) {
+		int page=Integer.parseInt(map.get("page").toString());
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		
+		String rq=map.get("rq").toString();
+		String nbbm="";
+		if(map.get("nbbh")!=null){
+			nbbm=map.get("nbbh").toString();
+		}
+		
+		Object gsdmIn=map.get("gsdm_in");
+		Object fgsdmIn=map.get("fgsdm_in");
+		String addSql="";
+		String  gsdmLike="";
+		String  fgsdmLike="";
+		
+		//选择了公司 
+		if(gsdmIn==null){
+			gsdmLike=map.get("gsdm_like").toString();
+			addSql += " and a.gsdm = '"+gsdmLike+ "' ";
+			
+			//选择了分公司
+			if(fgsdmIn==null){
+				fgsdmLike=map.get("fgsdm_like").toString();;
+				addSql += " and a.fgsdm = '"+fgsdmLike+ "' ";
+			}else{
+				String fgsdmIns[]= fgsdmIn.toString().split(",");
+				addSql +=" and a.fgsdm in (";
+				for(int i=0;i<fgsdmIns.length;i++){
+					addSql +="'"+fgsdmIns[i]+"'";
+					if(i<fgsdmIns.length-1){
+						addSql +=",";
+					}
+				}
+				addSql +=")";
+			}
+		}else{
+			//没有选择公司 （分公司也没有选择）
+			String gsdmIns[]=gsdmIn.toString().split(",");
+			addSql += " and a.gsdm in (";
+			for(int i=0;i<gsdmIns.length;i++){
+				addSql +="'" +gsdmIns[i]+"'";
+				if(i<gsdmIns.length-1){
+					addSql+=",";
+				}
+			}
+			addSql +=")";
+			String fgsdmIns[]= fgsdmIn.toString().split(",");
+			addSql +=" and a.fgsdm in (";
+			for(int i=0;i<fgsdmIns.length;i++){
+				addSql +="'"+fgsdmIns[i]+"'";
+				if(i<fgsdmIns.length-1){
+					addSql +=",";
+				}
+			}
+			addSql +=")";
+			
+			
+		}
+		String countSql="SELECT ifnull(count(*),0) as countTs FROM  bsth_c_cwjy  a "+ 
+				   " left  join ( select * from bsth_c_ylxxb b where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1) b " +
+				  " on a.nbbm=b.nbbm left join (select nbbm,group_concat(jsy) as jsy  "
+				  + "from bsth_c_ylb where  to_days(rq)= to_days('"+rq+"' ) group by nbbm "+
+				   " ) c on a.nbbm=c.nbbm  where  a.nbbm like '%"+nbbm+"%' " +addSql ;
+		int listsize=jdbcTemplate.queryForObject(countSql, Integer.class);
+		// TODO Auto-generated method stub
+		String sql="SELECT a.gsdm as gsdm,a.fgsdm as fgsdm,a.nbbm as nbbm,b.jsy as jsy,b.jzl as jzl ,b.stationid as stationid,"
+				+ "b.nylx as nylx,b.yj as yj,b.bz as bz,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
+				   " left  join ( select * from bsth_c_ylxxb b where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1) b " +
+				  " on a.nbbm=b.nbbm left join (select nbbm,group_concat(jsy) as jsy  "
+				  + "from bsth_c_ylb where  to_days(rq)= to_days('"+rq+"' ) group by nbbm "+
+				   " ) c on a.nbbm=c.nbbm  where  a.nbbm like '%"+nbbm+"%' " +addSql+ "  limit "+page*10+","+10;
+		
+		
+		List<Ylxxb> yList= jdbcTemplate.query(sql,
+				 new RowMapper<Ylxxb>(){
+			 @Override
+			 public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Ylxxb t=new Ylxxb();
+				 t.setGsdm(rs.getString("gsdm"));
+				 t.setFgsdm(rs.getString("fgsdm"));
+				 t.setNbbm(rs.getString("nbbm"));
+				 t.setJsy(rs.getString("jsy"));
+				 t.setJzl(rs.getDouble("jzl"));
+				 t.setStationid(rs.getString("stationid"));
+				 t.setNylx(rs.getInt("nylx"));
+				 t.setYj(rs.getDouble("yj"));
+				 t.setBz(rs.getString("bz"));
+				 t.setLdgh(rs.getString("ldgh"));
+				 return t;
+			 }
+		});
+		List<Object[]> list=repository.obtainCwjycl(rq,nbbm);
+		for (int i = 0; i < list.size(); i++) {
+			Ylxxb y=new Ylxxb();
+			y.setGsdm(list.get(i)[0]==null?"":list.get(i)[0].toString());
+			y.setNbbm(list.get(i)[1]==null?"":list.get(i)[1].toString());
+			y.setJsy(list.get(i)[2]==null?"":list.get(i)[2].toString());
+			y.setJzl(list.get(i)[3]==null?0.0:Double.parseDouble(list.get(i)[3].toString()));
+			y.setStationid(list.get(i)[4]==null?"":list.get(i)[4].toString());
+			y.setNylx(list.get(i)[5]==null?0:Integer.parseInt(list.get(i)[5].toString()));
+			y.setYj(list.get(i)[6]==null?0.0:Double.parseDouble(list.get(i)[6].toString()));
+			y.setBz(list.get(i)[7]==null?"":list.get(i)[7].toString());
+			y.setLdgh(list.get(i)[8]==null?"":list.get(i)[8].toString());
+			try {
+				y.setYyrq(sdf.parse(rq));
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			yList.add(y);
+		}
+		PageHelper pageHelper = new PageHelper(listsize, map);
+		pageHelper.getMap();
+		PageObject<Ylxxb> pageObject=pageHelper.getPageObject();
+		pageObject.setDataList(yList);
+		return pageObject;
+	}*/
+
+	@Override
+	public Ylxxb bynbbm(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		// TODO Auto-generated method stub
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		String rq = map.get("rq").toString();
+		String nbbm = "";
+		if (map.get("nbbm") != null) {
+			nbbm = map.get("nbbm").toString();
+		}
+		List<Object[]> list = repository.obtainCwjycl(rq, nbbm);
+		Ylxxb y = new Ylxxb();
+		if (list.size() > 0) {
+			y.setGsdm(list.get(0)[0] == null ? "" : list.get(0)[0].toString());
+			y.setNbbm(list.get(0)[1] == null ? "" : list.get(0)[1].toString());
+			y.setJsy(list.get(0)[2] == null ? "" : list.get(0)[2].toString());
+			y.setJzl(list.get(0)[3] == null ? 0.0 : Double.parseDouble(list.get(0)[3].toString()));
+			y.setStationid(list.get(0)[4] == null ? "" : list.get(0)[4].toString());
+			y.setNylx(list.get(0)[5] == null ? 0 : Integer.parseInt(list.get(0)[5].toString()));
+			y.setYj(list.get(0)[6] == null ? 0.0 : Double.parseDouble(list.get(0)[6].toString()));
+			y.setBz(list.get(0)[7] == null ? "" : list.get(0)[7].toString());
+			y.setLdgh(list.get(0)[8] == null ? "" : list.get(0)[8].toString());
+			try {
+				y.setYyrq(sdf.parse(rq));
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		return y;
+	}
+
+	@Transactional 
+	@Override
+	public Map<String, Object> savejzl(Map<String, Object> maps) throws Exception {
+		// TODO Auto-generated method stub
+		Map<String, Object> map=new HashMap<String,Object>();
+		try {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//			String rq = sdf.format(t.getYyrq());
+//			String nbbm=t.getNbbm();
+//			List<Ylxxb> yList=ylxxbRepository.obtainYlxx2(rq,nbbm);
+//			if(yList.size()>0){
+//				t.setId(yList.get(0).getId());
+//				ylxxbRepository.save(t);
+//			}else{
+//				ylxxbRepository.save(t);
+//			}
+			String gsbm=maps.get("gsbm").toString();
+			String fgsbm=maps.get("fgsbm").toString();
+			String rq=maps.get("rq").toString();
+			Date date=sdf.parse(rq);
+			String json =StringEscapeUtils.unescapeHtml4(maps.get("ylbList").toString());
+			JSONArray jsonArray=JSONArray.parseArray(json);
+			JSONObject jsonObject;
+			// 获取车辆存油信息
+			for (int i = 0; i < jsonArray.size(); i++) {
+				jsonObject=jsonArray.getJSONObject(i);
+				Integer id =jsonObject.getInteger("id");
+				String jsy=jsonObject.getString("jsy");
+				double jzl=jsonObject.getDoubleValue("jzl");
+				String stationid=jsonObject.getString("stationid");
+				String nbbm=jsonObject.getString("nbbm");
+				int nylx=jsonObject.getIntValue("nylx");
+				String jyggh=jsonObject.getString("jyggh");
+				String bz=jsonObject.getString("bz");
+				Ylxxb y;
+				if(id>0){
+					y=ylxxbRepository.findById(id).get();
+					y.setJsy(jsy);
+					y.setJzl(jzl);
+					y.setStationid(stationid);
+					y.setJyggh(jyggh);
+					y.setBz(bz);
+					y.setCreatetime(new Date());
+					y.setYyrq(date);
+					ylxxbRepository.save(y);
+				}else{
+					if(jsy!="" && jzl>0){
+						y=new Ylxxb();
+						y.setGsdm(gsbm);
+						y.setJsy(jsy);
+						y.setNbbm(nbbm);
+						y.setJzl(jzl);
+						y.setStationid(stationid);
+						y.setJyggh(jyggh);
+						y.setBz(bz);
+						y.setCreatetime(new Date());
+						y.setYyrq(date);
+						y.setJylx(1);
+						y.setNylx(0);
+						ylxxbRepository.save(y);
+					}
+				}
+			}
+			map.put("status", ResponseCode.SUCCESS);
+			
+		} catch (Exception e) {
+			map.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e;
+			// TODO: handle exception
+		}
+		return map;
+	}
+
+	
+	
+	@Override
+	public List<Ylxxb> Pagequery(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		String rq=map.get("rq").toString();
+		String nbbm=map.get("nbbh").toString();
+		String gsdm=map.get("gsdm_like").toString();
+		
+		String fgsdm=map.get("fgsdm_like").toString();
+		String line =map.get("line_like").toString().trim();
+		/*String sql="SELECT a.gsdm as gsdm,a.fgsdm as fgsdm,a.nbbm as nbbm,"
+				+ "b.jyggh as jyggh,b.jzl as jzl ,b.stationid as stationid,b.jsy as jsy,"
+				+ "b.nylx as nylx,b.yj as yj,b.bz as bz,b.id as id ,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
+				   " left  join ("
+				   + " select * from bsth_c_ylxxb b "
+				   + "where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1  "
+				   		+ " and gsdm = '"+gsdm+"') b " +
+				  " on a.nbbm=b.nbbm "
+				  + "left join (select nbbm,group_concat(jsy) as jsy  "
+				  + "from bsth_c_ylb where  to_days(rq)= to_days('"+rq+"' ) "
+				  		+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"'  group by nbbm "+
+				   " ) c on a.nbbm=c.nbbm  "
+				   + "where  a.nbbm like '%"+nbbm+"%' and a.gsdm='"+gsdm+"' and a.fgsdm ='"+fgsdm+"'"
+				   		+ " order by a.nbbm";*/
+		String sql= " select * from bsth_c_ylxxb b "
+				   + "where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1  "
+				   		+ " and gsdm = '"+gsdm+"'";
+		
+		List<Ylxxb> yList= jdbcTemplate.query(sql,
+				 new RowMapper<Ylxxb>(){
+			 @Override
+			 public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Ylxxb t=new Ylxxb();
+				 t.setId(rs.getInt("id"));
+				 t.setGsdm(rs.getString("gsdm"));
+				 t.setFgsdm(rs.getString("fgsdm"));
+				 t.setNbbm(rs.getString("nbbm"));
+				 t.setJyggh(rs.getString("jyggh"));
+				 t.setJsy(rs.getString("jsy"));
+				 t.setJzl(rs.getDouble("jzl"));
+				 t.setStationid(rs.getString("stationid"));
+				 t.setNylx(rs.getInt("nylx"));
+				 t.setYj(rs.getDouble("yj"));
+				 t.setBz(rs.getString("bz"));
+				 return t;
+			 }
+		});
+		List<Cwjy> cwList=null;
+		if(line.equals("")){
+			cwList = repository.selectAll(nbbm, gsdm, fgsdm);
+		}else{
+			cwList = repository.selectAll_s(nbbm, gsdm, fgsdm, line);
+		}
+				
+		String sql_ylb="SELECT nbbm,group_concat(jsy) AS jsy FROM bsth_c_ylb WHERE "
+				+ " rq = '"+rq+"' AND ssgsdm = '"+gsdm+"' AND "
+				+ " fgsdm = '"+fgsdm+"' GROUP BY nbbm";
+		
+		List<Map<String, String>> ylbList= jdbcTemplate.query(sql_ylb,
+				 new RowMapper<Map<String, String>>(){
+			 @Override
+			 public Map<String, String>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Map<String, String> maps =new HashMap<String, String>();
+				 maps.put("nbbm", rs.getString("nbbm"));
+				 maps.put("ldgh", rs.getString("jsy"));
+				 return maps;
+			 }
+		});
+		
+		List<Ylxxb> ylxxbList= new ArrayList<Ylxxb>();
+		Ylxxb y=null;
+		for (int i = 0; i < cwList.size(); i++) {
+			Cwjy cwjy=cwList.get(i);
+			y=new Ylxxb();
+			y.setNylx(0);
+			y.setId(0);
+			y.setJzl(0.0);
+			y.setGsdm(cwjy.getGsdm());
+			y.setFgsdm(cwjy.getFgsdm());
+			y.setNbbm(cwjy.getNbbm());
+			y.setLinename(cwjy.getLinename());
+			for (int j = 0; j < yList.size(); j++) {
+				Ylxxb ylxxb=yList.get(j);
+				if(y.getNbbm().equals(ylxxb.getNbbm())){
+					y.setId(ylxxb.getId());
+					y.setJyggh(ylxxb.getJyggh());
+				    y.setJsy(ylxxb.getJsy());
+				    y.setJzl(ylxxb.getJzl());
+				    y.setStationid(ylxxb.getStationid());
+				    y.setNylx(ylxxb.getNylx());
+				    y.setYj(ylxxb.getYj());
+				    y.setBz(ylxxb.getBz());
+				    break;
+				}
+			}
+			for (int j = 0; j < ylbList.size(); j++) {
+				Map<String, String> m=ylbList.get(j);
+				if(m.get("nbbm").toString().equals(cwjy.getNbbm())){
+					y.setLdgh(m.get("ldgh").toString());
+					break;
+				}
+				
+			}
+			
+			ylxxbList.add(y);
+			
+		}
+		
+		return ylxxbList;
+	}
+
+	@Override
+	public int checkNbbm(Cwjy t) {
+		// TODO Auto-generated method stub
+		String sql="select count(*) from bsth_c_cwjy where nbbm ='"+t.getNbbm()+"'"
+				+ " and gsdm ='"+t.getFgsdm()+"' and fgsdm ='"+t.getFgsdm()+"'";
+		int cs=jdbcTemplate.queryForObject(sql, Integer.class);
+		
+		return cs;
+	}
+
+	@Override
+	public List<Ylxxb> cwjyList(Map<String, Object> map) {
+		String rq=map.get("rq").toString();
+		String nbbm=map.get("nbbh").toString();
+		String gsdm=map.get("gsdm_like").toString();
+		
+		String fgsdm=map.get("fgsdm_like").toString();
+		String line =map.get("line_like").toString().trim();
+		boolean type=false;
+		if(map.get("type")!=null){
+			type=true;
+		}
+		String sql="select a.nbbm,a.gsdm,a.fgsdm,IFNULL(b.id,0) as id,IFNULL(b.jzl,0) as jzl,"
+		+ " IFNULL(b.jyggh,0) as jyggh,IFNULL(b.jsy,0) as jsy,IFNULL(b.stationid,0) as stationid ,"
+		+ " IFNULL(b.yj,0) as yj,IFNULL(b.nylx,0) as nylx,IFNULL(b.bz,'') as bz,IFNULL(c.jsy,'') as ldgh ,"
+		+ " IFNULL(c.xlname,c.linename) as xlname  from "
+		+ " (select * from bsth_c_cwjy where  gsdm='"+gsdm+"' and fgsdm='"+fgsdm+"') a "
+		+ " left join (select * from bsth_c_ylxxb where yyrq='"+rq+"' and gsdm='"+gsdm+"' and jylx=1) b"
+		+ " on a.nbbm=b.nbbm LEFT JOIN (select u.nbbm,u.jsy,v.linename,v.xlname,v.xlbm from(select a.nbbm,GROUP_CONCAT(a.jsy) as jsy "
+		+ " from (select nbbm,jsy from bsth_c_ylb x where x.rq='"+rq+"' "
+		+ " and x.ssgsdm='"+gsdm+"' and x.fgsdm='"+fgsdm+"' group by nbbm,jsy ) a  group by a.nbbm) u"
+		+ " LEFT JOIN(select o.nbbm,GROUP_CONCAT(o.xlbm) xlbm ,GROUP_CONCAT(o.linename) as xlname,"
+		+ " GROUP_CONCAT(p.`name`)  as linename from (select nbbm,xlbm,linename from bsth_c_ylb "
+		+ " where rq='"+rq+"' and ssgsdm='"+gsdm+"' and fgsdm='"+fgsdm+"' group by nbbm,xlbm,linename) o "
+		+ " LEFT JOIN bsth_c_line p on o.xlbm=p.line_code group by o.nbbm ) v on u.nbbm=v.nbbm) c "
+		+ " on a.nbbm=c.nbbm where 1=1 ";
+		if(!nbbm.equals("")){
+			sql +=" and a.nbbm like '%"+nbbm+"%'";
+		}
+		if(!line.equals("")){
+			sql += " and c.xlbm ='"+line+"'";
+		}
+		if(type){
+			sql +=" and c.xlbm is not null";
+		}
+		sql +=" order by xlname desc";
+		List<Ylxxb> yList= jdbcTemplate.query(sql,
+				 new RowMapper<Ylxxb>(){
+			 @Override
+			 public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Ylxxb t=new Ylxxb();
+				 t.setId(rs.getInt("id"));
+				 t.setGsdm(rs.getString("gsdm"));
+				 t.setFgsdm(rs.getString("fgsdm"));
+				 t.setNbbm(rs.getString("nbbm"));
+				 t.setJyggh(rs.getString("jyggh"));
+				 t.setJsy(rs.getString("jsy"));
+				 t.setJzl(rs.getDouble("jzl"));
+				 t.setStationid(rs.getString("stationid"));
+				 t.setNylx(rs.getInt("nylx"));
+				 t.setYj(rs.getDouble("yj"));
+				 t.setBz(rs.getString("bz"));
+				 t.setLdgh(rs.getString("ldgh"));
+				 t.setLinename(rs.getString("xlname"));
+				 return t;
+			 }
+		});
+		return yList;
+	}
+	
+	
+	@Override
+	public String importExcel(File file, String gsbm, String gsName) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		DecimalFormat df = new DecimalFormat("######0.00");
+		List<String> textList = new ArrayList<String>();
+		try {
+			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(file));
+			HSSFWorkbook wb = new HSSFWorkbook(fs);
+			HSSFSheet sheet = wb.getSheetAt(0);
+			// 取得总行数
+			int rowNum = sheet.getLastRowNum() + 1;
+			// 取得总列数
+			int cellNum = sheet.getRow(0).getLastCellNum();
+			HSSFRow row = null;
+			HSSFCell cell = null;
+			for(int i = 2; i < rowNum; i++){
+				row = sheet.getRow(i);
+				if (row == null){
+					continue;
+				}
+				String text = "";
+				for(int j = 0; j < cellNum; j++){
+					cell = row.getCell(j);
+					if(cell == null){
+						text += ",";
+						continue;
+					}
+						text += String.valueOf(cell) + ",";
+				}
+				String[] split = (text+";").split(",");
+				String str = "";
+				for(int j = 0; j < split.length && j < 5; j++){
+					str += split[j];
+				}
+				if(str.trim().length() == 0){
+					continue;
+				}
+				textList.add(text + ";");
+			}
+			for(int i = 0; i < textList.size(); i++){
+				String text = textList.get(i);
+				System.out.println(text);
+				String[] split = text.split(",");
+				String rq = split[0].trim();
+				String nbbm = split[1].trim();
+				String jsy = split[2].trim();
+				double jzl = Double.valueOf(split[3].trim().length()!=0?split[3]:"0");
+				String jyz = split[4].trim();
+				String remarks = split[5].trim();
+				if(rq.trim().length() == 0){
+					rq = sdf.format(new Date());
+				}
+				System.out.println(jsy);
+				if(jsy != null && jsy.length() > 0 && !(jsy.equals(jsy.replaceAll("\\p{P}", "")))){
+					return "场外加油：驾驶员工号错误，请检查是否导入错误excel";
+				}
+				
+				List<Double> jzl_ = repository.import_queryBySame(gsbm, rq, nbbm);
+//				
+				if(jzl_.size() == 0){
+					repository.import_insertData(gsbm, rq, nbbm, jsy, 
+							df.format(jzl), jyz, remarks, sd.format(new Date()));
+				}else{
+					repository.import_UpdateJzl(df.format(jzl), jsy, jyz, remarks, gsbm, rq, nbbm);
+				}
+			}
+			
+			/** 以下为测试导入ylxxb用 */
+//			Date date = new Date();
+//			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//			for(int i = 1; i < rowNum; i++){
+//				row = sheet.getRow(i);
+//				if (row == null){
+//					continue;
+//				}
+//				String text = "";
+//				for(int j = 0; j < cellNum; j++){
+//					cell = row.getCell(j);
+//					if(cell == null){
+//						text += ",";
+//						continue;
+//					}
+//					if(j == 1 && cell.getCellType() == Cell.CELL_TYPE_NUMERIC){
+//						text += dateFormat.format(cell.getDateCellValue()) + ",";
+//					} else if(j == 4 || j == 7){
+//						text += "0,";
+////					} else if(j == 6 && String.valueOf(cell).contains("-")){
+////						String str = String.valueOf(cell);
+////						text += str.split("-")[1] + ",";
+//					} else {
+//						text += String.valueOf(cell) + ",";
+//					}
+//				}
+//				System.out.println(text);
+//				Ylxxb ylxxb = new Ylxxb();
+//				String[] split = text.split(",");
+//				ylxxb.setCreatetime(date);
+//				ylxxb.setYyrq(sdf.parse(split[0].trim()));
+//				ylxxb.setJlrq(dateFormat.parse(split[1]));
+//				ylxxb.setFromgsdm("22");
+//				ylxxb.setNbbm(split[2]);
+//				ylxxb.setJzl(Double.valueOf(split[3]));
+//				ylxxb.setNylx(Integer.valueOf(split[4]));
+//				ylxxb.setStationid(split[5]);
+//				if(split[6].contains("-")){
+//					ylxxb.setJsy(split[6].split("-")[1]);
+//				}
+//				ylxxb.setBz(split[6]);
+//				ylxxb.setJylx(Integer.valueOf(split[7]));
+//				ylxxbRepository.save(ylxxb);
+//			}
+			wb.close();
+			fs.close();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return "文件导入失败";
+		} finally {
+			file.delete();
+		}
+		return "文件导入成功";
+	}
+	
+	
 }
 \ No newline at end of file
-package com.bsth.service.oil.impl;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.transaction.Transactional;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.common.ResponseCode;
-import com.bsth.data.BasicData;
-import com.bsth.entity.Cars;
-import com.bsth.entity.Line;
-import com.bsth.entity.mcy_forms.Daily;
-import com.bsth.entity.oil.Cyl;
-import com.bsth.entity.oil.Dlb;
-import com.bsth.entity.oil.Nylog;
-import com.bsth.entity.oil.Ylb;
-import com.bsth.entity.oil.Ylxxb;
-import com.bsth.entity.search.CustomerSpecs;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.repository.CarsRepository;
-import com.bsth.repository.LineRepository;
-import com.bsth.repository.oil.CylRepository;
-import com.bsth.repository.oil.DlbRepository;
-import com.bsth.repository.oil.NylogRepository;
-import com.bsth.repository.oil.YlbRepository;
-import com.bsth.repository.oil.YlxxbRepository;
-import com.bsth.security.util.SecurityUtils;
-import com.bsth.service.impl.BaseServiceImpl;
-import com.bsth.service.oil.DlbService;
-import com.bsth.service.oil.YlbService;
-import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import com.bsth.util.Arith;
-import com.bsth.util.BatchSaveUtils;
-import com.bsth.util.ReportUtils;
-import com.github.abel533.echarts.code.Y;
-
-import javassist.bytecode.stackmap.BasicBlock.Catch;
-
-@Service
-public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbService{
-	@Autowired
-	YlbRepository repository;
-	@Autowired
-	NylogRepository nylogRepository;
-	@Autowired
-	YlxxbRepository ylxxbRepository;
-
-	@Autowired
-	DlbService dlbService;
-	
-	@Autowired
-	DlbRepository dlbRepository;
-	
-	@Autowired
-	CylRepository cylRepository;
-	
-	@Autowired
-	CarsRepository carsRepository;
-	
-
-	@Autowired
-	LineRepository lineRepository;
-	
-	@Autowired
-	ScheduleRealInfoService scheduleRealInfoService;
-	
-	@Autowired
-	JdbcTemplate jdbcTemplate;
-	
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-	
-	
-	
-	/**
-	 * 获取进存油信息
-	 * @Transactional 回滚事物
-	 */
-	@Transactional  
-	@Override
-	public String obtainDsq() throws Exception{
-		String result = "failure";
-		try { 
-			List<Ylb> addList = new ArrayList<Ylb>();
-			String type = "";
-			List<Cars> carsList=carsRepository.findCars();
-			 Map<String, Boolean> carsMap=new HashMap<String, Boolean>();
-			 for (int i = 0; i < carsList.size(); i++) {
-				 Cars c=carsList.get(i);
-				 carsMap.put(c.getInsideCode(), c.getSfdc());
-			}
-			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-			Date dNow = new Date();   //当前时间
-			Date dBefore = new Date();
-			Calendar calendar = Calendar.getInstance(); //得到日历
-			calendar.setTime(dNow);//把当前时间赋给日历
-			calendar.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天
-			dBefore = calendar.getTime();   //得到前一天的时间
-			String rq=sdf.format(dBefore);
-			//保留两位小数
-			DecimalFormat df = new DecimalFormat("#.00");
-			// TODO Auto-generated method stub
-			Map<String, Object> newMap=new HashMap<String,Object>();
-			//当天YLB信息
-//			List<Ylb> ylList=repository.obtainYl(rq,"","","","","nbbm");
-			List<Ylb> ylList=this.listOrderBy(rq,"","","","","nbbm");
-			//当天YLXXB信息
-	//		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq);
-			//前一天所有车辆最后进场班次信息
-			List<Ylb> ylListBe=this.listByRqJcsx(rq,"","","","");
-//			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, "", "", "", "");
-			List<Cyl> clyList=cylRepository.obtainCyl("","");
-			//从排班表中计算出行驶的总里程
-			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("", rq, "", "", "", "");
-			
-			for(int x=0;x<listpb.size();x++){
-				boolean sfdc=true;
-				Map<String, Object> map=listpb.get(x);
-				if (carsMap.get(map.get("clZbh").toString())!=null) {
-					 sfdc= carsMap.get(map.get("clZbh").toString());
-				}else{
-					sfdc=true;
-				}
-				if(!sfdc){
-					//判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
-					Ylb t=new Ylb();
-					for(int k=0;k<ylList.size();k++){
-						Ylb t1=ylList.get(k);
-						if(t1.getNbbm().equals(map.get("clZbh").toString())
-								&&t1.getJsy().equals(map.get("jGh").toString())
-								&&t1.getXlbm().equals(map.get("xlBm").toString())
-								&&t1.getLp().equals(map.get("lpName").toString()))
-						{
-							t=t1;
-							type="update";
-						}
-					}
-					
-						//当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
-						if(map.get("seqNumber").toString().equals("1")){
-							boolean fage=true;
-							for (int i = 0; i < ylListBe.size(); i++) {
-								Ylb ylb=ylListBe.get(i);
-								if(map.get("clZbh").toString().equals(ylb.getNbbm())){
-									if(ylb.getJzyl()!=null){
-										if(ylb.getJzyl()>0){
-											t.setCzyl(ylb.getJzyl());
-											fage=false;
-											break;
-										}
-									}
-									
-								}
-							}
-							if(fage){
-								for (int y = 0; y < clyList.size(); y++) {
-									Cyl cyl=clyList.get(y);
-									if(map.get("clZbh").toString().equals(cyl.getNbbm())){
-										if(cyl.getCyl()!=null){
-											t.setCzyl(cyl.getCyl());
-											fage=false;
-											break;
-										}
-									}
-								}
-							}
-							if(fage){
-								t.setCzyl(0.0);
-							}
-						}
-						t.setNbbm(map.get("clZbh").toString());
-						t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
-						t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(map.get("totalKilometers").toString()));
-						t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
-						t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
-						t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
-						t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
-						t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
-						t.setLp(map.get("lpName")==null?"":map.get("lpName").toString());
-						t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
-						t.setJname(map.get("jName").toString());
-						t.setRq(sdf.parse(rq));
-						t.setCreatetime(dNow);
-						if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
-							if(type.equals("update")){
-								repository.save(t);
-							}else{
-								addList.add(t);
-							}
-						}
-				}
-				
-			} 
-			if(addList.size()>0){ 
-				try {
-					new BatchSaveUtils<Ylb>().saveList2(addList, Ylb.class); 
-				} catch (Exception e) {
-					// TODO: handle exception
-					if(e.getMessage().indexOf("PK_YLB_UK")>0){
-						newMap.put("fage", "存在相同数据,数据已经过滤");
-						logger.info("定时器:存在相同数据,数据已经过滤");
-					}
-				}
-			}
-			result = "success";
-		}catch (Exception e) {
-			// TODO Auto-generated catch block
-			throw e;
-		}finally{
-			logger.info("setDDRB:"+result);
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * 获取进存油信息
-	 * @Transactional 回滚事物
-	 */
-	@Transactional  
-	@Override
-	public Map<String, Object> obtain(Map<String, Object> map2) throws Exception{
-		Map<String, Object> newMap = new HashMap<String, Object>();
-		try {
-			Date date=new Date();
-			List<Cars> carsList = carsRepository.findCars();
-			Map<String, Boolean> carsMap = new HashMap<String, Boolean>();
-			for (int i = 0; i < carsList.size(); i++) {
-				Cars c = carsList.get(i);
-				carsMap.put(c.getInsideCode(), c.getSfdc());
-			}
-			String rq = map2.get("rq").toString();
-			String line = "";
-			if (map2.get("xlbm_like") != null) {
-				line = map2.get("xlbm_like").toString().trim();
-			}
-			String gsbm="";
-			if(map2.get("ssgsdm_like")!=null){
-				gsbm=map2.get("ssgsdm_like").toString();
-			}
-			String fgsbm="";
-			if(map2.get("fgsdm_like")!=null){
-				fgsbm=map2.get("fgsdm_like").toString();
-			}
-			String nbbm="";
-			if(map2.get("nbbm_eq")!=null){
-				nbbm=map2.get("nbbm_eq").toString();
-			}
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			// 保留两位小数
-			DecimalFormat df = new DecimalFormat("#.00");
-			// TODO Auto-generated method stub
-			// 当天YLB信息
-			List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
-
-			// 当天YLXXB信息
-			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
-
-			// 前一天所有车辆最后进场班次信息
-			List<Ylb> ylListBe = this.listByRqJcsx(rq, gsbm, fgsbm, "", nbbm);
-			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
-
-			// 从排班表中计算出行驶的总里程
-			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
-			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList("", rq, gsbm, fgsbm, "", nbbm);
-
-			String sxtj=map2.get("sxtj").toString();
-			if(sxtj.equals("0")){
-				listpb=listpbs;
-			}else if (sxtj.equals("5")){
-					List<String> stringList=new ArrayList<String>();
-
-					List<Object[]> objectLists = repository.checkNbmmFgs(rq, gsbm);
-					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm=objectLists.get(i)[0].toString();
-						stringList.add(clbm);
-					}
-					
-					for (int i = 0; i < stringList.size(); i++) {
-						String strNbbm=stringList.get(i);
-						for (int j = 0; j < listpbs.size(); j++) {
-							Map<String, Object> map = listpbs.get(j);
-							String mapNbbm=map.get("clZbh").toString();
-							if(strNbbm.equals(mapNbbm)){
-								listpb.add(map);
-							}
-						}
-					}
-					
-			}else{
-				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, "",nbbm);
-				List<String> stringList=new ArrayList<String>();
-				for (int i = 0; i < objectLists.size(); i++) {
-					String clbm=objectLists.get(i)[0].toString();
-					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
-					//一车一单
-					if(sxtj.equals("1")){
-						if(cs==1){
-							stringList.add(clbm);
-						}
-					}	
-					//一车多单
-					if(sxtj.equals("2")){
-						if(cs>1){
-							stringList.add(clbm);
-						}
-					}
-				}
-				
-				for (int i = 0; i < stringList.size(); i++) {
-					String strNbbm=stringList.get(i);
-					for (int j = 0; j < listpbs.size(); j++) {
-						Map<String, Object> map = listpbs.get(j);
-						String mapNbbm=map.get("clZbh").toString();
-						if(strNbbm.equals(mapNbbm)){
-							listpb.add(map);
-						}
-					}
-				}
-			}
-
-			List<Ylb> addList = new ArrayList<Ylb>();
-			List<Ylb> updateList = new ArrayList<Ylb>();
-			Map<String, Object> ylMap=new HashMap<String, Object>();
-			
-			Map<String, Object> cMap=new HashMap<String, Object>();
-			for (int x = 0; x < listpb.size(); x++) {
-				String type = "add";
-				boolean sfdc = true;
-				Map<String, Object> map = listpb.get(x);
-				if (carsMap.get(map.get("clZbh").toString()) != null) {
-					sfdc = carsMap.get(map.get("clZbh").toString());
-				} else {
-					sfdc = true;
-				}
-				if (!sfdc) {
-					// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
-					Ylb t = new Ylb();
-					for (int k = 0; k < ylList.size(); k++) {
-						Ylb t1 = ylList.get(k);
-						if (t1.getNbbm().equals(map.get("clZbh").toString())
-								&& t1.getJsy().equals(map.get("jGh").toString())
-								&& t1.getXlbm().equals(map.get("xlBm").toString()
-								)) {
-							if(t1.getLp()==null){
-								//同人同车同线路不同路牌的过滤  （考虑到历史数据）
-								if (cMap.get(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString())==null) {
-									t = t1;
-									type = "update";
-									cMap.put(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString(),
-											map.get("clZbh").toString());
-								}
-							}else{
-								if(t1.getLp().equals(map.get("lpName").toString())){
-									t = t1;
-									type = "update";
-								}
-								
-							}
-						}
-					}
-					// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
-					if (map.get("seqNumber").toString().equals("1")) {
-						boolean fage = true;
-						if(line.equals("")){
-							for (int i = 0; i < ylListBe.size(); i++) {
-								Ylb ylb = ylListBe.get(i);
-								if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
-									if(ylb.getJzyl()>0){
-										t.setCzyl(ylb.getJzyl());
-										fage = false;
-										break;
-									}
-									
-								}
-							}
-							if (fage) {
-								for (int y = 0; y < clyList.size(); y++) {
-									Cyl cyl = clyList.get(y);
-									if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
-										if(cyl!=null){
-											if(cyl.getCyl()>=0){
-												t.setCzyl(cyl.getCyl());
-												fage = false;
-												break;
-											}else {
-												if(cyl.getCxrl()!=null){
-													if(cyl.getCxrl()>0){
-														t.setCzyl(cyl.getCxrl());
-														fage = false;
-														break;
-													}
-												}
-											}
-										}
-									}
-								}
-							}
-							if (fage) {
-								t.setCzyl(0.0);
-							}
-						}else{
-							if (line.equals(map.get("xlBm").toString())) {
-								for (int i = 0; i < ylListBe.size(); i++) {
-									Ylb ylb = ylListBe.get(i);
-									if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
-										if(ylb.getJzyl()>0){
-											t.setCzyl(ylb.getJzyl());
-											fage = false;
-											break;
-										}
-										
-									}
-								}
-								if (fage) {
-									for (int y = 0; y < clyList.size(); y++) {
-										Cyl cyl = clyList.get(y);
-										if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
-											if(cyl!=null){
-												if(cyl.getCyl()>=0){
-													t.setCzyl(cyl.getCyl());
-													fage = false;
-													break;
-												}else {
-													if(cyl.getCxrl()!=null){
-														if(cyl.getCxrl()>0){
-															t.setCzyl(cyl.getCxrl());
-															fage = false;
-															break;
-														}
-													}
-												}
-											}
-										}
-									}
-								}
-								if (fage) {
-									t.setCzyl(0.0);
-								}
-							}
-						}
-						
-					}
-					
-					Double jzl = 0.0;
-					//一人一车加注量只匹配一次
-					if(ylMap.get(map.get("clZbh").toString()+"_"+ map.get("jGh").toString())==null){
-						
-						boolean fage2=false;
-						for (int i = 0; i < ylxxList.size(); i++) {
-							Ylxxb ylxxb = ylxxList.get(i);
-							if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
-									&& map.get("jGh").toString().equals(ylxxb.getJsy())
-									&& ylxxb.getJylx()==1) {
-								if(ylxxb.getJzl()>0){
-									fage2=true;
-								}
-								
-							}
-						}
-						//车辆的加注量如果有任工干预，略接口过来 数据
-						if(fage2){
-							// 把当天手工输入的的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断,加油类型为1）
-							for (int j = 0; j < ylxxList.size(); j++) {
-								Ylxxb ylxxb = ylxxList.get(j);
-								if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
-										&& map.get("jGh").toString().equals(ylxxb.getJsy())
-										&& ylxxb.getJylx()==1) {
-									jzl =Arith.add(jzl, ylxxb.getJzl());
-								}
-							}
-							ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
-						}else{
-							// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
-							for (int j = 0; j < ylxxList.size(); j++) {
-								Ylxxb ylxxb = ylxxList.get(j);
-								if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
-										&& map.get("jGh").toString().equals(ylxxb.getJsy())) {
-									jzl =Arith.add(jzl, ylxxb.getJzl());
-								}
-							}
-							ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
-						}
-						
-					}
-					t.setJzl(jzl);
-					t.setNbbm(map.get("clZbh").toString());
-					t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
-					t.setZlc(map.get("totalKilometers") == null ? 0.0
-							: Double.parseDouble(map.get("totalKilometers").toString()));
-					t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
-					t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
-					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
-					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
-					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
-					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
-					t.setRq(sdf.parse(rq));
-					t.setLp(map.get("lpName")==null?"":map.get("lpName").toString());
-					t.setJname(map.get("jName").toString());
-					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
-						 if(type.equals("add")){
-							 t.setCreatetime(date);
-							 addList.add(t); 
-						 }else{
-							 t.setUpdatetime(date);
-						     updateList.add(t); 
-						  }
-					 }
-//					repository.save(t);
-					newMap.put("status", ResponseCode.SUCCESS);
-
-				}
-			}
-			if(addList.size()>0){ 
-				try {
-					new BatchSaveUtils<Ylb>().saveList2(addList, Ylb.class); 
-				} catch (Exception e) {
-					// TODO: handle exception
-					if(e.getMessage().indexOf("PK_YLB_UK")>0){
-						newMap.put("fage", "存在相同数据,数据已经过滤");
-						logger.info("获取:存在相同数据,数据已经过滤");
-					}
-				}
-				
-			}
-			if(updateList.size()>0){
-				for (int i = 0; i < updateList.size(); i++) {
-					repository.save(updateList.get(i));
-				}
-			}
-			SysUser user = SecurityUtils.getCurrentUser();
-			Nylog nylog=new Nylog();
-			nylog.setCreatedate(new Date());
-			nylog.setCzmc("获取加存油");
-			nylog.setNylx("油");
-			nylog.setUserid(user.getUserName());
-			nylog.setUsername(user.getName());
-			nylog.setCxtj(rq+"-"+gsbm+"-"+fgsbm+"-"+line+"-"+nbbm+"-"+sxtj);
-			nylogRepository.save(nylog);
-			newMap.put("status", ResponseCode.SUCCESS);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			newMap.put("status", ResponseCode.ERROR);
-			throw e;
-		}
-
-		return newMap;
-	}
-	
-	
-	/**
-	 * 进场等于出场
-	 */
-	@Transactional  
-	@Override
-	public Map<String, Object> outAndIn(Map<String, Object> map) throws Exception{
-		// TODO Auto-generated method stub
-		String xlbm="";
-		if(map.get("xlbm_like")!=null){
-			xlbm= map.get("xlbm_like").toString().trim();
-		}
-		String gsbm="";
-		if(map.get("ssgsdm_like")!=null){
-			gsbm=map.get("ssgsdm_like").toString();
-		}
-		String fgsbm="";
-		if(map.get("fgsdm_like")!=null){
-			fgsbm=map.get("fgsdm_like").toString();
-		}
-		String rq = map.get("rq").toString();
-		String nbbm="";
-		if(map.get("nbbm_eq")!=null){
-			nbbm=map.get("nbbm_eq").toString();
-		}
-		
-		Map<String, Object> newMap=new HashMap<String,Object>();
-		Map<String, Object> map2=new HashMap<String,Object>();
-		try {
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
-			map.put("rq_eq", sdf.parse(rq));
-//			List<Cyl> clyList = cylRepository.obtainCyl();
-			// 获取车辆存油信息
-			List<Cyl> cylList = cylRepository.obtainCyl(nbbm,gsbm);
-			// 指定日期YLB信息
-			List<Ylb> ylbList =new ArrayList<Ylb>();
-			List<Ylb> ylbLists =new ArrayList<Ylb>();
-			List<Ylb> iterator2=new ArrayList<Ylb>();
-			ylbLists=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
-			iterator2=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
-			// 从排班表中计算出行驶的总里程
-
-			String sxtj=map.get("sxtj").toString();
-			if(sxtj.equals("0")){
-				ylbList=ylbLists;
-			}else{
-				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
-				List<String> stringList=new ArrayList<String>();
-				for (int i = 0; i < objectLists.size(); i++) {
-					String clbm=objectLists.get(i)[0].toString();
-					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
-					//一车一单
-					if(sxtj.equals("1")){
-						if(cs==1){
-							stringList.add(clbm);
-						}
-					}	
-					//一车多单
-					if(sxtj.equals("2")){
-						if(cs>1){
-							stringList.add(clbm);
-						}
-					}
-				}
-				
-				for (int i = 0; i < stringList.size(); i++) {
-					String strNbbm=stringList.get(i);
-					for (int j = 0; j < ylbLists.size(); j++) {
-						Ylb y = ylbLists.get(j);
-						String mapNbbm=y.getNbbm();
-						if(strNbbm.equals(mapNbbm)){
-							ylbList.add(y);
-						}
-					}
-				}
-			}
-			
-			for (int i=0;i<ylbList.size();i++) {
-				Ylb ylb = ylbList.get(i);
-				// 判断是否已经计算过
-				if (newMap.get("nbbm" + ylb.getNbbm()) == null) {
-					String nbbm_eq = ylb.getNbbm();
-					Date rq_eq = ylb.getRq();
-					// 得到一天总的加油和里程（根据车，时间）
-					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",gsbm,fgsbm);
-					// 保存总的加油量
-					Double jzl = 0.0;
-					// 保存总的里程
-					Double zlc = 0.0;
-					//保存总的损耗
-					Double zsh = 0.0;
-					for (int j = 0; j < sumList.size(); j++) {
-						jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
-						zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
-						zsh = Arith.add(zsh, Double.valueOf(sumList.get(j)[2].toString()));
-					}
-//					jzl = Arith.sub(jzl, zsh);
-					// 保留两位小数
-					DecimalFormat df = new DecimalFormat("#.00");
-					Double zyl = 0.0;
-					Double nextJzyl = 0.0;
-					// 保存已经计算过的车辆，相同车辆编号的车不在计算
-					newMap.put("nbbm" + ylb.getNbbm(), ylb.getNbbm());
-
-					// 查询指定车辆，设置进、存、耗油量
-					map.remove("nbbm_eq");
-					map.put("nbbm_eq", ylb.getNbbm());
-					map.put("xlbm_like", ylb.getXlbm());
-//					Iterator<Ylb> iterator2 = repository
-//							.findAll(new CustomerSpecs<Ylb>(map), new Sort(Direction.ASC, "jcsx")).iterator();
-					double czyl=0.0;
-					for (int j = 0; j < iterator2.size(); j++) {
-						Ylb t = iterator2.get(j);
-						if(t.getNbbm().equals(ylb.getNbbm())){
-							if (t.getJcsx() == 1) {
-								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
-//								Double yl = t.getCzyl();
-//								Double jcyl = t.getCzyl();
-								czyl = t.getCzyl();
-								zyl =jzl;
-								Double yh=0.0;
-								if(zlc>0 ){
-									 yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
-								}
-								nextJzyl =Arith.sub( Arith.add(t.getJzl(), t.getCzyl()),yh);
-//								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()), t.getCzyl()),yh);
-								//把进场油量的小数和整数分别取出
-//								int ylxs=(int) nextJzyl; 10.6--11  10.3--10
-								if(zlc>0 && t.getZlc()>0){
-									long l=Math.round(nextJzyl);
-									double ylxs=l*100/100;
-//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
-									t.setYh(yh);
-									t.setJzyl(ylxs);
-									nextJzyl=ylxs;
-								}else{
-									t.setYh(yh);
-									t.setJzyl(nextJzyl);
-								}
-							} else {
-								t.setCzyl(nextJzyl);
-								Double yh=0.0;
-								if(zlc>0){
-									yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
-								}
-								nextJzyl =Arith.sub( Arith.add(t.getJzl(),nextJzyl),yh);
-//								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()),nextJzyl),yh);
-								if(zlc>0 && t.getZlc()>0){
-									long l=0l;
-									double ylxs=0.0;
-									if(j==iterator2.size()-1){
-										ylxs=czyl;
-									}else{
-										if(iterator2.get(j+1).getNbbm().equals(t.getNbbm())){
-											l=Math.round(nextJzyl);
-											ylxs=l*100/100;
-										}else{
-											ylxs=czyl;
-										}
-										
-									}
-									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
-//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-									
-									t.setYh(yh);
-									t.setJzyl(ylxs);
-									nextJzyl=ylxs;
-								}else{
-									t.setYh(yh);
-									t.setJzyl(nextJzyl);
-								}
-							}
-							if(t.getJzyl()<0){
-								t.setJzyl(0.0);
-							}
-							if(t.getCzyl()<0){
-								t.setCzyl(0.0);
-							}
-							if(t.getYh()<0){
-								t.setYh(0.0);
-							}
-							if(t.getSh()<0){
-								t.setSh(0.0);
-							}
-							repository.save(t);
-						}
-						map2.put("status", ResponseCode.SUCCESS);
-					}
-				}
-			}
-			
-			SysUser user = SecurityUtils.getCurrentUser();
-			Nylog nylog=new Nylog();
-			nylog.setCreatedate(new Date());
-			nylog.setCzmc("进场等于出场");
-			nylog.setNylx("油");
-			nylog.setUserid(user.getUserName());
-			nylog.setUsername(user.getName());
-			nylog.setCxtj(rq+"-"+gsbm+"-"+fgsbm+"-"+xlbm+"-"+nbbm+"-"+sxtj);
-			
-			nylogRepository.save(nylog);
-		} catch (Exception e) {
-			map2.put("status", ResponseCode.ERROR);
-			logger.error("save erro.", e);
-			throw e; 
-		}
-		return map2;
-	}
-	
-
-	/**
-	 * 核对，有加注没里程
-	 * @param map
-	 * @return
-	 */
-	@Transactional
-	@Override
-	public Map<String, Object> checkYl(Map<String, Object> map) throws Exception{
-		Map<String, Object> newMap=new HashMap<String,Object>();
-//		String xlbm="";
-//		if(map.get("xlbm_like")!=null){
-//			xlbm=map.get("xlbm_like").toString();
-//		}
-		// TODO Auto-generated method stub
-		
-		List<Cars> carsList = carsRepository.findCars();
-		Map<String, String> carsMap = new HashMap<String, String>();
-		for (int i = 0; i < carsList.size(); i++) {
-			Cars c = carsList.get(i);
-			carsMap.put(c.getInsideCode(), c.getBrancheCompanyCode()==null?"":c.getBrancheCompanyCode());
-		}
-		
-		try{
-			//获取车辆存油信息
-			
-			String rq=map.get("rq").toString();
-			String xlbm="";
-			if(map.get("xlbm_like")!=null){
-				xlbm= map.get("xlbm_like").toString().trim();
-			}
-			String gsbm="";
-			if(map.get("ssgsdm_like")!=null){
-				gsbm=map.get("ssgsdm_like").toString();
-			}
-			String fgsbm="";
-			if(map.get("fgsdm_like")!=null){
-				fgsbm=map.get("fgsdm_like").toString();
-			}
-			String nbbm="";
-			if(map.get("nbbm_eq")!=null){
-				nbbm=map.get("nbbm_eq").toString();
-			}
-//			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
-			List<Ylb> ylListBe=this.listByRqJcsx(rq, gsbm, fgsbm, "", nbbm);
-			List<Ylb> ylbList=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
-//					repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
-//			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
-			String sql="select * from bsth_c_ylxxb where yyrq='"+rq+"' "
-					+ " and gsdm ='"+gsbm+"' and nylx ='0' and nbbm "
-					+ " not in ( select nbbm  from bsth_c_ylb "
-					+ " where  rq='"+rq+"' "
-					+ " and ssgsdm='"+gsbm+"' and fgsdm ='"+fgsbm+"')"
-					+ " and nbbm in (select inside_code from "
-					+ " bsth_c_cars where business_code ='"+gsbm+"' "
-					+ " and branche_company_code='"+fgsbm+"')";
-			
-			List<Ylxxb> ylxxbList=jdbcTemplate.query(sql,  
-			        new RowMapper<Ylxxb>(){  
-	            @Override  
-	            public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-	            	Ylxxb s  = new Ylxxb(); 
-	            	s.setId(rs.getInt("id"));
-	            	s.setYyrq(rs.getDate("yyrq"));
-	            	s.setNbbm(rs.getString("nbbm"));
-	            	s.setGsdm(rs.getString("gsdm"));
-	            	s.setFgsdm(rs.getString("fgsdm"));
-	            	s.setJsy(rs.getString("jsy"));
-	            	s.setJzl(rs.getDouble("jzl"));
-	            	s.setStationid(rs.getString("stationid"));
-	            	s.setNylx(rs.getInt("nylx"));
-	            	s.setJyggh(rs.getString("jyggh"));
-	            	s.setYj(rs.getDouble("yj"));
-//	            	s.setLdgh(rs.getString("ldgh"));
-	            	s.setBz(rs.getString("bz"));
-	                return s;  
-	            }  
-			});  
-			Map<String, Object> m=new HashMap<String,Object>();
-			for (int i = 0; i < ylxxbList.size(); i++) {
-				Boolean fage=false;
-				Ylxxb y1=ylxxbList.get(i);
-				if(m.get(y1.getNbbm())==null){
-					Line line=BasicData.nbbm2LineMap.get(y1.getNbbm());
-					if(null !=line){
-						if(!xlbm.equals("")){
-							if(line.getLineCode().equals(xlbm)){
-								fage=true;
-							}
-						}else{
-							fage=true;
-						}
-					}
-					
-					if(fage){
-						Ylb t=new Ylb();
-						t.setNbbm(y1.getNbbm());
-						t.setRq(y1.getYyrq());
-						t.setJsy(y1.getJsy());
-						t.setJname(BasicData.allPerson.get(y1.getGsdm()+"-"+y1.getJsy()));
-						t.setJzl(y1.getJzl());
-						t.setSsgsdm(y1.getGsdm());
-						String fgsdm="";
-						if(null !=carsMap.get(y1.getNbbm())){
-							fgsdm=carsMap.get(y1.getNbbm());
-						}
-						t.setFgsdm(fgsdm);
-						t.setJcsx(1);
-						if(null !=line){
-							t.setXlbm(line.getLineCode());
-						}else{
-							t.setXlbm("");
-						}
-						t.setJcsx(1);
-						boolean status=true;
-						for (int j = 0; j < ylListBe.size(); j++) {
-							Ylb b=ylListBe.get(j);
-							if(b.getNbbm().equals(y1.getNbbm())){
-								t.setCzyl(b.getJzyl());
-								status=false;
-								break;
-							}
-						}
-						if(status){
-							t.setCzyl(0.0);
-						}
-						t.setJzyl(Arith.add(t.getJzl(), t.getCzyl()));
-						t.setYh(0.0);
-						 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
-							 t.setCreatetime(new Date());
-							 try {
-								 repository.save(t);
-								 m.put(t.getName(), t.getName());
-							} catch (Exception e) {
-								// TODO: handle exception
-								if(e.getMessage().indexOf("PK_YLB_UK")>0){
-									newMap.put("fage", "存在相同数据,数据已经过滤");
-									logger.info("核对有存油没里程：存在相同数据,数据已经过滤");
-								}
-							}
-						}
-					}
-				}
-			}
-			
-			SysUser user = SecurityUtils.getCurrentUser();
-			Nylog nylog=new Nylog();
-			nylog.setCreatedate(new Date());
-			nylog.setCzmc("核对加注量");
-			nylog.setNylx("油");
-			nylog.setUserid(user.getUserName());
-			nylog.setUsername(user.getName());
-			nylog.setCxtj(rq+"-"+gsbm+"-"+fgsbm+"-"+xlbm+"-"+nbbm+"-");
-			nylogRepository.save(nylog);
-			newMap.put("status", ResponseCode.SUCCESS);
-		}catch(Exception e){
-			newMap.put("status", ResponseCode.ERROR);
-			logger.error("save erro.", e);
-			throw e;
-		}
-		
-		return newMap;
-	}
-
-
-	@Override
-	public List<Map<String, Object>> oilListMonth(Map<String, Object> map) {
-		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-				sdfSimple = new SimpleDateFormat("yyyyMMdd");
-		
-		String type=map.get("type").toString();
-		String date=map.get("date").toString().trim();
-		String gsdm=map.get("gsdm").toString();
-		String fgsdm=map.get("fgsdm").toString();
-		String date2=date.substring(0, 8)+"01";
-		String lineStr="";
-		String line =map.get("line").toString().trim();
-		/*if(line !=null && !line.equals("")){
-			lineStr =" and xlbm= '"+ line +"'";
-		}else{
-			lineStr =" and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"' ";
-		}
-		String sql="select a.nbbm,a.rq,a.jzyl from (" +
-				" select x.nbbm,max(x.rq) as rq,max(x.jcsx) as jcsx from "
-				+ "(select nbbm,rq,max(jcsx)  as jcsx from bsth_c_ylb  where rq between  '"
-				+ date2 +"'  and '" + date+"' "+lineStr
-				+ " group by   nbbm,rq)  x group by x.nbbm ) b" 
-				+ "	left join (select nbbm,rq,jzyl,jcsx  FROM   bsth_c_ylb  "
-				+ "	where rq between  '"
-				+ date2 +"'  and '" + date+"' "+lineStr
-				+ ") a "
-				+ "	on a.nbbm =b.nbbm and a.jcsx=b.jcsx and a.rq=b.rq "
-				+ " where a.nbbm is not null order by a.nbbm";
-		
-		// TODO Auto-generated method stub
-		List<Ylb> list =jdbcTemplate.query(sql,  
-			        new RowMapper<Ylb>(){  
-			            @Override  
-			            public Ylb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-		            		Ylb s  = new Ylb(); 
-			            	s.setNbbm(rs.getString("nbbm"));
-			            	s.setRq(rs.getDate("rq"));
-			            	s.setJzyl(rs.getDouble("jzyl"));
-			                return s;  
-			            }  
-					});  */
-		
-		double qtyy=0.0;//其他用油
-		double cdyy=0.0;//车队用油
-		double byyy=0.0;//保养用油
-		double cjxx=0.0;//车间小修
-		double cjgb=0.0;//车间高保
-		double fyyyhj=0.0;//非营运用油合计
-		List<Ylb> listYlb=repository.listByMonthJcsx(date2, date, gsdm, fgsdm, line);
-		
-		Map<String, Object> ms=new HashMap<String,Object>();
-		List<Ylb> list=new ArrayList<Ylb>();
-		for (int i = 0; i < listYlb.size(); i++) {
-			Ylb t=listYlb.get(i);
-			fyyyhj =Arith.add(fyyyhj, t.getSh());
-			if(t.getShyy()==null){
-				qtyy=Arith.add(qtyy, t.getSh());
-			}else{
-				if(t.getShyy().equals("6")){
-					cdyy=Arith.add(cdyy, t.getSh());
-				}else if(t.getShyy().equals("2")){
-					byyy=Arith.add(byyy, t.getSh());
-				}else if(t.getShyy().equals("7")){
-					cjxx=Arith.add(cjxx, t.getSh());
-				}else if(t.getShyy().equals("8")){
-					cjgb=Arith.add(cjgb, t.getSh());
-				}else{
-					qtyy=Arith.add(qtyy, t.getSh());
-				}
-			}
-			if(ms.get(t.getNbbm())==null){
-				ms.put(t.getNbbm(), t.getNbbm());
-				list.add(t);
-			}
-		}
-		
-		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
-		int  size = 0;
-		Map<String, Object> m_ = new HashMap<String, Object>();
-		double ycyhj=0.0;
-		for(Ylb ylb : list){
-			ycyhj=Arith.add(ycyhj, ylb.getJzyl());
-			int x=size%3;
-			if(x==0 && size>0){
-				mapList.add(m_);
-        		m_ = new HashMap<String, Object>();
-        	}
-			size++;
-			m_.put("xh"+x, size);
-			m_.put("nbbm"+x, ylb.getNbbm()!=null?ylb.getNbbm():"");
-			m_.put("rq"+x, ylb.getRq()!=null?sdfMonth.format(ylb.getRq()):"");
-			m_.put("jzyl"+x, ylb.getJzyl()!=null?ylb.getJzyl():"");
-			
-		}
-		 if(m_.get("nbbm0")!=null){
-	        	if(m_.get("nbbm1")==null){
-	        		m_.put("xh1", "");
-	        		m_.put("nbbm1" , "");
-	        		m_.put("rq1" , "");
-	        		m_.put("jzyl1" , "");
-	        	}
-	        	if(m_.get("nbbm2")==null){
-	        		m_.put("xh2", "");
-	        		m_.put("nbbm2" , "");
-	        		m_.put("rq2" , "");
-	        		m_.put("jzyl2" , "");
-	        	}
-	        	mapList.add(m_);
-	        }
-
-		if(type != null && type.equals("export")){
-			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-			Map<String, Object> m = new HashMap<String, Object>();
-			m.put("ycyhj", ycyhj);
-			m.put("qtyy", qtyy);
-			m.put("cdyy", cdyy);
-			m.put("byyy", byyy);
-			m.put("cjxx", cjxx);
-			m.put("cjgb", cjgb);
-			m.put("fyyyhj", fyyyhj);
-			ReportUtils ee = new ReportUtils();
-			try {
-				String lineName = "";
-				if(map.containsKey("lineName"))
-					lineName = map.get("lineName").toString();
-				listI.add(mapList.iterator());
-				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould/oilListMonth.xls",
-						path+"export/" + sdfSimple.format(sdfMonth.parse(date))
-						+ "-" + lineName + "-月存油报表.xls");
-			} catch (Exception e) {
-				// TODO: handle exception
-				e.printStackTrace();
-			}
-		}else{
-			 m_=new HashMap<String,Object>();
-			 m_.put("xh0", "99");
-			 m_.put("nbbm0", "存油合计:"+ycyhj +" 非营运用油： 其他用油:"+qtyy +",车队:"+cdyy+",保养用油:"+byyy
-					 +",车间(小修):"+cjxx+",车间(高保):"+cjgb+",非营运用油合计:"+fyyyhj);
-			 mapList.add(m_);
-		}
-		
-		return mapList;
-	}
-
-	@Override
-	public StringBuffer checkNbmmNum(String rq, String gsbm, String fgsbm, String xlbm,String nbbm,int lx) {
-		StringBuffer stringList =new StringBuffer();
-		List<Object[]> objectList=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
-		for (int i = 0; i < objectList.size(); i++) {
-			String clbm=objectList.get(i)[0].toString()+",";
-			int cs=Integer.parseInt(objectList.get(i)[1].toString());
-			//一车一单
-			if(lx==1){
-				if(cs==1){
-					stringList.append(clbm);
-				}
-			}
-			//一车多单
-			if(lx==2){
-				if(cs>1){
-					stringList.append(clbm);
-				}
-				
-			}
-		}
-		return stringList;
-	}
-	
-	
-
-	@Override
-	public Map<String, Object> sumYlb(Map<String, Object> map) {
-		// TODO Auto-generated method stub
-		List<String> stringList=new ArrayList<String>();
-		String rq=map.get("rq").toString();
-		String gsbm=map.get("ssgsdm_like").toString();
-		String fgsbm=map.get("fgsdm_like").toString();
-		String xlbm=map.get("xlbm_like").toString().trim();
-		String nbbm=map.get("nbbm_eq").toString();
-		String sxtj=map.get("sxtj").toString();
-		String type=map.get("type").toString();
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		List<Object[]> sumYlbList=new ArrayList<Object[]>();
-		try {
-		if(nbbm.trim()!=""){
-			stringList.add(nbbm);
-		}else{
-			if(!sxtj.equals("0")){
-				List<Object[]> objectLists;
-				if(sxtj.equals("3")){
-					//有加油没里程
-					objectLists=repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
-					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm=objectLists.get(i)[0].toString();
-						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
-						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
-						if(jzl>0 && zlc<=0){
-							stringList.add(clbm);
-						}
-						
-					}
-					
-				}else if(sxtj.equals("4")){
-					//有里程没加油
-					objectLists=repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
-					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm=objectLists.get(i)[0].toString();
-						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
-						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
-						if(zlc>0 && jzl<=0){
-							stringList.add(clbm);
-						}
-						
-					}
-				}else{
-					objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
-					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm=objectLists.get(i)[0].toString();
-						int cs=Integer.parseInt(objectLists.get(i)[1].toString());
-						//一车一单
-					
-						if(sxtj.equals("1")){
-							if(cs==1){
-								stringList.add(clbm);
-							}
-						}
-						//一车多单
-						if(sxtj.equals("2")){
-							if(cs>1){
-								stringList.add(clbm);
-							}
-						}
-					}
-				}
-			}
-		}
-		if(sxtj.equals("0")){
-			sumYlbList=repository.sumYlb2(rq, gsbm, fgsbm, xlbm,nbbm);
-		}else{
-			if(stringList.size()>0){
-				
-//				String strings[]=new String[stringList.size()];
-//					for(int i=0;i<stringList.size();i++){
-//					strings[i]=stringList.get(i);
-//				}
-				if (type.equals("1"))
-					sumYlbList=repository.sumYlb(rq, gsbm, fgsbm, xlbm, stringList);
-				else
-					sumYlbList=repository.sumYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
-			}
-//			else{
-//				sumYlbList=repository.sumYlb2(rq, gsbm, fgsbm, xlbm, nbbm);
-//			}
-			
-		}
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		Double jzl=0.0,yh=0.0,sh=0.0; 
-		for (int i = 0; i < sumYlbList.size(); i++) {
-			jzl = Arith.add(jzl, Double.valueOf(sumYlbList.get(i)[0].toString()));
-			yh = Arith.add(yh, Double.valueOf(sumYlbList.get(i)[1].toString()));
-			sh = Arith.add(sh, Double.valueOf(sumYlbList.get(i)[2].toString()));
-		}
-		
-		Map<String, Object> sumMap=new HashMap<String,Object>();
-		sumMap.put("jzl", jzl);
-		sumMap.put("yh", yh);
-		sumMap.put("sh", sh);
-		
-//		String sql="select sum(jzl),sum(yh),sum(sh) from bsth_c_ylb "
-//				+ " where to_days('"+map.get("rq").toString()+"')=to_days(rq)  "
-//				+ " and ssgsdm like '%"+map.get("ssgsdm_like").toString()+"%' "
-//				+ " and fgsdm like '%"+map.get("fgsdm_like").toString()+"%' "
-//				+ " and xlbm like '%"+map.get("xlbm_like").toString()+ "%'"
-//				+ " and nbbm like '%"+map.get("nbbm_eq").toString()+"% '";
-//		if(map.get("nbbm_in")!=null){
-////			sql +=" and nbbm in ("
-//		}
-		return sumMap;
-	}
-
-	
-	
-	@Override
-	public List<Ylb> listYlb(Map<String, Object> map) {
-		// TODO Auto-generated method stub
-		List<Ylb> listYlb = new ArrayList<Ylb>();
-		try {
-			List<String> stringList = new ArrayList<String>();
-			String rq = map.get("rq").toString();
-			String gsbm = map.get("ssgsdm_like").toString();
-			String fgsbm = map.get("fgsdm_like").toString();
-			String xlbm = map.get("xlbm_like").toString().trim();
-			String nbbm = map.get("nbbm_eq").toString();
-			String sxtj = map.get("sxtj").toString();
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-			String type = map.get("type").toString();
-			if (nbbm.trim() != "") {
-				stringList.add(nbbm);
-				List<Object[]> objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
-				if (objectLists.size() > 0) {
-					int cs = Integer.parseInt(objectLists.get(0)[1].toString());
-					if (sxtj.equals("1")) {
-						if (cs == 1) {
-							if (type.equals("1"))
-								listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
-							else
-								listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
-
-						}
-					} else if (sxtj.equals("2")) {
-						if (cs > 1) {
-							if (type.equals("1"))
-								listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
-							else
-								listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
-						}
-					} else {
-						if (type.equals("1"))
-							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
-						else
-							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
-					}
-				}
-
-			} else {
-				// 全部
-				if (sxtj.equals("0")) {
-					List<Object[]> objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
-					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm = objectLists.get(i)[0].toString();
-						stringList.add(clbm);
-					}
-					if (stringList.size() > 0) {
-						if (type.equals("1"))
-							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
-						else
-							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
-					}
-				}else if(sxtj.equals("5")){
-					List<Object[]> objectLists = repository.checkNbmmFgs(rq, gsbm);
-					for (int i = 0; i < objectLists.size(); i++) {
-						String clbm =objectLists.get(i)[0].toString();
-						stringList.add(clbm);
-					}
-					
-					if (stringList.size() > 0) {
-						if (type.equals("1"))
-							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
-						else
-							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
-					}
-				} else {
-					List<Object[]> objectLists;
-					if (sxtj.equals("3")) {
-						// 有加油没里程
-						objectLists = repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
-						for (int i = 0; i < objectLists.size(); i++) {
-							String clbm = objectLists.get(i)[0].toString();
-							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
-							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
-							if (jzl > 0 && zlc <= 0) {
-								stringList.add(clbm);
-							}
-
-						}
-
-					} else if (sxtj.equals("4")) {
-						// 有里程没加油
-						objectLists = repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
-						for (int i = 0; i < objectLists.size(); i++) {
-							String clbm = objectLists.get(i)[0].toString();
-							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
-							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
-							if (zlc > 0 && jzl <= 0) {
-								stringList.add(clbm);
-							}
-
-						}
-					} else {
-						objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
-						for (int i = 0; i < objectLists.size(); i++) {
-							String clbm = objectLists.get(i)[0].toString();
-							int cs = Integer.parseInt(objectLists.get(i)[1].toString());
-							// 一车一单
-							if (sxtj.equals("1")) {
-								if (cs == 1) {
-									stringList.add(clbm);
-								}
-							}
-							// 一车多单
-							if (sxtj.equals("2")) {
-								if (cs > 1) {
-									stringList.add(clbm);
-								}
-							}
-						}
-					}
-
-					if (stringList.size() > 0) {
-						if (type.equals("1"))
-							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
-						else
-							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
-					}
-				}
-			}
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return listYlb;
-	}
-	
-	@Transactional  
-	@Override
-	public Map<String, Object> saveYlbList(Map<String, Object> map) throws Exception {
-		// TODO Auto-generated method stub
-		Map<String, Object> newMap=new HashMap<String,Object>();
-		try{
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-		String json =StringEscapeUtils.unescapeHtml4(map.get("ylbList").toString());
-		JSONArray jsonArray=JSONArray.parseArray(json);
-		JSONObject jsonObject;
-		// 获取车辆存油信息
-		List<Cyl> cylList = cylRepository.obtainCyl("","");
-		for (int i = 0; i < jsonArray.size(); i++) {
-//			Ylb t=new Ylb();
-			jsonObject=jsonArray.getJSONObject(i);
-			double czyl = jsonObject.getDoubleValue("czyl");
-			double jzl =jsonObject.getDoubleValue("jzl");
-			double jzyl =jsonObject.getDoubleValue("jzyl");
-			double sh  =jsonObject.getDoubleValue("sh");
-			String shyy =jsonObject.getString("shyy");
-			double ns = jsonObject.getDoubleValue("ns");
-			String rylx =jsonObject.getString("rylx");
-			int yhlx =jsonObject.getIntValue("yhlx");
-			Integer id =jsonObject.getInteger("id");
-			String nbbm =jsonObject.getString("nbbm");
-			String rq=jsonObject.getString("rq");
-			double yh = Arith.sub(Arith.add(czyl, jzl),jzyl);
-			if(yh<0){
-				yh=0.0;
-			}
-			repository.ylbUpdate(id, czyl, jzyl, yh, sh, shyy, ns, rylx,yhlx);
-		}
-//		List<Map<String, Object>> list=(List<Map<String, Object>>) map.get("ylbList");
-		SysUser user = SecurityUtils.getCurrentUser();
-		Nylog nylog=new Nylog();
-		nylog.setCreatedate(new Date());
-		nylog.setCzmc("保存全部");
-		nylog.setNylx("油");
-		nylog.setUserid(user.getUserName());
-		nylog.setUsername(user.getName());
-		nylog.setCxtj("");
-		nylogRepository.save(nylog);
-		newMap.put("status", ResponseCode.SUCCESS);
-		}catch(Exception e){
-			newMap.put("status", ResponseCode.ERROR);
-			logger.error("save erro.", e);
-			throw e;
-		}
-		return newMap;
-	}
-	
-	/**
-	 * 拆分
-	 */
-	@Transactional  
-	@Override
-	public Map<String, Object> sort(Map<String, Object> map) throws Exception{
-		// TODO Auto-generated method stub
-		Map<String, Object> newMap = new HashMap<String, Object>();
-		SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
-		
-		try {
-			List<Cyl> cylList = cylRepository.findAll(new CustomerSpecs<Cyl>(newMap));
-			String json =StringEscapeUtils.unescapeHtml4(map.get("ylbList").toString());
-			String fgsbm="999";
-			if(map.get("fgsbm")!=null){
-				fgsbm=map.get("fgsbm").toString();
-			}
-			JSONArray jsonArray=JSONArray.parseArray(json);
-			JSONObject jsonObject;
-			for (int x = 0; x < jsonArray.size(); x++) {
-				jsonObject=jsonArray.getJSONObject(x);
-				Double yl =jsonObject.getDoubleValue("jzyl");
-				Double sh  =jsonObject.getDoubleValue("sh");
-				String shyy =jsonObject.getString("shyy");
-				Double ns = jsonObject.getDoubleValue("ns");
-				String rylx =jsonObject.getString("rylx");
-				Integer id =jsonObject.getInteger("id");
-				Ylb ylb = repository.findById(id).get();
-				String nbbm_eq = ylb.getNbbm();
-				Date rq_eq = ylb.getRq();
-				// 得到一天总的加油和里程（根据车，时间）
-				List<Object[]>  sumList=new ArrayList<Object[]>();
-				if(fgsbm.equals(""))
-					sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",ylb.getSsgsdm(),fgsbm);
-				else
-					sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",ylb.getSsgsdm(),ylb.getFgsdm());
-
-				// 保存总的加油量
-				Double jzl = 0.0;
-				// 保存总的里程
-				Double zlc = 0.0;
-				//保存总的损耗
-				Double zsh = 0.0;
-				for (int j = 0; j < sumList.size(); j++) {
-					jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
-					zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
-					zsh = Arith.add(zsh, Double.valueOf(sumList.get(j)[2].toString()));
-				}
-//				jzl = Arith.sub(jzl, zsh);
-				//新的 损耗不等于 旧的损耗 总损耗从新算
-				/*if(Arith.sub(ylb.getSh(),sh )!=0){
-					zsh =Arith.add(Arith.sub(zsh, ylb.getSh()), sh);
-					jzl =Arith.sub(jzl, zsh);
-				}else{
-					jzl =Arith.sub(jzl, zsh);
-				}*/
-				map.put("nbbm_eq", nbbm_eq);
-				map.put("rq_eq", rq_eq);
-				List<Ylb> iterator2=null;
-				if(fgsbm.equals(""))
-					iterator2=this.listOrderBy(sdf.format(rq_eq),ylb.getSsgsdm(),fgsbm,"",
-							ylb.getNbbm(),"jcsx");
-				else
-					iterator2=this.listOrderBy(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
-							ylb.getNbbm(),"jcsx");
-					
-//						repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
-//						ylb.getNbbm(),"jcsx");
-				DecimalFormat df = new DecimalFormat("#.00");
-				Double zyl = 0.0;
-				Double nextJzyl = 0.0;
-				// 车的，进，出油量及耗油
-				double czyl=0.0;
-				for (int i = 0; i < iterator2.size(); i++) {
-					Ylb t = iterator2.get(i);
-					if (t.getJcsx() == 1) {
-						if(t.getId()==id){
-							t.setSh(sh);
-							t.setShyy(shyy);
-						}
-						czyl=t.getCzyl();
-						Double jcyl = t.getCzyl();
-						zyl = Arith.sub(Arith.add(jcyl, jzl), yl);
-						Double yh = 0.0;
-						if (zlc > 0 && t.getZlc() > 0) {
-							yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
-						}
-						nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), yh);
-//						nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), Arith.add(yh, t.getSh()));
-						if(zlc>0 && t.getZlc() > 0){
-							long l=Math.round(nextJzyl);
-							double ylxs=l*100/100;
-//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-							yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
-							t.setYh(yh);
-							t.setJzyl(ylxs);
-							nextJzyl=ylxs;
-						}else{
-							t.setYh(yh);
-							t.setJzyl(nextJzyl);
-						}
-					} else {
-						if(t.getId()==id){
-							t.setSh(sh);
-							t.setShyy(shyy);
-						}
-							t.setCzyl(nextJzyl);
-							Double yh =0.0;
-							if (t.getZlc() >= 0) {
-								yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
-							}
-//							nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), Arith.add(yh, t.getSh()));
-							nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), yh);
-							if(zlc>0 && t.getZlc() >0){
-								long l=0l;
-								double ylxs=0.0;
-								if(i==iterator2.size()-1){
-									ylxs=yl;
-								}else{
-									l=Math.round(nextJzyl);
-									ylxs=l*100/100;
-								}
-								yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
-								t.setYh(yh);
-								t.setJzyl(ylxs);
-								nextJzyl=ylxs;
-							}else{
-								t.setYh(yh);
-								t.setJzyl(nextJzyl);
-							}
-					}
-					if(t.getJzyl()<0){
-						t.setJzyl(0.0);
-					}
-					if(t.getCzyl()<0){
-						t.setCzyl(0.0);
-					}
-					if(t.getYh()<0){
-						t.setYh(0.0);
-					}
-					if(t.getSh()<0){
-						t.setSh(0.0);
-					}
-					repository.save(t);
-				}
-				newMap.put("status", ResponseCode.SUCCESS);
-			}
-			
-			SysUser user = SecurityUtils.getCurrentUser();
-			Nylog nylog=new Nylog();
-			nylog.setCreatedate(new Date());
-			nylog.setCzmc("拆分");
-			nylog.setNylx("油");
-			nylog.setUserid(user.getUserName());
-			nylog.setUsername(user.getName());
-			nylog.setCxtj("");
-			nylogRepository.save(nylog);
-		} catch (Exception e) {
-			newMap.put("status", ResponseCode.ERROR);
-			logger.error("save erro.", e);
-			throw e; 
-		}
-		return newMap;
-	}
-
-	
-	@Override
-	public String checkJsy(Map<String, Object> map) {
-		// TODO Auto-generated method stub
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-		String rq=map.get("date").toString();
-		String nbbm=map.get("nbbm").toString();
-		String jsy =map.get("jsy").toString();
-		String xlbm=map.get("xlbm").toString();
-		List<Ylb> list= repository.checkYlb(rq, nbbm, jsy,xlbm,"nbbm");
-		String type="1";
-		if(list.size()>0){
-			type="0";
-		}
-		return type;
-	}
-	
-	@Override
-	public String checkDate(Map<String, Object> map) {
-		// TODO Auto-generated method stub
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-		String rq=map.get("rq").toString();
-		String gsbm=map.get("ssgsdm_like").toString();
-		String type="1";
-		if(gsbm.equals("26")){
-			Date date=new Date();
-			try {
-				long day2=date.getTime();
-				long day1=sdf.parse(rq).getTime();
-				long days = (day2 - day1) / (24*3600*1000);  
-			    if(days>3){
-			    	type="2";
-			    }
-			} catch (ParseException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return type;
-	}
-	
-	
-
-	@Override
-	public Map<String, Object> saveYlb(Ylb t) {
-		Map<String, Object> map = new HashMap<>();
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-		String rq=sdf.format(t.getRq());
-		String gsdm=t.getSsgsdm();
-		String fgsdm=t.getFgsdm();
-		String xlbm=t.getXlbm();
-		String jhsj=t.getJhsj();
-		String jsy=t.getJsy();
-		String nbbm=t.getNbbm();
-		t.setCreatetime(new Date());
-		String[] jhsjStr = jhsj.split(":");
-		long fcsjL= Long.parseLong(jhsjStr[0])*60+Long.parseLong(jhsjStr[1]);
-		List<Ylb> list=this.listOrderBy(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
-//				repository.obtainYl(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
-		int jcsx=1;
-		if(list.size()>0){
-			for (int i = 0; i < list.size(); i++) {
-				Ylb y=list.get(i);
-				String[] fcsjStr = y.getJhsj().split(":");
-				long fcsj=Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
-				if(fcsjL>fcsj){
-					jcsx=jcsx+y.getJcsx();
-				}else{
-					y.setJcsx(y.getJcsx()+1);
-					repository.save(y);
-				}
-			}
-			
-		}
-		t.setJcsx(jcsx);
-		repository.save(t);
-		
-		SysUser user = SecurityUtils.getCurrentUser();
-		Nylog nylog=new Nylog();
-		nylog.setCreatedate(new Date());
-		nylog.setCzmc("手动添加");
-		nylog.setNylx("油");
-		nylog.setUserid(user.getUserName());
-		nylog.setUsername(user.getName());
-		nylog.setCxtj("");
-		nylogRepository.save(nylog);
-		map.put("status", ResponseCode.SUCCESS);
-        map.put("t", t);
-		return map;
-	}
-	@Transactional  
-	@Override
-	public Map<String, Object> deleteIds(Map<String, Object> map) throws Exception{
-		// TODO Auto-generated method stub
-		Map<String, Object> maps = new HashMap<>();
-		try{
-		String json =StringEscapeUtils.unescapeHtml4(map.get("ids").toString());
-		JSONArray jsonArray=JSONArray.parseArray(json);
-		JSONObject jsonObject;
-		for (int x = 0; x < jsonArray.size(); x++) {
-			jsonObject=jsonArray.getJSONObject(x);
-			Integer id =jsonObject.getInteger("id");
-			repository.deleteById(id);
-		}
-		
-		SysUser user = SecurityUtils.getCurrentUser();
-		Nylog nylog=new Nylog();
-		nylog.setCreatedate(new Date());
-		nylog.setCzmc("删除");
-		nylog.setNylx("油");
-		nylog.setUserid(user.getUserName());
-		nylog.setUsername(user.getName());
-		nylog.setCxtj("");
-		nylogRepository.save(nylog);
-		maps.put("status", ResponseCode.SUCCESS);
-		} catch (Exception e) {
-			maps.put("status", ResponseCode.ERROR);
-			logger.error("save erro.", e);
-			throw e; 
-		}
-		return maps;
-	}
-	
-	public  List<Ylb> listOrderBy(String rq,String gsdm,
-			String fgsdm,String xlbm,String nbbm,
-			String px) {
-		// TODO Auto-generated method stub
-		String sql="SELECT * FROM bsth_c_ylb  "
-				+ " where rq ='"+rq+"' and ssgsdm like '%"+gsdm+"%' "
-				+ " and fgsdm like '%"+fgsdm+"%'";
-		if(xlbm.equals("")){
-			sql+= " and xlbm like '%"+xlbm+"%' ";
-		}else{
-			sql+= " and xlbm = '"+xlbm+"' ";
-		}
-				
-		sql += "and nbbm like '%"+nbbm+"%' order by "+px+" asc ";
-		
-		List<Ylb> list = jdbcTemplate.query(sql, new RowMapper<Ylb>() {
-			@Override
-			public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
-				Ylb y = new Ylb();
-				y.setId(arg0.getInt("id"));
-				return y;
-			}
-		});
-		List<Ylb> lists=new ArrayList<Ylb>();
-		List<Ylb> ylbLists=repository.obtainYl(rq,gsdm,fgsdm,xlbm,nbbm,"jcsx");
-		for (int i = 0; i < list.size(); i++) {
-			Ylb t=list.get(i);
-			for (int j = 0; j < ylbLists.size(); j++) {
-				Ylb t2=ylbLists.get(j);
-				if(t.getId().intValue()==t2.getId().intValue()){
-					lists.add(t2);
-					break;
-				}
-			}
-		}
-		
-		return lists;
-	}
-
-	@Override
-	public Map<String, Object> updateHistory(Map<String, Object> map) throws Exception {
-		// TODO Auto-generated method stub
-		Map<String, Object> newMap = new HashMap<String, Object>();
-
-		List<Cars> carsList = carsRepository.findCars();
-		Map<String, Boolean> carsMap = new HashMap<String, Boolean>();
-		for (int i = 0; i < carsList.size(); i++) {
-			Cars c = carsList.get(i);
-			carsMap.put(c.getInsideCode(), c.getSfdc());
-		}
-		try{
-			String date = map.get("date").toString();
-			String line = map.get("line").toString();
-			List<Line> listLine=lineRepository.findLineByCode(line);
-			String gsdm ="";
-			String fgsdm ="";
-			if(listLine.size()>0){
-				Line l=listLine.get(0);
-				gsdm=l.getCompany();
-				fgsdm=l.getBrancheCompany();
-			}
-			
-			String nbbmstr="";
-			List<Map<String, Object>> listpbYc=new ArrayList<Map<String, Object>>();//油车数据
-			List<Map<String, Object>> listpbDc=new ArrayList<Map<String, Object>>();//电车数据
-			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("", date,gsdm, fgsdm, "", "");
-			for (int i = 0; i < listpb.size(); i++) {
-				if(listpb.get(i).get("xlBm").toString().equals(line)){
-					nbbmstr +=listpb.get(i).get("clZbh").toString();
-				}
-			}
-			for (int i = 0; i < listpb.size(); i++) {
-				boolean sfdc=true;
-				Map<String, Object> m = listpb.get(i);
-				if (carsMap.get(m.get("clZbh").toString()) != null) {
-					sfdc = carsMap.get(m.get("clZbh").toString());
-				} else {
-					sfdc = true;
-				}
-				if(nbbmstr.indexOf(m.get("clZbh").toString())>-1){
-					if(sfdc){
-						listpbDc.add(m);
-					}else{
-						listpbYc.add(m);
-					}
-				}
-			}
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			//初始存油量
-			List<Cyl> clyList = cylRepository.obtainCyl("",gsdm);
-			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 0,gsdm);
-			//重新统计油车数据开始
-			List<Ylb> ylListBe =repository.listByRqJcsx(date, gsdm, fgsdm, "", "");
-			List<Ylb> ylbList=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm");
-			List<Ylb> ylbList_upd=new ArrayList<Ylb>(); 
-			List<Ylb> ylbList_del=new ArrayList<Ylb>(); 
-			
-			for (int j = 0; j < ylbList.size(); j++) {
-				Ylb t=ylbList.get(j);
-				boolean fage=true;
-				if(StringUtils.isEmpty(t.getLp())){
-					fage=false;
-				}else{
-					for (int i = 0; i < listpbYc.size(); i++) {
-						Map<String, Object> m = listpbYc.get(i);
-						if(t.getNbbm().equals(m.get("clZbh").toString())
-						&&t.getJsy().equals(m.get("jGh").toString())
-						&&t.getXlbm().equals(m.get("xlBm").toString())
-						&&t.getLp().equals(m.get("lpName").toString())){
-							//该条记录不用删除
-							fage =false;
-							ylbList_upd.add(t);
-						}
-					}
-				}
-				if(fage){
-					if(t.getXlbm().equals(line)){
-						ylbList_del.add(t);
-					}
-				}
-				
-			}
-			String nbbmStr="";
-			List<Ylb> list=new ArrayList<Ylb>();
-			/*
-			 * 第一步 修改车辆里程 和加注量
-			 */
-			Map<String, Object> ylMap=new HashMap<String, Object>();
-			for (int x = 0; x < listpbYc.size(); x++) {
-				String type = "add";
-				Map<String, Object> maps = listpbYc.get(x);
-					// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
-					Ylb t = new Ylb();
-					for (int k = 0; k < ylbList_upd.size(); k++) {
-						Ylb t1 = ylbList_upd.get(k);
-						if (t1.getNbbm().equals(maps.get("clZbh").toString())
-								&& t1.getJsy().equals(maps.get("jGh").toString())
-								&& t1.getXlbm().equals(maps.get("xlBm").toString())
-								&& t1.getLp().equals(maps.get("lpName").toString())) {
-									t = t1;
-									type = "update";
-						}
-					}
-					if(type.equals("add")){
-						// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
-						if (maps.get("seqNumber").toString().equals("1")) {
-							boolean fage = true;
-							for (int i = 0; i < ylListBe.size(); i++) {
-								Ylb ylb = ylListBe.get(i);
-								if (maps.get("clZbh").toString().equals(ylb.getNbbm())) {
-									if(ylb.getJzyl()>0){
-										t.setCzyl(ylb.getJzyl());
-										fage = false;
-										break;
-									}
-								}
-							}
-							if (fage) {
-								for (int y = 0; y < clyList.size(); y++) {
-									Cyl cyl = clyList.get(y);
-									if (maps.get("clZbh").toString().equals(cyl.getNbbm())) {
-										if(cyl!=null){
-											if(cyl.getCyl()>=0){
-												t.setCzyl(cyl.getCyl());
-												fage = false;
-												break;
-											}else {
-												if(cyl.getCxrl()!=null){
-													if(cyl.getCxrl()>0){
-														t.setCzyl(cyl.getCxrl());
-														fage = false;
-														break;
-													}
-												}
-											}
-										}
-									}
-								}
-							}
-							if (fage) {
-								t.setCzyl(0.0);
-							}
-						}
-					}
-					
-					Double jzl = 0.0;
-					//一人一车加注量只匹配一次
-					if(ylMap.get(maps.get("clZbh").toString()+"_"+ maps.get("jGh").toString())!=null){
-					}else{
-						boolean fage2=false;
-						for (int i = 0; i < ylxxList.size(); i++) {
-							Ylxxb ylxxb = ylxxList.get(i);
-							if (maps.get("clZbh").toString().equals(ylxxb.getNbbm())
-									&& maps.get("jGh").toString().equals(ylxxb.getJsy())
-									&& ylxxb.getJylx()==1) {
-								if(ylxxb.getJzl()>0){
-									fage2=true;
-								}
-							}
-						}
-						//车辆的加注量如果有任工干预，略接口过来 数据
-						if(fage2){
-							// 把当天手工输入的的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断,加油类型为1）
-							for (int j = 0; j < ylxxList.size(); j++) {
-								Ylxxb ylxxb = ylxxList.get(j);
-								if (maps.get("clZbh").toString().equals(ylxxb.getNbbm())
-										&& maps.get("jGh").toString().equals(ylxxb.getJsy())
-										&& ylxxb.getJylx()==1) {
-									jzl =Arith.add(jzl, ylxxb.getJzl());
-								}
-							}
-							ylMap.put(maps.get("clZbh").toString()+"_"+ maps.get("jGh").toString(),maps.get("xlBm") == null ? "" : maps.get("xlBm").toString());
-						}else{
-							// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
-							for (int j = 0; j < ylxxList.size(); j++) {
-								Ylxxb ylxxb = ylxxList.get(j);
-								if (maps.get("clZbh").toString().equals(ylxxb.getNbbm())
-										&& maps.get("jGh").toString().equals(ylxxb.getJsy())) {
-									jzl =Arith.add(jzl, ylxxb.getJzl());
-								}
-							}
-							ylMap.put(maps.get("clZbh").toString()+"_"+ maps.get("jGh").toString(),maps.get("xlBm") == null ? "" : maps.get("xlBm").toString());
-						}
-					}
-					t.setJzl(jzl);
-					t.setNbbm(maps.get("clZbh").toString());
-					t.setJsy(maps.get("jGh") == null ? "" : maps.get("jGh").toString());
-					t.setJname(maps.get("jName").toString());
-					t.setZlc(maps.get("totalKilometers") == null ? 0.0
-							: Double.parseDouble(maps.get("totalKilometers").toString()));
-					t.setXlbm(maps.get("xlBm") == null ? "" : maps.get("xlBm").toString());
-					t.setJcsx(Integer.parseInt(maps.get("seqNumber").toString()));
-					t.setSsgsdm(maps.get("company") == null ? "" : maps.get("company").toString());
-					t.setFgsdm(maps.get("bCompany") == null ? "" : maps.get("bCompany").toString());
-					t.setJhsj(maps.get("fcsj")==null?"":maps.get("fcsj").toString());
-					t.setRq(sdf.parse(date));
-					t.setLp(maps.get("lpName")==null?"":maps.get("lpName").toString());
-					if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
-						 if(type.equals("add")){
-							 if(nbbmStr.indexOf(t.getNbbm())<0){
-								 nbbmStr +=t.getNbbm()+",";
-							 }
-							 t.setCreatetime(new Date());
-						 }else{
-							 t.setUpdatetime(new Date());
-						 }
-				    }
-					try {
-					    repository.save(t);
-					} catch (Exception e) {
-						// TODO: handle exception
-						if(e.getMessage().indexOf("PK_YLB_UK")>0){
-							newMap.put("fage", "存在相同数据,数据已经过滤");
-							logger.info("油量存在相同数据,数据已经过滤");
-						}
-					}
-				    
-			    }
-				for (int i = 0; i < ylbList_del.size(); i++) {
-					Ylb y=ylbList_del.get(i);
-					if(nbbmStr.indexOf(y.getNbbm())<0){
-						 nbbmStr +=y.getNbbm()+",";
-					 }
-					repository.deleteById(y.getId());
-				}
-				
-				//重新计算删除了的或者新增了的车的车的油耗信息（考虑车辆可能跨线路，从分公司赛选计算）
-				double czyl=0.0;
-				List<Ylb> iterator2=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm,jcsx");
-				String[] nbbms=nbbmStr.split(",");
-				for (int i = 0; i < nbbms.length; i++) {
-					String clzbm=nbbms[i];
-					// 得到一天总的加油和里程（根据车，时间）
-					List<Object[]> sumList = repository.sumLcYl(clzbm, sdf.parse(date),"",gsdm,fgsdm);
-					// 保存总的加油量
-					Double jzl = 0.0;
-					// 保存总的里程
-					Double zlc = 0.0;
-					for (int j = 0; j < sumList.size(); j++) {
-						jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
-						zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
-					}
-					// 保留两位小数
-					DecimalFormat df = new DecimalFormat("#.00");
-					Double zyl = 0.0;
-					Double nextJzyl = 0.0;
-					for (int j = 0; j < iterator2.size(); j++) {
-						Ylb t = iterator2.get(j);
-						if(t.getNbbm().equals(clzbm)){
-							if (t.getJcsx() == 1) {
-								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
-								czyl = t.getCzyl();
-								zyl =jzl;
-								Double yh=0.0;
-								if(zlc>0 ){
-									 yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
-								}
-								nextJzyl =Arith.sub( Arith.add(t.getJzl(), t.getCzyl()),yh);
-								//把进场油量的小数和整数分别取出
-								if(zlc>0 && t.getZlc()>0){
-									long l=Math.round(nextJzyl);
-									double ylxs=l*100/100;
-									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
-									t.setYh(yh);
-									t.setJzyl(ylxs);
-									nextJzyl=ylxs;
-								}else{
-									t.setYh(yh);
-									t.setJzyl(nextJzyl);
-								}
-							} else {
-								t.setCzyl(nextJzyl);
-								Double yh=0.0;
-								if(zlc>0){
-									yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
-								}
-								nextJzyl =Arith.sub( Arith.add(t.getJzl(),nextJzyl),yh);
-								if(zlc>0 && t.getZlc()>0){
-									long l=0l;
-									double ylxs=0.0;
-									if(j==iterator2.size()-1){
-										ylxs=czyl;
-									}else{
-										if(iterator2.get(j+1).getNbbm().equals(t.getNbbm())){
-											l=Math.round(nextJzyl);
-											ylxs=l*100/100;
-										}else{
-											ylxs=czyl;
-										}
-										
-									}
-									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
-									t.setYh(yh);
-									t.setJzyl(ylxs);
-									nextJzyl=ylxs;
-								}else{
-									t.setYh(yh);
-									t.setJzyl(nextJzyl);
-								}
-							}
-							if(t.getJzyl()<0){
-								t.setJzyl(0.0);
-							}
-							if(t.getCzyl()<0){
-								t.setCzyl(0.0);
-							}
-							if(t.getYh()<0){
-								t.setYh(0.0);
-							}
-							if(t.getSh()<0){
-								t.setSh(0.0);
-							}
-							repository.save(t);
-						}
-					}
-				}
-				
-				//重新统计油车数据结束
-				
-				
-				//重新获取电耗数据开始
-				Map<String, List<Dlb>> mapList=dlbService.updeteHistory(listpbDc, date, gsdm, fgsdm, line);
-				List<Dlb> delDlb=mapList.get("delList");
-				for (int i = 0; i < delDlb.size(); i++) {
-					Dlb d=delDlb.get(i);
-					dlbRepository.deleteById(d.getId());
-				}
-				List<Dlb> updDlb=mapList.get("updList");
-				for (int i = 0; i < updDlb.size(); i++) {
-					Dlb d=updDlb.get(i);
-					try {
-						dlbRepository.save(d);
-					} catch (Exception e) {
-						// TODO: handle exception
-						if(e.getMessage().indexOf("PK_DLB_UK")>0){
-							newMap.put("fage", "存在相同数据,数据已经过滤");
-							logger.info("电量存在相同数据,数据已经过滤");
-						}
-					}
-				}
-				//重新获取电耗数据结束
-				
-				SysUser user = SecurityUtils.getCurrentUser();
-				Nylog nylog=new Nylog();
-				nylog.setCreatedate(new Date());
-				nylog.setCzmc("重新统计");
-				nylog.setNylx("油");
-				nylog.setUserid(user.getUserName());
-				nylog.setUsername(user.getName());
-				nylog.setCxtj(line+"-"+ date+"-"+gsdm+"-"+fgsdm);
-				nylogRepository.save(nylog);
-				newMap.put("status", ResponseCode.SUCCESS);
-			}catch(Exception e){
-				// TODO Auto-generated catch block
-				newMap.put("status", ResponseCode.ERROR);
-				throw e;
-			}
-		
-		
-		return newMap;
-	}
-
-	public List<Ylb> listByRqJcsx(String rq,String gsdm,String fgsdm,String xlbm,String nbbm) {
-		List<Ylb> list=repository.listByRqJcsx(rq, gsdm, fgsdm, xlbm, nbbm);
-		Map<String, Object> m=new HashMap<String,Object>();
-		List<Ylb> list_=new ArrayList<Ylb>();
-		for (int i = 0; i < list.size(); i++) {
-			Ylb t=list.get(i);
-			if(m.get(t.getNbbm())==null){
-				m.put(t.getNbbm(), t.getNbbm());
-				list_.add(t);
-			}
-		}
-		return list_;
-	}
-
-	@Override
-	public Map<String, Object> update(Map<String, Object> map) {
-		if(map.get("id")!=null){
-			if(map.get("id").toString().length()>0){
-				Integer id=Integer.parseInt(map.get("id").toString());
-				String jsy=map.get("jsy").toString();
-				Ylb t=repository.findById(id).get();
-				t.setJsy(jsy);
-				repository.save(t);
-				map.put("status", ResponseCode.SUCCESS);
-			}
-		}
-		return map;
-	}
-}
+package com.bsth.service.oil.impl;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.transaction.Transactional;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
+import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
+import com.bsth.entity.mcy_forms.Daily;
+import com.bsth.entity.oil.Cyl;
+import com.bsth.entity.oil.Dlb;
+import com.bsth.entity.oil.Nylog;
+import com.bsth.entity.oil.Ylb;
+import com.bsth.entity.oil.Ylxxb;
+import com.bsth.entity.search.CustomerSpecs;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.CarsRepository;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.oil.CylRepository;
+import com.bsth.repository.oil.DlbRepository;
+import com.bsth.repository.oil.NylogRepository;
+import com.bsth.repository.oil.YlbRepository;
+import com.bsth.repository.oil.YlxxbRepository;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.oil.DlbService;
+import com.bsth.service.oil.YlbService;
+import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.util.Arith;
+import com.bsth.util.BatchSaveUtils;
+import com.bsth.util.ReportUtils;
+import com.github.abel533.echarts.code.Y;
+
+import javassist.bytecode.stackmap.BasicBlock.Catch;
+
+@Service
+public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbService{
+	@Autowired
+	YlbRepository repository;
+	@Autowired
+	NylogRepository nylogRepository;
+	@Autowired
+	YlxxbRepository ylxxbRepository;
+
+	@Autowired
+	DlbService dlbService;
+	
+	@Autowired
+	DlbRepository dlbRepository;
+	
+	@Autowired
+	CylRepository cylRepository;
+	
+	@Autowired
+	CarsRepository carsRepository;
+	
+
+	@Autowired
+	LineRepository lineRepository;
+	
+	@Autowired
+	ScheduleRealInfoService scheduleRealInfoService;
+	
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	private static boolean modify_rights_close = true;
+	
+	/**
+	 * 获取进存油信息
+	 * @Transactional 回滚事物
+	 */
+	@Transactional  
+	@Override
+	public String obtainDsq() throws Exception{
+		String result = "failure";
+		try { 
+			List<Ylb> addList = new ArrayList<Ylb>();
+			String type = "";
+			List<Cars> carsList=carsRepository.findCars();
+			 Map<String, Boolean> carsMap=new HashMap<String, Boolean>();
+			 for (int i = 0; i < carsList.size(); i++) {
+				 Cars c=carsList.get(i);
+				 carsMap.put(c.getInsideCode(), c.getSfdc());
+			}
+			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+			Date dNow = new Date();   //当前时间
+			Date dBefore = new Date();
+			Calendar calendar = Calendar.getInstance(); //得到日历
+			calendar.setTime(dNow);//把当前时间赋给日历
+			calendar.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天
+			dBefore = calendar.getTime();   //得到前一天的时间
+			String rq=sdf.format(dBefore);
+			//保留两位小数
+			DecimalFormat df = new DecimalFormat("#.00");
+			// TODO Auto-generated method stub
+			Map<String, Object> newMap=new HashMap<String,Object>();
+			//当天YLB信息
+//			List<Ylb> ylList=repository.obtainYl(rq,"","","","","nbbm");
+			List<Ylb> ylList=this.listOrderBy(rq,"","","","","nbbm");
+			//当天YLXXB信息
+	//		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq);
+			//前一天所有车辆最后进场班次信息
+			List<Ylb> ylListBe=this.listByRqJcsx(rq,"","","","");
+//			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, "", "", "", "");
+			List<Cyl> clyList=cylRepository.obtainCyl("","");
+			//从排班表中计算出行驶的总里程
+			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("", rq, "", "", "", "");
+			
+			for(int x=0;x<listpb.size();x++){
+				boolean sfdc=true;
+				Map<String, Object> map=listpb.get(x);
+				if (carsMap.get(map.get("clZbh").toString())!=null) {
+					 sfdc= carsMap.get(map.get("clZbh").toString());
+				}else{
+					sfdc=true;
+				}
+				if(!sfdc){
+					//判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+					Ylb t=new Ylb();
+					for(int k=0;k<ylList.size();k++){
+						Ylb t1=ylList.get(k);
+						if(t1.getNbbm().equals(map.get("clZbh").toString())
+								&&t1.getJsy().equals(map.get("jGh").toString())
+								&&t1.getXlbm().equals(map.get("xlBm").toString())
+								&&t1.getLp().equals(map.get("lpName").toString()))
+						{
+							t=t1;
+							type="update";
+						}
+					}
+					
+						//当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+						if(map.get("seqNumber").toString().equals("1")){
+							boolean fage=true;
+							for (int i = 0; i < ylListBe.size(); i++) {
+								Ylb ylb=ylListBe.get(i);
+								if(map.get("clZbh").toString().equals(ylb.getNbbm())){
+									if(ylb.getJzyl()!=null){
+										if(ylb.getJzyl()>=0){
+											t.setCzyl(ylb.getJzyl());
+											fage=false;
+											break;
+										}
+									}
+									
+								}
+							}
+							if(fage){
+								for (int y = 0; y < clyList.size(); y++) {
+									Cyl cyl=clyList.get(y);
+									if(map.get("clZbh").toString().equals(cyl.getNbbm())){
+										if(cyl.getCyl()!=null){
+											t.setCzyl(cyl.getCyl());
+											fage=false;
+											break;
+										}
+									}
+								}
+							}
+							if(fage){
+								t.setCzyl(0.0);
+							}
+						}
+						t.setNbbm(map.get("clZbh").toString());
+						t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
+						t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(map.get("totalKilometers").toString()));
+						t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
+						t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
+						t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
+						t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
+						t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
+						t.setLp(map.get("lpName")==null?"":map.get("lpName").toString());
+						t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
+						t.setJname(map.get("jName").toString());
+						t.setRq(sdf.parse(rq));
+						t.setCreatetime(dNow);
+						if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+							if(type.equals("update")){
+								repository.save(t);
+							}else{
+								addList.add(t);
+							}
+						}
+				}
+				
+			} 
+			if(addList.size()>0){ 
+				try {
+					new BatchSaveUtils<Ylb>().saveList2(addList, Ylb.class); 
+				} catch (Exception e) {
+					// TODO: handle exception
+					if(e.getMessage().indexOf("PK_YLB_UK")>0){
+						newMap.put("fage", "存在相同数据,数据已经过滤");
+						logger.info("定时器:存在相同数据,数据已经过滤");
+					}
+				}
+			}
+			result = "success";
+		}catch (Exception e) {
+			// TODO Auto-generated catch block
+			throw e;
+		}finally{
+			logger.info("setDDRB:"+result);
+		}
+		
+		return result;
+	}
+	
+	/**
+	 * 获取进存油信息
+	 * @Transactional 回滚事物
+	 */
+	@Transactional  
+	@Override
+	public Map<String, Object> obtain(Map<String, Object> map2) throws Exception{
+		Map<String, Object> newMap = new HashMap<String, Object>();
+		try {
+			Date date=new Date();
+			List<Cars> carsList = carsRepository.findCars();
+			Map<String, Boolean> carsMap = new HashMap<String, Boolean>();
+			for (int i = 0; i < carsList.size(); i++) {
+				Cars c = carsList.get(i);
+				carsMap.put(c.getInsideCode(), c.getSfdc());
+			}
+			String rq = map2.get("rq").toString();
+			String line = "";
+			if (map2.get("xlbm_like") != null) {
+				line = map2.get("xlbm_like").toString().trim();
+			}
+			String gsbm="";
+			if(map2.get("ssgsdm_like")!=null){
+				gsbm=map2.get("ssgsdm_like").toString();
+			}
+			String fgsbm="";
+			if(map2.get("fgsdm_like")!=null){
+				fgsbm=map2.get("fgsdm_like").toString();
+			}
+			String nbbm="";
+			if(map2.get("nbbm_eq")!=null){
+				nbbm=map2.get("nbbm_eq").toString();
+			}
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			// 保留两位小数
+			DecimalFormat df = new DecimalFormat("#.00");
+			// TODO Auto-generated method stub
+			// 当天YLB信息
+			List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
+
+			// 当天YLXXB信息
+			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
+
+			// 前一天所有车辆最后进场班次信息
+			List<Ylb> ylListBe = this.listByRqJcsx(rq, gsbm, fgsbm, "", nbbm);
+			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
+
+			// 从排班表中计算出行驶的总里程
+			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
+			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList("", rq, gsbm, fgsbm, "", nbbm);
+
+			String sxtj=map2.get("sxtj").toString();
+			if(sxtj.equals("0")){
+				listpb=listpbs;
+			}else if (sxtj.equals("5")){
+					List<String> stringList=new ArrayList<String>();
+
+					List<Object[]> objectLists = repository.checkNbmmFgs(rq, gsbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						stringList.add(clbm);
+					}
+					
+					for (int i = 0; i < stringList.size(); i++) {
+						String strNbbm=stringList.get(i);
+						for (int j = 0; j < listpbs.size(); j++) {
+							Map<String, Object> map = listpbs.get(j);
+							String mapNbbm=map.get("clZbh").toString();
+							if(strNbbm.equals(mapNbbm)){
+								listpb.add(map);
+							}
+						}
+					}
+					
+			}else{
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, "",nbbm);
+				List<String> stringList=new ArrayList<String>();
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+					//一车一单
+					if(sxtj.equals("1")){
+						if(cs==1){
+							stringList.add(clbm);
+						}
+					}	
+					//一车多单
+					if(sxtj.equals("2")){
+						if(cs>1){
+							stringList.add(clbm);
+						}
+					}
+				}
+				
+				for (int i = 0; i < stringList.size(); i++) {
+					String strNbbm=stringList.get(i);
+					for (int j = 0; j < listpbs.size(); j++) {
+						Map<String, Object> map = listpbs.get(j);
+						String mapNbbm=map.get("clZbh").toString();
+						if(strNbbm.equals(mapNbbm)){
+							listpb.add(map);
+						}
+					}
+				}
+			}
+
+			List<Ylb> addList = new ArrayList<Ylb>();
+			List<Ylb> updateList = new ArrayList<Ylb>();
+			Map<String, Object> ylMap=new HashMap<String, Object>();
+			
+			Map<String, Object> cMap=new HashMap<String, Object>();
+			for (int x = 0; x < listpb.size(); x++) {
+				String type = "add";
+				boolean sfdc = true;
+				Map<String, Object> map = listpb.get(x);
+				if (carsMap.get(map.get("clZbh").toString()) != null) {
+					sfdc = carsMap.get(map.get("clZbh").toString());
+				} else {
+					sfdc = true;
+				}
+				if (!sfdc) {
+					// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+					Ylb t = new Ylb();
+					for (int k = 0; k < ylList.size(); k++) {
+						Ylb t1 = ylList.get(k);
+						if (t1.getNbbm().equals(map.get("clZbh").toString())
+								&& t1.getJsy().equals(map.get("jGh").toString())
+								&& t1.getXlbm().equals(map.get("xlBm").toString()
+								)) {
+							if(t1.getLp()==null){
+								//同人同车同线路不同路牌的过滤  （考虑到历史数据）
+								if (cMap.get(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString())==null) {
+									t = t1;
+									type = "update";
+									cMap.put(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString(),
+											map.get("clZbh").toString());
+								}
+							}else{
+								if(t1.getLp().equals(map.get("lpName").toString())){
+									t = t1;
+									type = "update";
+								}
+								
+							}
+						}
+					}
+					// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+					if (map.get("seqNumber").toString().equals("1")) {
+						boolean fage = true;
+						if(line.equals("")){
+							for (int i = 0; i < ylListBe.size(); i++) {
+								Ylb ylb = ylListBe.get(i);
+								if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
+									if(ylb.getJzyl()>=0){
+										t.setCzyl(ylb.getJzyl());
+										fage = false;
+										break;
+									}
+									
+								}
+							}
+							if (fage) {
+								for (int y = 0; y < clyList.size(); y++) {
+									Cyl cyl = clyList.get(y);
+									if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
+										if(cyl!=null){
+											if(cyl.getCyl()>=0){
+												t.setCzyl(cyl.getCyl());
+												fage = false;
+												break;
+											}else {
+												if(cyl.getCxrl()!=null){
+													if(cyl.getCxrl()>0){
+														t.setCzyl(cyl.getCxrl());
+														fage = false;
+														break;
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+							if (fage) {
+								t.setCzyl(0.0);
+							}
+						}else{
+							if (line.equals(map.get("xlBm").toString())) {
+								for (int i = 0; i < ylListBe.size(); i++) {
+									Ylb ylb = ylListBe.get(i);
+									if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
+										if(ylb.getJzyl()>=0){
+											t.setCzyl(ylb.getJzyl());
+											fage = false;
+											break;
+										}
+										
+									}
+								}
+								if (fage) {
+									for (int y = 0; y < clyList.size(); y++) {
+										Cyl cyl = clyList.get(y);
+										if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
+											if(cyl!=null){
+												if(cyl.getCyl()>=0){
+													t.setCzyl(cyl.getCyl());
+													fage = false;
+													break;
+												}else {
+													if(cyl.getCxrl()!=null){
+														if(cyl.getCxrl()>0){
+															t.setCzyl(cyl.getCxrl());
+															fage = false;
+															break;
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+								if (fage) {
+									t.setCzyl(0.0);
+								}
+							}
+						}
+						
+					}
+					
+					Double jzl = 0.0;
+					//一人一车加注量只匹配一次
+					if(ylMap.get(map.get("clZbh").toString()+"_"+ map.get("jGh").toString())==null){
+						
+						boolean fage2=false;
+						for (int i = 0; i < ylxxList.size(); i++) {
+							Ylxxb ylxxb = ylxxList.get(i);
+							if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
+									&& map.get("jGh").toString().equals(ylxxb.getJsy())
+									&& ylxxb.getJylx()==1) {
+								if(ylxxb.getJzl()>0){
+									fage2=true;
+								}
+								
+							}
+						}
+						//车辆的加注量如果有任工干预，略接口过来 数据
+						if(fage2){
+							// 把当天手工输入的的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断,加油类型为1）
+							for (int j = 0; j < ylxxList.size(); j++) {
+								Ylxxb ylxxb = ylxxList.get(j);
+								if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
+										&& map.get("jGh").toString().equals(ylxxb.getJsy())
+										&& ylxxb.getJylx()==1) {
+									jzl =Arith.add(jzl, ylxxb.getJzl());
+								}
+							}
+							ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+						}else{
+							// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
+							for (int j = 0; j < ylxxList.size(); j++) {
+								Ylxxb ylxxb = ylxxList.get(j);
+								if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
+										&& map.get("jGh").toString().equals(ylxxb.getJsy())) {
+									jzl =Arith.add(jzl, ylxxb.getJzl());
+								}
+							}
+							ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+						}
+						
+					}
+					t.setJzl(jzl);
+					t.setNbbm(map.get("clZbh").toString());
+					t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
+					t.setZlc(map.get("totalKilometers") == null ? 0.0
+							: Double.parseDouble(map.get("totalKilometers").toString()));
+					t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+					t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
+					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
+					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
+					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
+					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
+					t.setRq(sdf.parse(rq));
+					t.setLp(map.get("lpName")==null?"":map.get("lpName").toString());
+					t.setJname(map.get("jName").toString());
+					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+						 if(type.equals("add")){
+							 t.setCreatetime(date);
+							 addList.add(t); 
+						 }else{
+							 t.setUpdatetime(date);
+						     updateList.add(t); 
+						  }
+					 }
+//					repository.save(t);
+					newMap.put("status", ResponseCode.SUCCESS);
+
+				}
+			}
+			if(addList.size()>0){ 
+				try {
+					new BatchSaveUtils<Ylb>().saveList2(addList, Ylb.class); 
+				} catch (Exception e) {
+					// TODO: handle exception
+					if(e.getMessage().indexOf("PK_YLB_UK")>0){
+						newMap.put("fage", "存在相同数据,数据已经过滤");
+						logger.info("获取:存在相同数据,数据已经过滤");
+					}
+				}
+				
+			}
+			if(updateList.size()>0){
+				for (int i = 0; i < updateList.size(); i++) {
+					repository.save(updateList.get(i));
+				}
+			}
+			SysUser user = SecurityUtils.getCurrentUser();
+			Nylog nylog=new Nylog();
+			nylog.setCreatedate(new Date());
+			nylog.setCzmc("获取加存油");
+			nylog.setNylx("油");
+			nylog.setUserid(user.getUserName());
+			nylog.setUsername(user.getName());
+			nylog.setCxtj(rq+"-"+gsbm+"-"+fgsbm+"-"+line+"-"+nbbm+"-"+sxtj);
+			nylogRepository.save(nylog);
+			newMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			newMap.put("status", ResponseCode.ERROR);
+			throw e;
+		}
+
+		return newMap;
+	}
+	
+	
+	/**
+	 * 进场等于出场
+	 */
+	@Transactional  
+	@Override
+	public Map<String, Object> outAndIn(Map<String, Object> map) throws Exception{
+		// TODO Auto-generated method stub
+		String xlbm="";
+		if(map.get("xlbm_like")!=null){
+			xlbm= map.get("xlbm_like").toString().trim();
+		}
+		String gsbm="";
+		if(map.get("ssgsdm_like")!=null){
+			gsbm=map.get("ssgsdm_like").toString();
+		}
+		String fgsbm="";
+		if(map.get("fgsdm_like")!=null){
+			fgsbm=map.get("fgsdm_like").toString();
+		}
+		String rq = map.get("rq").toString();
+		String nbbm="";
+		if(map.get("nbbm_eq")!=null){
+			nbbm=map.get("nbbm_eq").toString();
+		}
+		
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		Map<String, Object> map2=new HashMap<String,Object>();
+		try {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+			map.put("rq_eq", sdf.parse(rq));
+//			List<Cyl> clyList = cylRepository.obtainCyl();
+			// 获取车辆存油信息
+			List<Cyl> cylList = cylRepository.obtainCyl(nbbm,gsbm);
+			// 指定日期YLB信息
+			List<Ylb> ylbList =new ArrayList<Ylb>();
+			List<Ylb> ylbLists =new ArrayList<Ylb>();
+			List<Ylb> iterator2=new ArrayList<Ylb>();
+			ylbLists=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+			iterator2=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
+			// 从排班表中计算出行驶的总里程
+
+			String sxtj=map.get("sxtj").toString();
+			if(sxtj.equals("0")){
+				ylbList=ylbLists;
+			}else{
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+				List<String> stringList=new ArrayList<String>();
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+					//一车一单
+					if(sxtj.equals("1")){
+						if(cs==1){
+							stringList.add(clbm);
+						}
+					}	
+					//一车多单
+					if(sxtj.equals("2")){
+						if(cs>1){
+							stringList.add(clbm);
+						}
+					}
+				}
+				
+				for (int i = 0; i < stringList.size(); i++) {
+					String strNbbm=stringList.get(i);
+					for (int j = 0; j < ylbLists.size(); j++) {
+						Ylb y = ylbLists.get(j);
+						String mapNbbm=y.getNbbm();
+						if(strNbbm.equals(mapNbbm)){
+							ylbList.add(y);
+						}
+					}
+				}
+			}
+			
+			for (int i=0;i<ylbList.size();i++) {
+				Ylb ylb = ylbList.get(i);
+				// 判断是否已经计算过
+				if (newMap.get("nbbm" + ylb.getNbbm()) == null) {
+					String nbbm_eq = ylb.getNbbm();
+					Date rq_eq = ylb.getRq();
+					// 得到一天总的加油和里程（根据车，时间）
+					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",gsbm,fgsbm);
+					// 保存总的加油量
+					Double jzl = 0.0;
+					// 保存总的里程
+					Double zlc = 0.0;
+					//保存总的损耗
+					Double zsh = 0.0;
+					for (int j = 0; j < sumList.size(); j++) {
+						jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
+						zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
+						zsh = Arith.add(zsh, Double.valueOf(sumList.get(j)[2].toString()));
+					}
+//					jzl = Arith.sub(jzl, zsh);
+					// 保留两位小数
+					DecimalFormat df = new DecimalFormat("#.00");
+					Double zyl = 0.0;
+					Double nextJzyl = 0.0;
+					// 保存已经计算过的车辆，相同车辆编号的车不在计算
+					newMap.put("nbbm" + ylb.getNbbm(), ylb.getNbbm());
+
+					// 查询指定车辆，设置进、存、耗油量
+					map.remove("nbbm_eq");
+					map.put("nbbm_eq", ylb.getNbbm());
+					map.put("xlbm_like", ylb.getXlbm());
+//					Iterator<Ylb> iterator2 = repository
+//							.findAll(new CustomerSpecs<Ylb>(map), new Sort(Direction.ASC, "jcsx")).iterator();
+					double czyl=0.0;
+					for (int j = 0; j < iterator2.size(); j++) {
+						Ylb t = iterator2.get(j);
+						if(t.getNbbm().equals(ylb.getNbbm())){
+							if (t.getJcsx() == 1) {
+								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
+//								Double yl = t.getCzyl();
+//								Double jcyl = t.getCzyl();
+								czyl = t.getCzyl();
+								zyl =jzl;
+								Double yh=0.0;
+								if(zlc>0 ){
+									 yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+								}
+								nextJzyl =Arith.sub( Arith.add(t.getJzl(), t.getCzyl()),yh);
+//								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()), t.getCzyl()),yh);
+								//把进场油量的小数和整数分别取出
+//								int ylxs=(int) nextJzyl; 10.6--11  10.3--10
+								if(zlc>0 && t.getZlc()>0){
+									long l=Math.round(nextJzyl);
+									double ylxs=l*100/100;
+//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
+							} else {
+								t.setCzyl(nextJzyl);
+								Double yh=0.0;
+								if(zlc>0){
+									yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+								}
+								nextJzyl =Arith.sub( Arith.add(t.getJzl(),nextJzyl),yh);
+//								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()),nextJzyl),yh);
+								if(zlc>0 && t.getZlc()>0){
+									long l=0l;
+									double ylxs=0.0;
+									if(j==iterator2.size()-1){
+										ylxs=czyl;
+									}else{
+										if(iterator2.get(j+1).getNbbm().equals(t.getNbbm())){
+											l=Math.round(nextJzyl);
+											ylxs=l*100/100;
+										}else{
+											ylxs=czyl;
+										}
+										
+									}
+									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
+//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+									
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
+							}
+							if(t.getJzyl()<0){
+								t.setJzyl(0.0);
+							}
+							if(t.getCzyl()<0){
+								t.setCzyl(0.0);
+							}
+							if(t.getYh()<0){
+								t.setYh(0.0);
+							}
+							if(t.getSh()<0){
+								t.setSh(0.0);
+							}
+							repository.save(t);
+						}
+						map2.put("status", ResponseCode.SUCCESS);
+					}
+				}
+			}
+			
+			SysUser user = SecurityUtils.getCurrentUser();
+			Nylog nylog=new Nylog();
+			nylog.setCreatedate(new Date());
+			nylog.setCzmc("进场等于出场");
+			nylog.setNylx("油");
+			nylog.setUserid(user.getUserName());
+			nylog.setUsername(user.getName());
+			nylog.setCxtj(rq+"-"+gsbm+"-"+fgsbm+"-"+xlbm+"-"+nbbm+"-"+sxtj);
+			
+			nylogRepository.save(nylog);
+		} catch (Exception e) {
+			map2.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e; 
+		}
+		return map2;
+	}
+	
+
+	/**
+	 * 核对，有加注没里程
+	 * @param map
+	 * @return
+	 */
+	@Transactional
+	@Override
+	public Map<String, Object> checkYl(Map<String, Object> map) throws Exception{
+		Map<String, Object> newMap=new HashMap<String,Object>();
+//		String xlbm="";
+//		if(map.get("xlbm_like")!=null){
+//			xlbm=map.get("xlbm_like").toString();
+//		}
+		// TODO Auto-generated method stub
+		
+		List<Cars> carsList = carsRepository.findCars();
+		Map<String, String> carsMap = new HashMap<String, String>();
+		for (int i = 0; i < carsList.size(); i++) {
+			Cars c = carsList.get(i);
+			carsMap.put(c.getInsideCode(), c.getBrancheCompanyCode()==null?"":c.getBrancheCompanyCode());
+		}
+		
+		try{
+			//获取车辆存油信息
+			
+			String rq=map.get("rq").toString();
+			String xlbm="";
+			if(map.get("xlbm_like")!=null){
+				xlbm= map.get("xlbm_like").toString().trim();
+			}
+			String gsbm="";
+			if(map.get("ssgsdm_like")!=null){
+				gsbm=map.get("ssgsdm_like").toString();
+			}
+			String fgsbm="";
+			if(map.get("fgsdm_like")!=null){
+				fgsbm=map.get("fgsdm_like").toString();
+			}
+			String nbbm="";
+			if(map.get("nbbm_eq")!=null){
+				nbbm=map.get("nbbm_eq").toString();
+			}
+//			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
+			List<Ylb> ylListBe=this.listByRqJcsx(rq, gsbm, fgsbm, "", nbbm);
+			List<Ylb> ylbList=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
+//					repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
+//			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
+			String sql="select * from bsth_c_ylxxb where yyrq='"+rq+"' "
+					+ " and gsdm ='"+gsbm+"' and nylx ='0' and nbbm "
+					+ " not in ( select nbbm  from bsth_c_ylb "
+					+ " where  rq='"+rq+"' "
+					+ " and ssgsdm='"+gsbm+"' and fgsdm ='"+fgsbm+"')"
+					+ " and nbbm in (select inside_code from "
+					+ " bsth_c_cars where business_code ='"+gsbm+"' "
+					+ " and branche_company_code='"+fgsbm+"')";
+			
+			List<Ylxxb> ylxxbList=jdbcTemplate.query(sql,  
+			        new RowMapper<Ylxxb>(){  
+	            @Override  
+	            public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+	            	Ylxxb s  = new Ylxxb(); 
+	            	s.setId(rs.getInt("id"));
+	            	s.setYyrq(rs.getDate("yyrq"));
+	            	s.setNbbm(rs.getString("nbbm"));
+	            	s.setGsdm(rs.getString("gsdm"));
+	            	s.setFgsdm(rs.getString("fgsdm"));
+	            	s.setJsy(rs.getString("jsy"));
+	            	s.setJzl(rs.getDouble("jzl"));
+	            	s.setStationid(rs.getString("stationid"));
+	            	s.setNylx(rs.getInt("nylx"));
+	            	s.setJyggh(rs.getString("jyggh"));
+	            	s.setYj(rs.getDouble("yj"));
+//	            	s.setLdgh(rs.getString("ldgh"));
+	            	s.setBz(rs.getString("bz"));
+	                return s;  
+	            }  
+			});  
+			Map<String, Object> m=new HashMap<String,Object>();
+			for (int i = 0; i < ylxxbList.size(); i++) {
+				Boolean fage=false;
+				Ylxxb y1=ylxxbList.get(i);
+				if(m.get(y1.getNbbm())==null){
+					Line line=BasicData.nbbm2LineMap.get(y1.getNbbm());
+					if(null !=line){
+						if(!xlbm.equals("")){
+							if(line.getLineCode().equals(xlbm)){
+								fage=true;
+							}
+						}else{
+							fage=true;
+						}
+					}
+					
+					if(fage){
+						Ylb t=new Ylb();
+						t.setNbbm(y1.getNbbm());
+						t.setRq(y1.getYyrq());
+						t.setJsy(y1.getJsy());
+						t.setJname(BasicData.allPerson.get(y1.getGsdm()+"-"+y1.getJsy()));
+						t.setJzl(y1.getJzl());
+						t.setSsgsdm(y1.getGsdm());
+						String fgsdm="";
+						if(null !=carsMap.get(y1.getNbbm())){
+							fgsdm=carsMap.get(y1.getNbbm());
+						}
+						t.setFgsdm(fgsdm);
+						t.setJcsx(1);
+						if(null !=line){
+							t.setXlbm(line.getLineCode());
+						}else{
+							t.setXlbm("");
+						}
+						t.setJcsx(1);
+						boolean status=true;
+						for (int j = 0; j < ylListBe.size(); j++) {
+							Ylb b=ylListBe.get(j);
+							if(b.getNbbm().equals(y1.getNbbm())){
+								t.setCzyl(b.getJzyl());
+								status=false;
+								break;
+							}
+						}
+						if(status){
+							t.setCzyl(0.0);
+						}
+						t.setJzyl(Arith.add(t.getJzl(), t.getCzyl()));
+						t.setYh(0.0);
+						 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+							 t.setCreatetime(new Date());
+							 try {
+								 repository.save(t);
+								 m.put(t.getName(), t.getName());
+							} catch (Exception e) {
+								// TODO: handle exception
+								if(e.getMessage().indexOf("PK_YLB_UK")>0){
+									newMap.put("fage", "存在相同数据,数据已经过滤");
+									logger.info("核对有存油没里程：存在相同数据,数据已经过滤");
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			SysUser user = SecurityUtils.getCurrentUser();
+			Nylog nylog=new Nylog();
+			nylog.setCreatedate(new Date());
+			nylog.setCzmc("核对加注量");
+			nylog.setNylx("油");
+			nylog.setUserid(user.getUserName());
+			nylog.setUsername(user.getName());
+			nylog.setCxtj(rq+"-"+gsbm+"-"+fgsbm+"-"+xlbm+"-"+nbbm+"-");
+			nylogRepository.save(nylog);
+			newMap.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			newMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e;
+		}
+		
+		return newMap;
+	}
+
+
+	@Override
+	public List<Map<String, Object>> oilListMonth(Map<String, Object> map) {
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		
+		String type=map.get("type").toString();
+		String date=map.get("date").toString().trim();
+		String gsdm=map.get("gsdm").toString();
+		String fgsdm=map.get("fgsdm").toString();
+		String date2=date.substring(0, 8)+"01";
+		String lineStr="";
+		String line =map.get("line").toString().trim();
+		/*if(line !=null && !line.equals("")){
+			lineStr =" and xlbm= '"+ line +"'";
+		}else{
+			lineStr =" and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"' ";
+		}
+		String sql="select a.nbbm,a.rq,a.jzyl from (" +
+				" select x.nbbm,max(x.rq) as rq,max(x.jcsx) as jcsx from "
+				+ "(select nbbm,rq,max(jcsx)  as jcsx from bsth_c_ylb  where rq between  '"
+				+ date2 +"'  and '" + date+"' "+lineStr
+				+ " group by   nbbm,rq)  x group by x.nbbm ) b" 
+				+ "	left join (select nbbm,rq,jzyl,jcsx  FROM   bsth_c_ylb  "
+				+ "	where rq between  '"
+				+ date2 +"'  and '" + date+"' "+lineStr
+				+ ") a "
+				+ "	on a.nbbm =b.nbbm and a.jcsx=b.jcsx and a.rq=b.rq "
+				+ " where a.nbbm is not null order by a.nbbm";
+		
+		// TODO Auto-generated method stub
+		List<Ylb> list =jdbcTemplate.query(sql,  
+			        new RowMapper<Ylb>(){  
+			            @Override  
+			            public Ylb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+		            		Ylb s  = new Ylb(); 
+			            	s.setNbbm(rs.getString("nbbm"));
+			            	s.setRq(rs.getDate("rq"));
+			            	s.setJzyl(rs.getDouble("jzyl"));
+			                return s;  
+			            }  
+					});  */
+		
+		double qtyy=0.0;//其他用油
+		double cdyy=0.0;//车队用油
+		double byyy=0.0;//保养用油
+		double cjxx=0.0;//车间小修
+		double cjgb=0.0;//车间高保
+		double fyyyhj=0.0;//非营运用油合计
+		List<Ylb> listYlb=repository.listByMonthJcsx(date2, date, gsdm, fgsdm, line);
+		
+		Map<String, Object> ms=new HashMap<String,Object>();
+		List<Ylb> list=new ArrayList<Ylb>();
+		for (int i = 0; i < listYlb.size(); i++) {
+			Ylb t=listYlb.get(i);
+			fyyyhj =Arith.add(fyyyhj, t.getSh());
+			if(t.getShyy()==null){
+				qtyy=Arith.add(qtyy, t.getSh());
+			}else{
+				if(t.getShyy().equals("6")){
+					cdyy=Arith.add(cdyy, t.getSh());
+				}else if(t.getShyy().equals("2")){
+					byyy=Arith.add(byyy, t.getSh());
+				}else if(t.getShyy().equals("7")){
+					cjxx=Arith.add(cjxx, t.getSh());
+				}else if(t.getShyy().equals("8")){
+					cjgb=Arith.add(cjgb, t.getSh());
+				}else{
+					qtyy=Arith.add(qtyy, t.getSh());
+				}
+			}
+			if(ms.get(t.getNbbm())==null){
+				ms.put(t.getNbbm(), t.getNbbm());
+				list.add(t);
+			}
+		}
+		
+		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
+		int  size = 0;
+		Map<String, Object> m_ = new HashMap<String, Object>();
+		double ycyhj=0.0;
+		for(Ylb ylb : list){
+			ycyhj=Arith.add(ycyhj, ylb.getJzyl());
+			int x=size%3;
+			if(x==0 && size>0){
+				mapList.add(m_);
+        		m_ = new HashMap<String, Object>();
+        	}
+			size++;
+			m_.put("xh"+x, size);
+			m_.put("nbbm"+x, ylb.getNbbm()!=null?ylb.getNbbm():"");
+			m_.put("rq"+x, ylb.getRq()!=null?sdfMonth.format(ylb.getRq()):"");
+			m_.put("jzyl"+x, ylb.getJzyl()!=null?ylb.getJzyl():"");
+			
+		}
+		 if(m_.get("nbbm0")!=null){
+	        	if(m_.get("nbbm1")==null){
+	        		m_.put("xh1", "");
+	        		m_.put("nbbm1" , "");
+	        		m_.put("rq1" , "");
+	        		m_.put("jzyl1" , "");
+	        	}
+	        	if(m_.get("nbbm2")==null){
+	        		m_.put("xh2", "");
+	        		m_.put("nbbm2" , "");
+	        		m_.put("rq2" , "");
+	        		m_.put("jzyl2" , "");
+	        	}
+	        	mapList.add(m_);
+	        }
+
+		if(type != null && type.equals("export")){
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("ycyhj", ycyhj);
+			m.put("qtyy", qtyy);
+			m.put("cdyy", cdyy);
+			m.put("byyy", byyy);
+			m.put("cjxx", cjxx);
+			m.put("cjgb", cjgb);
+			m.put("fyyyhj", fyyyhj);
+			ReportUtils ee = new ReportUtils();
+			try {
+				String lineName = "";
+				if(map.containsKey("lineName"))
+					lineName = map.get("lineName").toString();
+				listI.add(mapList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/oilListMonth.xls",
+						path+"export/" + sdfSimple.format(sdfMonth.parse(date))
+						+ "-" + lineName + "-月存油报表.xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}else{
+			 m_=new HashMap<String,Object>();
+			 m_.put("xh0", "99");
+			 m_.put("nbbm0", "存油合计:"+ycyhj +" 非营运用油： 其他用油:"+qtyy +",车队:"+cdyy+",保养用油:"+byyy
+					 +",车间(小修):"+cjxx+",车间(高保):"+cjgb+",非营运用油合计:"+fyyyhj);
+			 mapList.add(m_);
+		}
+		
+		return mapList;
+	}
+
+	@Override
+	public StringBuffer checkNbmmNum(String rq, String gsbm, String fgsbm, String xlbm,String nbbm,int lx) {
+		StringBuffer stringList =new StringBuffer();
+		List<Object[]> objectList=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+		for (int i = 0; i < objectList.size(); i++) {
+			String clbm=objectList.get(i)[0].toString()+",";
+			int cs=Integer.parseInt(objectList.get(i)[1].toString());
+			//一车一单
+			if(lx==1){
+				if(cs==1){
+					stringList.append(clbm);
+				}
+			}
+			//一车多单
+			if(lx==2){
+				if(cs>1){
+					stringList.append(clbm);
+				}
+				
+			}
+		}
+		return stringList;
+	}
+	
+	
+
+	@Override
+	public Map<String, Object> sumYlb(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<String> stringList=new ArrayList<String>();
+		String rq=map.get("rq").toString();
+		String gsbm=map.get("ssgsdm_like").toString();
+		String fgsbm=map.get("fgsdm_like").toString();
+		String xlbm=map.get("xlbm_like").toString().trim();
+		String nbbm=map.get("nbbm_eq").toString();
+		String sxtj=map.get("sxtj").toString();
+		String type=map.get("type").toString();
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		List<Object[]> sumYlbList=new ArrayList<Object[]>();
+		try {
+		if(nbbm.trim()!=""){
+			stringList.add(nbbm);
+		}else{
+			if(!sxtj.equals("0")){
+				List<Object[]> objectLists;
+				if(sxtj.equals("3")){
+					//有加油没里程
+					objectLists=repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
+						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
+						if(jzl>0 && zlc<=0){
+							stringList.add(clbm);
+						}
+						
+					}
+					
+				}else if(sxtj.equals("4")){
+					//有里程没加油
+					objectLists=repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
+						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
+						if(zlc>0 && jzl<=0){
+							stringList.add(clbm);
+						}
+						
+					}
+				}else{
+					objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+						//一车一单
+					
+						if(sxtj.equals("1")){
+							if(cs==1){
+								stringList.add(clbm);
+							}
+						}
+						//一车多单
+						if(sxtj.equals("2")){
+							if(cs>1){
+								stringList.add(clbm);
+							}
+						}
+					}
+				}
+			}
+		}
+		if(sxtj.equals("0")){
+			sumYlbList=repository.sumYlb2(rq, gsbm, fgsbm, xlbm,nbbm);
+		}else{
+			if(stringList.size()>0){
+				
+//				String strings[]=new String[stringList.size()];
+//					for(int i=0;i<stringList.size();i++){
+//					strings[i]=stringList.get(i);
+//				}
+				if (type.equals("1"))
+					sumYlbList=repository.sumYlb(rq, gsbm, fgsbm, xlbm, stringList);
+				else
+					sumYlbList=repository.sumYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+			}
+//			else{
+//				sumYlbList=repository.sumYlb2(rq, gsbm, fgsbm, xlbm, nbbm);
+//			}
+			
+		}
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		Double jzl=0.0,yh=0.0,sh=0.0; 
+		for (int i = 0; i < sumYlbList.size(); i++) {
+			jzl = Arith.add(jzl, Double.valueOf(sumYlbList.get(i)[0].toString()));
+			yh = Arith.add(yh, Double.valueOf(sumYlbList.get(i)[1].toString()));
+			sh = Arith.add(sh, Double.valueOf(sumYlbList.get(i)[2].toString()));
+		}
+		
+		Map<String, Object> sumMap=new HashMap<String,Object>();
+		sumMap.put("jzl", jzl);
+		sumMap.put("yh", yh);
+		sumMap.put("sh", sh);
+		
+//		String sql="select sum(jzl),sum(yh),sum(sh) from bsth_c_ylb "
+//				+ " where to_days('"+map.get("rq").toString()+"')=to_days(rq)  "
+//				+ " and ssgsdm like '%"+map.get("ssgsdm_like").toString()+"%' "
+//				+ " and fgsdm like '%"+map.get("fgsdm_like").toString()+"%' "
+//				+ " and xlbm like '%"+map.get("xlbm_like").toString()+ "%'"
+//				+ " and nbbm like '%"+map.get("nbbm_eq").toString()+"% '";
+//		if(map.get("nbbm_in")!=null){
+////			sql +=" and nbbm in ("
+//		}
+		return sumMap;
+	}
+
+	
+	
+	@Override
+	public List<Ylb> listYlb(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<Ylb> listYlb = new ArrayList<Ylb>();
+		try {
+			List<String> stringList = new ArrayList<String>();
+			String rq = map.get("rq").toString();
+			String gsbm = map.get("ssgsdm_like").toString();
+			String fgsbm = map.get("fgsdm_like").toString();
+			String xlbm = map.get("xlbm_like").toString().trim();
+			String nbbm = map.get("nbbm_eq").toString();
+			String sxtj = map.get("sxtj").toString();
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			String type = map.get("type").toString();
+			if (nbbm.trim() != "") {
+				stringList.add(nbbm);
+				List<Object[]> objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
+				if (objectLists.size() > 0) {
+					int cs = Integer.parseInt(objectLists.get(0)[1].toString());
+					if (sxtj.equals("1")) {
+						if (cs == 1) {
+							if (type.equals("1"))
+								listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+							else
+								listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+
+						}
+					} else if (sxtj.equals("2")) {
+						if (cs > 1) {
+							if (type.equals("1"))
+								listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+							else
+								listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+						}
+					} else {
+						if (type.equals("1"))
+							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+					}
+				}
+
+			} else {
+				// 全部
+				if (sxtj.equals("0")) {
+					List<Object[]> objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm = objectLists.get(i)[0].toString();
+						stringList.add(clbm);
+					}
+					if (stringList.size() > 0) {
+						if (type.equals("1"))
+							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+					}
+				}else if(sxtj.equals("5")){
+					List<Object[]> objectLists = repository.checkNbmmFgs(rq, gsbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm =objectLists.get(i)[0].toString();
+						stringList.add(clbm);
+					}
+					
+					if (stringList.size() > 0) {
+						if (type.equals("1"))
+							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+					}
+				} else {
+					List<Object[]> objectLists;
+					if (sxtj.equals("3")) {
+						// 有加油没里程
+						objectLists = repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+							if (jzl > 0 && zlc <= 0) {
+								stringList.add(clbm);
+							}
+
+						}
+
+					} else if (sxtj.equals("4")) {
+						// 有里程没加油
+						objectLists = repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+							if (zlc > 0 && jzl <= 0) {
+								stringList.add(clbm);
+							}
+
+						}
+					} else {
+						objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							int cs = Integer.parseInt(objectLists.get(i)[1].toString());
+							// 一车一单
+							if (sxtj.equals("1")) {
+								if (cs == 1) {
+									stringList.add(clbm);
+								}
+							}
+							// 一车多单
+							if (sxtj.equals("2")) {
+								if (cs > 1) {
+									stringList.add(clbm);
+								}
+							}
+						}
+					}
+
+					if (stringList.size() > 0) {
+						if (type.equals("1"))
+							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+					}
+				}
+			}
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return listYlb;
+	}
+	
+	@Transactional  
+	@Override
+	public Map<String, Object> saveYlbList(Map<String, Object> map) throws Exception {
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		try{
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		String json =StringEscapeUtils.unescapeHtml4(map.get("ylbList").toString());
+		JSONArray jsonArray=JSONArray.parseArray(json);
+		JSONObject jsonObject;
+		// 获取车辆存油信息
+		List<Cyl> cylList = cylRepository.obtainCyl("","");
+		for (int i = 0; i < jsonArray.size(); i++) {
+//			Ylb t=new Ylb();
+			jsonObject=jsonArray.getJSONObject(i);
+			double czyl = jsonObject.getDoubleValue("czyl");
+			double jzl =jsonObject.getDoubleValue("jzl");
+			double jzyl =jsonObject.getDoubleValue("jzyl");
+			double sh  =jsonObject.getDoubleValue("sh");
+			String shyy =jsonObject.getString("shyy");
+			double ns = jsonObject.getDoubleValue("ns");
+			String rylx =jsonObject.getString("rylx");
+			int yhlx =jsonObject.getIntValue("yhlx");
+			Integer id =jsonObject.getInteger("id");
+			String nbbm =jsonObject.getString("nbbm");
+			String rq=jsonObject.getString("rq");
+			double yh = Arith.sub(Arith.add(czyl, jzl),jzyl);
+			if(yh<0){
+				yh=0.0;
+			}
+			repository.ylbUpdate(id, czyl, jzyl, yh, sh, shyy, ns, rylx,yhlx);
+		}
+//		List<Map<String, Object>> list=(List<Map<String, Object>>) map.get("ylbList");
+		SysUser user = SecurityUtils.getCurrentUser();
+		Nylog nylog=new Nylog();
+		nylog.setCreatedate(new Date());
+		nylog.setCzmc("保存全部");
+		nylog.setNylx("油");
+		nylog.setUserid(user.getUserName());
+		nylog.setUsername(user.getName());
+		nylog.setCxtj("");
+		nylogRepository.save(nylog);
+		newMap.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			newMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e;
+		}
+		return newMap;
+	}
+	
+	/**
+	 * 拆分
+	 */
+	@Transactional  
+	@Override
+	public Map<String, Object> sort(Map<String, Object> map) throws Exception{
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap = new HashMap<String, Object>();
+		SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+		
+		try {
+			List<Cyl> cylList = cylRepository.findAll(new CustomerSpecs<Cyl>(newMap));
+			String json =StringEscapeUtils.unescapeHtml4(map.get("ylbList").toString());
+			String fgsbm="999";
+			if(map.get("fgsbm")!=null){
+				fgsbm=map.get("fgsbm").toString();
+			}
+			JSONArray jsonArray=JSONArray.parseArray(json);
+			JSONObject jsonObject;
+			for (int x = 0; x < jsonArray.size(); x++) {
+				jsonObject=jsonArray.getJSONObject(x);
+				Double yl =jsonObject.getDoubleValue("jzyl");
+				Double sh  =jsonObject.getDoubleValue("sh");
+				String shyy =jsonObject.getString("shyy");
+				Double ns = jsonObject.getDoubleValue("ns");
+				String rylx =jsonObject.getString("rylx");
+				Integer id =jsonObject.getInteger("id");
+				Ylb ylb = repository.findById(id).get();
+				String nbbm_eq = ylb.getNbbm();
+				Date rq_eq = ylb.getRq();
+				// 得到一天总的加油和里程（根据车，时间）
+				List<Object[]>  sumList=new ArrayList<Object[]>();
+				if(fgsbm.equals(""))
+					sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",ylb.getSsgsdm(),fgsbm);
+				else
+					sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",ylb.getSsgsdm(),ylb.getFgsdm());
+
+				// 保存总的加油量
+				Double jzl = 0.0;
+				// 保存总的里程
+				Double zlc = 0.0;
+				//保存总的损耗
+				Double zsh = 0.0;
+				for (int j = 0; j < sumList.size(); j++) {
+					jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
+					zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
+					zsh = Arith.add(zsh, Double.valueOf(sumList.get(j)[2].toString()));
+				}
+//				jzl = Arith.sub(jzl, zsh);
+				//新的 损耗不等于 旧的损耗 总损耗从新算
+				/*if(Arith.sub(ylb.getSh(),sh )!=0){
+					zsh =Arith.add(Arith.sub(zsh, ylb.getSh()), sh);
+					jzl =Arith.sub(jzl, zsh);
+				}else{
+					jzl =Arith.sub(jzl, zsh);
+				}*/
+				map.put("nbbm_eq", nbbm_eq);
+				map.put("rq_eq", rq_eq);
+				List<Ylb> iterator2=null;
+				if(fgsbm.equals(""))
+					iterator2=this.listOrderBy(sdf.format(rq_eq),ylb.getSsgsdm(),fgsbm,"",
+							ylb.getNbbm(),"jcsx");
+				else
+					iterator2=this.listOrderBy(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
+							ylb.getNbbm(),"jcsx");
+					
+//						repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
+//						ylb.getNbbm(),"jcsx");
+				DecimalFormat df = new DecimalFormat("#.00");
+				Double zyl = 0.0;
+				Double nextJzyl = 0.0;
+				// 车的，进，出油量及耗油
+				double czyl=0.0;
+				for (int i = 0; i < iterator2.size(); i++) {
+					Ylb t = iterator2.get(i);
+					if (t.getJcsx() == 1) {
+						if(t.getId()==id){
+							t.setSh(sh);
+							t.setShyy(shyy);
+						}
+						czyl=t.getCzyl();
+						Double jcyl = t.getCzyl();
+						zyl = Arith.sub(Arith.add(jcyl, jzl), yl);
+						Double yh = 0.0;
+						if (zlc > 0 && t.getZlc() > 0) {
+							yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+						}
+						nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), yh);
+//						nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), Arith.add(yh, t.getSh()));
+						if(zlc>0 && t.getZlc() > 0){
+							long l=Math.round(nextJzyl);
+							double ylxs=l*100/100;
+//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+							yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
+							t.setYh(yh);
+							t.setJzyl(ylxs);
+							nextJzyl=ylxs;
+						}else{
+							t.setYh(yh);
+							t.setJzyl(nextJzyl);
+						}
+					} else {
+						if(t.getId()==id){
+							t.setSh(sh);
+							t.setShyy(shyy);
+						}
+							t.setCzyl(nextJzyl);
+							Double yh =0.0;
+							if (t.getZlc() >= 0) {
+								yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+							}
+//							nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), Arith.add(yh, t.getSh()));
+							nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), yh);
+							if(zlc>0 && t.getZlc() >0){
+								long l=0l;
+								double ylxs=0.0;
+								if(i==iterator2.size()-1){
+									ylxs=yl;
+								}else{
+									l=Math.round(nextJzyl);
+									ylxs=l*100/100;
+								}
+								yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
+								t.setYh(yh);
+								t.setJzyl(ylxs);
+								nextJzyl=ylxs;
+							}else{
+								t.setYh(yh);
+								t.setJzyl(nextJzyl);
+							}
+					}
+					if(t.getJzyl()<0){
+						t.setJzyl(0.0);
+					}
+					if(t.getCzyl()<0){
+						t.setCzyl(0.0);
+					}
+					if(t.getYh()<0){
+						t.setYh(0.0);
+					}
+					if(t.getSh()<0){
+						t.setSh(0.0);
+					}
+					repository.save(t);
+				}
+				newMap.put("status", ResponseCode.SUCCESS);
+			}
+			
+			SysUser user = SecurityUtils.getCurrentUser();
+			Nylog nylog=new Nylog();
+			nylog.setCreatedate(new Date());
+			nylog.setCzmc("拆分");
+			nylog.setNylx("油");
+			nylog.setUserid(user.getUserName());
+			nylog.setUsername(user.getName());
+			nylog.setCxtj("");
+			nylogRepository.save(nylog);
+		} catch (Exception e) {
+			newMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e; 
+		}
+		return newMap;
+	}
+
+	
+	@Override
+	public String checkJsy(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		String rq=map.get("date").toString();
+		String nbbm=map.get("nbbm").toString();
+		String jsy =map.get("jsy").toString();
+		String xlbm=map.get("xlbm").toString();
+		List<Ylb> list= repository.checkYlb(rq, nbbm, jsy,xlbm,"nbbm");
+		String type="1";
+		if(list.size()>0){
+			type="0";
+		}
+		return type;
+	}
+	
+	@Override
+	public String checkDate(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		String rq=map.get("rq").toString();
+		String gsbm=map.get("ssgsdm_like").toString();
+		String type="1";
+		if(gsbm.equals("26") && modify_rights_close){
+			Date date=new Date();
+			try {
+				long day2=date.getTime();
+				long day1=sdf.parse(rq).getTime();
+				long days = (day2 - day1) / (24*3600*1000);  
+			    if(days>3){
+			    	type="2";
+			    }
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		return type;
+	}
+	
+	@Override
+	public String getModifyRights(){
+		return modify_rights_close?"关闭":"打开";
+	}
+	
+	@Override
+	public String modifyRightsChange(){
+		if(modify_rights_close){
+			modify_rights_close = false;
+		} else {
+			modify_rights_close = true;
+		}
+		return modify_rights_close?"权限关闭":"权限打开";
+	}
+	
+	
+
+	@Override
+	public Map<String, Object> saveYlb(Ylb t) {
+		Map<String, Object> map = new HashMap<>();
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		String rq=sdf.format(t.getRq());
+		String gsdm=t.getSsgsdm();
+		String fgsdm=t.getFgsdm();
+		String xlbm=t.getXlbm();
+		String jhsj=t.getJhsj();
+		String jsy=t.getJsy();
+		String nbbm=t.getNbbm();
+		t.setCreatetime(new Date());
+		String[] jhsjStr = jhsj.split(":");
+		long fcsjL= Long.parseLong(jhsjStr[0])*60+Long.parseLong(jhsjStr[1]);
+		List<Ylb> list=this.listOrderBy(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+//				repository.obtainYl(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+		int jcsx=1;
+		if(list.size()>0){
+			for (int i = 0; i < list.size(); i++) {
+				Ylb y=list.get(i);
+				String[] fcsjStr = y.getJhsj().split(":");
+				long fcsj=Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+				if(fcsjL>fcsj){
+					jcsx=jcsx+y.getJcsx();
+				}else{
+					y.setJcsx(y.getJcsx()+1);
+					repository.save(y);
+				}
+			}
+			
+		}
+		t.setJcsx(jcsx);
+		repository.save(t);
+		
+		SysUser user = SecurityUtils.getCurrentUser();
+		Nylog nylog=new Nylog();
+		nylog.setCreatedate(new Date());
+		nylog.setCzmc("手动添加");
+		nylog.setNylx("油");
+		nylog.setUserid(user.getUserName());
+		nylog.setUsername(user.getName());
+		nylog.setCxtj("");
+		nylogRepository.save(nylog);
+		map.put("status", ResponseCode.SUCCESS);
+        map.put("t", t);
+		return map;
+	}
+	@Transactional  
+	@Override
+	public Map<String, Object> deleteIds(Map<String, Object> map) throws Exception{
+		// TODO Auto-generated method stub
+		Map<String, Object> maps = new HashMap<>();
+		try{
+		String json =StringEscapeUtils.unescapeHtml4(map.get("ids").toString());
+		JSONArray jsonArray=JSONArray.parseArray(json);
+		JSONObject jsonObject;
+		for (int x = 0; x < jsonArray.size(); x++) {
+			jsonObject=jsonArray.getJSONObject(x);
+			Integer id =jsonObject.getInteger("id");
+			repository.deleteById(id);
+		}
+		
+		SysUser user = SecurityUtils.getCurrentUser();
+		Nylog nylog=new Nylog();
+		nylog.setCreatedate(new Date());
+		nylog.setCzmc("删除");
+		nylog.setNylx("油");
+		nylog.setUserid(user.getUserName());
+		nylog.setUsername(user.getName());
+		nylog.setCxtj("");
+		nylogRepository.save(nylog);
+		maps.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			maps.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e; 
+		}
+		return maps;
+	}
+	
+	public  List<Ylb> listOrderBy(String rq,String gsdm,
+			String fgsdm,String xlbm,String nbbm,
+			String px) {
+		// TODO Auto-generated method stub
+		String sql="SELECT * FROM bsth_c_ylb  "
+				+ " where rq ='"+rq+"' and ssgsdm like '%"+gsdm+"%' "
+				+ " and fgsdm like '%"+fgsdm+"%'";
+		if(xlbm.equals("")){
+			sql+= " and xlbm like '%"+xlbm+"%' ";
+		}else{
+			sql+= " and xlbm = '"+xlbm+"' ";
+		}
+				
+		sql += "and nbbm like '%"+nbbm+"%' order by "+px+" asc ";
+		
+		List<Ylb> list = jdbcTemplate.query(sql, new RowMapper<Ylb>() {
+			@Override
+			public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Ylb y = new Ylb();
+				y.setId(arg0.getInt("id"));
+				return y;
+			}
+		});
+		List<Ylb> lists=new ArrayList<Ylb>();
+		List<Ylb> ylbLists=repository.obtainYl(rq,gsdm,fgsdm,xlbm,nbbm,"jcsx");
+		for (int i = 0; i < list.size(); i++) {
+			Ylb t=list.get(i);
+			for (int j = 0; j < ylbLists.size(); j++) {
+				Ylb t2=ylbLists.get(j);
+				if(t.getId().intValue()==t2.getId().intValue()){
+					lists.add(t2);
+					break;
+				}
+			}
+		}
+		
+		return lists;
+	}
+
+	@Override
+	public Map<String, Object> updateHistory(Map<String, Object> map) throws Exception {
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap = new HashMap<String, Object>();
+
+		List<Cars> carsList = carsRepository.findCars();
+		Map<String, Boolean> carsMap = new HashMap<String, Boolean>();
+		for (int i = 0; i < carsList.size(); i++) {
+			Cars c = carsList.get(i);
+			carsMap.put(c.getInsideCode(), c.getSfdc());
+		}
+		try{
+			String date = map.get("date").toString();
+			String line = map.get("line").toString();
+			List<Line> listLine=lineRepository.findLineByCode(line);
+			String gsdm ="";
+			String fgsdm ="";
+			if(listLine.size()>0){
+				Line l=listLine.get(0);
+				gsdm=l.getCompany();
+				fgsdm=l.getBrancheCompany();
+			}
+			
+			String nbbmstr="";
+			List<Map<String, Object>> listpbYc=new ArrayList<Map<String, Object>>();//油车数据
+			List<Map<String, Object>> listpbDc=new ArrayList<Map<String, Object>>();//电车数据
+			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("", date,gsdm, fgsdm, "", "");
+			for (int i = 0; i < listpb.size(); i++) {
+				if(listpb.get(i).get("xlBm").toString().equals(line)){
+					nbbmstr +=listpb.get(i).get("clZbh").toString();
+				}
+			}
+			for (int i = 0; i < listpb.size(); i++) {
+				boolean sfdc=true;
+				Map<String, Object> m = listpb.get(i);
+				if (carsMap.get(m.get("clZbh").toString()) != null) {
+					sfdc = carsMap.get(m.get("clZbh").toString());
+				} else {
+					sfdc = true;
+				}
+				if(nbbmstr.indexOf(m.get("clZbh").toString())>-1){
+					if(sfdc){
+						listpbDc.add(m);
+					}else{
+						listpbYc.add(m);
+					}
+				}
+			}
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			//初始存油量
+			List<Cyl> clyList = cylRepository.obtainCyl("",gsdm);
+			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 0,gsdm);
+			//重新统计油车数据开始
+			List<Ylb> ylListBe =repository.listByRqJcsx(date, gsdm, fgsdm, "", "");
+			List<Ylb> ylbList=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm");
+			List<Ylb> ylbList_upd=new ArrayList<Ylb>(); 
+			List<Ylb> ylbList_del=new ArrayList<Ylb>(); 
+			
+			for (int j = 0; j < ylbList.size(); j++) {
+				Ylb t=ylbList.get(j);
+				boolean fage=true;
+				if(StringUtils.isEmpty(t.getLp())){
+					fage=false;
+				}else{
+					for (int i = 0; i < listpbYc.size(); i++) {
+						Map<String, Object> m = listpbYc.get(i);
+						if(t.getNbbm().equals(m.get("clZbh").toString())
+						&&t.getJsy().equals(m.get("jGh").toString())
+						&&t.getXlbm().equals(m.get("xlBm").toString())
+						&&t.getLp().equals(m.get("lpName").toString())){
+							//该条记录不用删除
+							fage =false;
+							ylbList_upd.add(t);
+						}
+					}
+				}
+				if(fage){
+					if(t.getXlbm().equals(line)){
+						ylbList_del.add(t);
+					}
+				}
+				
+			}
+			String nbbmStr="";
+			List<Ylb> list=new ArrayList<Ylb>();
+			/*
+			 * 第一步 修改车辆里程 和加注量
+			 */
+			Map<String, Object> ylMap=new HashMap<String, Object>();
+			for (int x = 0; x < listpbYc.size(); x++) {
+				String type = "add";
+				Map<String, Object> maps = listpbYc.get(x);
+					// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+					Ylb t = new Ylb();
+					for (int k = 0; k < ylbList_upd.size(); k++) {
+						Ylb t1 = ylbList_upd.get(k);
+						if (t1.getNbbm().equals(maps.get("clZbh").toString())
+								&& t1.getJsy().equals(maps.get("jGh").toString())
+								&& t1.getXlbm().equals(maps.get("xlBm").toString())
+								&& t1.getLp().equals(maps.get("lpName").toString())) {
+									t = t1;
+									type = "update";
+						}
+					}
+					if(type.equals("add")){
+						// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+						if (maps.get("seqNumber").toString().equals("1")) {
+							boolean fage = true;
+							for (int i = 0; i < ylListBe.size(); i++) {
+								Ylb ylb = ylListBe.get(i);
+								if (maps.get("clZbh").toString().equals(ylb.getNbbm())) {
+									if(ylb.getJzyl()>=0){
+										t.setCzyl(ylb.getJzyl());
+										fage = false;
+										break;
+									}
+								}
+							}
+							if (fage) {
+								for (int y = 0; y < clyList.size(); y++) {
+									Cyl cyl = clyList.get(y);
+									if (maps.get("clZbh").toString().equals(cyl.getNbbm())) {
+										if(cyl!=null){
+											if(cyl.getCyl()>=0){
+												t.setCzyl(cyl.getCyl());
+												fage = false;
+												break;
+											}else {
+												if(cyl.getCxrl()!=null){
+													if(cyl.getCxrl()>0){
+														t.setCzyl(cyl.getCxrl());
+														fage = false;
+														break;
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+							if (fage) {
+								t.setCzyl(0.0);
+							}
+						}
+					}
+					
+					Double jzl = 0.0;
+					//一人一车加注量只匹配一次
+					if(ylMap.get(maps.get("clZbh").toString()+"_"+ maps.get("jGh").toString())!=null){
+					}else{
+						boolean fage2=false;
+						for (int i = 0; i < ylxxList.size(); i++) {
+							Ylxxb ylxxb = ylxxList.get(i);
+							if (maps.get("clZbh").toString().equals(ylxxb.getNbbm())
+									&& maps.get("jGh").toString().equals(ylxxb.getJsy())
+									&& ylxxb.getJylx()==1) {
+								if(ylxxb.getJzl()>0){
+									fage2=true;
+								}
+							}
+						}
+						//车辆的加注量如果有任工干预，略接口过来 数据
+						if(fage2){
+							// 把当天手工输入的的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断,加油类型为1）
+							for (int j = 0; j < ylxxList.size(); j++) {
+								Ylxxb ylxxb = ylxxList.get(j);
+								if (maps.get("clZbh").toString().equals(ylxxb.getNbbm())
+										&& maps.get("jGh").toString().equals(ylxxb.getJsy())
+										&& ylxxb.getJylx()==1) {
+									jzl =Arith.add(jzl, ylxxb.getJzl());
+								}
+							}
+							ylMap.put(maps.get("clZbh").toString()+"_"+ maps.get("jGh").toString(),maps.get("xlBm") == null ? "" : maps.get("xlBm").toString());
+						}else{
+							// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
+							for (int j = 0; j < ylxxList.size(); j++) {
+								Ylxxb ylxxb = ylxxList.get(j);
+								if (maps.get("clZbh").toString().equals(ylxxb.getNbbm())
+										&& maps.get("jGh").toString().equals(ylxxb.getJsy())) {
+									jzl =Arith.add(jzl, ylxxb.getJzl());
+								}
+							}
+							ylMap.put(maps.get("clZbh").toString()+"_"+ maps.get("jGh").toString(),maps.get("xlBm") == null ? "" : maps.get("xlBm").toString());
+						}
+					}
+					t.setJzl(jzl);
+					t.setNbbm(maps.get("clZbh").toString());
+					t.setJsy(maps.get("jGh") == null ? "" : maps.get("jGh").toString());
+					t.setJname(maps.get("jName").toString());
+					t.setZlc(maps.get("totalKilometers") == null ? 0.0
+							: Double.parseDouble(maps.get("totalKilometers").toString()));
+					t.setXlbm(maps.get("xlBm") == null ? "" : maps.get("xlBm").toString());
+					t.setJcsx(Integer.parseInt(maps.get("seqNumber").toString()));
+					t.setSsgsdm(maps.get("company") == null ? "" : maps.get("company").toString());
+					t.setFgsdm(maps.get("bCompany") == null ? "" : maps.get("bCompany").toString());
+					t.setJhsj(maps.get("fcsj")==null?"":maps.get("fcsj").toString());
+					t.setRq(sdf.parse(date));
+					t.setLp(maps.get("lpName")==null?"":maps.get("lpName").toString());
+					if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+						 if(type.equals("add")){
+							 if(nbbmStr.indexOf(t.getNbbm())<0){
+								 nbbmStr +=t.getNbbm()+",";
+							 }
+							 t.setCreatetime(new Date());
+						 }else{
+							 t.setUpdatetime(new Date());
+						 }
+				    }
+					try {
+					    repository.save(t);
+					} catch (Exception e) {
+						// TODO: handle exception
+						if(e.getMessage().indexOf("PK_YLB_UK")>0){
+							newMap.put("fage", "存在相同数据,数据已经过滤");
+							logger.info("油量存在相同数据,数据已经过滤");
+						}
+					}
+				    
+			    }
+				for (int i = 0; i < ylbList_del.size(); i++) {
+					Ylb y=ylbList_del.get(i);
+					if(nbbmStr.indexOf(y.getNbbm())<0){
+						 nbbmStr +=y.getNbbm()+",";
+					 }
+					repository.deleteById(y.getId());
+				}
+				
+				//重新计算删除了的或者新增了的车的车的油耗信息（考虑车辆可能跨线路，从分公司赛选计算）
+				double czyl=0.0;
+				List<Ylb> iterator2=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm,jcsx");
+				String[] nbbms=nbbmStr.split(",");
+				for (int i = 0; i < nbbms.length; i++) {
+					String clzbm=nbbms[i];
+					// 得到一天总的加油和里程（根据车，时间）
+					List<Object[]> sumList = repository.sumLcYl(clzbm, sdf.parse(date),"",gsdm,fgsdm);
+					// 保存总的加油量
+					Double jzl = 0.0;
+					// 保存总的里程
+					Double zlc = 0.0;
+					for (int j = 0; j < sumList.size(); j++) {
+						jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
+						zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
+					}
+					// 保留两位小数
+					DecimalFormat df = new DecimalFormat("#.00");
+					Double zyl = 0.0;
+					Double nextJzyl = 0.0;
+					for (int j = 0; j < iterator2.size(); j++) {
+						Ylb t = iterator2.get(j);
+						if(t.getNbbm().equals(clzbm)){
+							if (t.getJcsx() == 1) {
+								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
+								czyl = t.getCzyl();
+								zyl =jzl;
+								Double yh=0.0;
+								if(zlc>0 ){
+									 yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+								}
+								nextJzyl =Arith.sub( Arith.add(t.getJzl(), t.getCzyl()),yh);
+								//把进场油量的小数和整数分别取出
+								if(zlc>0 && t.getZlc()>0){
+									long l=Math.round(nextJzyl);
+									double ylxs=l*100/100;
+									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
+							} else {
+								t.setCzyl(nextJzyl);
+								Double yh=0.0;
+								if(zlc>0){
+									yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+								}
+								nextJzyl =Arith.sub( Arith.add(t.getJzl(),nextJzyl),yh);
+								if(zlc>0 && t.getZlc()>0){
+									long l=0l;
+									double ylxs=0.0;
+									if(j==iterator2.size()-1){
+										ylxs=czyl;
+									}else{
+										if(iterator2.get(j+1).getNbbm().equals(t.getNbbm())){
+											l=Math.round(nextJzyl);
+											ylxs=l*100/100;
+										}else{
+											ylxs=czyl;
+										}
+										
+									}
+									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
+							}
+							if(t.getJzyl()<0){
+								t.setJzyl(0.0);
+							}
+							if(t.getCzyl()<0){
+								t.setCzyl(0.0);
+							}
+							if(t.getYh()<0){
+								t.setYh(0.0);
+							}
+							if(t.getSh()<0){
+								t.setSh(0.0);
+							}
+							repository.save(t);
+						}
+					}
+				}
+				
+				//重新统计油车数据结束
+				
+				
+				//重新获取电耗数据开始
+				Map<String, List<Dlb>> mapList=dlbService.updeteHistory(listpbDc, date, gsdm, fgsdm, line);
+				List<Dlb> delDlb=mapList.get("delList");
+				for (int i = 0; i < delDlb.size(); i++) {
+					Dlb d=delDlb.get(i);
+					dlbRepository.deleteById(d.getId());
+				}
+				List<Dlb> updDlb=mapList.get("updList");
+				for (int i = 0; i < updDlb.size(); i++) {
+					Dlb d=updDlb.get(i);
+					try {
+						dlbRepository.save(d);
+					} catch (Exception e) {
+						// TODO: handle exception
+						if(e.getMessage().indexOf("PK_DLB_UK")>0){
+							newMap.put("fage", "存在相同数据,数据已经过滤");
+							logger.info("电量存在相同数据,数据已经过滤");
+						}
+					}
+				}
+				//重新获取电耗数据结束
+				
+				SysUser user = SecurityUtils.getCurrentUser();
+				Nylog nylog=new Nylog();
+				nylog.setCreatedate(new Date());
+				nylog.setCzmc("重新统计");
+				nylog.setNylx("油");
+				nylog.setUserid(user.getUserName());
+				nylog.setUsername(user.getName());
+				nylog.setCxtj(line+"-"+ date+"-"+gsdm+"-"+fgsdm);
+				nylogRepository.save(nylog);
+				newMap.put("status", ResponseCode.SUCCESS);
+			}catch(Exception e){
+				// TODO Auto-generated catch block
+				newMap.put("status", ResponseCode.ERROR);
+				throw e;
+			}
+		
+		
+		return newMap;
+	}
+
+	public List<Ylb> listByRqJcsx(String rq,String gsdm,String fgsdm,String xlbm,String nbbm) {
+		List<Ylb> list=repository.listByRqJcsx(rq, gsdm, fgsdm, xlbm, nbbm);
+		Map<String, Object> m=new HashMap<String,Object>();
+		List<Ylb> list_=new ArrayList<Ylb>();
+		for (int i = 0; i < list.size(); i++) {
+			Ylb t=list.get(i);
+			if(m.get(t.getNbbm())==null){
+				m.put(t.getNbbm(), t.getNbbm());
+				list_.add(t);
+			}
+		}
+		return list_;
+	}
+
+	@Override
+	public Map<String, Object> update(Map<String, Object> map) {
+		if(map.get("id")!=null){
+			if(map.get("id").toString().length()>0){
+				Integer id=Integer.parseInt(map.get("id").toString());
+				String jsy=map.get("jsy").toString();
+				Ylb t=repository.findById(id).get();
+				t.setJsy(jsy);
+				repository.save(t);
+				map.put("status", ResponseCode.SUCCESS);
+			}
+		}
+		return map;
+	}
+}
@@ -20,7 +20,7 @@ public interface ReportService {
 	List<Map<String, Object>> queryInOutStrtion(String line,String date,int zd,String lzsj);
 	List<Map<String, Object>> queryInOutStrtions(String line,String date,int zd,String lzsj);
-	List<Map<String, String>>  sreachZd(String line,int zdlx);
+	List<Map<String, String>>  sreachZd(String line,int zdlx, String date1, String date2);
 	List<Object[]> historyMessageCount(String line, String date, String code);
 	List<Object[]> historyMessageList(String line, String date, String code,String type);
@@ -4,7 +4,6 @@ import com.bsth.data.BasicData;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
 import com.bsth.entity.StationRoute;
-import com.bsth.entity.calc.CalcStatistics;
 import com.bsth.entity.excep.ArrivalInfo;
 import com.bsth.entity.mcy_forms.Singledata;
 import com.bsth.entity.oil.Dlb;
@@ -14,6 +13,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.Dictionary;
 import com.bsth.entity.sys.Interval;
 import com.bsth.repository.LineRepository;
+import com.bsth.repository.LsStationRouteRepository;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.LineService;
@@ -74,6 +74,8 @@ public class ReportServiceImpl implements ReportService{
 	@Autowired
 	StationRouteRepository stationRouteRepository;
 	@Autowired
+	LsStationRouteRepository lsStationRouteRepository;
+	@Autowired
 	CulateMileageService culateMileageService;
 	@Autowired
 	DictionaryService dictionaryService;
@@ -285,74 +287,24 @@ public class ReportServiceImpl implements ReportService{
 		return list;
 	}
 	@Override
-	public List<Map<String, String>> sreachZd(String line, int zdlx) {
+	public List<Map<String, String>> sreachZd(String line, int zdlx, String date1, String date2) {
 		List<Map<String, String>> list = new ArrayList<>();
 		// TODO Auto-generated method stub
-		
-		List<StationRoute> listSr = stationRoutRepository.findAllByLine(line, zdlx);
-		List<String> temp0List = new ArrayList<String>(),
-					 temp1List = new ArrayList<String>();
-		Map<String, List<String>> temp0 = new HashMap<String, List<String>>();
-		Map<String, List<String>> temp1 = new HashMap<String, List<String>>();
-		for(StationRoute sr : listSr){
-			String stationCode = sr.getStationCode().trim();
-			String stationName = sr.getStationName().trim();
-			if(sr.getDestroy() == 0){
-				if(!temp0.containsKey(stationName)){
-					temp0.put(stationName, new ArrayList<String>());
-					temp0List.add(stationName);
+		if(date1.length() >= 10 && date1.length() >= 10){
+			date1 = date1.substring(0, 10);
+			date2 = date2.substring(0, 10);
+			List<Object[]> findHistory = lsStationRouteRepository.findHistory(line, zdlx, date1, date2);
+			Set<String> tempSet = new HashSet<String>();
+			for(Object[] obj : findHistory){
+				if(obj[2] != null && obj[2].toString().trim().length() > 0){
+					tempSet.add(obj[2].toString().trim());
 				}
-				temp0.get(stationName).add(stationCode);
-			} else if(sr.getDestroy() == 1){
-				if(!temp1.containsKey(stationName)){
-					temp1.put(stationName, new ArrayList<String>());
-					temp1List.add(stationName);
-				}
-				temp1.get(stationName).add(stationCode);
 			}
-		}
-		
-		Set<String> keySet = temp0.keySet();
-		for(String key : temp0List){
-			Map<String, String> reMap = new HashMap<String, String>();
-			String stationCode_s = "";
-			List<String> list0 = temp0.get(key);
-			for(String sc : list0){
-				if(stationCode_s.length() > 0)
-					stationCode_s += ",";
-				stationCode_s += sc;
-			}
-			if(temp1.containsKey(key)){
-				List<String> list1 = temp1.get(key);
-				String sc1 = "";
-				for(String sc : list1){
-					if(sc1.length() > 0)
-						sc1 += ",";
-					sc1 += sc;
-				}
-				if(sc1.length() > 0 && stationCode_s.length() > 0){
-					stationCode_s = sc1 + "," + stationCode_s;
-				} else {
-					stationCode_s = sc1 + stationCode_s;
-				}
-			}
-			reMap.put("id", stationCode_s);
-			reMap.put("text", key);
-			list.add(reMap);
-		}
-		
-		for(String key : temp1List){
-			if(!(keySet.contains(key))){
+			for(Object[] obj : findHistory){
+				int length = tempSet.toArray().length;
 				Map<String, String> reMap = new HashMap<String, String>();
-				String stationCode_s = "";
-				List<String> list1 = temp1.get(key);
-				for(String sc : list1){
-					if(stationCode_s.length() > 0)
-						stationCode_s += ",";
-					stationCode_s += sc;
-				}
-				reMap.put("id", stationCode_s);
-				reMap.put("text", key + " (历史)");
+				reMap.put("id", obj[0].toString());
+				reMap.put("text", obj[1] + (length > 1 ? (" -版本" + obj[2]) : ""));
 				list.add(reMap);
 			}
 		}
@@ -148,28 +148,27 @@ public class VehicleDataSyncTaskServiceImpl extends BServiceImpl&lt;VehicleDataSync
                             .build()).start();
                     // 3、等待同步结束
                     countDownLatch.await();
-                    // 3-1、更新日志
-                    task.setEndDate(new Date());
-                    long runMills = task.getEndDate().getTime() - task.getStartDate().getTime();
-                    task.setProcessSeconds((int) runMills / 1000);
-                    task.setStatus(VehicleDataSyncTaskStatusEnum.END);
-                    task.setProcessMsg("成功！");
-                    super.save(task);
+
                 } catch (Exception exp) {
                     // 获取异常stack信息
                     StringWriter sw = new StringWriter();
                     PrintWriter pw = new PrintWriter(sw);
                     exp.printStackTrace(pw);
+                    task.setProcessMsg("有问题：" + StringUtils.substring(sw.toString(), 0, 1800)); // 日志限定长度
+                } finally {
+                    MDC.clear();
-                    // 更新日志
+                    // 3-1、更新执行信息
+                    if (StringUtils.isEmpty(task.getProcessMsg())) {
+                        task.setProcessMsg("成功！");
+                    }
+                    // 3-2、更新执行时间
                     task.setEndDate(new Date());
                     long runMills = task.getEndDate().getTime() - task.getStartDate().getTime();
                     task.setProcessSeconds((int) runMills / 1000);
                     task.setStatus(VehicleDataSyncTaskStatusEnum.END);
-                    task.setProcessMsg("有问题：" + StringUtils.substring(sw.toString(), 0, 1800)); // 日志限定长度
+                    // 3-3、更新任务信息
                     super.save(task);
-                } finally {
-                    MDC.clear();
                 }
             }
@@ -104,8 +104,8 @@ public class VehicleDataSyncTaskThread implements Runnable {
             vehicleDataSyncTask.setSyncUpdateCounts(Long.valueOf(
                     processKtrStepMeatureMap.get("更新车辆数据输出").updates).intValue());
             vehicleDataSyncTask.setSyncErrorCounts(Long.valueOf(
-                    processKtrStepMeatureMap.get("新增车辆数据输出").errors +
-                    processKtrStepMeatureMap.get("更新车辆数据输出").errors).intValue());
+                    processKtrStepMeatureMap.get("新增错误数据文件").writes +
+                    processKtrStepMeatureMap.get("更新错误数据文件").writes).intValue());
             LOG.info("ktr执行度量值：{}", processKtrStepMeatureMap);
@@ -190,7 +190,7 @@ public class VehicleDataSyncTaskThread implements Runnable {
             );
             LOG.info(stringBuffer.toString());
-            // 如果task内部有errors，更新日志
+            // 如果task内部有errors，更新执行信息
             if (processKtrStepMeatureMap.get("数据检验错误输出").writes > 0) {
                 task.setProcessMsg("有问题：存在数据检验错误，请查看日志！");
             } else if (processKtrStepMeatureMap.get("新增错误数据文件").writes > 0) {
@@ -205,7 +205,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         session.fireAllRules();
-        session.dispose();;
+        session.dispose();
         return result;
     }
@@ -5,6 +5,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.kie.api.runtime.rule.AccumulateFunction;
 import java.io.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 /**
  * Created by xu on 17/2/28.
@@ -18,24 +22,68 @@ public class ErrorBcCountFunction implements AccumulateFunction {
     public void writeExternal(ObjectOutput out) throws IOException {
     }
-    protected static class ErrorCountData implements Externalizable {
-        public long errorcount = 0;
+    protected static class ErrorCountData implements Serializable {
+        // TODO：这里暂时这样写，之后新版本去除
         public TTInfoDetail ttInfoDetail;
+        /** 错误班次map，key=ttinfodetailId value=ttinfodetail */
+        public Map<Long, TTInfoDetail> errorTtInfoDetailMap;
+        // 空班次数
+        public Integer nullBcCount;
+        /**  错误路牌map，key=路牌Id，value=路牌名字 */
+        public Map<Long, String> errorlpMap;
         public ErrorCountData() {
+            nullBcCount = 0;
+            errorTtInfoDetailMap = new HashMap<>();
+            errorlpMap = new HashMap<>();
         }
-        @Override
-        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-            errorcount = in.readLong();
-            ttInfoDetail = (TTInfoDetail) in.readObject();
+        public void accTTInfoDetail(TTInfoDetail ttInfoDetail) {
+            // 计算错误班次
+
+            if (ttInfoDetail.getTtinfo() == null) {
+                nullBcCount ++;
+                return;
+            }
+
+            // 判定条件（数据库中的对应字段没有非空约束），与界面saTimeTable.js的validInfo方法对应
+            // 1、起点站编码，名字为空
+            // 2、终点站编码，名字为空
+            // 3、班次时间
+            // TODO：其他再议
+            if (StringUtils.isEmpty(ttInfoDetail.getQdzCode()) ||
+                    StringUtils.isEmpty(ttInfoDetail.getQdzName()) ||
+                    StringUtils.isEmpty(ttInfoDetail.getZdzCode()) ||
+                    StringUtils.isEmpty(ttInfoDetail.getZdzName()) ||
+                    (ttInfoDetail.getBcsj() == null) ) {
+
+                errorTtInfoDetailMap.put(ttInfoDetail.getId(), ttInfoDetail);
+            }
+
+            // 计算错误路牌
+            if (ttInfoDetail.getLp().getIsCancel()) {
+                errorlpMap.put(ttInfoDetail.getLp().getId(), ttInfoDetail.getLp().getLpName());
+            }
         }
-        @Override
-        public void writeExternal(ObjectOutput out) throws IOException {
-            out.writeLong(errorcount);
-            out.writeObject(ttInfoDetail);
+        public void reTTInfoDetail(TTInfoDetail ttInfoDetail) {
+            if (ttInfoDetail.getTtinfo() == null) {
+                nullBcCount --;
+                return;
+            }
+            if (StringUtils.isEmpty(ttInfoDetail.getQdzCode()) ||
+                    StringUtils.isEmpty(ttInfoDetail.getQdzName()) ||
+                    StringUtils.isEmpty(ttInfoDetail.getZdzCode()) ||
+                    StringUtils.isEmpty(ttInfoDetail.getZdzName()) ||
+                    (ttInfoDetail.getBcsj() == null) ) {
+
+                errorTtInfoDetailMap.remove(ttInfoDetail.getId());
+            }
+            if (ttInfoDetail.getLp().getIsCancel()) {
+                errorlpMap.remove(ttInfoDetail.getLp().getId());
+            }
         }
+
     }
     @Override
@@ -44,60 +92,42 @@ public class ErrorBcCountFunction implements AccumulateFunction {
     }
     @Override
-    public void init(Serializable context) throws Exception {
-        ErrorCountData errorCountData = (ErrorCountData) context;
-        errorCountData.errorcount = 0;
-    }
+    public void init(Serializable context) throws Exception { }
     @Override
     public void accumulate(Serializable context, Object value) {
         ErrorCountData errorCountData = (ErrorCountData) context;
         TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
-
-        if (ttInfoDetail.getTtinfo() == null) {
-            errorCountData.errorcount ++;
-            return;
-        }
-
-        // 判定条件（数据库中的对应字段没有非空约束），与界面saTimeTable.js的validInfo方法对应
-        // 1、起点站编码，名字为空
-        // 2、终点站编码，名字为空
-        // 3、班次时间
-        // TODO：其他再议
-        if (StringUtils.isEmpty(ttInfoDetail.getQdzCode()) ||
-            StringUtils.isEmpty(ttInfoDetail.getQdzName()) ||
-            StringUtils.isEmpty(ttInfoDetail.getZdzCode()) ||
-            StringUtils.isEmpty(ttInfoDetail.getZdzName()) ||
-            (ttInfoDetail.getBcsj() == null) ) {
-
-            errorCountData.errorcount ++;
-        }
+        errorCountData.accTTInfoDetail(ttInfoDetail);
     }
     @Override
     public void reverse(Serializable context, Object value) throws Exception {
         ErrorCountData errorCountData = (ErrorCountData) context;
         TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
-
-        if (ttInfoDetail.getTtinfo() == null) {
-            errorCountData.errorcount --;
-            return;
-        }
-
-        if (StringUtils.isEmpty(ttInfoDetail.getQdzCode()) ||
-                StringUtils.isEmpty(ttInfoDetail.getQdzName()) ||
-                StringUtils.isEmpty(ttInfoDetail.getZdzCode()) ||
-                StringUtils.isEmpty(ttInfoDetail.getZdzName()) ) {
-
-            errorCountData.errorcount --;
-        }
-
+        errorCountData.reTTInfoDetail(ttInfoDetail);
     }
     @Override
     public Object getResult(Serializable context) throws Exception {
         ErrorCountData errorCountData = (ErrorCountData) context;
-        return errorCountData.errorcount;
+
+        // 错误班次数
+        Integer errorBcCount = errorCountData.nullBcCount + errorCountData.errorTtInfoDetailMap.values().size();
+        // 错误路牌数
+        Integer errorLpCount = errorCountData.errorlpMap.values().size();
+        // 错误路牌描述
+        List<String> errorLpInfoList = new ArrayList<>();
+        for (String lpName: errorCountData.errorlpMap.values()) {
+            errorLpInfoList.add("路牌" + "[" + lpName + "]" + "已作废");
+        }
+
+        List<Object> resultObj = new ArrayList<>(3);
+        resultObj.add(errorBcCount);
+        resultObj.add(errorLpCount);
+        resultObj.add(errorLpInfoList);
+
+        return resultObj;
     }
     @Override
@@ -107,6 +137,6 @@ public class ErrorBcCountFunction implements AccumulateFunction {
     @Override
     public Class<?> getResultType() {
-        return Number.class;
+        return List.class;
     }
 }
@@ -35,7 +35,12 @@ public class Result {
         private Long yybc;
         /** 错误班次数 */
-        private Long errorbc;
+        private Integer errorbc;
+
+        /** 错误路牌数 */
+        private Integer errorlpCount;
+        /** 错误路牌描述 */
+        private List<String> errorlpInfo;
         public Long getTtid() {
             return ttid;
@@ -85,14 +90,10 @@ public class Result {
             this.yybc = yybc;
         }
-        public Long getErrorbc() {
+        public Integer getErrorbc() {
             return errorbc;
         }
-        public void setErrorbc(Long errorbc) {
-            this.errorbc = errorbc;
-        }
-
         public Integer getLineVersion() {
             return lineVersion;
         }
@@ -100,5 +101,25 @@ public class Result {
         public void setLineVersion(Integer lineVersion) {
             this.lineVersion = lineVersion;
         }
+
+        public void setErrorbc(Integer errorbc) {
+            this.errorbc = errorbc;
+        }
+
+        public Integer getErrorlpCount() {
+            return errorlpCount;
+        }
+
+        public void setErrorlpCount(Integer errorlpCount) {
+            this.errorlpCount = errorlpCount;
+        }
+
+        public List<String> getErrorlpInfo() {
+            return errorlpInfo;
+        }
+
+        public void setErrorlpInfo(List<String> errorlpInfo) {
+            this.errorlpInfo = errorlpInfo;
+        }
     }
 }
-package com.bsth.util;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class IpUtils {
-
-	public static String getIpAddr(HttpServletRequest request) {
-		if (request == null) {
-			return "unknown";
-		}
-		String ip = request.getHeader("x-forwarded-for");
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getHeader("Proxy-Client-IP");
-		}
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getHeader("X-Forwarded-For");
-		}
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getHeader("WL-Proxy-Client-IP");
-		}
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getHeader("X-Real-IP");
-		}
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getRemoteAddr();
-		}
-		return ip;
-	}
-}
+package com.bsth.util;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Enumeration;
+
+public class IpUtils {
+
+	public static String getIpAddr(HttpServletRequest request) {
+		if (request == null) {
+			return "unknown";
+		}
+		String ip = request.getHeader("x-forwarded-for");
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("X-Forwarded-For");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("WL-Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("X-Real-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getRemoteAddr();
+		}
+		return ip;
+	}
+
+	/**
+	 * 获取本地IP地址
+	 * @return
+	 */
+	public static String getLocalIpAddress() {
+		try {
+			Enumeration<NetworkInterface> allNetInterfaces = NetworkInterface.getNetworkInterfaces();
+			InetAddress ip = null;
+			while (allNetInterfaces.hasMoreElements()) {
+				NetworkInterface netInterface = (NetworkInterface) allNetInterfaces.nextElement();
+				if (netInterface.isLoopback() || netInterface.isVirtual() || !netInterface.isUp() || "docker0".equals(netInterface.getDisplayName())) {
+					continue;
+				} else {
+					Enumeration<InetAddress> addresses = netInterface.getInetAddresses();
+					while (addresses.hasMoreElements()) {
+						ip = addresses.nextElement();
+						if (ip != null && ip instanceof Inet4Address) {
+							return ip.getHostAddress();
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			System.err.println("IP地址获取失败" + e.toString());
+		}
+
+		return "";
+	}
+}
@@ -9,7 +9,7 @@ spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.Im
 spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.jpa.show-sql= true
+spring.jpa.show-sql= false
 #DATABASE
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
@@ -10,7 +10,7 @@ datatools.kvars_dbuname=root
 #数据库密码
 datatools.kvars_dbpwd=
 #数据库库名
-datatools.kvars_dbdname=control
+datatools.kvars_dbdname=test_control
 # 3、上传数据配置信息
 # 上传文件目录配置（根据不同的环境需要修正）
@@ -36,17 +36,17 @@
         </parameter>
         <parameter>
             <name>paramClzbh</name>
-            <default_value/>
+            <default_value>S0I-052</default_value>
             <description>&#x53c2;&#x6570;-&#x8f66;&#x8f86;&#x81ea;&#x7f16;&#x53f7;</description>
         </parameter>
         <parameter>
             <name>paramFrom</name>
-            <default_value>2021-01-01 00&#x3a;00&#x3a;00</default_value>
+            <default_value/>
             <description>&#x53c2;&#x6570;-&#x5f00;&#x59cb;&#x65f6;&#x95f4;&#xff08;&#x683c;&#x5f0f;&#xff1a;yyyy-MM-dd HH&#x3a;mm&#x3a;ss&#xff09;</description>
         </parameter>
         <parameter>
             <name>paramTo</name>
-            <default_value>2021-05-01 00&#x3a;00&#x3a;00</default_value>
+            <default_value/>
             <description>&#x53c2;&#x6570;-&#x7ed3;&#x675f;&#x65f6;&#x95f4;&#xff08;&#x683c;&#x5f0f;&#xff1a;yyyy-MM-dd HH&#x3a;mm&#x3a;ss&#xff09;</description>
         </parameter>
         <parameter>
@@ -452,6 +452,33 @@
     </attributes>
   </connection>
   <connection>
+    <name>test_control_local</name>
+    <server>localhost</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>test_control</database>
+    <port>3306</port>
+    <username>root</username>
+    <password>Encrypted </password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
     <name>test_control&#xff08;&#x672c;&#x673a;&#xff09;</name>
     <server>127.0.0.1</server>
     <type>MYSQL</type>
@@ -464,6 +491,7 @@
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
       <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
@@ -669,8 +697,6 @@
   <hop> <from>&#x672c;&#x5730;&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x67e5;&#x8be2; </from><to>&#x672c;&#x5730;&#x8f66;&#x8f86;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x5f85;&#x66f4;&#x65b0;&#x6570;&#x636e;</from><to>&#x66f4;&#x65b0;&#x6570;&#x636e;&#x5904;&#x7406;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</from><to>&#x5f85;&#x5904;&#x7406;&#x6570;&#x636e;xls&#x8f93;&#x51fa;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x66f4;&#x65b0;&#x6570;&#x636e;&#x5904;&#x7406;</from><to>&#x83b7;&#x53d6;&#x62a5;&#x5e9f;&#x8f66;&#x8f86;&#x6570;&#x636e;&#xff08;&#x66fe;&#x7ecf;&#x914d;&#x7f6e;&#x8fc7;&#x7ebf;&#x8def;&#xff09;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x83b7;&#x53d6;&#x62a5;&#x5e9f;&#x8f66;&#x8f86;&#x6570;&#x636e;&#xff08;&#x66fe;&#x7ecf;&#x914d;&#x7f6e;&#x8fc7;&#x7ebf;&#x8def;&#xff09;</from><to>&#x62a5;&#x5e9f;&#x8f66;&#x8f86;&#x7ba1;&#x7406;&#x8bbe;&#x5907;&#x6570;&#x636e;&#x5904;&#x7406;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x672c;&#x5730;&#x8f66;&#x8f86;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</from><to>&#x672c;&#x5730;&#x7ebf;&#x8def;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x672c;&#x5730;&#x7ebf;&#x8def;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</from><to>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x672c;&#x5730;&#x7ebf;&#x8def;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</from><to>&#x5224;&#x5b9a;&#x65b0;&#x589e;&#x2f;&#x66f4;&#x65b0;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
@@ -681,7 +707,11 @@
   <hop> <from>&#x65b0;&#x589e;&#x8f66;&#x8f86;&#x8bbe;&#x5907;&#x6570;&#x636e;&#x8f93;&#x51fa;</from><to>&#x6dfb;&#x52a0;&#x8f66;&#x8f86;&#x8bbe;&#x5907;&#x9519;&#x8bef;&#x6570;&#x636e;&#x6587;&#x4ef6;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x66f4;&#x65b0;&#x6570;&#x636e;&#x5904;&#x7406;</from><to>&#x5224;&#x5b9a;&#x662f;&#x5426;&#x66f4;&#x65b0;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x66f4;&#x65b0;&#x8f66;&#x8f86;&#x6570;&#x636e;&#x8f93;&#x51fa;</from><to>&#x66f4;&#x65b0;&#x9519;&#x8bef;&#x6570;&#x636e;&#x6587;&#x4ef6;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x5224;&#x5b9a;&#x662f;&#x5426;&#x66f4;&#x65b0;</from><to>&#x66f4;&#x65b0;&#x8f66;&#x8f86;&#x6570;&#x636e;&#x8f93;&#x51fa;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5224;&#x5b9a;&#x662f;&#x5426;&#x66f4;&#x65b0;</from><to>&#x5f85;&#x5904;&#x7406;&#x66f4;&#x65b0;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5f85;&#x5904;&#x7406;&#x66f4;&#x65b0;&#x6570;&#x636e;</from><to>&#x66f4;&#x65b0;&#x8f66;&#x8f86;&#x6570;&#x636e;&#x8f93;&#x51fa;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5f85;&#x5904;&#x7406;&#x66f4;&#x65b0;&#x6570;&#x636e;</from><to>&#x5224;&#x65ad;&#x662f;&#x5426;&#x62a5;&#x5e9f;&#x66f4;&#x65b0;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5224;&#x65ad;&#x662f;&#x5426;&#x62a5;&#x5e9f;&#x66f4;&#x65b0;</from><to>&#x662f;&#x5426;&#x62a5;&#x5e9f;&#x4e14;&#x66fe;&#x7ecf;&#x914d;&#x7f6e;&#x8fc7;&#x7ebf;&#x8def;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x662f;&#x5426;&#x62a5;&#x5e9f;&#x4e14;&#x66fe;&#x7ecf;&#x914d;&#x7f6e;&#x8fc7;&#x7ebf;&#x8def;</from><to>&#x62a5;&#x5e9f;&#x8f66;&#x8f86;&#x7ba1;&#x7406;&#x8bbe;&#x5907;&#x6570;&#x636e;&#x5904;&#x7406;</to><enabled>Y</enabled> </hop>
   </order>
   <step>
     <name>JavaScript&#x89e3;&#x6790;json&#x751f;&#x6210;&#x6570;&#x636e;</name>
@@ -971,7 +1001,7 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-<send_true_to>&#x66f4;&#x65b0;&#x8f66;&#x8f86;&#x6570;&#x636e;&#x8f93;&#x51fa;</send_true_to>
+<send_true_to>&#x5f85;&#x5904;&#x7406;&#x66f4;&#x65b0;&#x6570;&#x636e;</send_true_to>
 <send_false_to/>
     <compare>
 <condition>
@@ -995,8 +1025,43 @@
     </compare>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>754</xloc>
-      <yloc>312</yloc>
+      <xloc>822</xloc>
+      <yloc>311</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5224;&#x65ad;&#x662f;&#x5426;&#x62a5;&#x5e9f;&#x66f4;&#x65b0;</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+<send_true_to>&#x662f;&#x5426;&#x62a5;&#x5e9f;&#x4e14;&#x66fe;&#x7ecf;&#x914d;&#x7f6e;&#x8fc7;&#x7ebf;&#x8def;</send_true_to>
+<send_false_to/>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <conditions>
+  <condition>
+   <negated>N</negated>
+   <operator>OR</operator>
+   <leftvalue>isScrapUpdate</leftvalue>
+   <function>&#x3d;</function>
+   <rightvalue/>
+   <value><name>constant</name><type>Boolean</type><text>Y</text><length>-1</length><precision>-1</precision><isnull>N</isnull><mask/></value>   </condition>
+  </conditions>
+ </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>672</xloc>
+      <yloc>497</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -1279,6 +1344,25 @@
     </step>
   <step>
+    <name>&#x5f85;&#x5904;&#x7406;&#x66f4;&#x65b0;&#x6570;&#x636e;</name>
+    <type>Dummy</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>673</xloc>
+      <yloc>406</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x5f85;&#x65b0;&#x589e;&#x6570;&#x636e;</name>
     <type>Dummy</type>
     <description/>
@@ -2085,10 +2169,51 @@
     </step>
   <step>
+    <name>&#x662f;&#x5426;&#x62a5;&#x5e9f;&#x4e14;&#x66fe;&#x7ecf;&#x914d;&#x7f6e;&#x8fc7;&#x7ebf;&#x8def;</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+<send_true_to>&#x62a5;&#x5e9f;&#x8f66;&#x8f86;&#x7ba1;&#x7406;&#x8bbe;&#x5907;&#x6570;&#x636e;&#x5904;&#x7406;</send_true_to>
+<send_false_to/>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <conditions>
+  <condition>
+   <negated>N</negated>
+   <leftvalue>scrapState_update</leftvalue>
+   <function>&#x3d;</function>
+   <rightvalue/>
+   <value><name>constant</name><type>String</type><text>1</text><length>-1</length><precision>-1</precision><isnull>N</isnull><mask/></value>   </condition>
+  <condition>
+   <negated>N</negated>
+   <operator>AND</operator>
+   <leftvalue>xl</leftvalue>
+   <function>IS NOT NULL</function>
+   <rightvalue/>
+   </condition>
+  </conditions>
+ </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>513</xloc>
+      <yloc>585</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x66f4;&#x65b0;&#x6570;&#x636e;&#x5904;&#x7406;</name>
     <type>ScriptValueMod</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
          <partitioning>
@@ -2099,7 +2224,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f;---------------- &#x66f4;&#x65b0;&#x7528;&#x7684;&#x5b57;&#x6bb5;&#x91cd;&#x65b0;&#x547d;&#x540d;&#xff08;&#x65b9;&#x4fbf;&#x540e;&#x7eed;&#x64cd;&#x4f5c;&#xff09;-----------&#x2f;&#x2f;&#xa;&#x2f;&#x2f; TODO&#xff1a;&#x540e;&#x9762;&#x8fd8;&#x6709;&#x66f4;&#x591a;&#x7684;&#x66f4;&#x65b0;&#x5b57;&#x6bb5;&#xa;&#xa;var update_date &#x3d; new Date&#x28;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f;------------ 1&#x3001;&#x516c;&#x53f8;&#x5206;&#x516c;&#x53f8;&#x76f8;&#x5173;&#x5b57;&#x6bb5; -----------&#x2f;&#x2f;&#xa;var company_update &#x3d; gsmc&#x3b; &#x2f;&#x2f; &#x516c;&#x53f8;&#x540d;&#x79f0;&#xa;var branche_company_update &#x3d; fgsmc&#x3b; &#x2f;&#x2f; &#x5206;&#x516c;&#x53f8;&#x540d;&#x79f0;&#xa;var business_code_update &#x3d; gsdm&#x3b; &#x2f;&#x2f; &#x516c;&#x53f8;&#x4ee3;&#x7801;&#xa;var branch_company_code_update &#x3d; fgsdm&#x3b; &#x2f;&#x2f; &#x5206;&#x516c;&#x53f8;&#x4ee3;&#x7801;&#xa;var isGsUpdate &#x3d; false&#x3b; &#x2f;&#x2f; &#x662f;&#x5426;&#x66f4;&#x65b0;&#xa;if &#x28;&#x21;company_update.equals&#x28;company&#x29;&#x29; &#x7b;&#xa;	isGsUpdate &#x3d; true&#x3b;&#xa;&#x7d;&#xa;if &#x28;&#x21;branche_company_update.equals&#x28;branche_company&#x29;&#x29; &#x7b;&#xa;	isGsUpdate &#x3d; true&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f;------------- 2&#x3001;&#x62a5;&#x5e9f;&#x76f8;&#x5173;&#x5b57;&#x6bb5; ------------&#x2f;&#x2f;&#xa;var equipmentCode_update &#x3d; equipment_code&#x3b; &#x2f;&#x2f; &#x8bbe;&#x5907;&#x7f16;&#x53f7;&#xa;var scrapCode_update &#x3d; scrap_code&#x3b; &#x2f;&#x2f; &#x62a5;&#x5e9f;&#x53f7;&#xa;var scrapState_update &#x3d; &#x28;scrap_state &#x3d;&#x3d; true &#x3f; 1 &#x3a; 0&#x29;&#x3b; &#x2f;&#x2f; &#x62a5;&#x5e9f;&#x72b6;&#x6001;&#xa;var scrapState_update_b &#x3d; scrap_state&#x3b; &#x2f;&#x2f; &#x62a5;&#x5e9f;&#x72b6;&#x6001;&#xa;var scrapDate_update &#x3d; scrap_date&#x3b; &#x2f;&#x2f; &#x62a5;&#x5e9f;&#x65e5;&#x671f;&#xa;var isScrapUpdate &#x3d; false&#x3b; &#x2f;&#x2f; &#x662f;&#x5426;&#x66f4;&#x65b0;&#xa;if &#x28;carState &#x3d;&#x3d; &#x27;3&#x27; &#x7c;&#x7c; scrapType &#x3d;&#x3d; &#x27;1&#x27;&#x29; &#x7b;&#xa;	scrapState_update_b &#x3d; true&#x3b;&#xa;	scrapState_update &#x3d; 1&#x3b;&#xa;	scrapDate_update &#x3d; scrapDate &#x3d;&#x3d; null &#x3f; null &#x3a; str2date&#x28;scrapDate, &#x27;yyyy-MM-dd&#x27;&#x29;&#x3b;&#xa;	equipmentCode_update &#x3d; &#x27;BF-&#x27; &#x2b; equipmentCode_update&#x3b;&#xa;	scrapCode_update &#x3d; &#x27;BF-&#x27; &#x2b; equipmentCode_update&#x3b;&#xa;&#x7d;&#xa;if &#x28;scrapState_update_b &#x21;&#x3d; scrap_state&#x29; &#x7b;&#xa;	isScrapUpdate &#x3d; true&#x3b;&#xa;&#x7d;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f;---------------- &#x66f4;&#x65b0;&#x7528;&#x7684;&#x5b57;&#x6bb5;&#x91cd;&#x65b0;&#x547d;&#x540d;&#xff08;&#x65b9;&#x4fbf;&#x540e;&#x7eed;&#x64cd;&#x4f5c;&#xff09;-----------&#x2f;&#x2f;&#xa;&#x2f;&#x2f; TODO&#xff1a;&#x540e;&#x9762;&#x8fd8;&#x6709;&#x66f4;&#x591a;&#x7684;&#x66f4;&#x65b0;&#x5b57;&#x6bb5;&#xa;&#xa;var update_date &#x3d; new Date&#x28;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f;------------ 1&#x3001;&#x516c;&#x53f8;&#x5206;&#x516c;&#x53f8;&#x76f8;&#x5173;&#x5b57;&#x6bb5; -----------&#x2f;&#x2f;&#xa;var company_update &#x3d; gsmc&#x3b; &#x2f;&#x2f; &#x516c;&#x53f8;&#x540d;&#x79f0;&#xa;var branche_company_update &#x3d; fgsmc&#x3b; &#x2f;&#x2f; &#x5206;&#x516c;&#x53f8;&#x540d;&#x79f0;&#xa;var business_code_update &#x3d; gsdm&#x3b; &#x2f;&#x2f; &#x516c;&#x53f8;&#x4ee3;&#x7801;&#xa;var branch_company_code_update &#x3d; fgsdm&#x3b; &#x2f;&#x2f; &#x5206;&#x516c;&#x53f8;&#x4ee3;&#x7801;&#xa;var isGsUpdate &#x3d; false&#x3b; &#x2f;&#x2f; &#x662f;&#x5426;&#x66f4;&#x65b0;&#xa;if &#x28;&#x21;company_update.equals&#x28;company&#x29;&#x29; &#x7b;&#xa;	isGsUpdate &#x3d; true&#x3b;&#xa;&#x7d;&#xa;if &#x28;&#x21;branche_company_update.equals&#x28;branche_company&#x29;&#x29; &#x7b;&#xa;	isGsUpdate &#x3d; true&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f;------------- 2&#x3001;&#x62a5;&#x5e9f;&#x76f8;&#x5173;&#x5b57;&#x6bb5; ------------&#x2f;&#x2f;&#xa;var equipmentCode_update &#x3d; equipment_code&#x3b; &#x2f;&#x2f; &#x8bbe;&#x5907;&#x7f16;&#x53f7;&#xa;var scrapCode_update &#x3d; scrap_code&#x3b; &#x2f;&#x2f; &#x62a5;&#x5e9f;&#x53f7;&#xa;var scrapState_update &#x3d; &#x28;scrap_state &#x3d;&#x3d; true &#x3f; 1 &#x3a; 0&#x29;&#x3b; &#x2f;&#x2f; &#x62a5;&#x5e9f;&#x72b6;&#x6001;&#xa;var scrapState_update_b &#x3d; scrap_state&#x3b; &#x2f;&#x2f; &#x62a5;&#x5e9f;&#x72b6;&#x6001;&#xa;var scrapDate_update &#x3d; scrap_date&#x3b; &#x2f;&#x2f; &#x62a5;&#x5e9f;&#x65e5;&#x671f;&#xa;var isScrapUpdate &#x3d; false&#x3b; &#x2f;&#x2f; &#x662f;&#x5426;&#x66f4;&#x65b0;&#xa;if &#x28;carState &#x3d;&#x3d; &#x27;3&#x27; &#x7c;&#x7c; scrapType &#x3d;&#x3d; &#x27;1&#x27;&#x29; &#x7b;&#xa;	scrapState_update_b &#x3d; true&#x3b;&#xa;	scrapState_update &#x3d; 1&#x3b;&#xa;	&#x2f;&#x2f; &#x4f7f;&#x7528;&#x8f66;&#x8f86;&#x5e93;&#x7684;&#x62a5;&#x5e9f;&#x65f6;&#x95f4;&#xa;	scrapDate_update &#x3d; scrapDate &#x3d;&#x3d; null &#x3f; null &#x3a; str2date&#x28;scrapDate, &#x27;yyyy-MM-dd&#x27;&#x29;&#x3b;&#xa;	&#x2f;&#x2f; &#x8f66;&#x8f86;&#x5e93;&#x62a5;&#x5e9f;&#x65f6;&#x95f4;&#x4e3a;&#x7a7a;&#xff0c;&#x518d;&#x4f7f;&#x7528;&#x5f53;&#x524d;&#x65f6;&#x95f4;&#xa;	if &#x28;scrapDate_update &#x3d;&#x3d; null&#x29; &#x7b;&#xa;		scrapDate_update &#x3d; new Date&#x28;&#x29;&#x3b; &#x2f;&#x2f; &#x62a5;&#x5e9f;&#x65e5;&#x671f;&#x8bbe;&#x5b9a;&#x4f4d;&#x5f53;&#x524d;&#x65e5;&#x671f;&#xa;	&#x7d;&#xa;	equipmentCode_update &#x3d; &#x27;BF-&#x27; &#x2b; equipmentCode_update&#x3b;&#xa;	scrapCode_update &#x3d; &#x27;BF-&#x27; &#x2b; equipmentCode_update&#x3b;&#xa;&#x7d;&#xa;if &#x28;scrapState_update_b &#x21;&#x3d; scrap_state&#x29; &#x7b;&#xa;	isScrapUpdate &#x3d; true&#x3b;&#xa;&#x7d;</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>update_date</name>
         <rename>update_date</rename>
         <type>Date</type>
@@ -2162,7 +2287,7 @@
         <replace>N</replace>
       </field>      <field>        <name>scrapDate_update</name>
         <rename>scrapDate_update</rename>
-        <type>String</type>
+        <type>Date</type>
         <length>-1</length>
         <precision>-1</precision>
         <replace>N</replace>
@@ -2174,17 +2299,17 @@
         <replace>N</replace>
       </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>674</xloc>
-      <yloc>403</yloc>
+      <xloc>670</xloc>
+      <yloc>309</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
   <step>
-    <name>&#x672c;&#x5730;&#x7ebf;&#x8def;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</name>
-    <type>DBLookup</type>
+    <name>&#x66f4;&#x65b0;&#x8f66;&#x8f86;&#x6570;&#x636e;&#x8f93;&#x51fa;</name>
+    <type>Update</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
          <partitioning>
@@ -2192,45 +2317,68 @@
            <schema_name/>
            </partitioning>
     <connection>control_jndi</connection>
-    <cache>Y</cache>
-    <cache_load_all>Y</cache_load_all>
-    <cache_size>0</cache_size>
+    <skip_lookup>N</skip_lookup>
+    <commit>100</commit>
+    <use_batch>N</use_batch>
+    <error_ignored>N</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <schema/>
-      <table>bsth_c_line</table>
-      <orderby/>
-      <fail_on_multiple>N</fail_on_multiple>
-      <eat_row_on_failure>N</eat_row_on_failure>
+      <table>bsth_c_cars</table>
       <key>
-        <name>xl</name>
+        <name>id</name>
         <field>id</field>
         <condition>&#x3d;</condition>
         <name2/>
-      </key>
+        </key>
       <value>
-        <name>line_code</name>
-        <rename>line_code</rename>
-        <default/>
-        <type>None</type>
-      </value>
+        <name>equipment_code</name>
+        <rename>equipmentCode_update</rename>
+        </value>
       <value>
-        <name>name</name>
-        <rename>name</rename>
-        <default/>
-        <type>None</type>
-      </value>
-    </lookup>
+        <name>scrap_code</name>
+        <rename>scrapCode_update</rename>
+        </value>
+      <value>
+        <name>scrap_date</name>
+        <rename>scrapDate_update</rename>
+        </value>
+      <value>
+        <name>scrap_state</name>
+        <rename>scrapState_update</rename>
+        </value>
+      <value>
+        <name>company</name>
+        <rename>company_update</rename>
+        </value>
+      <value>
+        <name>business_code</name>
+        <rename>business_code_update</rename>
+        </value>
+      <value>
+        <name>branche_company</name>
+        <rename>branche_company_update</rename>
+        </value>
+      <value>
+        <name>branche_company_code</name>
+        <rename>branch_company_code_update</rename>
+        </value>
+      <value>
+        <name>update_date</name>
+        <rename>update_date</rename>
+        </value>
+      </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>340</xloc>
-      <yloc>582</yloc>
+      <xloc>820</xloc>
+      <yloc>404</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
   <step>
-    <name>&#x672c;&#x5730;&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x67e5;&#x8be2; </name>
-    <type>DBLookup</type>
+    <name>&#x66f4;&#x65b0;&#x9519;&#x8bef;&#x6570;&#x636e;&#x6587;&#x4ef6;</name>
+    <type>ExcelOutput</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -2239,30 +2387,215 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <connection>control_jndi</connection>
-    <cache>Y</cache>
-    <cache_load_all>Y</cache_load_all>
-    <cache_size>0</cache_size>
-    <lookup>
-      <schema/>
-      <table>bsth_c_cars</table>
-      <orderby>update_date desc</orderby>
-      <fail_on_multiple>N</fail_on_multiple>
-      <eat_row_on_failure>N</eat_row_on_failure>
-      <key>
+    <header>Y</header>
+    <footer>N</footer>
+    <encoding/>
+    <append>N</append>
+    <add_to_result_filenames>Y</add_to_result_filenames>
+    <file>
+      <name>&#x24;&#x7b;file_update_error&#x7d;</name>
+      <extention>xls</extention>
+      <do_not_open_newfile_init>N</do_not_open_newfile_init>
+      <create_parent_folder>N</create_parent_folder>
+      <split>N</split>
+      <add_date>N</add_date>
+      <add_time>N</add_time>
+      <SpecifyFormat>N</SpecifyFormat>
+      <date_time_format/>
+      <sheetname>Sheet1</sheetname>
+      <autosizecolums>N</autosizecolums>
+      <nullisblank>N</nullisblank>
+      <protect_sheet>N</protect_sheet>
+      <password>Encrypted </password>
+      <splitevery>0</splitevery>
+      <usetempfiles>N</usetempfiles>
+      <tempdirectory/>
+      </file>
+    <template>
+      <enabled>N</enabled>
+      <append>N</append>
+      <filename>template.xls</filename>
+    </template>
+    <fields>
+      <field>
         <name>clzbh</name>
-        <field>inside_code</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
         <name>id</name>
-        <rename>id</rename>
-        <default/>
         <type>Integer</type>
-      </value>
-      <value>
-        <name>equipment_code</name>
+        <format/>
+      </field>
+      <field>
+        <name>company_update</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>branche_company_update</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>business_code_update</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>branch_company_code_update</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>equipmentCode_update</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>scrapCode_update</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>scrapState_update</name>
+        <type>Integer</type>
+        <format/>
+      </field>
+      <field>
+        <name>scrapDate_update</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>NrErrors</name>
+        <type>Integer</type>
+        <format/>
+      </field>
+      <field>
+        <name>ErrorDescription</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>ErrorFields</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>ErrorCodes</name>
+        <type>String</type>
+        <format/>
+      </field>
+    </fields>
+    <custom>
+    <header_font_name>arial</header_font_name>
+    <header_font_size>10</header_font_size>
+    <header_font_bold>N</header_font_bold>
+    <header_font_italic>N</header_font_italic>
+    <header_font_underline>no</header_font_underline>
+    <header_font_orientation>horizontal</header_font_orientation>
+    <header_font_color>black</header_font_color>
+    <header_background_color>none</header_background_color>
+    <header_row_height>255</header_row_height>
+    <header_alignment>left</header_alignment>
+    <header_image/>
+    <row_font_name>arial</row_font_name>
+    <row_font_size>10</row_font_size>
+    <row_font_color>black</row_font_color>
+    <row_background_color>none</row_background_color>
+      </custom>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>972</xloc>
+      <yloc>404</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x672c;&#x5730;&#x7ebf;&#x8def;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>control_jndi</connection>
+    <cache>Y</cache>
+    <cache_load_all>Y</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_line</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xl</name>
+        <field>id</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>line_code</name>
+        <rename>line_code</rename>
+        <default/>
+        <type>None</type>
+      </value>
+      <value>
+        <name>name</name>
+        <rename>name</rename>
+        <default/>
+        <type>None</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>340</xloc>
+      <yloc>582</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x672c;&#x5730;&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x67e5;&#x8be2; </name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>control_jndi</connection>
+    <cache>Y</cache>
+    <cache_load_all>Y</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_cars</table>
+      <orderby>update_date desc</orderby>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>clzbh</name>
+        <field>inside_code</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>id</name>
+        <rename>id</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+      <value>
+        <name>equipment_code</name>
         <rename>equipment_code</rename>
         <default/>
         <type>String</type>
@@ -2628,255 +2961,6 @@
       </GUI>
     </step>
-  <step>
-    <name>&#x83b7;&#x53d6;&#x62a5;&#x5e9f;&#x8f66;&#x8f86;&#x6570;&#x636e;&#xff08;&#x66fe;&#x7ecf;&#x914d;&#x7f6e;&#x8fc7;&#x7ebf;&#x8def;&#xff09;</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-<send_true_to/>
-<send_false_to/>
-    <compare>
-<condition>
- <negated>N</negated>
- <conditions>
-  <condition>
-   <negated>N</negated>
-   <leftvalue>scrapState_update</leftvalue>
-   <function>&#x3d;</function>
-   <rightvalue/>
-   <value><name>constant</name><type>String</type><text>1</text><length>-1</length><precision>-1</precision><isnull>N</isnull><mask/></value>   </condition>
-  <condition>
-   <negated>N</negated>
-   <operator>AND</operator>
-   <leftvalue>xl</leftvalue>
-   <function>IS NOT NULL</function>
-   <rightvalue/>
-   </condition>
-  </conditions>
- </condition>
-    </compare>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>672</xloc>
-      <yloc>496</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x66f4;&#x65b0;&#x8f66;&#x8f86;&#x6570;&#x636e;&#x8f93;&#x51fa;</name>
-    <type>Update</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <connection>control_jndi</connection>
-    <skip_lookup>N</skip_lookup>
-    <commit>100</commit>
-    <use_batch>N</use_batch>
-    <error_ignored>N</error_ignored>
-    <ignore_flag_field/>
-    <lookup>
-      <schema/>
-      <table>bsth_c_cars</table>
-      <key>
-        <name>id</name>
-        <field>id</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-        </key>
-      <value>
-        <name>equipment_code</name>
-        <rename>equipmentCode_update</rename>
-        </value>
-      <value>
-        <name>scrap_code</name>
-        <rename>scrapCode_update</rename>
-        </value>
-      <value>
-        <name>scrap_date</name>
-        <rename>scrapDate_update</rename>
-        </value>
-      <value>
-        <name>scrap_state</name>
-        <rename>scrapState_update</rename>
-        </value>
-      <value>
-        <name>company</name>
-        <rename>company_update</rename>
-        </value>
-      <value>
-        <name>business_code</name>
-        <rename>business_code_update</rename>
-        </value>
-      <value>
-        <name>branche_company</name>
-        <rename>branche_company_update</rename>
-        </value>
-      <value>
-        <name>branche_company_code</name>
-        <rename>branch_company_code_update</rename>
-        </value>
-      <value>
-        <name>update_date</name>
-        <rename>update_date</rename>
-        </value>
-      </lookup>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>825</xloc>
-      <yloc>400</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x66f4;&#x65b0;&#x9519;&#x8bef;&#x6570;&#x636e;&#x6587;&#x4ef6;</name>
-    <type>ExcelOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <header>Y</header>
-    <footer>N</footer>
-    <encoding/>
-    <append>N</append>
-    <add_to_result_filenames>Y</add_to_result_filenames>
-    <file>
-      <name>&#x24;&#x7b;file_update_error&#x7d;</name>
-      <extention>xls</extention>
-      <do_not_open_newfile_init>N</do_not_open_newfile_init>
-      <create_parent_folder>N</create_parent_folder>
-      <split>N</split>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <SpecifyFormat>N</SpecifyFormat>
-      <date_time_format/>
-      <sheetname>Sheet1</sheetname>
-      <autosizecolums>N</autosizecolums>
-      <nullisblank>N</nullisblank>
-      <protect_sheet>N</protect_sheet>
-      <password>Encrypted </password>
-      <splitevery>0</splitevery>
-      <usetempfiles>N</usetempfiles>
-      <tempdirectory/>
-      </file>
-    <template>
-      <enabled>N</enabled>
-      <append>N</append>
-      <filename>template.xls</filename>
-    </template>
-    <fields>
-      <field>
-        <name>clzbh</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>id</name>
-        <type>Integer</type>
-        <format/>
-      </field>
-      <field>
-        <name>company_update</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>branche_company_update</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>business_code_update</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>branch_company_code_update</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>equipmentCode_update</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>scrapCode_update</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>scrapState_update</name>
-        <type>Integer</type>
-        <format/>
-      </field>
-      <field>
-        <name>scrapDate_update</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>NrErrors</name>
-        <type>Integer</type>
-        <format/>
-      </field>
-      <field>
-        <name>ErrorDescription</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>ErrorFields</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>ErrorCodes</name>
-        <type>String</type>
-        <format/>
-      </field>
-    </fields>
-    <custom>
-    <header_font_name>arial</header_font_name>
-    <header_font_size>10</header_font_size>
-    <header_font_bold>N</header_font_bold>
-    <header_font_italic>N</header_font_italic>
-    <header_font_underline>no</header_font_underline>
-    <header_font_orientation>horizontal</header_font_orientation>
-    <header_font_color>black</header_font_color>
-    <header_background_color>none</header_background_color>
-    <header_row_height>255</header_row_height>
-    <header_alignment>left</header_alignment>
-    <header_image/>
-    <row_font_name>arial</row_font_name>
-    <row_font_size>10</row_font_size>
-    <row_font_color>black</row_font_color>
-    <row_background_color>none</row_background_color>
-      </custom>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>962</xloc>
-      <yloc>400</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
   <step_error_handling>
       <error>
         <source_step>JavaScript&#x89e3;&#x6790;json&#x751f;&#x6210;&#x6570;&#x636e;</source_step>
@@ -359,6 +359,10 @@
 		<level value="INFO" />
 		<appender-ref ref="STDOUT" />
 	</logger>
+	<!--<logger name="org.hibernate.type.descriptor.sql.BasicBinder" additivity="true">
+		<level value="TRACE" />
+		<appender-ref ref="STDOUT" />
+	</logger>-->
 	<!-- 日志输出级别 -->
 	<root level="info">
@@ -307,7 +307,7 @@ rule &quot;statinfo_result&quot; // 统计计算结果
         $inbc: Long() from accumulate (TTInfoDetail(bcType == "in") from $ttInfoDetails_wrap.getBcInfoList(), count())
         $outbc: Long() from accumulate (TTInfoDetail(bcType == "out") from $ttInfoDetails_wrap.getBcInfoList(), count())
         $yybc: Long() from accumulate (TTInfoDetail(bcType != "out", bcType != "in") from $ttInfoDetails_wrap.getBcInfoList(), count())
-        $errorbc: Long() from accumulate ($ttd: TTInfoDetail() from $ttInfoDetails_wrap.getBcInfoList(), ecount($ttd))
+        $errorbc: List() from accumulate ($ttd: TTInfoDetail() from $ttInfoDetails_wrap.getBcInfoList(), ecount($ttd))
     then
         log.info("时刻表={},id={},班次数={},进场={},出场={},营运={},错误={}", $statInfo.getTtname(), $statInfo.getTtid(), $allbc, $inbc, $outbc, $yybc, $errorbc);
@@ -315,7 +315,9 @@ rule &quot;statinfo_result&quot; // 统计计算结果
         $statInfo.setInbc($inbc);
         $statInfo.setOutbc($outbc);
         $statInfo.setYybc($yybc);
-        $statInfo.setErrorbc($errorbc);
+        $statInfo.setErrorbc((Integer) $errorbc.get(0));
+        $statInfo.setErrorlpCount((Integer) $errorbc.get(1));
+        $statInfo.setErrorlpInfo((List<String>) $errorbc.get(2));
         int lineVersion = $ttInfoDetails_wrap.getLineVersion();
         $statInfo.setLineVersion(lineVersion);
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<meta name="renderer" content="webkit" />
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-	<meta charset="UTF-8">
-	<title>调度系统</title>
-
-	<meta http-equiv="Pragma" content="no-cache">
-	<meta http-equiv="Cache-control" content="no-cache">
-	<meta http-equiv="Cache" content="no-cache">
-
-	<!-- Font Awesome 图标字体 -->
-	<link
-			href="/metronic_v4.5.4/plugins/font-awesome/css/font-awesome.min.css"
-			rel="stylesheet" type="text/css" />
-	<!-- Bootstrap style -->
-	<link href="/metronic_v4.5.4/plugins/bootstrap/css/bootstrap.min.css"
-		  rel="stylesheet" type="text/css" />
-	<!-- jsTree 数插件 -->
-	<link
-			href="/metronic_v4.5.4/plugins/jstree/dist/themes/default/style.min.css"
-			rel="stylesheet" type="text/css" />
-	<!-- MULTI-select 多选下拉框美化 -->
-	<link
-			href="/metronic_v4.5.4/plugins/jquery-multi-select/css/multi-select.css"
-			rel="stylesheet" type="text/css" />
-
-	<!-- editable -->
-	<link
-			href="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css"
-			rel="stylesheet" type="text/css" />
-	<!-- METRONIC style -->
-	<link href="/metronic_v4.5.4/layout4/css/themes/light.min.css"
-		  rel="stylesheet" type="text/css" id="style_color" />
-	<link href="/metronic_v4.5.4/css/components.css" rel="stylesheet"
-		  type="text/css" />
-	<link href="/metronic_v4.5.4/css/plugins.css" rel="stylesheet"
-		  type="text/css" />
-	<link href="/metronic_v4.5.4/layout4/css/layout.min.css"
-		  rel="stylesheet" type="text/css" />
-	<link href="/metronic_v4.5.4/layout4/css/custom.min.css"
-		  rel="stylesheet" type="text/css" />
-	<!-- select2 下拉框插件 -->
-	<link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css"
-		  rel="stylesheet" type="text/css" />
-	<link
-			href="/metronic_v4.5.4/plugins/select2/css/select2-bootstrap.min.css"
-			rel="stylesheet" type="text/css" />
-	<!-- layer 弹层 插件 -->
-	<link href="/assets/plugins/layer-v2.4/layer/skin/layer.css"
-		  rel="stylesheet" type="text/css" />
-	<!-- fileinput 上传 插件 -->
-	<link href="/assets/plugins/fileinput/css/fileinput.min.css"
-		  rel="stylesheet" type="text/css" />
-	<!-- iCheck 单选框和复选框 -->
-	<link href="/metronic_v4.5.4/plugins/icheck/skins/all.css"
-		  rel="stylesheet" type="text/css" />
-	<!-- 日期控件 -->
-	<link
-			href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css"
-			rel="stylesheet" type="text/css" />
-	<!-- table 表格控件 -->
-	<!--<link rel="stylesheet"-->
-		  <!--href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"-->
-		  <!--type="text/css" />-->
-	<link href="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css" rel="stylesheet" type="text/css"/>
-	<!-- handsontable样式 -->
-	<link rel="stylesheet"
-		  href="/assets/bower_components/handsontable/dist/handsontable.full.css" />
-	<!-- sweetalert样式 -->
-	<link rel="stylesheet"
-		  href="/assets/bower_components/sweetalert/dist/sweetalert.css" />
-	<!-- schedule计划调度AngularJS模块主css -->
-	<link rel="stylesheet" href="/pages/scheduleApp/module/common/main.css"
-		  type="text/css" />
-	<link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" merge="plugins"/>
-
-	<!-- CSS动画 -->
-	<link
-			href="/metronic_v4.5.4/plugins/tipso/css/animate.css"
-			rel="stylesheet" type="text/css" />
-
-	<!-- 提示工具样式 -->
-	<link
-			href="/metronic_v4.5.4/plugins/tipso/css/tipso.css"
-			rel="stylesheet" type="text/css" />
-
-	<style type="text/css">
-		.searchForm {
-
-		}
-
-		.searchForm .form-group .control-label {
-			padding-right: 0px;
-			text-align: right;
-			margin-top: 7px;
-		}
-
-		.searchForm .form-group>div {
-			padding-left: 10px;
-			padding-right: 0px;
-		}
-
-		.searchForm .row>div {
-			padding-left: 0px;
-			padding-right: 0px;
-			padding: 5px 0 5px 0;
-			width: 270px;
-			display: inline-block;
-		}
-
-		.searchForm .form-actions {
-
-		}
-
-		tr.row-active td {
-			border-bottom: 1px solid blue !important;
-			color: blue;
-		}
-
-		.ms-container .ms-selectable li.ms-elem-selectable,.ms-container .ms-selection li.ms-elem-selection
-		{
-			font-size: 14px;
-		}
-
-		.ms-container .ms-selectable li.ms-elem-selectable,.ms-container .ms-selection li.ms-elem-selection
-		{
-			padding: 6px 26px;
-		}
-
-		.ms-container .ms-list {
-			height: 306px;
-		}
-
-		.ms-container .ms-selectable,.ms-container .ms-selection {
-			width: 47%;
-		}
-
-		.ms-container {
-			width: 470px;
-			margin: auto;
-		}
-
-		.multi-custom-header-left {
-			text-align: center;
-			padding: 7px;
-			color: #3B3F51;
-		}
-
-		.multi-custom-header-right {
-			text-align: center;
-			padding: 7px;
-			font-weight: bold;
-			color: #36C6D3;
-		}
-
-		.mt-element-list .list-simple.mt-list-container ul>.mt-list-item>.list-item-content
-		{
-			padding: 0 55px 0 0px;
-		}
-
-		.mt-element-list .list-simple.mt-list-container ul>.mt-list-item {
-			padding: 3.3px 0;
-		}
-
-		#route-container {
-			display: none;
-		}
-
-		.page-content.active {
-			display: block !important;
-		}
-
-		.page-header.navbar .page-logo .logo-default {
-			margin: 0;
-		}
-
-		.page-header.navbar .top-menu .navbar-nav>li.dropdown.open .dropdown-toggle
-		{
-			background-color: #284a99;
-		}
-
-		.page-header.navbar .page-logo {
-			padding-right: 10px;
-		}
-
-		.page-logo .logo-default.logo-default-text {
-			font-weight: 600;
-			color: white !important;
-			margin-top: 19px !important;
-			font-size: 24px;
-			text-decoration: none;
-		}
-
-		.page-logo .logo-default.logo-default-text:HOVER {
-			color: #dedede !important;
-		}
-
-		body,.page-content-wrapper,#pjax-container{
-			height: 100%;
-		}
-		html{
-			height: 90%;
-		}
-		.page-container{
-			height: 100%;
-		}
-	</style>
-
-	<!-- ocLazyLoading载入文件的位置 -->
-	<link id="ng_load_plugins_before" />
-
-</head>
-<body
-		class="page-container-bg-solid page-header-fixed page-sidebar-closed-hide-logo page-sidebar-fixed">
-<div class="page-header navbar navbar-fixed-top"
-	 style="background: linear-gradient(to bottom, #124e78, #125688);">
-	<div class="page-header-inner ">
-		<!-- LOGO -->
-		<div class="page-logo">
-			<a href="index.html" class="logo-default logo-default-text">
-				浦东公交调度系统 </a>
-			<div class="menu-toggler sidebar-toggler"></div>
-		</div>
-		<!-- END LOGO -->
-		<a href="javascript:;" class="menu-toggler responsive-toggler"
-		   data-toggle="collapse" data-target=".navbar-collapse"> </a>
-		<div class="page-top">
-			<div class="top-menu">
-				<ul class="nav navbar-nav pull-right">
-					<!-- 信息通知区 -->
-					<li
-							class="dropdown dropdown-extended dropdown-notification dropdown-dark"
-							id="header_notification_bar"><a href="javascript:;"
-															class="dropdown-toggle" data-toggle="dropdown"
-															data-hover="dropdown" data-close-others="true"> <i
-							class="fa fa-bell"></i> <span class="badge badge-success">
-									0 </span>
-					</a>
-						<ul class="dropdown-menu" style="max-width: 345px; width: 345px;">
-							<li class="external">
-								<h3>
-									今日 <span class="bold">0 条</span> 通知
-								</h3> <a href="javascript:;">查看全部</a>
-							</li>
-							<li>
-								<ul class="dropdown-menu-list scroller" style="height: 250px;"
-									data-handle-color="#637283">
-								</ul>
-							</li>
-						</ul></li>
-					<li class="dropdown dropdown-user dropdown-dark"><a
-							href="javascript:;" class="dropdown-toggle"
-							data-toggle="dropdown" data-hover="dropdown"
-							data-close-others="true"> <span id="indexTopUName"
-															class="username username-hide-on-mobile"
-															style="vertical-align: middle;"> <i class="fa fa-user"></i></span>
-					</a>
-						<ul class="dropdown-menu dropdown-menu-default">
-							<li><a href="javascript:;"> <i class="fa fa-user"></i>
-								我的信息
-							</a></li>
-							<li><a href="javascript:;" id="changePWD"> <i
-									class="fa fa-unlock-alt"></i> 修改密码
-							</a></li>
-							<li class="divider"></li>
-							<li><a href="javascript:;"> <i class="fa fa-lock"></i>
-								锁屏
-							</a></li>
-							<li><a href="/logout"> <i class="fa fa-key"></i> 注销登陆
-							</a></li>
-						</ul></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</div>
-<div class="page-container">
-	<div class="page-sidebar-wrapper">
-		<div class="page-sidebar navbar-collapse collapse">
-			<ul class="page-sidebar-menu page-sidebar-menu-fixed"
-				data-keep-expanded="false" data-auto-scroll="true"
-				data-slide-speed="200" id="leftMenuSidebar">
-			</ul>
-		</div>
-	</div>
-	<div class="page-content-wrapper">
-		<div id="pjax-container" class="page-content"></div>
-
-		<div id="route-container">
-			<div ng-app="ScheduleApp">
-				<div ng-controller="ScheduleAppController">
-
-					<!-- loading widget -->
-					<div id="loadingWidget" class="flyover mask" loading-widget>
-						<div class="alert alert-info">
-							<strong>载入中......</strong>
-						</div>
-					</div>
-
-					<div ui-view class="uv"></div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script id="menu_list_temp" type="text/html">
-	{{each list as group i}}
-	<li class="heading">
-		<h3 class="uppercase">{{group.name}}</h3>
-	</li>
-	{{each group.children as dir j}}
-	<li class="nav-item">
-		<a href="javascript:;" class="nav-link nav-toggle ">
-			<i class="{{dir.icon}}"></i>
-			<span class="title">{{dir.name}}</span>
-			<span class="arrow"></span>
-		</a>
-		<ul class="sub-menu">
-			{{each dir.children as module s}}
-			<li class="nav-item  ">
-				{{if module.container=="pjax-container"}}
-				<a href="/pages/{{module.path}}" class="nav-link " data-pjax>
-					<span class="title">{{module.name}}</span>
-				</a>
-				{{else}}
-				<a href="{{module.path}}" class="nav-link " data-angularjs>
-					<span class="title">{{module.name}}</span>
-				</a>
-				{{/if}}
-			</li>
-			{{/each}}
-		</ul>
-	</li>
-	{{/each}}
-	{{/each}}
-
-</script>
-<script>
-	delete window.require;
-	delete window.exports;
-	delete window.module;
-</script>
-<!-- jQuery -->
-<script src="/metronic_v4.5.4/plugins/jquery.min.js" data-exclude=1></script>
-<!-- bootstrap -->
-<script src="/metronic_v4.5.4/plugins/bootstrap/js/bootstrap.min.js"
-		data-exclude=1></script>
-<script src="/pages/forms/statement/js/jquery.autocompleter.js"></script>
-<script src="/pages/forms/statement/js/jquery.PrintArea.js"></script>
-<!-- MTRONIC JS -->
-<script src="/metronic_v4.5.4/scripts/app.min.js" data-exclude=1></script>
-<script src="/metronic_v4.5.4/layout4/scripts/layout.min.js"
-		data-exclude=1></script>
-<!-- 虚拟滚动条 -->
-<script
-		src="/metronic_v4.5.4/plugins/jquery-slimscroll/jquery.slimscroll.min.js"></script>
-<!-- jsTree 树插件 -->
-<script src="/metronic_v4.5.4/plugins/jstree/dist/jstree.min.js"></script>
-<!-- bootstrap-hover-dropDown -->
-<script
-		src="/metronic_v4.5.4/plugins/bootstrap-hover-dropdown/bootstrap-hover-dropdown.min.js"></script>
-<!-- jquery.validate 表单验证 -->
-<script
-		src="/metronic_v4.5.4/plugins/jquery-validation/js/jquery.validate.min.js"></script>
-<script
-		src="/metronic_v4.5.4/plugins/jquery-validation/js/localization/messages_zh.js"></script>
-<!-- 向导式插件 -->
-<script
-		src="/metronic_v4.5.4//plugins/bootstrap-wizard/jquery.bootstrap.wizard.min.js"></script>
-<!-- iCheck 单选框和复选框  -->
-<script src="/metronic_v4.5.4/plugins/icheck/icheck.min.js"></script>
-<!-- select2 下拉框 -->
-<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>
-<!-- MULTI SELECT 多选下拉框 -->
-<script
-		src="/metronic_v4.5.4/plugins/jquery-multi-select/js/jquery.multi-select.js"></script>
-<!-- editable.js -->
-<script
-		src="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/js/bootstrap-editable.min.js"></script>
-<!-- PJAX -->
-<script src="/assets/plugins/jquery.pjax.js"></script>
-<!-- layer 弹层 -->
-<script src="/assets/plugins/layer-v2.4/layer/layer.js" data-exclude=1></script>
-<!-- fileinput 上传 -->
-<script src="/assets/plugins/fileinput/canvas-to-blob.min.js"></script>
-<script src="/assets/plugins/fileinput/purify.min.js"></script>
-<script src="/assets/plugins/fileinput/sortable.min.js"></script>
-<script src="/assets/plugins/fileinput/fileinput.min.js"></script>
-<script src="/assets/plugins/fileinput/fileinput_locale_zh.js"></script>
-<!-- jquery.purl URL解析 -->
-<script src="/assets/plugins/purl.js"></script>
-<!-- jquery.serializejson JSON序列化插件 -->
-<script src="/assets/plugins/jquery.serializejson.js"></script>
-<!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js"></script>
-<!-- jquery.pageinator 分页 -->
-<script src="/assets/plugins/jqPaginator.min.js"></script>
-<!-- moment.js 日期处理类库 -->
-<script src="/assets/plugins/moment-with-locales.js"></script>
-
-<script src="/assets/plugins/pinyin.js"></script>
-<!-- 日期控件 -->
-<script
-		src="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/js/bootstrap-datetimepicker.min.js"></script>
-<!-- 表格控件 -->
-<script src="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js"></script>
-<!-- 统计图控件 -->
-<!--<script src="/assets/global/getEchart.js"></script>
-<script src="/assets/global/echarts.js"></script> -->
-<script src="/assets/js/common.js"></script>
-<script src="/assets/js/dictionary.js"></script>
-<!-- tipso JS -->
-<script src="/metronic_v4.5.4/plugins/tipso/js/tipso.js"></script>
-<script data-exclude=1>
-	//初始打开的片段地址
-	var initFragment = "^_^initFragment^_^";
-	//静态文件目录
-	var dir = '/pages/';
-	//片段容器
-	var pjaxContainer = '#pjax-container'
-			, angJsContainer = '#route-container';
-
-	$(document).ajaxError(function (event, jqxhr, settings, thrownError) {
-		if(jqxhr.status == 403){
-			layer.closeAll();
-			layer.alert(jqxhr.message?jqxhr.message:'访问被拒绝', {icon: 2, title: '操作失败'});
-		}
-	});
-
-	$(function () {
-		$.get('/user/currentUser', function (user) {
-			$('#indexTopUName').text(user.userName);
-		});
-
-		//带 data-pjax 的链接由pjax加载
-		$(document).pjax('a[data-pjax]', pjaxContainer);
-
-		//pjax左菜单点击事件
-		$(document).on('click', '#leftMenuSidebar a[data-pjax]', function () {
-			setTitle(this);
-
-			$('#leftMenuSidebar li.nav-item.active').removeClass('active');
-			$(this).parent().addClass('active');
-			showPjax();
-		});
-
-		//angularjs左菜单点击事件
-		$(document).on('click', '#leftMenuSidebar a[data-angularjs]', function () {
-			setTitle(this);
-
-			$('#leftMenuSidebar li.nav-item.active').removeClass('active');
-			$(this).parent().addClass('active');
-			showAngJs();
-		});
-
-		//加载左菜单栏
-		$get('/module/findByCurrentUser', null,
-				function (ms) {
-					var treeArray = createTreeData(ms);
-					treeArray.sort(function (a, b) {
-						return a.createDate - b.createDate;
-					});
-					var menuHtml = template('menu_list_temp', {list: treeArray});
-					$('#leftMenuSidebar').html(menuHtml);
-
-					//----------- 检查URL ----------------
-					var h = location.hash;
-					if (initFragment && initFragment != '') {
-						showPjax();
-						//普通片段
-						loadPage(initFragment);
-						//选中菜单
-						$.each($('#leftMenuSidebar a'), function (i, item) {
-							if (urlPattern($(item).attr('href'), initFragment)) {
-								activeLeftMenu(item);
-							}
-						});
-					} else if (h) {
-						//angularjs片段
-						showAngJs();
-						//选中菜单
-						$.each($('#leftMenuSidebar a'), function (i, item) {
-							if ($(item).attr('href') == h) {
-								activeLeftMenu(item);
-							}
-						});
-					}
-					else {
-						//加载主页
-						loadPage('/pages/home.html');
-					}
-				});
-
-		//修改密码
-		$('#changePWD').on('click', function () {
-			$.get('/pages/permission/user/changePWD.html', function (content) {
-				layer.open({
-					type: 1,
-					area: ['600px', '360px'],
-					content: content,
-					title: '修改密码',
-					shift: 5,
-					scrollbar: false,
-					success: function () {
-					}
-				});
-			});
-		});
-	});
-
-	//modal关闭时销毁dom
-	$(document).on('hidden.bs.modal', '.modal', function () {
-		$(this).remove();
-	});
-
-	//pjax加载完成事件
-	$(document).on('pjax:success', function () {
-		var dicts = $(pjaxContainer).find('.nt-dictionary');
-		dictionaryUtils.transformDom(dicts);
-	});
-
-	function loadPage(url) {
-		$.pjax({url: url, container: pjaxContainer})
-	}
-
-	function urlPattern(a, b) {
-		var r;
-		try {
-			r = a.substring(0, a.lastIndexOf('/')) == b.substring(0, b.lastIndexOf('/'));
-		} catch (e) {
-			r = false;
-		}
-		return r;
-	}
-
-	function showPjax() {
-		$(angJsContainer).removeClass('page-content active').hide();
-		$(pjaxContainer).addClass('page-content active');
-	}
-
-	function showAngJs() {
-		$(pjaxContainer).html('').removeClass('page-content active').hide();
-		$(angJsContainer).addClass('page-content active');
-	}
-
-	function activeLeftMenu(item) {
-		$(item).parent('.nav-item').addClass('active').parent('.sub-menu').show().parent().addClass('open');
-		setTitle(item);
-	}
-
-	function setTitle(menuItem){
-		document.title = $('span.title', menuItem).text();
-	}
-
-</script>
-<!-- d3 -->
-<script src="/assets/js/d3.min.js" data-exclude=1></script>
-<!-- webSocket JS -->
-<script src="/assets/js/sockjs.min.js"></script>
-
-<!-- TODO：angularJS相关库 -->
-
-<!-- angularJS相关库 -->
-<!-- 这个是基于angularjs 1.4.10修改的版本，主要是修改了history控制部分，用于兼容route和pjax的同时操作history的冲突 -->
-<script src="/assets/js/angular.js" data-autocephaly=1></script>
-<script src="/assets/bower_components/angular-i18n/angular-locale_zh-cn.js" data-autocephaly=1></script>
-<script
-		src="/assets/bower_components/angular-resource/angular-resource.min.js"
-		data-exclude=1></script>
-<script
-		src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js"
-		data-exclude=1></script>
-<script
-		src="/assets/bower_components/angular-animate/angular-animate.min.js"
-		data-exclude=1></script>
-<script
-		src="/assets/bower_components/angular-touch/angular-touch.min.js"
-		data-exclude=1></script>
-<script
-		src="/assets/bower_components/angular-ui-router/release/angular-ui-router.min.js"
-		data-exclude=1></script>
-<script
-		src="/assets/bower_components/oclazyload/dist/ocLazyLoad.min.js"
-		data-exclude=1></script>
-<script
-		src="/assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"
-		data-exclude=1></script>
-<!-- handsontable相关js -->
-<script
-		src="/assets/bower_components/handsontable/dist/handsontable.full.js"></script>
-<script
-		src="/assets/bower_components/ngHandsontable/dist/ngHandsontable.js"></script>
-<!-- sweetalert相关js -->
-<script src="/assets/bower_components/sweetalert/dist/sweetalert.min.js"></script>
-<script src="/assets/bower_components/ng-sweet-alert/ng-sweet-alert.js"></script>
-
-<!-- schedule计划调度AngularJS模块主JS -->
-<script src="/pages/scheduleApp/module/common/main.js" data-exclude=1></script>
-<script
-		src="/pages/scheduleApp/module/common/prj-common-globalservice.js"
-		data-exclude=1></script>
-<script src="/pages/scheduleApp/module/common/prj-common-filter.js"
-		data-exclude=1></script>
-<script src="/pages/scheduleApp/module/common/prj-common-directive.js"
-		data-exclude=1></script>
-<script
-		src="/pages/scheduleApp/module/common/prj-common-ui-route-state.js"
-		data-exclude=1></script>
-
-<!-- 地图相关 -->
-<!-- 百度 -->
-<script
-		src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
-		data-exclude=1></script>
-<script
-		src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
-		data-exclude=1></script>
-<script type="text/javascript"
-		src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
-		data-exclude=1></script>
-<script type="text/javascript"
-		src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
-		data-exclude=1></script>
-<script src="/assets/js/baidu/TextIconOverlay.js" data-exclude=1></script>
-<script src="/assets/js/baidu//MarkerClusterer.js" data-exclude=1></script>
-<!-- 高德  -->
-<script
-		src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
-		data-exclude=1></script>
-<!-- echarts4 -->
-<script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
-<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
-<!-- RSA加密 -->
-<script src="/assets/plugins/jsencrypt.min.js"></script>
-
-</body>
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+	<meta name="renderer" content="webkit" />
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+	<meta charset="UTF-8">
+	<title>调度系统</title>
+
+	<meta http-equiv="Pragma" content="no-cache">
+	<meta http-equiv="Cache-control" content="no-cache">
+	<meta http-equiv="Cache" content="no-cache">
+
+	<!-- Font Awesome 图标字体 -->
+	<link
+			href="/metronic_v4.5.4/plugins/font-awesome/css/font-awesome.min.css"
+			rel="stylesheet" type="text/css" />
+	<!-- Bootstrap style -->
+	<link href="/metronic_v4.5.4/plugins/bootstrap/css/bootstrap.min.css"
+		  rel="stylesheet" type="text/css" />
+	<!-- jsTree 数插件 -->
+	<link
+			href="/metronic_v4.5.4/plugins/jstree/dist/themes/default/style.min.css"
+			rel="stylesheet" type="text/css" />
+	<!-- MULTI-select 多选下拉框美化 -->
+	<link
+			href="/metronic_v4.5.4/plugins/jquery-multi-select/css/multi-select.css"
+			rel="stylesheet" type="text/css" />
+
+	<!-- editable -->
+	<link
+			href="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css"
+			rel="stylesheet" type="text/css" />
+	<!-- METRONIC style -->
+	<link href="/metronic_v4.5.4/layout4/css/themes/light.min.css"
+		  rel="stylesheet" type="text/css" id="style_color" />
+	<link href="/metronic_v4.5.4/css/components.css" rel="stylesheet"
+		  type="text/css" />
+	<link href="/metronic_v4.5.4/css/plugins.css" rel="stylesheet"
+		  type="text/css" />
+	<link href="/metronic_v4.5.4/layout4/css/layout.min.css"
+		  rel="stylesheet" type="text/css" />
+	<link href="/metronic_v4.5.4/layout4/css/custom.min.css"
+		  rel="stylesheet" type="text/css" />
+	<!-- select2 下拉框插件 -->
+	<link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css"
+		  rel="stylesheet" type="text/css" />
+	<link
+			href="/metronic_v4.5.4/plugins/select2/css/select2-bootstrap.min.css"
+			rel="stylesheet" type="text/css" />
+	<!-- layer 弹层 插件 -->
+	<link href="/assets/plugins/layer-v2.4/layer/skin/layer.css"
+		  rel="stylesheet" type="text/css" />
+	<!-- fileinput 上传 插件 -->
+	<link href="/assets/plugins/fileinput/css/fileinput.min.css"
+		  rel="stylesheet" type="text/css" />
+	<!-- iCheck 单选框和复选框 -->
+	<link href="/metronic_v4.5.4/plugins/icheck/skins/all.css"
+		  rel="stylesheet" type="text/css" />
+	<!-- 日期控件 -->
+	<link
+			href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css"
+			rel="stylesheet" type="text/css" />
+	<!-- table 表格控件 -->
+	<!--<link rel="stylesheet"-->
+		  <!--href="//api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"-->
+		  <!--type="text/css" />-->
+	<link href="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css" rel="stylesheet" type="text/css"/>
+	<!-- handsontable样式 -->
+	<link rel="stylesheet"
+		  href="/assets/bower_components/handsontable/dist/handsontable.full.css" />
+	<!-- sweetalert样式 -->
+	<link rel="stylesheet"
+		  href="/assets/bower_components/sweetalert/dist/sweetalert.css" />
+	<!-- schedule计划调度AngularJS模块主css -->
+	<link rel="stylesheet" href="/pages/scheduleApp/module/common/main.css"
+		  type="text/css" />
+	<link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" merge="plugins"/>
+
+	<!-- CSS动画 -->
+	<link
+			href="/metronic_v4.5.4/plugins/tipso/css/animate.css"
+			rel="stylesheet" type="text/css" />
+
+	<!-- 提示工具样式 -->
+	<link
+			href="/metronic_v4.5.4/plugins/tipso/css/tipso.css"
+			rel="stylesheet" type="text/css" />
+
+	<style type="text/css">
+		.searchForm {
+
+		}
+
+		.searchForm .form-group .control-label {
+			padding-right: 0px;
+			text-align: right;
+			margin-top: 7px;
+		}
+
+		.searchForm .form-group>div {
+			padding-left: 10px;
+			padding-right: 0px;
+		}
+
+		.searchForm .row>div {
+			padding-left: 0px;
+			padding-right: 0px;
+			padding: 5px 0 5px 0;
+			width: 270px;
+			display: inline-block;
+		}
+
+		.searchForm .form-actions {
+
+		}
+
+		tr.row-active td {
+			border-bottom: 1px solid blue !important;
+			color: blue;
+		}
+
+		.ms-container .ms-selectable li.ms-elem-selectable,.ms-container .ms-selection li.ms-elem-selection
+		{
+			font-size: 14px;
+		}
+
+		.ms-container .ms-selectable li.ms-elem-selectable,.ms-container .ms-selection li.ms-elem-selection
+		{
+			padding: 6px 26px;
+		}
+
+		.ms-container .ms-list {
+			height: 306px;
+		}
+
+		.ms-container .ms-selectable,.ms-container .ms-selection {
+			width: 47%;
+		}
+
+		.ms-container {
+			width: 470px;
+			margin: auto;
+		}
+
+		.multi-custom-header-left {
+			text-align: center;
+			padding: 7px;
+			color: #3B3F51;
+		}
+
+		.multi-custom-header-right {
+			text-align: center;
+			padding: 7px;
+			font-weight: bold;
+			color: #36C6D3;
+		}
+
+		.mt-element-list .list-simple.mt-list-container ul>.mt-list-item>.list-item-content
+		{
+			padding: 0 55px 0 0px;
+		}
+
+		.mt-element-list .list-simple.mt-list-container ul>.mt-list-item {
+			padding: 3.3px 0;
+		}
+
+		#route-container {
+			display: none;
+		}
+
+		.page-content.active {
+			display: block !important;
+		}
+
+		.page-header.navbar .page-logo .logo-default {
+			margin: 0;
+		}
+
+		.page-header.navbar .top-menu .navbar-nav>li.dropdown.open .dropdown-toggle
+		{
+			background-color: #284a99;
+		}
+
+		.page-header.navbar .page-logo {
+			padding-right: 10px;
+		}
+
+		.page-logo .logo-default.logo-default-text {
+			font-weight: 600;
+			color: white !important;
+			margin-top: 19px !important;
+			font-size: 24px;
+			text-decoration: none;
+		}
+
+		.page-logo .logo-default.logo-default-text:HOVER {
+			color: #dedede !important;
+		}
+
+		body,.page-content-wrapper,#pjax-container{
+			height: 100%;
+		}
+		html{
+			height: 90%;
+		}
+		.page-container{
+			height: 100%;
+		}
+	</style>
+
+	<!-- ocLazyLoading载入文件的位置 -->
+	<link id="ng_load_plugins_before" />
+
+</head>
+<body
+		class="page-container-bg-solid page-header-fixed page-sidebar-closed-hide-logo page-sidebar-fixed">
+<div class="page-header navbar navbar-fixed-top"
+	 style="background: linear-gradient(to bottom, #124e78, #125688);">
+	<div class="page-header-inner ">
+		<!-- LOGO -->
+		<div class="page-logo">
+			<a href="index.html" class="logo-default logo-default-text">
+				浦东公交调度系统 </a>
+			<div class="menu-toggler sidebar-toggler"></div>
+		</div>
+		<!-- END LOGO -->
+		<a href="javascript:;" class="menu-toggler responsive-toggler"
+		   data-toggle="collapse" data-target=".navbar-collapse"> </a>
+		<div class="page-top">
+			<div class="top-menu">
+				<ul class="nav navbar-nav pull-right">
+					<!-- 信息通知区 -->
+					<li
+							class="dropdown dropdown-extended dropdown-notification dropdown-dark"
+							id="header_notification_bar"><a href="javascript:;"
+															class="dropdown-toggle" data-toggle="dropdown"
+															data-hover="dropdown" data-close-others="true"> <i
+							class="fa fa-bell"></i> <span class="badge badge-success">
+									0 </span>
+					</a>
+						<ul class="dropdown-menu" style="max-width: 345px; width: 345px;">
+							<li class="external">
+								<h3>
+									今日 <span class="bold">0 条</span> 通知
+								</h3> <a href="javascript:;">查看全部</a>
+							</li>
+							<li>
+								<ul class="dropdown-menu-list scroller" style="height: 250px;"
+									data-handle-color="#637283">
+								</ul>
+							</li>
+						</ul></li>
+					<li class="dropdown dropdown-user dropdown-dark"><a
+							href="javascript:;" class="dropdown-toggle"
+							data-toggle="dropdown" data-hover="dropdown"
+							data-close-others="true"> <span id="indexTopUName"
+															class="username username-hide-on-mobile"
+															style="vertical-align: middle;"> <i class="fa fa-user"></i></span>
+					</a>
+						<ul class="dropdown-menu dropdown-menu-default">
+							<li><a href="javascript:;"> <i class="fa fa-user"></i>
+								我的信息
+							</a></li>
+							<li><a href="javascript:;" id="changePWD"> <i
+									class="fa fa-unlock-alt"></i> 修改密码
+							</a></li>
+							<li class="divider"></li>
+							<li><a href="javascript:;"> <i class="fa fa-lock"></i>
+								锁屏
+							</a></li>
+							<li><a href="/logout"> <i class="fa fa-key"></i> 注销登陆
+							</a></li>
+						</ul></li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="page-container">
+	<div class="page-sidebar-wrapper">
+		<div class="page-sidebar navbar-collapse collapse">
+			<ul class="page-sidebar-menu page-sidebar-menu-fixed"
+				data-keep-expanded="false" data-auto-scroll="true"
+				data-slide-speed="200" id="leftMenuSidebar">
+			</ul>
+		</div>
+	</div>
+	<div class="page-content-wrapper">
+		<div id="pjax-container" class="page-content"></div>
+
+		<div id="route-container">
+			<div ng-app="ScheduleApp">
+				<div ng-controller="ScheduleAppController">
+
+					<!-- loading widget -->
+					<div id="loadingWidget" class="flyover mask" loading-widget>
+						<div class="alert alert-info">
+							<strong>载入中......</strong>
+						</div>
+					</div>
+
+					<div ui-view class="uv"></div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script id="menu_list_temp" type="text/html">
+	{{each list as group i}}
+	<li class="heading">
+		<h3 class="uppercase">{{group.name}}</h3>
+	</li>
+	{{each group.children as dir j}}
+	<li class="nav-item">
+		<a href="javascript:;" class="nav-link nav-toggle ">
+			<i class="{{dir.icon}}"></i>
+			<span class="title">{{dir.name}}</span>
+			<span class="arrow"></span>
+		</a>
+		<ul class="sub-menu">
+			{{each dir.children as module s}}
+			<li class="nav-item  ">
+				{{if module.container=="pjax-container"}}
+				<a href="/pages/{{module.path}}" class="nav-link " data-pjax>
+					<span class="title">{{module.name}}</span>
+				</a>
+				{{else}}
+				<a href="{{module.path}}" class="nav-link " data-angularjs>
+					<span class="title">{{module.name}}</span>
+				</a>
+				{{/if}}
+			</li>
+			{{/each}}
+		</ul>
+	</li>
+	{{/each}}
+	{{/each}}
+
+</script>
+<script>
+	delete window.require;
+	delete window.exports;
+	delete window.module;
+</script>
+<!-- jQuery -->
+<script src="/metronic_v4.5.4/plugins/jquery.min.js" data-exclude=1></script>
+<!-- bootstrap -->
+<script src="/metronic_v4.5.4/plugins/bootstrap/js/bootstrap.min.js"
+		data-exclude=1></script>
+<script src="/pages/forms/statement/js/jquery.autocompleter.js"></script>
+<script src="/pages/forms/statement/js/jquery.PrintArea.js"></script>
+<!-- MTRONIC JS -->
+<script src="/metronic_v4.5.4/scripts/app.min.js" data-exclude=1></script>
+<script src="/metronic_v4.5.4/layout4/scripts/layout.min.js"
+		data-exclude=1></script>
+<!-- 虚拟滚动条 -->
+<script
+		src="/metronic_v4.5.4/plugins/jquery-slimscroll/jquery.slimscroll.min.js"></script>
+<!-- jsTree 树插件 -->
+<script src="/metronic_v4.5.4/plugins/jstree/dist/jstree.min.js"></script>
+<!-- bootstrap-hover-dropDown -->
+<script
+		src="/metronic_v4.5.4/plugins/bootstrap-hover-dropdown/bootstrap-hover-dropdown.min.js"></script>
+<!-- jquery.validate 表单验证 -->
+<script
+		src="/metronic_v4.5.4/plugins/jquery-validation/js/jquery.validate.min.js"></script>
+<script
+		src="/metronic_v4.5.4/plugins/jquery-validation/js/localization/messages_zh.js"></script>
+<!-- 向导式插件 -->
+<script
+		src="/metronic_v4.5.4//plugins/bootstrap-wizard/jquery.bootstrap.wizard.min.js"></script>
+<!-- iCheck 单选框和复选框  -->
+<script src="/metronic_v4.5.4/plugins/icheck/icheck.min.js"></script>
+<!-- select2 下拉框 -->
+<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>
+<!-- MULTI SELECT 多选下拉框 -->
+<script
+		src="/metronic_v4.5.4/plugins/jquery-multi-select/js/jquery.multi-select.js"></script>
+<!-- editable.js -->
+<script
+		src="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/js/bootstrap-editable.min.js"></script>
+<!-- PJAX -->
+<script src="/assets/plugins/jquery.pjax.js"></script>
+<!-- layer 弹层 -->
+<script src="/assets/plugins/layer-v2.4/layer/layer.js" data-exclude=1></script>
+<!-- fileinput 上传 -->
+<script src="/assets/plugins/fileinput/canvas-to-blob.min.js"></script>
+<script src="/assets/plugins/fileinput/purify.min.js"></script>
+<script src="/assets/plugins/fileinput/sortable.min.js"></script>
+<script src="/assets/plugins/fileinput/fileinput.min.js"></script>
+<script src="/assets/plugins/fileinput/fileinput_locale_zh.js"></script>
+<!-- jquery.purl URL解析 -->
+<script src="/assets/plugins/purl.js"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js"></script>
+<!-- jquery.pageinator 分页 -->
+<script src="/assets/plugins/jqPaginator.min.js"></script>
+<!-- moment.js 日期处理类库 -->
+<script src="/assets/plugins/moment-with-locales.js"></script>
+
+<script src="/assets/plugins/pinyin.js"></script>
+<!-- 日期控件 -->
+<script
+		src="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/js/bootstrap-datetimepicker.min.js"></script>
+<!-- 表格控件 -->
+<script src="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js"></script>
+<!-- 统计图控件 -->
+<!--<script src="/assets/global/getEchart.js"></script>
+<script src="/assets/global/echarts.js"></script> -->
+<script src="/assets/js/common.js"></script>
+<script src="/assets/js/dictionary.js"></script>
+<!-- tipso JS -->
+<script src="/metronic_v4.5.4/plugins/tipso/js/tipso.js"></script>
+<script data-exclude=1>
+	//初始打开的片段地址
+	var initFragment = "^_^initFragment^_^";
+	//静态文件目录
+	var dir = '/pages/';
+	//片段容器
+	var pjaxContainer = '#pjax-container'
+			, angJsContainer = '#route-container';
+
+	$(document).ajaxError(function (event, jqxhr, settings, thrownError) {
+		if(jqxhr.status == 403){
+			layer.closeAll();
+			layer.alert(jqxhr.message?jqxhr.message:'访问被拒绝', {icon: 2, title: '操作失败'});
+		}
+	});
+
+	$(function () {
+		$.get('/user/currentUser', function (user) {
+			$('#indexTopUName').text(user.userName);
+		});
+
+		//带 data-pjax 的链接由pjax加载
+		$(document).pjax('a[data-pjax]', pjaxContainer);
+
+		//pjax左菜单点击事件
+		$(document).on('click', '#leftMenuSidebar a[data-pjax]', function () {
+			setTitle(this);
+
+			$('#leftMenuSidebar li.nav-item.active').removeClass('active');
+			$(this).parent().addClass('active');
+			showPjax();
+		});
+
+		//angularjs左菜单点击事件
+		$(document).on('click', '#leftMenuSidebar a[data-angularjs]', function () {
+			setTitle(this);
+
+			$('#leftMenuSidebar li.nav-item.active').removeClass('active');
+			$(this).parent().addClass('active');
+			showAngJs();
+		});
+
+		//加载左菜单栏
+		$get('/module/findByCurrentUser', null,
+				function (ms) {
+					var treeArray = createTreeData(ms);
+					treeArray.sort(function (a, b) {
+						return a.createDate - b.createDate;
+					});
+					var menuHtml = template('menu_list_temp', {list: treeArray});
+					$('#leftMenuSidebar').html(menuHtml);
+
+					//----------- 检查URL ----------------
+					var h = location.hash;
+					if (initFragment && initFragment != '') {
+						showPjax();
+						//普通片段
+						loadPage(initFragment);
+						//选中菜单
+						$.each($('#leftMenuSidebar a'), function (i, item) {
+							if (urlPattern($(item).attr('href'), initFragment)) {
+								activeLeftMenu(item);
+							}
+						});
+					} else if (h) {
+						//angularjs片段
+						showAngJs();
+						//选中菜单
+						$.each($('#leftMenuSidebar a'), function (i, item) {
+							if ($(item).attr('href') == h) {
+								activeLeftMenu(item);
+							}
+						});
+					}
+					else {
+						//加载主页
+						loadPage('/pages/home.html');
+					}
+				});
+
+		//修改密码
+		$('#changePWD').on('click', function () {
+			$.get('/pages/permission/user/changePWD.html', function (content) {
+				layer.open({
+					type: 1,
+					area: ['600px', '360px'],
+					content: content,
+					title: '修改密码',
+					shift: 5,
+					scrollbar: false,
+					success: function () {
+					}
+				});
+			});
+		});
+	});
+
+	//modal关闭时销毁dom
+	$(document).on('hidden.bs.modal', '.modal', function () {
+		$(this).remove();
+	});
+
+	//pjax加载完成事件
+	$(document).on('pjax:success', function () {
+		var dicts = $(pjaxContainer).find('.nt-dictionary');
+		dictionaryUtils.transformDom(dicts);
+	});
+
+	function loadPage(url) {
+		$.pjax({url: url, container: pjaxContainer})
+	}
+
+	function urlPattern(a, b) {
+		var r;
+		try {
+			r = a.substring(0, a.lastIndexOf('/')) == b.substring(0, b.lastIndexOf('/'));
+		} catch (e) {
+			r = false;
+		}
+		return r;
+	}
+
+	function showPjax() {
+		$(angJsContainer).removeClass('page-content active').hide();
+		$(pjaxContainer).addClass('page-content active');
+	}
+
+	function showAngJs() {
+		$(pjaxContainer).html('').removeClass('page-content active').hide();
+		$(angJsContainer).addClass('page-content active');
+	}
+
+	function activeLeftMenu(item) {
+		$(item).parent('.nav-item').addClass('active').parent('.sub-menu').show().parent().addClass('open');
+		setTitle(item);
+	}
+
+	function setTitle(menuItem){
+		document.title = $('span.title', menuItem).text();
+	}
+
+</script>
+<!-- d3 -->
+<script src="/assets/js/d3.min.js" data-exclude=1></script>
+<!-- webSocket JS -->
+<script src="/assets/js/sockjs.min.js"></script>
+
+<!-- TODO：angularJS相关库 -->
+
+<!-- angularJS相关库 -->
+<!-- 这个是基于angularjs 1.4.10修改的版本，主要是修改了history控制部分，用于兼容route和pjax的同时操作history的冲突 -->
+<script src="/assets/js/angular.js" data-autocephaly=1></script>
+<script src="/assets/bower_components/angular-i18n/angular-locale_zh-cn.js" data-autocephaly=1></script>
+<script
+		src="/assets/bower_components/angular-resource/angular-resource.min.js"
+		data-exclude=1></script>
+<script
+		src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js"
+		data-exclude=1></script>
+<script
+		src="/assets/bower_components/angular-animate/angular-animate.min.js"
+		data-exclude=1></script>
+<script
+		src="/assets/bower_components/angular-touch/angular-touch.min.js"
+		data-exclude=1></script>
+<script
+		src="/assets/bower_components/angular-ui-router/release/angular-ui-router.min.js"
+		data-exclude=1></script>
+<script
+		src="/assets/bower_components/oclazyload/dist/ocLazyLoad.min.js"
+		data-exclude=1></script>
+<script
+		src="/assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"
+		data-exclude=1></script>
+<!-- handsontable相关js -->
+<script
+		src="/assets/bower_components/handsontable/dist/handsontable.full.js"></script>
+<script
+		src="/assets/bower_components/ngHandsontable/dist/ngHandsontable.js"></script>
+<!-- sweetalert相关js -->
+<script src="/assets/bower_components/sweetalert/dist/sweetalert.min.js"></script>
+<script src="/assets/bower_components/ng-sweet-alert/ng-sweet-alert.js"></script>
+
+<!-- schedule计划调度AngularJS模块主JS -->
+<script src="/pages/scheduleApp/module/common/main.js" data-exclude=1></script>
+<script
+		src="/pages/scheduleApp/module/common/prj-common-globalservice.js"
+		data-exclude=1></script>
+<script src="/pages/scheduleApp/module/common/prj-common-filter.js"
+		data-exclude=1></script>
+<script src="/pages/scheduleApp/module/common/prj-common-directive.js"
+		data-exclude=1></script>
+<script
+		src="/pages/scheduleApp/module/common/prj-common-ui-route-state.js"
+		data-exclude=1></script>
+
+<!-- 地图相关 -->
+<!-- 百度 -->
+<script
+		src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
+		data-exclude=1></script>
+<script
+		src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
+		data-exclude=1></script>
+<script type="text/javascript"
+		src="//api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
+		data-exclude=1></script>
+<script type="text/javascript"
+		src="//api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
+		data-exclude=1></script>
+<script src="/assets/js/baidu/TextIconOverlay.js" data-exclude=1></script>
+<script src="/assets/js/baidu//MarkerClusterer.js" data-exclude=1></script>
+<!-- 高德  -->
+<script
+		src="//webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
+		data-exclude=1></script>
+<!-- echarts4 -->
+<script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
+<!-- RSA加密 -->
+<script src="/assets/plugins/jsencrypt.min.js"></script>
+
+</body>
 </html>
 \ No newline at end of file
-<!-- 手动添加站点 -->
-<div class="modal fade" id="edit_route_mobal" tabindex="-1" role="basic"
-	aria-hidden="true">
-
-	<div class="modal-dialog">
-
-		<div class="modal-content"  >
-
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal"
-					aria-hidden="true"></button>
-				<h4 class="modal-title">生成路线（站点和路段）</h4>
-			</div>
-
-			<div class="modal-body">
-
-				<form class="form-horizontal" role="form"
-					id="save_route_template_form" action="" method="">
-
-					<div class="alert alert-danger display-hide">
-						<button class="close" data-close="alert"></button>
-						您的输入有误，请检查下面的输入项
-					</div>
-
-					<!-- 站点名称 -->
-					<div class="form-body">
-
-						<div class="form-group">
-							<label class="control-label col-md-2"> <span
-								class="required"> * </span> 坐标：
-							</label>
-							<div class="col-md-10">
-								<textarea class="form-control" rows="12" name="points"
-									id="pointInput" placeholder="坐标点"></textarea>
-							</div>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="col-md-3 control-label">选择文本类型：</label>
-						<div class="col-md-3">
-							<div class="icheck-list">
-								<label> <input type="radio" class="icheck"
-									name="typeCheck" value='0' checked> txt
-								</label> <label> <input type="radio" class="icheck"
-									name="typeCheck" value='1'> xml
-								</label>
-							</div>
-						</div>
-						<label class="col-md-3 control-label">选择方向：</label>
-						<div class="col-md-3">
-							<div class="icheck-list">
-								<label> <input type="radio" class="icheck"
-									name="dirCheck" value='0' checked> 上行
-								</label> <label> <input type="radio" class="icheck"
-									name="dirCheck" value='1'> 下行
-								</label>
-							</div>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="alert alert-info font-blue-chambray"
-							style="background-color: #2C3E50">
-							<h5 class="block">
-								<span class="help-block" style="color: #1bbc9b;"> *
-									坐标生成路线规划说明： </span>
-							</h5>
-							<p>
-
-								<span class="help-block" style="color: #1bbc9b;">
-									1.txt格式
-									<br>&nbsp;请在文本域中按顺序依次输坐标点,每行中的数据之间用【Tab】键隔开（如果是站点，请将在坐标后面加 stop;没有
-									stop默认是路段点，连续带stop的坐标认为是同一个站点）,每输入完一个坐标时请按回车键【Enter】换行. 例如：
-									<br>121.511870	31.180638	043703.000
-									<br>121.511870	31.180643	043705.000
-									<br>121.511870	31.180648	043706.000	Stop
-									<br>121.511872	31.180653	043707.000
-								</span>
-							</p>
-							<p>
-
-								<span class="help-block" style="color: #1bbc9b;">
-									2.xml格式
-									<br>用gps生成工具，生成的kml文件里的数据
-								</span>
-							</p>
-						</div>
-					</div>
-				</form>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn default" data-dismiss="modal"
-					id="addMobalHiden">取消</button>
-<!-- 				<button type="button" class="btn btn-primary hidden" id="referenceCurrentVersion">引用当前版本</button> -->
-				<button type="button" class="btn btn-primary" id="templateSaveData">提交数据</button>
-			</div>
-		</div>
-	</div>
-</div>
-<script type="text/javascript">
-
-$('#edit_route_mobal').on('editRouteMobal.show', function(e,transGPS,editRoute,map,dra,ajaxd,fun){
-	// 延迟加载显示mobal
-	setTimeout(function(){$('#edit_route_mobal').modal({show : true,backdrop: 'static', keyboard: false});},200);
-	// 获取表单元素
-	var form = $('#save_route_template_form');
-	
-	// 获取错误提示信息元素
-	var error = $('.alert-danger', form);
-	
-	// 提交数据点击事件
-	$('.modal-footer #templateSaveData').on('click',function() {
-		form.submit();
-	});
-
-
-    //从xml中获取节点内容
-    function getXmlNode(str){
-        //创建文档对象
-        var parser=new DOMParser();
-        var xmlDoc=parser.parseFromString(str,"text/xml");
-
-        //提取数据
-        var countrys = xmlDoc.getElementsByTagName('coordinates');
-        //var countrys = xmlDoc.getElementsByTagName('DataSource');
-
-        var arr = [];
-
-        for (var i = 0; i < countrys.length; i++) {
-            arr.push(countrys[i].textContent);
-        };
-        // console.log(arr);
-        return arr;
-
-    }
-
-    // xml方式上传是，处理转成txt格式的方法
-    var getXmlSection = function (xml) {
-        // var xml = $("#xmlText").val();
-        var stationPointList = getXmlNode(xml);
-        var sListSize = stationPointList.length;
-        var sectionPointListStr = stationPointList[stationPointList.length - 1];
-        var sectionPointList = sectionPointListStr.split(" ");
-        var index = 0;
-
-        // var sectionStr = "";
-        var sections = [];
-        for (var i = 0; i < sectionPointList.length; i++) {
-            var pointStr = sectionPointList[i],
-                point = pointStr.split(",");
-
-            if (index < sListSize - 1 && point == stationPointList[index]) {
-                sections.push(point[0] + "	" + point[1] + "	" + point[2] + "	Stop");
-                index++;
-            } else {
-                sections.push(point[0] + "	" + point[1] + "	" + point[2]);
-            }
-        }
-        return sections;
-    };
-
-
-        // 表单验证
-	form.validate({
-		
-		errorElement : 'span', 
-		
-		errorClass : 'help-block help-block-error', 
-		
-		focusInvalid : false, 
-		
-		rules : {
-			
-			'points' : {
-				
-				required : true,
-				
-			}
-	
-		},
-		
-		invalidHandler : function(event, validator) {  
-			
-			error.show();
-			
-			App.scrollTo(error, -200);
-			
-		},
-
-		highlight : function(element) { 
-			
-			$(element).closest('.form-group').addClass('has-error'); 
-			
-		},
-
-		unhighlight : function(element) { 
-			
-			$(element).closest('.form-group').removeClass('has-error'); 
-			
-		},
-
-		success : function(label) {
-			
-			label.closest('.form-group').removeClass('has-error'); 
-			
-		},
-		submitHandler : function(f) {
-			// 隐藏弹出层
-			$('#edit_route_mobal').modal('hide');		
-			// 获取线路对象
-			var line = editRoute.getLineObj();		
-			// 原坐标类型
-			var baseRes = "WGS84";
-			// 定义线路名称
-			var lineNameV = $('.portlet-title .caption').text();
-			var dirStr = '';
-			// 路线方向
-			var directionData = $("input[name='dirCheck']:checked").val();
-			/**
-			 *  添加类型0（txt）/1（xml）
-			 *  txt方式路段需要30个点取一个
-			 *  xml路段取所有点
-			 */
-			var type = $("input[name='typeCheck']:checked").val();
-			editRoute.setLineDir(directionData);
-			// 设置线路对象生成方式
-			editRoute.setLineGenerationType('uploadGPS');
-			// 弹出正在加载层
-			var i = layer.load(2);
-			// 表单序列化
-			var paramsForm = form.serializeJSON();
-            var array = [];
-			if(type == 1){
-                array = getXmlSection(paramsForm.points);
-			} else {
-                // 切割坐标点
-                array = paramsForm.points.split('\r\n');
-			}
-			// 把坐标点转换为站点或路段
-			var arrayFormat = inputStationValueFormat(array);
-			var stationList = arrayFormat.stationList;		
-			var sectionListTemp = arrayFormat.sectionList;
-			var sectionList = [];
-			// 隔30个取一个点（相当于30s）
-			var typeNum = type == 0 ? 30:1;
-            for(var i = 0; i*typeNum < sectionListTemp.length; i++) {
-                sectionList[i] = sectionListTemp[i*typeNum];
-			}
-			sectionList[sectionList.length] = sectionListTemp[sectionListTemp.length-1];
-			
-			var sectionListFinal = [];
-			sectionListFinal.push({sectionName : lineNameV, points : sectionList});
-			// 根据站点名称获取百度坐标
-			map.stationsPointsToLibraryPoint(stationList,function(resultJson) {
-				// 根据坐标点获取两点之间的时间与距离
-				map.getDistanceAndDuration(resultJson,function(stationdataList) {
-					// 设置第一个站的距离
-					stationdataList[0].distance = '';
-					// 设置第一个站的时间
-					stationdataList[0].duration = '';
-					// 定义站点信息JSON字符串
-					var stationJSON = JSON.stringify(stationdataList);
-					// 参数集合
-					var params = {};
-					params.baseRes =  baseRes;
-					// 是否添加该站点
-					
-					// 站点信息JSON字符串
-					params.stationJSON = stationJSON;
-					// 线路ID
-					params.lineId = line.id;
-					// 方向
-					params.directions = directionData;
-					// 原始坐标类型
-					params.dbType = 'b';
-					// 圆形半径
-					params.radius = '80';
-					// 限速
-					params.speedLimit = '60';
-					// 图形类型（r：圆形；p：多边形）
-					params.shapesType = 'r';
-					// destroy：是否撤销
-					params.destroy = '0';
-					// versions：版本号
-					params.versions = '1';
-					// 定义路段信息字符串
-					var sectionJSON = JSON.stringify(sectionListFinal);
-					// 路段信息JSON字符串
-					params.sectionJSON = sectionJSON;
-					addSave(params,line.id,directionData);
-				}); 
-				
-			});		
-		},	
-		
-	}); 
-	
-	function inputStationValueFormat(paramsStationsArray) {
-		var stationList = [];
-		var sectionList = [];
-		var routeList = {"stationList":stationList, "sectionList":sectionList};
-		var len = paramsStationsArray.length;
-		// 处理相同站点判断值
-		var isPush = true; 
-		for(var k =0;k<len;k++) {
-			if(paramsStationsArray[k]=="")
-				continue;
-			var tempStr = paramsStationsArray[k].split('\t');
-			var tempPoint = transGpsLoc(tempStr[0],tempStr[1]);
-			var point = {lng:tempPoint.lng, lat:tempPoint.lat};
-			if(tempStr.length < 4){
-				sectionList[k] = point;
-				isPush = true; 
-			}else {
-				if(isPush) {
-					sectionList[k] = point;
-					stationList.push({name:tempStr[3], potion:{lng:tempPoint.lng, lat:tempPoint.lat} , wgs:{x:tempStr[0], y:tempStr[1]}});
-				}
-				isPush = false; 
-			}
-		}
-		for(var i = 0 ;i<sectionList.length;i++) {
-			if(sectionList[i] == "" || typeof(sectionList[i]) == "undefined" || sectionList[i] == null) {
-				sectionList.splice(i,1);//删除数组中下表i-i+1之间的值
-				i= i-1;
-			}
-		              
-		}
-		return routeList;
-	}
-	
-	function transGpsLoc(lng,lat) {
-		var bdLoc = transGPS.locationMake(lng, lat);
-		var gcjLoc = transGPS.transformFromWGSToGCJ(bdLoc);
-		var bdEn = transGPS.bd_encrypt(gcjLoc);
-		return bdEn;
-	}
-	
-	/** 引用当前版本站点和走向*/
-	/* $("#referenceCurrentVersion").on('click',function() {
-		// 获取线路对象
-		var line = editRoute.getLineObj();	
-		// 路线方向
-		var direction = $("input[name='dirCheck']:checked").val();
-		// 设置线路对象方向
-		editRoute.setLineDir(direction);
-		// 设置线路对象生成方式
-		editRoute.setLineGenerationType('cite');
-		$.post("/station/referenceCurrentVersion",{'lineId' : line.id , 'directions' : direction},function(rd){
-			// 隐藏弹出层
-			$('#edit_route_mobal').modal('hide');	
-			// 关闭弹出层
-			layer.closeAll();
-			if(rd.status='SUCCESS') {				
-				// 清除地图覆盖物
-				map.clearMarkAndOverlays();
-				// 查询路段信息
-				var params = {};
-				params.lineId=line.id;
-				params.dir = direction;
-				// 查询路段信息
-				$get('/sectionroute/findCacheSection',params,function(data) {
-					// 在地图上画出线路走向
-					fun.linePanlThree(line.id,data,direction);
-				});
-				$('#route_show').removeClass('hidden');
-				$('#generationRoute_div').addClass('hidden');
-				// 刷新路段列表
-				$('#section').click();
-				layer.msg('引用当前版本成功！');
-			}else { 
-				layer.msg('引用当前版本失败，请重新引用或选择其他方式！');
-			}
-		}) 
-	}); */
-	
-	function addSave(params,lineid,directionData) {
-		// 保存
-		$post("/station/cacheSave",params,function(rd) {
-			// 关闭弹出层
-			layer.closeAll();
-			if(rd.status='SUCCESS') {
-				var stationD = rd.stationData,isNullStr = '';
-				for(var t = 0 ;t<stationD.length;t++) {
-					if(stationD[t].potion.lat =='' || stationD[t].potion.lat ==null ||
-							stationD[t].potion.lng =='' || stationD[t].potion.lng ==null)
-						isNullStr = isNullStr + stationD[t].name + ' , ';
-				}
-				if(isNullStr!='') {
-					layer.open({
-						  title: '提示',
-						  content:'【' + isNullStr  + '】' + '地址系统无法解析!,请手动调整位置!'
-					});   
-				}
-				// 清除地图覆盖物
-				map.clearMarkAndOverlays();
-				var params = {};
-				params.lineId = lineid;
-				params.dir = directionData;
-				// 查询路段信息
-				$get('/sectionroute/findCacheSection',params,function(data) {
-					// 在地图上画出线路走向
-					fun.linePanlThree(lineid,data,directionData);
-				});
-				$('#route_show').removeClass('hidden');
-				$('#generationRoute_div').addClass('hidden');
-				// 刷新路段列表
-				$('#section').click();
-				layer.open({title: '友情提示'
-					  ,content: '生成路线成功，生成的线路可能会有误差。请先单击路段，拖动编辑、然后双击保存！'});
-			}else { 
-				layer.msg('生成路线失败！');
-			}
-		});		
-	} 
-});
+<!-- 手动添加站点 -->
+<div class="modal fade" id="edit_route_mobal" tabindex="-1" role="basic"
+	aria-hidden="true">
+
+	<div class="modal-dialog">
+
+		<div class="modal-content"  >
+
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true"></button>
+				<h4 class="modal-title">生成路线（站点和路段）</h4>
+			</div>
+
+			<div class="modal-body">
+
+				<form class="form-horizontal" role="form"
+					id="save_route_template_form" action="" method="">
+
+					<div class="alert alert-danger display-hide">
+						<button class="close" data-close="alert"></button>
+						您的输入有误，请检查下面的输入项
+					</div>
+
+					<!-- 站点名称 -->
+					<div class="form-body">
+
+						<div class="form-group">
+							<label class="control-label col-md-2"> <span
+								class="required"> * </span> 坐标：
+							</label>
+							<div class="col-md-10">
+								<textarea class="form-control" rows="12" name="points"
+									id="pointInput" placeholder="坐标点"></textarea>
+							</div>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-md-3 control-label">选择文本类型：</label>
+						<div class="col-md-3">
+							<div class="icheck-list">
+								<label> <input type="radio" class="icheck"
+									name="typeCheck" value='0' checked> txt
+								</label> <label> <input type="radio" class="icheck"
+									name="typeCheck" value='1'> xml
+								</label>
+							</div>
+						</div>
+						<label class="col-md-3 control-label">选择方向：</label>
+						<div class="col-md-3">
+							<div class="icheck-list">
+								<label> <input type="radio" class="icheck"
+									name="dirCheck" value='0' checked> 上行
+								</label> <label> <input type="radio" class="icheck"
+									name="dirCheck" value='1'> 下行
+								</label>
+							</div>
+						</div>
+					</div>
+					<div class="form-group">
+						<div class="alert alert-info font-blue-chambray"
+							style="background-color: #2C3E50">
+							<h5 class="block">
+								<span class="help-block" style="color: #1bbc9b;"> *
+									坐标生成路线规划说明： </span>
+							</h5>
+							<p>
+
+								<span class="help-block" style="color: #1bbc9b;">
+									1.txt格式
+									<br>&nbsp;请在文本域中按顺序依次输坐标点,每行中的数据之间用【Tab】键隔开（如果是站点，请将在坐标后面加 stop;没有
+									stop默认是路段点，连续带stop的坐标认为是同一个站点）,每输入完一个坐标时请按回车键【Enter】换行. 例如：
+									<br>121.511870	31.180638	043703.000
+									<br>121.511870	31.180643	043705.000
+									<br>121.511870	31.180648	043706.000	Stop
+									<br>121.511872	31.180653	043707.000
+								</span>
+							</p>
+							<p>
+
+								<span class="help-block" style="color: #1bbc9b;">
+									2.xml格式
+									<br>用gps生成工具，生成的kml文件里的数据
+								</span>
+							</p>
+						</div>
+					</div>
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" data-dismiss="modal"
+					id="addMobalHiden">取消</button>
+<!-- 				<button type="button" class="btn btn-primary hidden" id="referenceCurrentVersion">引用当前版本</button> -->
+				<button type="button" class="btn btn-primary" id="templateSaveData">提交数据</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+
+$('#edit_route_mobal').on('editRouteMobal.show', function(e,transGPS,editRoute,map,dra,ajaxd,fun){
+	// 延迟加载显示mobal
+	setTimeout(function(){$('#edit_route_mobal').modal({show : true,backdrop: 'static', keyboard: false});},200);
+	// 获取表单元素
+	var form = $('#save_route_template_form');
+	
+	// 获取错误提示信息元素
+	var error = $('.alert-danger', form);
+	
+	// 提交数据点击事件
+	$('.modal-footer #templateSaveData').on('click',function() {
+		form.submit();
+	});
+
+
+    //从xml中获取节点内容
+    function getXmlNode(str){
+        //创建文档对象
+        var parser=new DOMParser();
+        var xmlDoc=parser.parseFromString(str,"text/xml");
+
+        //提取数据
+        var countrys = xmlDoc.getElementsByTagName('coordinates');
+        //var countrys = xmlDoc.getElementsByTagName('DataSource');
+
+        var arr = [];
+
+        for (var i = 0; i < countrys.length; i++) {
+            arr.push(countrys[i].textContent);
+        };
+        // console.log(arr);
+        return arr;
+
+    }
+
+    // xml方式上传是，处理转成txt格式的方法
+    var getXmlSection = function (xml) {
+        // var xml = $("#xmlText").val();
+        var stationPointList = getXmlNode(xml);
+        var sListSize = stationPointList.length;
+        var sectionPointListStr = stationPointList[stationPointList.length - 1];
+        var sectionPointList = sectionPointListStr.split(" ");
+
+        // var sectionStr = "";
+        var sections = [];
+        var mapping = nearestSectionPoint(stationPointList, sectionPointList);
+        for (var i = 0; i < sectionPointList.length; i++) {
+            var pointStr = sectionPointList[i],
+                point = pointStr.split(",");
+
+            if (mapping[pointStr]) {
+                sections.push(point[0] + "	" + point[1] + "	" + point[2] + "	Stop");
+            } else {
+                sections.push(point[0] + "	" + point[1] + "	" + point[2]);
+            }
+        }
+        return sections;
+    };
+
+    var nearestSectionPoint = function (stationPointList, sectionPointList) {
+    	var mapping = {};
+		for (var i = 0;i < stationPointList.length - 1;i++) {
+			var minDistance = 999999999, stationPoint = stationPointList[i].split(","), pointStr;
+			for (var j = 0;j < sectionPointList.length;j++) {
+				var sectionPointStr = sectionPointList[j], sectionPoint = sectionPointStr.split(",");
+				var distance = Math.sqrt(Math.pow(parseFloat(stationPoint[0]) - parseFloat(sectionPoint[0]), 2) + Math.pow(parseFloat(stationPoint[1]) - parseFloat(sectionPoint[1]), 2));
+				if (distance < minDistance) {
+					minDistance = distance;
+					pointStr = sectionPointStr;
+				}
+			}
+			mapping[pointStr] = stationPointList[i];
+		}
+
+		return mapping;
+	}
+
+
+        // 表单验证
+	form.validate({
+		
+		errorElement : 'span', 
+		
+		errorClass : 'help-block help-block-error', 
+		
+		focusInvalid : false, 
+		
+		rules : {
+			
+			'points' : {
+				
+				required : true,
+				
+			}
+	
+		},
+		
+		invalidHandler : function(event, validator) {  
+			
+			error.show();
+			
+			App.scrollTo(error, -200);
+			
+		},
+
+		highlight : function(element) { 
+			
+			$(element).closest('.form-group').addClass('has-error'); 
+			
+		},
+
+		unhighlight : function(element) { 
+			
+			$(element).closest('.form-group').removeClass('has-error'); 
+			
+		},
+
+		success : function(label) {
+			
+			label.closest('.form-group').removeClass('has-error'); 
+			
+		},
+		submitHandler : function(f) {
+			// 隐藏弹出层
+			$('#edit_route_mobal').modal('hide');		
+			// 获取线路对象
+			var line = editRoute.getLineObj();		
+			// 原坐标类型
+			var baseRes = "WGS84";
+			// 定义线路名称
+			var lineNameV = $('.portlet-title .caption').text();
+			var dirStr = '';
+			// 路线方向
+			var directionData = $("input[name='dirCheck']:checked").val();
+			/**
+			 *  添加类型0（txt）/1（xml）
+			 *  txt方式路段需要30个点取一个
+			 *  xml路段取所有点
+			 */
+			var type = $("input[name='typeCheck']:checked").val();
+			editRoute.setLineDir(directionData);
+			// 设置线路对象生成方式
+			editRoute.setLineGenerationType('uploadGPS');
+			// 弹出正在加载层
+			var i = layer.load(2);
+			// 表单序列化
+			var paramsForm = form.serializeJSON();
+            var array = [];
+			if(type == 1){
+                array = getXmlSection(paramsForm.points);
+			} else {
+                // 切割坐标点
+                array = paramsForm.points.split('\r\n');
+			}
+			// 把坐标点转换为站点或路段
+			var arrayFormat = inputStationValueFormat(array);
+			var stationList = arrayFormat.stationList;		
+			var sectionListTemp = arrayFormat.sectionList;
+			var sectionList = [];
+			// 隔30个取一个点（相当于30s）
+			var typeNum = type == 0 ? 30:1;
+            for(var i = 0; i*typeNum < sectionListTemp.length; i++) {
+                sectionList[i] = sectionListTemp[i*typeNum];
+			}
+			sectionList[sectionList.length] = sectionListTemp[sectionListTemp.length-1];
+			
+			var sectionListFinal = [];
+			sectionListFinal.push({sectionName : lineNameV, points : sectionList});
+			// 根据站点名称获取百度坐标
+			map.stationsPointsToLibraryPoint(stationList,function(resultJson) {
+				// 根据坐标点获取两点之间的时间与距离
+				map.getDistanceAndDuration(resultJson,function(stationdataList) {
+					// 设置第一个站的距离
+					stationdataList[0].distance = '';
+					// 设置第一个站的时间
+					stationdataList[0].duration = '';
+					// 定义站点信息JSON字符串
+					var stationJSON = JSON.stringify(stationdataList);
+					// 参数集合
+					var params = {};
+					params.baseRes =  baseRes;
+					// 是否添加该站点
+					
+					// 站点信息JSON字符串
+					params.stationJSON = stationJSON;
+					// 线路ID
+					params.lineId = line.id;
+					// 方向
+					params.directions = directionData;
+					// 原始坐标类型
+					params.dbType = 'b';
+					// 圆形半径
+					params.radius = '80';
+					// 限速
+					params.speedLimit = '60';
+					// 图形类型（r：圆形；p：多边形）
+					params.shapesType = 'r';
+					// destroy：是否撤销
+					params.destroy = '0';
+					// versions：版本号
+					params.versions = '1';
+					// 定义路段信息字符串
+					var sectionJSON = JSON.stringify(sectionListFinal);
+					// 路段信息JSON字符串
+					params.sectionJSON = sectionJSON;
+					addSave(params,line.id,directionData);
+				}); 
+				
+			});		
+		},	
+		
+	}); 
+	
+	function inputStationValueFormat(paramsStationsArray) {
+		var stationList = [];
+		var sectionList = [];
+		var routeList = {"stationList":stationList, "sectionList":sectionList};
+		var len = paramsStationsArray.length;
+		// 处理相同站点判断值
+		var isPush = true; 
+		for(var k =0;k<len;k++) {
+			if(paramsStationsArray[k]=="")
+				continue;
+			var tempStr = paramsStationsArray[k].split('\t');
+			var tempPoint = transGpsLoc(tempStr[0],tempStr[1]);
+			var point = {lng:tempPoint.lng, lat:tempPoint.lat};
+			if(tempStr.length < 4){
+				sectionList[k] = point;
+				isPush = true; 
+			}else {
+				if(isPush) {
+					sectionList[k] = point;
+					stationList.push({name:tempStr[3], potion:{lng:tempPoint.lng, lat:tempPoint.lat} , wgs:{x:tempStr[0], y:tempStr[1]}});
+				}
+				isPush = false; 
+			}
+		}
+		for(var i = 0 ;i<sectionList.length;i++) {
+			if(sectionList[i] == "" || isNaN(sectionList[i].lng) || typeof(sectionList[i]) == "undefined" || sectionList[i] == null) {
+				sectionList.splice(i,1);//删除数组中下表i-i+1之间的值
+				i= i-1;
+			}
+		              
+		}
+		return routeList;
+	}
+	
+	function transGpsLoc(lng,lat) {
+		var bdLoc = transGPS.locationMake(lng, lat);
+		var gcjLoc = transGPS.transformFromWGSToGCJ(bdLoc);
+		var bdEn = transGPS.bd_encrypt(gcjLoc);
+		return bdEn;
+	}
+	
+	/** 引用当前版本站点和走向*/
+	/* $("#referenceCurrentVersion").on('click',function() {
+		// 获取线路对象
+		var line = editRoute.getLineObj();	
+		// 路线方向
+		var direction = $("input[name='dirCheck']:checked").val();
+		// 设置线路对象方向
+		editRoute.setLineDir(direction);
+		// 设置线路对象生成方式
+		editRoute.setLineGenerationType('cite');
+		$.post("/station/referenceCurrentVersion",{'lineId' : line.id , 'directions' : direction},function(rd){
+			// 隐藏弹出层
+			$('#edit_route_mobal').modal('hide');	
+			// 关闭弹出层
+			layer.closeAll();
+			if(rd.status='SUCCESS') {				
+				// 清除地图覆盖物
+				map.clearMarkAndOverlays();
+				// 查询路段信息
+				var params = {};
+				params.lineId=line.id;
+				params.dir = direction;
+				// 查询路段信息
+				$get('/sectionroute/findCacheSection',params,function(data) {
+					// 在地图上画出线路走向
+					fun.linePanlThree(line.id,data,direction);
+				});
+				$('#route_show').removeClass('hidden');
+				$('#generationRoute_div').addClass('hidden');
+				// 刷新路段列表
+				$('#section').click();
+				layer.msg('引用当前版本成功！');
+			}else { 
+				layer.msg('引用当前版本失败，请重新引用或选择其他方式！');
+			}
+		}) 
+	}); */
+	
+	function addSave(params,lineid,directionData) {
+		// 保存
+		$post("/station/cacheSave",params,function(rd) {
+			// 关闭弹出层
+			layer.closeAll();
+			if(rd.status='SUCCESS') {
+				var stationD = rd.stationData,isNullStr = '';
+				for(var t = 0 ;t<stationD.length;t++) {
+					if(stationD[t].potion.lat =='' || stationD[t].potion.lat ==null ||
+							stationD[t].potion.lng =='' || stationD[t].potion.lng ==null)
+						isNullStr = isNullStr + stationD[t].name + ' , ';
+				}
+				if(isNullStr!='') {
+					layer.open({
+						  title: '提示',
+						  content:'【' + isNullStr  + '】' + '地址系统无法解析!,请手动调整位置!'
+					});   
+				}
+				// 清除地图覆盖物
+				map.clearMarkAndOverlays();
+				var params = {};
+				params.lineId = lineid;
+				params.dir = directionData;
+				// 查询路段信息
+				$get('/sectionroute/findCacheSection',params,function(data) {
+					// 在地图上画出线路走向
+					fun.linePanlThree(lineid,data,directionData);
+				});
+				$('#route_show').removeClass('hidden');
+				$('#generationRoute_div').addClass('hidden');
+				// 刷新路段列表
+				$('#section').click();
+				layer.open({title: '友情提示'
+					  ,content: '生成路线成功，生成的线路可能会有误差。请先单击路段，拖动编辑、然后双击保存！'});
+			}else { 
+				layer.msg('生成路线失败！');
+			}
+		});		
+	} 
+});
 </script>
 \ No newline at end of file
+<!-- 编辑路段 -->
+<div class="modal fade" id="edit_section_mobal" role="basic" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+				<h4 class="modal-title">路段修改</h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal" role="form" id="edit_section_form" action="/module" method="post">
+					<div class="alert alert-danger display-hide"> <button class="close" data-close="alert"></button>
+						您的输入有误，请检查下面的输入项
+					</div>
+					<!-- 线路ID -->
+					<input type="hidden" name="sectionId" id="section.id">
+					<input type="hidden" name="sectionRouteId" id="id">
+					<input type="hidden" name="sectionCode" id="section.sectionCode">
+					<input type="hidden" name="sectionRouteLine" id="lineId">
+					<input type="hidden" name="lineCode" id="lineCode">
+					<input type="hidden" name="bsectionVector" id="bsectionVector" />
+					<input type="hidden" name="csectionVector" id="csectionVector" value=""/>
+					<input type="hidden" name="dbType" id="dbType" value="b"/>
+					<input type="hidden" name="directions" id="dir">
+					<input type="hidden" name="speedLimit" id="speedLimit" >
+					<input type="hidden" name="roadCoding" id="roadCoding"/>
+					<input type="hidden" name="versions" id="versions"/>
+					<input type="hidden" name="start" id="start"/>
+					<input type="hidden" name="end" id="end"/>
+					<!-- 路段名称 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+								<span class="required"> * </span> 路段名称:
+							</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="sectionName" id="sectionName" placeholder="路段名称">
+							</div>
+						</div>
+					</div>
+					<!-- 路段序号 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+								上一路段:
+							</label>
+							<div class="col-md-6">
+								<select name="sectionrouteCode" class="form-control" id="sectionrouteCode" style="width:100%"></select>
+								<span class="help-block">说明:选择的路段将作为本站序号的参考，成为选择路段的下一个路段。 </span>
+							</div>
+						</div>
+					</div>
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-primary" id="editSectionButton">提交数据</button>
+				<button type="button" class="btn default" data-dismiss="modal">取消</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+debugger;
+$('#edit_section_mobal').on('editSectionMobal_show', function(e, map_,ajaxd,p,fun){
+	function setSectionFormValue(section) {
+		$('#edit_section_form input').each(function() {
+			$(this).val(eval('section.' + this.id));
+		});
+	}
+	let section = p.data;
+	let lineId = section.lineCode, version = section.versions, start = section.start, end = section.end;
+	setSectionFormValue(section);
+	// 获取路段号元素，并添加下拉属性值
+	ajaxd.getRouteByStartEnd(lineId,version,start, end,function(result) {
+		let routes = result.data.routes,paramsD =new Array();
+		var eq_scetionRouteCode = section.sectionrouteCode;
+		paramsD.push({'id':'请选择...','text':'将此路段设置位第一个路段'});
+		// 遍历
+		$.each(routes, function(i, g){
+			// 判断.
+			if(g.section.sectionName) {
+				let ptions_v = g.sectionrouteCode;
+				if(eq_scetionRouteCode != ptions_v) {
+					// 添加拼音检索下拉框格式数据数组.
+					paramsD.push({'id':ptions_v,
+								  'text':g.section.sectionName + '(' + ptions_v + ')'});
+				}
+			}
+		});
+		// 初始化上一个路段拼音检索下拉框.
+		initPinYinSelect2($('#sectionrouteCode'),paramsD,function(selector) {
+			if(paramsD.length > 0) {
+				var upStationRouteCode = paramsD[paramsD.length - 1].sectionrouteCode;
+				$('#sectionrouteCode').select2('val',upStationRouteCode);
+			}else {
+				$('#sectionrouteCode').select2('val','请选择...');
+			}
+		});
+	});
+	// 显示mobal
+	$('#edit_section_mobal').modal({show : true,backdrop: 'static',keyboard: false});//
+	// 当调用 hide 实例方法时触发
+	$('#edit_section_mobal').on('hide.bs.modal', function () {
+		closeMobleSetClean();
+	});
+	function closeMobleSetClean() {
+		// 清除地图覆盖物
+		map_.clearMarkAndOverlays();
+		$('#inoutSearch').click();
+		fun.editAChangeCssRemoveDisabled();
+		//ajaxd.getSectionRouteInfo(lineId,dir,$("#versions").val(),function(data) {
+		//	fun.linePanlThree(lineId,data,dir);
+		//});
+		setTimeout(function () {
+			map_.openSectionInfoWin_inout(p);
+		},1000);
+	}
+	// 编辑表单元素
+	var form = $('#edit_section_form');
+	// 获取错误提示元素
+	var error = $('.alert-danger', form);
+	// 提交数据按钮事件
+	$('#editSectionButton').on('click', function() {
+		// 表单提交
+		form.submit();
+	});
+	// 表单验证
+	form.validate({
+		errorElement : 'span',
+		errorClass : 'help-block help-block-error',
+		focusInvalid : false,
+		rules : {
+			'sectionName' : {required : true,maxlength:50}
+		},
+		invalidHandler : function(event, validator) {
+			error.show();
+			App.scrollTo(error, -200);
+		},
+		highlight : function(element) {
+			$(element).closest('.form-group').addClass('has-error');
+		},
+		unhighlight : function(element) {
+			$(element).closest('.form-group').removeClass('has-error');
+		},
+		success : function(label) {
+			label.closest('.form-group').removeClass('has-error');
+		},
+		submitHandler : function(f) {
+            // 获取折线坐标集合
+            var editPloyLineArray = p.getPath();
+            // 折线坐标集合
+            $('#bsectionVector').val(JSON.stringify(editPloyLineArray));
+			var params = form.serializeJSON();
+            params.destroy=0;
+            params.sectionDistance=0;
+            params.sectionTime=0;
+            params.status=$($("#versions").find("option:selected")[0]).attr("status");
+			error.hide();
+			debugger
+			if(params.sectionrouteCode=='请选择...')
+				params.sectionrouteCode='';
+			ajaxd.inoutSectionUpdate(params,function(resuntDate) {
+				if(resuntDate.status=='SUCCESS') {
+					// 弹出添加成功提示消息
+					layer.msg('修改成功...');
+				}else {
+					// 弹出添加失败提示消息
+					layer.msg('修改失败...');
+				}
+				$('#edit_section_mobal').modal('hide');
+				var dir = params.directions
+				closeMobleSetClean();
+			});
+		}
+	});
+});
+</script>
 \ No newline at end of file
@@ -196,6 +196,41 @@ var GetAjaxData = function(){
 			});
+		},
+
+		// 编辑线路走向保存
+		inoutSectionUpdate:function(section,callback) {
+			$post('/inout/sectionUpdate',section,function(data) {
+				callback && callback(data);
+			})
+		},
+
+		// 生成线路走向
+		inoutSectionSave:function(section,callback){
+			$post('/inout/sectionSave',section,function(data) {
+				callback && callback(data);
+			})
+		},
+
+		// 根据线路查找进出场的起终点信息
+		getStartEndByLine: function (lineId, version, cb) {
+			$get('/inout/getStartEndByLine', {lineId : lineId, version : version}, function (r) {
+				return cb && cb(r);
+			});
+		},
+
+		// 根据起终点查找对应的路段信息
+		getRouteByStartEnd: function (lineId, version, start, end, cb) {
+			$get('/inout/getRouteByStartEnd', {lineId : lineId, version : version, start : start, end : end}, function (r) {
+				return cb && cb(r);
+			});
+		},
+
+		// 根据ID查询路段信息.
+		getRouteInfoById : function(sectionRouteId,callback){
+			$get('/inout/' + sectionRouteId,{},function(r) {
+				return callback && callback(r);
+			});
 		}
 	};
 	return ajaxData;
-$(function(){
-	
-	// 上行方向（0：上行；1：下行）
-	var directionUpValue = $('#stationUp').data('direction');
-	
-	// 下行方向 （0：上行；1：下行）
-	var directionDownValue = $('.downSystem').data('direction');
-	
-	
-	
-	// 系统规划上行站点点击事件
-	$('.upSystem').on('click',function() {
-		// 隐藏上行规划
-		$('#upToolsMobal').hide();
-		// 弹出正在加载层
-		var i = layer.load(0,{offset:['200px', '280px']});
-		/** 修正线路名称 @param：<directionUpValue：方向（上行）> */
-		PublicFunctions.lineNameIsHaveInterval(directionUpValue);
-		
-	});
-	
-	// 上行站点其它规划点击事件
-	$('.upManual').on('click',function() {
-        //　加载模板手动添加站点页面
-        $.get('addstationstemplate.html', function(m){
-            $(pjaxContainer).append(m);
-            $('#add_station_template_mobal').trigger('AddStationTempMobal.show', [WorldsBMap,GetAjaxData,directionUpValue,LineObj,PublicFunctions]);
-        });
-		/*// 加载其它规划选择弹出层mobal页面
-		$.get('add_manual_select.html', function(m){
-			$(pjaxContainer).append(m);
-			$('#add_manual_mobal').trigger('AddManualMobal.show', [WorldsBMap,GetAjaxData,directionUpValue,LineObj,PublicFunctions]);
-		});*/
-		
-	});
-    $('.gpsRoute').on('click',function() {
-        var Line = LineObj.getLineObj();
-        // 加载其它规划选择弹出层mobal页面
-        $.get('editRoute.html', function(m){
-            $(pjaxContainer).append(m);
-            $('#edit_route_mobal').trigger('editRouteMobal.show', [WorldsBMap,GetAjaxData,Line,PublicFunctions]);
-        });
-    });
-    
-	// 上行站点新增事件
-	$('.module_tools #addUpStation').on('click', function() {
-		/** 设置新增站点对象方向属性值 @param：<directionUpValue：方向（0：上行；1：下行）> */
-		AddStationObj.setAddStationDiraction(directionUpValue);
-		// 加载选择新增方式mobal
-		$.get('add_select.html', function(m){
-			$(pjaxContainer).append(m);
-			$('#add_select_mobal').trigger('AddSelectMobal.show', [WorldsBMap,DrawingManagerObj,GetAjaxData,AddStationObj,LineObj,PublicFunctions]);
-		});
-	});
-	
-	// 修改上行站点mobal页面
-	$('.module_tools #editUpStation').on('click', function(){
-		var sel = PublicFunctions.getCurrSelNode(directionUpValue);
-		if(sel.length==0 || sel[0].original.chaildredType !='station'){
-			layer.msg('请先选择要编辑的上行站点！');
-			return;
-		}
-		$.get('edit_select.html', function(m){
-			$(pjaxContainer).append(m);
-			$('#edit_select_mobal').trigger('editSelectMobal_show', [WorldsBMap,DrawingManagerObj,GetAjaxData,EditStationObj,LineObj,PublicFunctions,directionUpValue]);
-		});
-	});
-	
-	// 撤销上行站点
-	$('.module_tools #deleteUpStation').on('click', function() {
-		PublicFunctions.stationRevoke(directionUpValue);
-	});
-	
-	// 上行批量撤销事件
-	$('.module_tools #batchUpDelete').on('click', function() {
-		var Line = LineObj.getLineObj();
-		/** 设置批量删除的线路方向 @param：<directionUpValue：方向（0：上行；1：下行）> */
-		DeleteBatchObj.setDeteleBatchDiraction(directionUpValue);
-		// 加载选择新增方式mobal
-		$.get('delete_select.html', function(m){
-			$(pjaxContainer).append(m);
-			$('#delete_select_mobal').trigger('deleteSelectMobal.show',[GetAjaxData,Line,PublicFunctions,DeleteBatchObj]);
-		});
-	});
-	
-	// 切换上下行.
-	$('.retweet').on('click',function() {
-		layer.confirm('您是否确定将【上、下】行站点和路段进行对换!', {
-			btn : [ '确认提示并提交', '取消' ]
-		},function () {
-			// 关闭所有提示弹出层.
-			layer.closeAll();
-			// 弹出提示层.
-    		var index = layer.load(1, {
-    			  shade: [0.1,'#fff'] // 透明度的白色背景
-    		});
-    		 var Line = LineObj.getLineObj();
-    		$post('/stationroute/updSwitchDir?lineIds='+ Line.id + "&status=" + $($("#versions").find("option:selected")[0]).attr("status") ,null,function(data) {
-    			layer.close(index);
-    			if(data.status=='SUCCESS') {
-    				// 弹出操作成功提示消息
-    				layer.msg('操作成功...');
-    			}else {
-    				// 弹出操作失败提示消息
-    				layer.msg('操作成功...');
-    			}
-    			 WorldsBMap.clearMarkAndOverlays();
-					$('#stationDown').removeClass('active');
-					$('#stationDown').removeClass('in');
-					$('#stationDown').addClass('fade');
-					$('#stationUp').addClass('active in');
-					$('#downLine').parent().removeClass('active');
-					$('#upLine').parent().addClass('active');
-				 // 刷新左边树
-				 PublicFunctions.resjtreeDate(Line.id,0,$("#versions").val());
-				 /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
-//				 GetAjaxData.getSectionRouteInfo(Line.id,0,function(data) {
-//					/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
-//					PublicFunctions.linePanlThree(Line.id,data,0);
-//				 });
-    		});
-		});
-	});
-	
-	$('#wrenchUpDis').on('click',function() {
-		var Line = LineObj.getLineObj();
-		GetAjaxData.getStation(Line.id,directionUpValue,$("#versions").val(),function(rd) {
-			// 加载其它规划选择弹出层mobal页面
-			$.get('tzzj.html', function(m){
-				$(pjaxContainer).append(m);
-				$('#tzzj_mobal').trigger('tzzjMobal.show', [WorldsBMap,GetAjaxData,0,Line.id,PublicFunctions,rd[0].children[0].children]);
-			});
-		});
-	})
-	
-	$('#wrenchDownDis').on('click',function() {
-		var Line = LineObj.getLineObj();
-		GetAjaxData.getStation(Line.id,directionDownValue,$("#versions").val(),function(rd) {
-			// 加载其它规划选择弹出层mobal页面
-			$.get('tzzj.html', function(m){
-				$(pjaxContainer).append(m);
-				$('#tzzj_mobal').trigger('tzzjMobal.show', [WorldsBMap,GetAjaxData,1,Line.id,PublicFunctions,rd[0].children[0].children]);
-			});
-		});
-	});
-
-	$('#quoteDown').on('click',function() {
-		// 弹出提示层.
-		var index = layer.load(1, {
-			  shade: [0.1,'#fff'] // 透明度的白色背景
-		});
-		 var Line = LineObj.getLineObj();
-		 var params = {'lineId':Line.id ,'dir':1,'toDir':0,status:$($("#versions").find("option:selected")[0]).attr("status")} ;
-		 quote(params,index);
-	});
-	
-	$('#quoteUp').on('click',function() {
-		// 弹出提示层.
-		var index = layer.load(1, {
-			  shade: [0.1,'#fff'] // 透明度的白色背景
-		});
-		 var Line = LineObj.getLineObj();
-		 console.log($($("#versions").find("option:selected")[0]).attr("status"));
-		 var params = {'lineId':Line.id ,'dir':0,'toDir':1,status:$($("#versions").find("option:selected")[0]).attr("status")};
-		 quote(params,index);
-	});
-
-    $('#batchUpdateIndustryCode').on('click',function() {
-        var Line = LineObj.getLineObj();
-        // 加载其它规划选择弹出层mobal页面
-        $.get('batch_update_industryCode.html', function(m){
-            $(pjaxContainer).append(m);
-            $('#batch_update_industryCode_mobal').trigger('batch_update_industryCodeMobal.show', [WorldsBMap,GetAjaxData,0,Line.id,PublicFunctions]);
-        });
-    });
-    $('#batchDowndateIndustryCode').on('click',function() {
-        var Line = LineObj.getLineObj();
-        // 加载其它规划选择弹出层mobal页面
-        $.get('batch_update_industryCode.html', function(m){
-            $(pjaxContainer).append(m);
-            $('#batch_update_industryCode_mobal').trigger('batch_update_industryCodeMobal.show', [WorldsBMap,GetAjaxData,1,Line.id,PublicFunctions]);
-        });
-    });
-	
-	function quote(params,index) {
-		$post('/sectionroute/quoteSection',params,function(data) {
-			layer.close(index);
-			if(data.status=='SUCCESS') {
-				// 弹出操作成功提示消息
-				layer.msg('操作成功...');
-			}else {
-				// 弹出操作失败提示消息
-				layer.msg('操作成功...');
-			}
-			WorldsBMap.clearMarkAndOverlays();
-			
-			var dir = params.dir;
-			if(dir == 0){
-				dir = 1;
-			}else{
-				dir = 0;
-			}
-			// 刷新左边树
-			PublicFunctions.resjtreeDate(params.lineId,dir,$("#versions").val());
-			/** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
-//			GetAjaxData.getSectionRouteInfo(params.lineId,params.dir,function(data) {
-//				/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
-//				PublicFunctions.linePanlThree(params.lineId,data,params.dir);
-//			});
-		});
-	}
-	// 编辑线路上行走向
-	$('.module_tools #editUplineTrend').on('click', function() {PublicFunctions.editLinePlan(directionUpValue);});
-	
-	// 线路上行
-	$('#leftUpOrDown #upLine').on('click', function(){
-		var lineIdEvents = LineObj.getLineObj();
-		
-		var val = $("#versions").val();
-		
-		/** 初始化上行树 @param：<Line.id：线路Id；0:上行> */
-		PublicFunctions.resjtreeDate(lineIdEvents.id,'0',val);
-
-	});
-	
-	// 系统规划下行站点
-	$('.downSystem').on('click',function() {
-		// 隐藏下行规划
-		$('#downToolsMobal').hide();
-		// 弹出正在加载层
-		var i = layer.load(0,{offset:['200px', '280px']});
-		/** 修正线路名称 @param：<directionUpValue：方向（上行）> */
-		PublicFunctions.lineNameIsHaveInterval(directionDownValue);
-	});
-	
-	// 下行站点其它规划点击事件
-	$('.downManual').on('click',function() {
-        //　加载模板手动添加站点页面
-        $.get('addstationstemplate.html', function(m){
-            $(pjaxContainer).append(m);
-            $('#add_station_template_mobal').trigger('AddStationTempMobal.show', [WorldsBMap,GetAjaxData,directionDownValue,LineObj,PublicFunctions]);
-        });
-		/*// 加载其它规划选择弹出层mobal页面
-		$.get('add_manual_select.html', function(m){
-			$(pjaxContainer).append(m);
-			$('#add_manual_mobal').trigger('AddManualMobal.show', [WorldsBMap,GetAjaxData,directionDownValue,LineObj,PublicFunctions]);
-		});*/
-	});
-	
-	// 下行站点新增事件
-	$('.module_tools #addDownStation').on('click', function() {
-		/** 设置新增站点对象方向属性值 @param：<directionUpValue：方向（0：上行；1：下行）> */
-		AddStationObj.setAddStationDiraction(directionDownValue);
-		// 加载选择新增方式mobal
-		$.get('add_select.html', function(m){
-			$(pjaxContainer).append(m);
-			$('#add_select_mobal').trigger('AddSelectMobal.show', [WorldsBMap,DrawingManagerObj,GetAjaxData,AddStationObj,LineObj,PublicFunctions]);
-		});
-	});	
-	
-	// 修改下行站点mobal页面
-	$('.module_tools #editDownStation').on('click', function(){
-		var sel = PublicFunctions.getCurrSelNode(directionDownValue);
-		if(sel.length==0 || sel[0].original.chaildredType !='station'){
-			layer.msg('请先选择要编辑的下行站点！');
-			return;
-		}
-		$.get('edit_select.html', function(m){
-			$(pjaxContainer).append(m);
-			$('#edit_select_mobal').trigger('editSelectMobal_show', [WorldsBMap,DrawingManagerObj,GetAjaxData,EditStationObj,LineObj,PublicFunctions,directionDownValue]);
-		});
-	});
-	
-	// 撤销下行站点
-	$('.module_tools #deleteDownStation').on('click', function() {
-		PublicFunctions.stationRevoke(directionDownValue);
-	});
-
-	// 下行批量撤销事件
-	$('.module_tools #batchDownDelete').on('click', function() {
-		var Line = LineObj.getLineObj();
-		/** 设置批量删除的线路方向 @param：<directionDownValue：方向（0：上行；1：下行）> */
-		DeleteBatchObj.setDeteleBatchDiraction(directionDownValue);
-		// 加载选择新增方式mobal
-		$.get('delete_select.html', function(m){
-			$(pjaxContainer).append(m);
-			$('#delete_select_mobal').trigger('deleteSelectMobal.show',[GetAjaxData,Line,PublicFunctions,DeleteBatchObj]);
-		});
-	});
-	
-	// 编辑线路下行走向
-	$('.module_tools #editDownlineTrend').on('click', function() {
-		PublicFunctions.editLinePlan(directionDownValue);
-	});
-	
-	// 线路下行
-	$('#leftUpOrDown #downLine').on('click', function(){
-		var lineIdEvents = LineObj.getLineObj();
-
-
-		var val = $("#versions").val();
-		/** 初始化下行树 @param：<Line.id：线路Id；1:下行> */
-		PublicFunctions.resjtreeDate(lineIdEvents.id,'1',val);
-	});
-	
-	// 生成行单
-	$('.module_tools #createUsingSingle').on('click', function() {
-		var lineIdEvents = LineObj.getLineObj();
-		var params = {lineId:lineIdEvents.id};
-		GetAjaxData.createUsingSingle(params,function(data) {
-			if(data.status=='SUCCESS') {
-				// 弹出生成成功提示消息
-				layer.msg('生成成功...');
-			}else {
-				// 弹出生成失败提示消息
-				layer.msg('生成失败...');
-			}
-		});
-	});
-	$('#scrllmouseEvent').on('mousemove',function() {
-		$('.defeat-scroll').css('overflow','auto');
-	}).on('mouseleave',function() {
-		$('.defeat-scroll').css('overflow','hidden');
-	});
-
-	$(".match_station_bnt").on("click",function () {
-        var index = layer.open({
-            title: '提示',
-            content:'是否匹配外部上下行站点行业编码!',
-            // type: 1,
-            // area: ['600px', '360px'],
-            // scrollbar: false,
-
-            btn:['确定','取消'],
-            yes: function(index){
-                var lineId = LineObj.getLineObj().id;
-                GetAjaxData.matchIndustryCode(lineId,function (rs) {
-                // $post("/stationroute/matchIndustryCode",{"lineId":lineId},function (rs) {
-                    if(rs.status == "SUCCESS"){
-                        var map = new Map();
-                        var upMatch = rs.upMatch, downMatch = rs.downMatch;
-                    	if(upMatch !=null && upMatch.length>0){
-                            map.set("up",upMatch);
-						}
-						if(downMatch !=null && downMatch.length>0){
-                            map.set("down",downMatch);
-						}
-						if(map.size>0){
-                            $('.portlet-title .match_station').addClass('hidden');
-                            PublicFunctions.resjtreeDate(lineId,0,$("#versions").val());
-                            /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
-//                            GetAjaxData.getSectionRouteInfo(lineId,0,function(data) {
-//                                /** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */
-//                                PublicFunctions.linePanlThree(lineId,data,0);
-//                            });
-                            $('#stationDown').removeClass('active');
-                            $('#stationDown').removeClass('in');
-                            $('#stationDown').addClass('fade');
-                            $('#stationUp').addClass('active in');
-                            $('#downLine').parent().removeClass('active');
-                            $('#upLine').parent().addClass('active');
-                            $.get('match_station_industryCode.html', function(m){
-                                $(pjaxContainer).append(m);
-                                $('#match_station_industryCode_mobal').trigger('match_station_industryCodeMobal.show', map);
-                            });
-                        } else {
-                    		layer.msg("没有匹配到外部站点数据，请手动添加！")
-						}
-                    } else
-                        layer.msg("匹配出错，请手动添加！")
-                });
-                layer.close(index);
-            },
-			btn2:function(){
-				layer.closeAll(index); //关闭当前窗口
-			}
-        });
-    })
+$(function(){
+	
+	// 上行方向（0：上行；1：下行）
+	var directionUpValue = $('#stationUp').data('direction');
+	
+	// 下行方向 （0：上行；1：下行）
+	var directionDownValue = $('.downSystem').data('direction');
+	
+	
+	
+	// 系统规划上行站点点击事件
+	$('.upSystem').on('click',function() {
+		// 隐藏上行规划
+		$('#upToolsMobal').hide();
+		// 弹出正在加载层
+		var i = layer.load(0,{offset:['200px', '280px']});
+		/** 修正线路名称 @param：<directionUpValue：方向（上行）> */
+		PublicFunctions.lineNameIsHaveInterval(directionUpValue);
+		
+	});
+	
+	// 上行站点其它规划点击事件
+	$('.upManual').on('click',function() {
+        //　加载模板手动添加站点页面
+        $.get('addstationstemplate.html', function(m){
+            $(pjaxContainer).append(m);
+            $('#add_station_template_mobal').trigger('AddStationTempMobal.show', [WorldsBMap,GetAjaxData,directionUpValue,LineObj,PublicFunctions]);
+        });
+		/*// 加载其它规划选择弹出层mobal页面
+		$.get('add_manual_select.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#add_manual_mobal').trigger('AddManualMobal.show', [WorldsBMap,GetAjaxData,directionUpValue,LineObj,PublicFunctions]);
+		});*/
+		
+	});
+    $('.gpsRoute').on('click',function() {
+        var Line = LineObj.getLineObj();
+        // 加载其它规划选择弹出层mobal页面
+        $.get('editRoute.html', function(m){
+            $(pjaxContainer).append(m);
+            $('#edit_route_mobal').trigger('editRouteMobal.show', [WorldsBMap,GetAjaxData,Line,PublicFunctions]);
+        });
+    });
+    
+	// 上行站点新增事件
+	$('.module_tools #addUpStation').on('click', function() {
+		/** 设置新增站点对象方向属性值 @param：<directionUpValue：方向（0：上行；1：下行）> */
+		AddStationObj.setAddStationDiraction(directionUpValue);
+		// 加载选择新增方式mobal
+		$.get('add_select.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#add_select_mobal').trigger('AddSelectMobal.show', [WorldsBMap,DrawingManagerObj,GetAjaxData,AddStationObj,LineObj,PublicFunctions]);
+		});
+	});
+	
+	// 修改上行站点mobal页面
+	$('.module_tools #editUpStation').on('click', function(){
+		var sel = PublicFunctions.getCurrSelNode(directionUpValue);
+		if(sel.length==0 || sel[0].original.chaildredType !='station'){
+			layer.msg('请先选择要编辑的上行站点！');
+			return;
+		}
+		$.get('edit_select.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#edit_select_mobal').trigger('editSelectMobal_show', [WorldsBMap,DrawingManagerObj,GetAjaxData,EditStationObj,LineObj,PublicFunctions,directionUpValue]);
+		});
+	});
+	
+	// 撤销上行站点
+	$('.module_tools #deleteUpStation').on('click', function() {
+		PublicFunctions.stationRevoke(directionUpValue);
+	});
+	
+	// 上行批量撤销事件
+	$('.module_tools #batchUpDelete').on('click', function() {
+		var Line = LineObj.getLineObj();
+		/** 设置批量删除的线路方向 @param：<directionUpValue：方向（0：上行；1：下行）> */
+		DeleteBatchObj.setDeteleBatchDiraction(directionUpValue);
+		// 加载选择新增方式mobal
+		$.get('delete_select.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#delete_select_mobal').trigger('deleteSelectMobal.show',[GetAjaxData,Line,PublicFunctions,DeleteBatchObj]);
+		});
+	});
+	
+	// 切换上下行.
+	$('.retweet').on('click',function() {
+		layer.confirm('您是否确定将【上、下】行站点和路段进行对换!', {
+			btn : [ '确认提示并提交', '取消' ]
+		},function () {
+			// 关闭所有提示弹出层.
+			layer.closeAll();
+			// 弹出提示层.
+    		var index = layer.load(1, {
+    			  shade: [0.1,'#fff'] // 透明度的白色背景
+    		});
+    		 var Line = LineObj.getLineObj();
+    		$post('/stationroute/updSwitchDir?lineIds='+ Line.id + "&status=" + $($("#versions").find("option:selected")[0]).attr("status") ,null,function(data) {
+    			layer.close(index);
+    			if(data.status=='SUCCESS') {
+    				// 弹出操作成功提示消息
+    				layer.msg('操作成功...');
+    			}else {
+    				// 弹出操作失败提示消息
+    				layer.msg('操作成功...');
+    			}
+    			 WorldsBMap.clearMarkAndOverlays();
+					$('#stationDown').removeClass('active');
+					$('#stationDown').removeClass('in');
+					$('#stationDown').addClass('fade');
+					$('#stationUp').addClass('active in');
+					$('#downLine').parent().removeClass('active');
+					$('#upLine').parent().addClass('active');
+				 // 刷新左边树
+				 PublicFunctions.resjtreeDate(Line.id,0,$("#versions").val());
+				 /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
+//				 GetAjaxData.getSectionRouteInfo(Line.id,0,function(data) {
+//					/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
+//					PublicFunctions.linePanlThree(Line.id,data,0);
+//				 });
+    		});
+		});
+	});
+	
+	$('#wrenchUpDis').on('click',function() {
+		var Line = LineObj.getLineObj();
+		GetAjaxData.getStation(Line.id,directionUpValue,$("#versions").val(),function(rd) {
+			// 加载其它规划选择弹出层mobal页面
+			$.get('tzzj.html', function(m){
+				$(pjaxContainer).append(m);
+				$('#tzzj_mobal').trigger('tzzjMobal.show', [WorldsBMap,GetAjaxData,0,Line.id,PublicFunctions,rd[0].children[0].children]);
+			});
+		});
+	})
+	
+	$('#wrenchDownDis').on('click',function() {
+		var Line = LineObj.getLineObj();
+		GetAjaxData.getStation(Line.id,directionDownValue,$("#versions").val(),function(rd) {
+			// 加载其它规划选择弹出层mobal页面
+			$.get('tzzj.html', function(m){
+				$(pjaxContainer).append(m);
+				$('#tzzj_mobal').trigger('tzzjMobal.show', [WorldsBMap,GetAjaxData,1,Line.id,PublicFunctions,rd[0].children[0].children]);
+			});
+		});
+	});
+
+	$('#quoteDown').on('click',function() {
+		// 弹出提示层.
+		var index = layer.load(1, {
+			  shade: [0.1,'#fff'] // 透明度的白色背景
+		});
+		 var Line = LineObj.getLineObj();
+		 var params = {'lineId':Line.id ,'dir':1,'toDir':0,status:$($("#versions").find("option:selected")[0]).attr("status")} ;
+		 quote(params,index);
+	});
+	
+	$('#quoteUp').on('click',function() {
+		// 弹出提示层.
+		var index = layer.load(1, {
+			  shade: [0.1,'#fff'] // 透明度的白色背景
+		});
+		 var Line = LineObj.getLineObj();
+		 console.log($($("#versions").find("option:selected")[0]).attr("status"));
+		 var params = {'lineId':Line.id ,'dir':0,'toDir':1,status:$($("#versions").find("option:selected")[0]).attr("status")};
+		 quote(params,index);
+	});
+
+    $('#batchUpdateIndustryCode').on('click',function() {
+        var Line = LineObj.getLineObj();
+        // 加载其它规划选择弹出层mobal页面
+        $.get('batch_update_industryCode.html', function(m){
+            $(pjaxContainer).append(m);
+            $('#batch_update_industryCode_mobal').trigger('batch_update_industryCodeMobal.show', [WorldsBMap,GetAjaxData,0,Line.id,PublicFunctions]);
+        });
+    });
+    $('#batchDowndateIndustryCode').on('click',function() {
+        var Line = LineObj.getLineObj();
+        // 加载其它规划选择弹出层mobal页面
+        $.get('batch_update_industryCode.html', function(m){
+            $(pjaxContainer).append(m);
+            $('#batch_update_industryCode_mobal').trigger('batch_update_industryCodeMobal.show', [WorldsBMap,GetAjaxData,1,Line.id,PublicFunctions]);
+        });
+    });
+	
+	function quote(params,index) {
+		$post('/sectionroute/quoteSection',params,function(data) {
+			layer.close(index);
+			if(data.status=='SUCCESS') {
+				// 弹出操作成功提示消息
+				layer.msg('操作成功...');
+			}else {
+				// 弹出操作失败提示消息
+				layer.msg('操作成功...');
+			}
+			WorldsBMap.clearMarkAndOverlays();
+			
+			var dir = params.dir;
+			if(dir == 0){
+				dir = 1;
+			}else{
+				dir = 0;
+			}
+			// 刷新左边树
+			PublicFunctions.resjtreeDate(params.lineId,dir,$("#versions").val());
+			/** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
+//			GetAjaxData.getSectionRouteInfo(params.lineId,params.dir,function(data) {
+//				/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
+//				PublicFunctions.linePanlThree(params.lineId,data,params.dir);
+//			});
+		});
+	}
+	// 编辑线路上行走向
+	$('.module_tools #editUplineTrend').on('click', function() {PublicFunctions.editLinePlan(directionUpValue);});
+	
+	// 线路上行
+	$('#leftUpOrDown #upLine').on('click', function(){
+		var lineIdEvents = LineObj.getLineObj();
+		
+		var val = $("#versions").val();
+		
+		/** 初始化上行树 @param：<Line.id：线路Id；0:上行> */
+		PublicFunctions.resjtreeDate(lineIdEvents.id,'0',val);
+
+	});
+	
+	// 系统规划下行站点
+	$('.downSystem').on('click',function() {
+		// 隐藏下行规划
+		$('#downToolsMobal').hide();
+		// 弹出正在加载层
+		var i = layer.load(0,{offset:['200px', '280px']});
+		/** 修正线路名称 @param：<directionUpValue：方向（上行）> */
+		PublicFunctions.lineNameIsHaveInterval(directionDownValue);
+	});
+	
+	// 下行站点其它规划点击事件
+	$('.downManual').on('click',function() {
+        //　加载模板手动添加站点页面
+        $.get('addstationstemplate.html', function(m){
+            $(pjaxContainer).append(m);
+            $('#add_station_template_mobal').trigger('AddStationTempMobal.show', [WorldsBMap,GetAjaxData,directionDownValue,LineObj,PublicFunctions]);
+        });
+		/*// 加载其它规划选择弹出层mobal页面
+		$.get('add_manual_select.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#add_manual_mobal').trigger('AddManualMobal.show', [WorldsBMap,GetAjaxData,directionDownValue,LineObj,PublicFunctions]);
+		});*/
+	});
+	
+	// 下行站点新增事件
+	$('.module_tools #addDownStation').on('click', function() {
+		/** 设置新增站点对象方向属性值 @param：<directionUpValue：方向（0：上行；1：下行）> */
+		AddStationObj.setAddStationDiraction(directionDownValue);
+		// 加载选择新增方式mobal
+		$.get('add_select.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#add_select_mobal').trigger('AddSelectMobal.show', [WorldsBMap,DrawingManagerObj,GetAjaxData,AddStationObj,LineObj,PublicFunctions]);
+		});
+	});	
+	
+	// 修改下行站点mobal页面
+	$('.module_tools #editDownStation').on('click', function(){
+		var sel = PublicFunctions.getCurrSelNode(directionDownValue);
+		if(sel.length==0 || sel[0].original.chaildredType !='station'){
+			layer.msg('请先选择要编辑的下行站点！');
+			return;
+		}
+		$.get('edit_select.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#edit_select_mobal').trigger('editSelectMobal_show', [WorldsBMap,DrawingManagerObj,GetAjaxData,EditStationObj,LineObj,PublicFunctions,directionDownValue]);
+		});
+	});
+	
+	// 撤销下行站点
+	$('.module_tools #deleteDownStation').on('click', function() {
+		PublicFunctions.stationRevoke(directionDownValue);
+	});
+
+	// 下行批量撤销事件
+	$('.module_tools #batchDownDelete').on('click', function() {
+		var Line = LineObj.getLineObj();
+		/** 设置批量删除的线路方向 @param：<directionDownValue：方向（0：上行；1：下行）> */
+		DeleteBatchObj.setDeteleBatchDiraction(directionDownValue);
+		// 加载选择新增方式mobal
+		$.get('delete_select.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#delete_select_mobal').trigger('deleteSelectMobal.show',[GetAjaxData,Line,PublicFunctions,DeleteBatchObj]);
+		});
+	});
+	
+	// 编辑线路下行走向
+	$('.module_tools #editDownlineTrend').on('click', function() {
+		PublicFunctions.editLinePlan(directionDownValue);
+	});
+	
+	// 线路下行
+	$('#leftUpOrDown #downLine').on('click', function(){
+		var lineIdEvents = LineObj.getLineObj();
+
+
+		var val = $("#versions").val();
+		/** 初始化下行树 @param：<Line.id：线路Id；1:下行> */
+		PublicFunctions.resjtreeDate(lineIdEvents.id,'1',val);
+	});
+	
+	// 生成行单
+	$('.module_tools #createUsingSingle').on('click', function() {
+		var lineIdEvents = LineObj.getLineObj();
+		var params = {lineId:lineIdEvents.id};
+		GetAjaxData.createUsingSingle(params,function(data) {
+			if(data.status=='SUCCESS') {
+				// 弹出生成成功提示消息
+				layer.msg('生成成功...');
+			}else {
+				// 弹出生成失败提示消息
+				layer.msg('生成失败...');
+			}
+		});
+	});
+	$('#scrllmouseEvent').on('mousemove',function() {
+		$('.defeat-scroll').css('overflow','auto');
+	}).on('mouseleave',function() {
+		$('.defeat-scroll').css('overflow','hidden');
+	});
+
+	$(".match_station_bnt").on("click",function () {
+        var index = layer.open({
+            title: '提示',
+            content:'是否匹配外部上下行站点行业编码!',
+            // type: 1,
+            // area: ['600px', '360px'],
+            // scrollbar: false,
+
+            btn:['确定','取消'],
+            yes: function(index){
+                var lineId = LineObj.getLineObj().id;
+                GetAjaxData.matchIndustryCode(lineId,function (rs) {
+                // $post("/stationroute/matchIndustryCode",{"lineId":lineId},function (rs) {
+                    if(rs.status == "SUCCESS"){
+                        var map = new Map();
+                        var upMatch = rs.upMatch, downMatch = rs.downMatch;
+                    	if(upMatch !=null && upMatch.length>0){
+                            map.set("up",upMatch);
+						}
+						if(downMatch !=null && downMatch.length>0){
+                            map.set("down",downMatch);
+						}
+						if(map.size>0){
+                            $('.portlet-title .match_station').addClass('hidden');
+                            PublicFunctions.resjtreeDate(lineId,0,$("#versions").val());
+                            /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
+//                            GetAjaxData.getSectionRouteInfo(lineId,0,function(data) {
+//                                /** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */
+//                                PublicFunctions.linePanlThree(lineId,data,0);
+//                            });
+                            $('#stationDown').removeClass('active');
+                            $('#stationDown').removeClass('in');
+                            $('#stationDown').addClass('fade');
+                            $('#stationUp').addClass('active in');
+                            $('#downLine').parent().removeClass('active');
+                            $('#upLine').parent().addClass('active');
+                            $.get('match_station_industryCode.html', function(m){
+                                $(pjaxContainer).append(m);
+                                $('#match_station_industryCode_mobal').trigger('match_station_industryCodeMobal.show', map);
+                            });
+                        } else {
+                    		layer.msg("没有匹配到外部站点数据，请手动添加！")
+						}
+                    } else
+                        layer.msg("匹配出错，请手动添加！")
+                });
+                layer.close(index);
+            },
+			btn2:function(){
+				layer.closeAll(index); //关闭当前窗口
+			}
+        });
+    })
+
+	// 进出场规划
+	$('#leftUpOrDown #inoutLine').on('click', function(){
+		var lineIdEvents = LineObj.getLineObj();
+
+		var val = $("#versions").val();
+
+		/** 初始化上行树 @param：<Line.id：线路Id；0:上行> */
+		PublicFunctions.resjtreeDate(lineIdEvents.id,'3',val);
+
+	});
 });
 \ No newline at end of file
@@ -25,6 +25,7 @@
  */
 var PublicFunctions = function () {
+	var mapData = {};
 	var PubFun = {
 		/** 初始化线路标题与ID */
 		setTiteText : function(lineId) {
@@ -55,12 +56,131 @@ var PublicFunctions = function () {
 			// 返回Obj
 			return array;
 		},
+		startOrEndPoint: function(points, carpark) {
+			var harr = new Array, i = 0;
+			for (i = 0;i < points.length;i++) {
+				harr.push('<option value="', points[i].stationCode, '_station">', points[i].stationName, '</option>');
+				points[i].bdPoint = points[i].station.bJwpoints;
+				points[i].bdPoints = points[i].station.bdPolygon;
+				points[i].shapesType = points[i].station.shapesType;
+				points[i].radius = points[i].station.radius;
+				mapData[points[i].stationCode + '_station'] = points[i];
+			}
+			harr.push('<option value="', carpark.parkCode, '_park">', carpark.parkName, '</option>');
+			carpark.bdPoint = carpark.bCenterPoint;
+			carpark.bdPoints = carpark.bParkPoint;
+			carpark.stationName = carpark.parkName;
+			mapData[carpark.parkCode + '_park'] = carpark;
+
+			return harr.join('');
+		},
 		/** @param id:线路ID ；directionData：方向 */
 		resjtreeDate : function(id,directionData,version){
 			if(!version){
 				version = $("#versions").val();
 			}
+
+			var status = $($("#versions").find("option:selected")[0]).attr("status");
+			if (directionData == 3) {
+				// 隐藏上行规划
+				$('#upToolsMobal').hide();
+				// 隐藏上行树
+				$('#uptreeMobal').hide();
+				// 隐藏下行规划
+				$('#downToolsMobal').hide();
+				// 隐藏下行树
+				$('#DowntreeMobal').hide();
+				//
+				$('#InoutCarparktreeMobal .table-toolbar').hide();
+
+				GetAjaxData.getStartEndByLine(id, version, function (result) {
+					if (result.data) {
+						$('#InoutCarparktreeMobal').show();
+						var formHtml = template('inout-carpark-search-form');
+						$('.inout-search').html(formHtml);
+
+						$('#startPoint').html(PubFun.startOrEndPoint(result.data.start, result.data.carpark));
+						$('#endPoint').html(PubFun.startOrEndPoint(result.data.end, result.data.carpark));
+						$('#startPoint').on('change', function () {
+							$('#InoutCarparktreeMobal .table-toolbar').hide();
+						});
+						$('#endPoint').on('change', function () {
+							$('#InoutCarparktreeMobal .table-toolbar').hide();
+						});
+						$('#inoutSearch').on('click', function () {
+							var start = $('#startPoint').val().split('_'), end = $('#endPoint').val().split('_');
+							if (start[1] == end[1]) {
+								layer.msg('进出场的站点不可能同时为站点或停车场');
+								return;
+							}
+
+							$('#inout_carpark_tree').show();
+							$('#InoutCarparktreeMobal .table-toolbar').show();
+
+							GetAjaxData.getRouteByStartEnd(id, version, start[0], end[0], (result1) => {
+								var routes = result1.data.routes, rootNode;
+								WorldsBMap.clearMarkAndOverlays();
+								var startPoint = mapData[start.join('_')], endPoint = mapData[end.join('_')], point, points;
+								if (startPoint.shapesType === 'r') {
+									point = startPoint.bdPoint.split(' ');
+									WorldsBMap.drawCircle({lng : point[0], lat : point[1]}, startPoint.radius, startPoint.stationName, true);
+								} else if (startPoint.shapesType === 'd') {
+									points = startPoint.bdPoints;
+									points = points.replace('POLYGON ((', '').replace('POLYGON((', '').replaceAll(', ', ',').replace('))', '');
+									points = points.split(',')
+									WorldsBMap.drawPolygon(points, startPoint.stationName, true);
+								}
+
+								if (endPoint.shapesType === 'r') {
+									point = endPoint.bdPoint.split(' ');
+									WorldsBMap.drawCircle({lng : point[0], lat : point[1]}, endPoint.radius, endPoint.stationName, true);
+								} else if (endPoint.shapesType === 'd') {
+									points = endPoint.bdPoints;
+									points = points.replace('POLYGON ((', '').replace('POLYGON((', '').replaceAll(', ', ',').replace('))', '');
+									points = points.split(',')
+									WorldsBMap.drawPolygon(points, endPoint.stationName, true);
+								}
+
+								rootNode = {id: -1, pId: null, name: '路段', text: '路段', icon: null, groupType: 2, container : 'pjax-container', enable : true, children: routes};
+								if (routes.length > 0) {
+									for (let i = 0,route;i < routes.length;i++) {
+										route = routes[i];
+										route.pId = 1;
+										route.name = route.section.sectionName;
+										route.text = route.section.sectionName;
+										route.icon = null;
+										route.groupType = 3;
+										route.chaildredType = 'section';
+										route.enable = true;
+										route.lineId = id;
+										route.lineCode = id;
+										route.versions = version;
+										route.dir = 3;
+										route.start = start[0];
+										route.end = end[0];
+										route.sectionrouteId = route.id;
+										route.sectionName = route.section.sectionName;
+										route.sectionBsectionVector = route.section.bsectionVector;
+										points = route.section.bsectionVector.replace('LINESTRING(', '').replace(')', '');
+										points = points.split(',');
+										WorldsBMap.drawPolyLine(points, route, start[0], end[0]);
+									}
+								} else {
+									rootNode.children = [{id: 0, pId: -1, name: '添加路段', text: '添加路段', lineId: id, lineCode: id, versions: version, dir: 3, start: start[0], end: end[0], icon: null, groupType: 3, container : 'pjax-container', enable : true, chaildredType: status > 0 ? 'addSection' : '', sectionBsectionVector: 'LINESTRING(' + startPoint.bdPoint + ')'}];
+								}
+								StationTreeData.inoutInit([rootNode]);
+								StationTreeData.inoutreloadeTree([rootNode]);
+							});
+						});
+					} else {
+						layer.msg(result.msg);
+					}
+				});
+			} else {
+				$('#InoutCarparktreeMobal').hide();
+				$('#inout_carpark_tree').hide();
+			}
 			// 获取树数据
 			GetAjaxData.getStation(id,directionData,version,function(treeDateJson) {
@@ -77,7 +197,7 @@ var PublicFunctions = function () {
 						// 刷新树
 						StationTreeData.upreloadeTree(treeDateJson);
 					}else {
-						if ($($("#versions").find("option:selected")[0]).attr("status") > 0) {
+						if (status > 0) {
 							// 显示上行规划
 							$('#upToolsMobal').show();
 						}else{
@@ -99,7 +219,7 @@ var PublicFunctions = function () {
 						// 跟新树
 						StationTreeData.dwonreloadeTree(treeDateJson);
 					}else {
-						if ($($("#versions").find("option:selected")[0]).attr("status") > 0) {
+						if (status > 0) {
 							// 显示下行规划
 							$('#downToolsMobal').show();
 						}else{
@@ -461,6 +581,7 @@ var PublicFunctions = function () {
 		/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */
 		linePanlThree : function(lineId,data,direction,version,callback) {
 			/** 获取站点路由信息 @param:<Line.id：线路Id；0：上行> @return：<resultdata：站点路由数据> */
+			debugger
             var polyline_center;
 			GetAjaxData.getStationRoutePoint(lineId,direction,version,function(resultdata) {
 				WorldsBMap.clearMarkAndOverlays();
@@ -536,6 +657,7 @@ var PublicFunctions = function () {
 		},
 		// 地图处于编辑状态
 		editMapStatus : function (dir) {
+			debugger
             WorldsBMap.setMap_status(1);
             // 有方向就显示退出编辑模式按钮
             if(dir!=null && dir!='null'){
@@ -31,6 +31,8 @@ window.WorldsBMap = function () {
         sectionArray = [], stationArray = new Map(),
         map_status = 0,drawingManager,topOverlay;
+    let currentSection = {};
+
     /**
      * 编辑缓冲区
      * stationMarkers: 站点图标集合
@@ -533,7 +535,7 @@ window.WorldsBMap = function () {
         },
         /** 在地图上画点 @param：<point_center：中心坐标点> */
-        drawingUpStationPoint: function (station, s) {
+        drawingUpStationPoint: function (station, s, isView) {
             // 中心点坐标字符串
             var bJwpointsStr = station.stationJwpoints;
             var stationName = station.stationRouteName;
@@ -558,7 +560,7 @@ window.WorldsBMap = function () {
             myRichMarker1.ct_source = '1';
             mapBValue.addOverlay(myRichMarker1);
             myRichMarker1.addEventListener('click', function () {
-                if(map_status != 1)
+                if(map_status != 1 && !isView)
                     WorldsBMap.openStationInfoWin(station);
             });
             stationArray[station.stationRouteId] = station;
@@ -922,8 +924,15 @@ window.WorldsBMap = function () {
         focusSection: function(sectionRoudId) {
             for (var i = 0, p; p = sectionArray[i++];) {
                 if (p.data.sectionrouteId == sectionRoudId) {
-                    WorldsBMap.openSectionInfoWin(p);
-                    break;
+                    switch (p.data.dir) {
+                        case 3:
+                            WorldsBMap.openSectionInfoWin_inout(p);
+                            break;
+                        default:
+                            WorldsBMap.openSectionInfoWin(p);
+                            break;
+                    }
+
                 }
             }
         },
@@ -1026,23 +1035,44 @@ window.WorldsBMap = function () {
                         params.destroy = 0;
                         params.directions = dir;
                         params.descriptions = '';
+                        params.start = stecion.start;
+                        params.end = stecion.end;
                         params.status=$($("#versions").find("option:selected")[0]).attr("status");
-                        GetAjaxData.sectionSave(params, function (result) {
-                            if(result.status =="SUCCESS"){
-                                $('.main_left_panel_m_layer').hide();
-                                $(btn).parents('.buffer_edit_body').parent().remove();
-                                PublicFunctions.editMapStatusRemove();
-                                PublicFunctions.resjtreeDate(lineId,dir,$("#versions").val());
-                                PublicFunctions.editAChangeCssRemoveDisabled();
+                        if (dir == 3) {
+                            GetAjaxData.inoutSectionSave(params, function (result) {
+                                if(result.status =="SUCCESS"){
+                                    $('.main_left_panel_m_layer').hide();
+                                    $(btn).parents('.buffer_edit_body').parent().remove();
+                                    PublicFunctions.editMapStatusRemove();
+                                    //PublicFunctions.resjtreeDate(lineId,dir,$("#versions").val());
+                                    $('#inoutSearch').click();
+                                    PublicFunctions.editAChangeCssRemoveDisabled();
 //                                GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {
 //                                    PublicFunctions.linePanlThree(lineId,data,dir);
 //                                });
-                                layer.msg("添加成功！");
-                            } else if(result.status =="ERROR") {
-                                layer.msg("添加失败！");
-                            }
-                        });
+                                    layer.msg("添加成功！");
+                                } else if(result.status =="ERROR") {
+                                    layer.msg("添加失败！");
+                                }
+                            });
+                        } else {
+                            GetAjaxData.sectionSave(params, function (result) {
+                                if(result.status =="SUCCESS"){
+                                    $('.main_left_panel_m_layer').hide();
+                                    $(btn).parents('.buffer_edit_body').parent().remove();
+                                    PublicFunctions.editMapStatusRemove();
+                                    PublicFunctions.resjtreeDate(lineId,dir,$("#versions").val());
+                                    PublicFunctions.editAChangeCssRemoveDisabled();
+//                                GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {
+//                                    PublicFunctions.linePanlThree(lineId,data,dir);
+//                                });
+                                    layer.msg("添加成功！");
+                                } else if(result.status =="ERROR") {
+                                    layer.msg("添加失败！");
+                                }
+                            });
+                        }
                     });
                 } else if(!sectionName){
                     layer.msg('请填写路段名字！');
@@ -1322,6 +1352,7 @@ window.WorldsBMap = function () {
             // 清楚地图覆盖物
             mapBValue.clearOverlays();
             mapBValue.removeOverlay();
+            sectionArray = [];
         },
         clearMark: function () {
             // 清楚地图覆盖物
@@ -1458,6 +1489,338 @@ window.WorldsBMap = function () {
 			})();
 		},
+
+        /**
+         * 画圆
+         * point(lng,lat) 中心点
+         * radius 半径(m)
+         * isMark 是否加站名
+         */
+        drawCircle: function (point, radius, stationName, isMark) {
+            let center = new BMap.Point(point.lng, point.lat);
+            let circle = new BMap.Circle(center, radius ,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5});
+            mapBValue.addOverlay(circle);
+            if (isMark) {
+                let html = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -3px; top: -30px; overflow: hidden;">'
+                    + '<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">'
+                    + '</div>'
+                    + '<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 20px; top: -30px;">' + stationName + '</label>';
+
+                let myRichMarker = new BMapLib.RichMarker(html, center, {
+                    "title": stationName,
+                    "anchor": new BMap.Size(-10, 8),
+                    "enableDragging": true
+                });
+                myRichMarker.disableDragging();
+                myRichMarker.ct_source = '1';
+                mapBValue.addOverlay(myRichMarker);
+            }
+        },
+
+        /**
+         * 画多边形
+         * points 点数组
+         */
+        drawPolygon: function (points, stationName, isMark) {
+            let bdPoints = new Array(), i = 0, point;
+            for (i = 0;i < points.length;i++) {
+                point = points[i].split(' ');
+                bdPoints.push(new BMap.Point(point[0], point[1]));
+            }
+            let polygon = new BMap.Polygon(bdPoints), center = bdPoints[0];
+            mapBValue.addOverlay(polygon);
+            if (isMark) {
+                let html = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -3px; top: -30px; overflow: hidden;">'
+                    + '<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">'
+                    + '</div>'
+                    + '<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 20px; top: -30px;">' + stationName + '</label>';
+
+                let myRichMarker = new BMapLib.RichMarker(html, center, {
+                    "title": stationName,
+                    "anchor": new BMap.Size(-10, 8),
+                    "enableDragging": true
+                });
+                myRichMarker.disableDragging();
+                myRichMarker.ct_source = '1';
+                mapBValue.addOverlay(myRichMarker);
+            }
+        },
+
+        drawPolyLine: function (points, data, start, end) {
+            debugger
+            let bdPoints = new Array(), i = 0, point, polyline;
+            for (i = 0;i < points.length;i++) {
+                point = points[i].split(' ');
+                bdPoints.push(new BMap.Point(point[0], point[1]));
+            }
+            // 创建线路走向
+            polyline = new BMap.Polyline(bdPoints, {
+                strokeColor: 'red',
+                strokeWeight: 6,
+                strokeOpacity: 0.7
+            });
+
+            polyline.data = data;
+            polyline.start = start;
+            polyline.end = end;
+            polyline.ct_source = '1';
+            // 把折线添加到地图上
+            mapBValue.addOverlay(polyline);
+            // 聚焦事件
+            polyline.addEventListener('mousemove', function (e) {
+                if (this != editPolyline)
+                    this.setStrokeColor("#20bd26");
+            });
+            // 失去焦点
+            polyline.addEventListener('mouseout', function (e) {
+                if (this != editPolyline && this != road_win_show_p)
+                    this.setStrokeColor("red");
+            });
+            // 添加单击事件
+            polyline.addEventListener('onclick', function (e) {
+                // 打开信息窗口
+                if (map_status != 1)
+                    WorldsBMap.openSectionInfoWin_inout(this);
+            });
+            // 添加右击事件
+            polyline.addEventListener('rightclick', function (e) {
+                if (currentSection.enableEditing) {
+                    this.disableEditing();
+                    WorldsBMap.saveSection_inout(this);
+                }
+            });
+            sectionArray.push(polyline);
+        },
+
+        // 打开路段信息窗口
+        openSectionInfoWin_inout: function(p) {
+            var section = p.data;
+            var dir = section.sectionrouteDirections;
+            var width = WorldsBMap.strGetLength(section.sectionName) * 10;
+            // 信息窗口参数属性
+            var opts = {
+                // 信息窗口宽度
+                width: (width < 200 ? 200 : width),
+                // 信息窗口高度
+                height: 150,
+                //设置不允许信窗发送短息
+                enableMessage: false,
+                //是否开启点击地图关闭信息窗口
+                enableCloseOnClick: false,
+                // 是否开启信息窗口打开时地图自动移动（默认开启）。(自 1.1 新增)
+                enableAutoPan: false
+            };
+            var htm = '<span style="color: #ff8355;font-size: 18px;">' + section.sectionName + '</span>' +
+                '<span class="help-block" >路段编码：' + section.sectionCode + '</span>' +
+                '<span class="help-block" >路段序号：' + section.sectionrouteCode + '</span>' +
+                '<span class="help-block" >版本号&nbsp&nbsp：' + section.versions + '</span>' +
+                '<div >';
+
+            if($($("#versions").find("option:selected")[0]).attr("status") > 0){
+                htm += '<button class="info_win_btn" id="editStation" onclick="WorldsBMap.editSection_inout(' + section.sectionrouteId +','+dir+ ')">修改</button>' +
+                    '<button  class="info_win_btn" id="addBetweenStationRoad" onclick="WorldsBMap.destroySection_inout('+ section.sectionrouteId + ','+section.sectionrouteLine+','+section.sectionrouteDirections+')">撤销</button>' +
+                    '<button class="info_win_btn" id="addSectionAfter" onclick="WorldsBMap.addSectionAfter_inout('+section.sectionrouteId+')">添加路段(之后)</button>' +
+                    '</div>';
+            }
+
+            // 创建信息窗口
+            var infoWindow_target = new BMap.InfoWindow(htm, opts);
+            // 切割段折线坐标字符串
+            var sectionStr = section.sectionBsectionVector.substring(11, section.sectionBsectionVector.length - 1);
+            // 分割折线坐标字符串
+            var lineArray = sectionStr.split(',');
+            var sectionArray = [];
+            for (var i = 0; i < lineArray.length; i++) {
+                sectionArray.push(new BMap.Point(lineArray[i].split(' ')[0], lineArray[i].split(' ')[1]));
+            }
+            // 计算中间点
+            var index = parseInt(sectionArray.length / 2);
+            var centerPoint = sectionArray[index];
+            //close event
+            infoWindow_target.addEventListener('close', function (e) {
+                p.setStrokeColor("red");
+                road_win_show_p = null;
+            });
+            //open event
+            infoWindow_target.addEventListener('open', function (e) {
+                p.setStrokeColor("#20bd26");
+                road_win_show_p = p;
+            });
+            //开启信息窗口
+            mapBValue.openInfoWindow(infoWindow_target, centerPoint);
+            mapBValue.panTo(centerPoint);
+        },
+
+        /**
+         * 进出场路段设置为编辑状态
+         */
+        editSection_inout: function(sectionRoudId) {
+            layer.confirm('进入编辑状态', {
+                btn : [ '确定','返回' ], icon: 3, title:'提示'
+            }, function() {
+                PublicFunctions.editMapStatus(dir);
+                layer.msg('双击保存路段');
+                var p;
+                for (var i = 0; p = sectionArray[i++];) {
+                    if (p.data.sectionrouteId == sectionRoudId) {
+                        mapBValue.closeInfoWindow();//关闭infoWindow
+                        p.enableEditing();
+                        p.setStrokeColor('blue');
+                        editPolyline = p;
+                        break;
+                    }
+                }
+                // 路段中间点为中心
+                var section = p.data;
+                var sectionStr = section.sectionBsectionVector.substring(11, section.sectionBsectionVector.length - 1);
+                // 分割折线坐标字符串
+                var lineArray = sectionStr.split(',');
+                var sectionPointArray = [];
+                for (var i = 0; i < lineArray.length; i++) {
+                    sectionPointArray.push(new BMap.Point(lineArray[i].split(' ')[0], lineArray[i].split(' ')[1]));
+                }
+                // 计算中间点
+                var index = parseInt(sectionPointArray.length / 2);
+                var centerPoint = sectionPointArray[index];
+                mapBValue.centerAndZoom(centerPoint, 17);
+                // var c = p.ia[Math.floor(p.ia.length/2)];
+                // mapBValue.centerAndZoom(new BMap.Point(c.lng, c.lat), 18);
+                p.addEventListener('dblclick', function () {
+                    /** 设置修改路段集合对象为空 */
+                    editPolyline = '';
+                    PublicFunctions.editMapStatusRemove();
+                    $.get('editsection_inout.html', function(m){
+                        $('body').append(m);
+                        $('#edit_section_mobal').trigger('editSectionMobal_show', [WorldsBMap,GetAjaxData,p,PublicFunctions]);
+                    });
+                });
+            });
+        },
+
+        // 撤销路段
+        destroySection_inout : function(sectionRoudId) {
+            layer.confirm('你确定要撤销此路段吗？', {
+                btn : [ '撤销','返回' ], icon: 3, title:'提示'
+            }, function(){
+                var status = $($("#versions").find("option:selected")[0]).attr("status");
+                $.post('/inout/destroy',{'id': sectionRoudId,status:status},function(resuntDate) {
+                    if (resuntDate.status == 'SUCCESS') {
+                        // 弹出添加成功提示消息
+                        layer.msg('撤销成功!');
+                    } else {
+                        // 弹出添加失败提示消息
+                        layer.msg('撤销失败!');
+                    }
+                    // 刷新左边树
+                    $('#inoutSearch').click();
+                    /** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */
+//                    GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {
+//                        /** 在地图上画出线路走向  @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */
+//                        PublicFunctions.linePanlThree(lineId,data,dir);
+//                    });
+                });
+            });
+        },
+
+        // 添加在路段之后
+        addSectionAfter_inout : function(sectionRoudId) {
+            //order = after  before;
+            var beforeSection;
+            // 关闭信息窗口
+            mapBValue.closeInfoWindow();
+            PublicFunctions.editMapStatus();
+            // 把数据填充到模版中
+            var addSectionHTML = template('add_draw_polyline-temp',{ 'id': sectionRoudId});
+            $('body .mian-portlet-body').append(addSectionHTML);
+            //暂停和开始绘制
+            $('.draw_polyline_switch>a').on('click', function () {
+                var t = $(this).text();
+                if(t=='暂停绘制'){
+                    WorldsBMap.exitDrawStatus();
+                    $(this).text('开始绘制');
+                }
+                else{
+                    WorldsBMap.openDrawStatus();
+                    $(this).text('暂停绘制');
+                }
+            });
+
+            //取消
+            $('#addSectionCancelBtn').on('click', function () {
+                $('.main_left_panel_m_layer').hide();
+                $(this).parents('.buffer_edit_body').parent().remove();
+                WorldsBMap.exitDrawStatus();
+                PublicFunctions.editMapStatusRemove();
+            });
+            GetAjaxData.getRouteInfoById(sectionRoudId, function(data){
+                beforeSection = data;
+                beforeSection.sectionBsectionVector = beforeSection.section.bsectionVector;
+                WorldsBMap.showAddSectionPanel(beforeSection);
+            });
+
+            //确定
+            $('#addSectionSbmintBtn').on('click', function () {
+                var btn = this;
+                $('#addSectionSbmintBtn').addClass("disabled");
+                var sectionName = $('#sectionNameInput').val();
+                var bsectionVector = $('#bsectionVectorInput').val();
+                var params = {};
+                if(sectionName && bsectionVector) {
+                    WorldsBMap.exitDrawStatus();
+                    GetAjaxData.getSectionCode(function(sectionCode) {
+                        params.lineId = beforeSection.line.id;
+                        params.lineCode = beforeSection.lineCode;
+                        params.sectionCode = sectionCode;// 设值路段编码.
+                        params.sectionName = sectionName;
+                        params.roadCoding = '';
+                        params.dbType = 'b';
+                        params.bsectionVector = bsectionVector;
+                        params.sectionrouteCode = beforeSection.sectionrouteCode+"_0";
+                        params.sectionTime = 0;
+                        params.sectionDistance = 60;
+                        params.speedLimit = 0;
+                        params.versions = beforeSection.versions;
+                        params.destroy = 0;
+                        params.directions = beforeSection.directions;
+                        params.descriptions = '';
+                        params.start = beforeSection.start;
+                        params.end = beforeSection.end;
+                        params.status=$($("#versions").find("option:selected")[0]).attr("status");
+
+                        GetAjaxData.inoutSectionSave(params, function (result) {
+                            if(result.status =="SUCCESS"){
+                                $('.main_left_panel_m_layer').hide();
+                                $(btn).parents('.buffer_edit_body').parent().remove();
+                                PublicFunctions.editMapStatusRemove();
+                                $('#inoutSearch').click();
+                                PublicFunctions.editAChangeCssRemoveDisabled();
+//                                GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {
+//                                    PublicFunctions.linePanlThree(lineId,data,dir);
+//                                });
+                                layer.msg("添加成功！");
+                            } else if(result.status =="ERROR") {
+                                layer.msg("添加失败！");
+                            }
+                        });
+                    });
+                } else if(!sectionName){
+                    layer.msg('请填写路段名字！');
+                } else if(!bsectionVector)
+                    layer.msg('请先绘制路段！');
+                setTimeout(function () {
+                    $("#addSectionSbmintBtn").removeClass("disabled");
+                },1000);
+            });
+        },
+        /**
+         * 保存进出场路段
+         */
+        saveSection_inout: function () {
+            $.get('editsection_inout.html', function(m){
+                $('body').append(m);
+                $('#edit_section_mobal').trigger('editSectionMobal_show', [WorldsBMap,GetAjaxData,currentSection,PublicFunctions]);
+            });
+        },
     };
     return Bmap;
-/**
- * reload事件
- * 
- * 
- */
-
-$(function() {
-
-	// 关闭左侧栏
-	if (!$('body').hasClass('page-sidebar-closed')) {
-		$('.menu-toggler.sidebar-toggler').click();
-	}
-	// 获取参数线路ID
-	var idAndDir = $.url().param('no');
-	var param = idAndDir.split(",");
-	var dir = 0, id;
-	if (param.length == 1) {
-		id = param[0];
-	} else {
-		id = param[0];
-		dir = param[1];
-	}
-	if (dir == 1) {
-		$('#stationUp').removeClass('active');
-		$('#stationUp').removeClass('in');
-		$('#stationUp').addClass('fade');
-		$('#stationDown').addClass('active in');
-		$('#upLine').parent().removeClass('active');
-		$('#downLine').parent().addClass('active');
-	}
-	// 如果线路ID不为空
-	if (id) {
-		var styleOptions = {
-			strokeColor : "blue",// 边线颜色。
-			fillColor : "blue",// 填充颜色。当参数为空时，圆形将没有填充效果。
-			strokeWeight : 3,// 边线的宽度，以像素为单位。
-			strokeOpacity : 0.8,// 边线透明度，取值范围0 - 1。
-			fillOpacity : 0.6,// 填充的透明度，取值范围0 - 1。
-			strokeStyle : 'solid' // 边线的样式，solid或dashed。
-		};
-
-		// 等候500毫秒执行
-		setTimeout(function() {
-
-			/**
-			 * 初始化线路对象，这里只初始化线路Id属性
-			 * 
-			 * @param:<id:线路ID>
-			 * @return:Line
-			 */
-			var Line = LineObj.init(id);
-
-			$("#versions").change(
-					function() {
-						var val = $(this).val();
-
-						/**
-						 * 初始化上行树
-						 * 
-						 * @param：<Line.id：线路Id；0:上行>
-						 */
-						PublicFunctions.resjtreeDate(Line.id, '0', val);
-						
-						
-						LineObj.setStatus($($("#versions").find("option:selected")[0]).attr("status"));
-						/**
-						 * 初始化下行树
-						 * 
-						 * @param：<Line.id：线路Id；1:下行>
-						 */
-						// PublicFunctions.resjtreeDate(Line.id,'1',val);
-						$('#stationDown').removeClass('active');
-						$('#stationDown').removeClass('in');
-						$('#stationDown').addClass('fade');
-						$('#stationUp').addClass('active in');
-						$('#downLine').parent().removeClass('active');
-						$('#upLine').parent().addClass('active');
-
-						if ($($("#versions").find("option:selected")[0]).attr("status") > 0) {
-							$(".table-toolbar").show();
-						} else {
-							$(".table-toolbar").hide();
-						}
-
-					});
-
-			/**
-			 * 初始化线路标题
-			 * 
-			 * @param：<Line.id：线路ID>
-			 */
-			PublicFunctions.setTiteText(Line.id);
-
-			/**
-			 * 初始化地图对象map
-			 * 
-			 * @return:Map对象
-			 */
-			var map_ = WorldsBMap.init();
-
-			/**
-			 * 初始化绘图工具类
-			 * 
-			 * @param：<map_：map对象；styleOptions：绘图样式对象>
-			 * @return:DrawingManager对象
-			 */
-			var drawingManager_ = DrawingManagerObj.init(map_, styleOptions);
-
-			GetAjaxData.getAllLineVersions(Line.id, function(data) {
-
-				$("#versions option").remove();
-
-				var reqData = false;
-
-				for (var i = 0; i < data.length; i++) {
-
-					var ver = data[i];
-
-					if (ver.status == 1) {
-
-						/**
-						 * 初始化上行树
-						 * 
-						 * @param：<Line.id：线路Id；0:上行>
-						 */
-						PublicFunctions
-								.TreeUpOrDown(Line.id, '0', ver.versions);
-
-						/**
-						 * 初始化下行树
-						 * 
-						 * @param：<Line.id：线路Id；1:下行>
-						 */
-						PublicFunctions
-								.TreeUpOrDown(Line.id, '1', ver.versions);
-
-						reqData = true;
-
-						var option = "<option value=" + ver.versions
-								+ " status=" + ver.status + " selected>"
-								+ ver.name + " (" + ver.versions + ")"
-								+ "</option>"
-						$("#versions").append(option);
-						LineObj.setStatus(ver.status);
-						continue;
-					}
-
-					var option = "<option value=" + ver.versions + " status="
-							+ ver.status + ">" + ver.name + " (" + ver.versions
-							+ ")" + "</option>"
-					$("#versions").append(option);
-				}
-
-				if (!reqData) {
-					for (var i = 0; i < data.length; i++) {
-						if (ver.status == 2) {
-
-							/**
-							 * 初始化上行树
-							 * 
-							 * @param：<Line.id：线路Id；0:上行>
-							 */
-							PublicFunctions.TreeUpOrDown(Line.id, '0',
-									ver.versions);
-
-							/**
-							 * 初始化下行树
-							 * 
-							 * @param：<Line.id：线路Id；1:下行>
-							 */
-							PublicFunctions.TreeUpOrDown(Line.id, '1',
-									ver.versions);
-
-							GetAjaxData.getSectionRouteInfo(Line.id, dir,
-									ver.versions, function(data) {
-										/**
-										 * 在地图上画出线路走向
-										 * 
-										 * @param:<Line.id：线路Id；0：上行；data：路段数据>
-										 */
-										PublicFunctions.linePanlThree(Line.id,
-												data, dir, function(
-														polyline_center) {
-													var map = WorldsBMap
-															.getmapBValue();
-													map.panTo(polyline_center);
-												});
-
-									});
-							reqData = true;
-
-							LineObj.setStatus(ver.status);
-							break;
-						}
-					}
-
-				}
-
-			});
-
-			GetAjaxData.getLineMatchStationIsUpdate(Line.id, function(data) {
-				if (data.status == 'SUCCESS' && data.data == "1") {
-					$('.portlet-title .match_station').removeClass('hidden');
-				}
-			});
-
-			$('#esc_edit_div').on(
-					'click',
-					function() {
-						var index = layer.open({
-							title : '退出提示',
-							content : '退出编辑模式后，当前没有保存的所有操作将被还原，确定要退出吗!',
-							// type: 1,
-							// area: ['600px', '360px'],
-							// scrollbar: false,
-
-							btn : [ '确定', '取消' ],
-							yes : function(index) {
-
-								// 刷新左边树
-								
-
-								var dir = WorldsBMap.getDir();
-								
-			                    PublicFunctions.resjtreeDate(Line.id,dir,$("#versions").val());
-								// PublicFunctions.resjtreeDate(Line.id,dir);
-								// 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向>
-								// @return：data：路段数据
-//								GetAjaxData.getSectionRouteInfo(Line.id, dir,
-//										function(data) {
-//											// 在地图上画出线路走向
-//											// @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据>
-//											PublicFunctions.linePanlThree(
-//													Line.id, data, dir);
-//										});
-								PublicFunctions.editMapStatusRemove();
-								layer.msg("已退出编辑模式！");
-								layer.close(index);
-							},
-							btn2 : function() {
-								layer.closeAll(index); // 关闭当前窗口
-								layer.msg("您没有退出编辑模式，请继续完成您未完成的操作！")
-							}
-						});
-					});
-		}, 500);
-
-	} else {
-
-		// 缺少ID
-		layer.confirm('【ID缺失，请点击返回，重新进行操作】', {
-			btn : [ '返回' ],
-			icon : 3,
-			title : '提示'
-		}, function(index) {
-
-			// 关闭提示弹出层
-			layer.close(index);
-
-			// 返回线路list页面
-			loadPage('/pages/base/line/list.html');
-
-		});
-
-	}
-	$('.green-seagreen dropdown-toggle').click(function() {
-		$('.dropdown-menu').css("display", "block");
-	});
+/**
+ * reload事件
+ * 
+ * 
+ */
+
+$(function() {
+
+	// 关闭左侧栏
+	if (!$('body').hasClass('page-sidebar-closed')) {
+		$('.menu-toggler.sidebar-toggler').click();
+	}
+	// 获取参数线路ID
+	var idAndDir = $.url().param('no');
+	var param = idAndDir.split(",");
+	var dir = 0, id;
+	if (param.length == 1) {
+		id = param[0];
+	} else {
+		id = param[0];
+		dir = param[1];
+	}
+	if (dir == 1) {
+		$('#stationUp').removeClass('active');
+		$('#stationUp').removeClass('in');
+		$('#stationUp').addClass('fade');
+		$('#stationDown').addClass('active in');
+		$('#upLine').parent().removeClass('active');
+		$('#downLine').parent().addClass('active');
+	}
+	// 如果线路ID不为空
+	if (id) {
+		var styleOptions = {
+			strokeColor : "blue",// 边线颜色。
+			fillColor : "blue",// 填充颜色。当参数为空时，圆形将没有填充效果。
+			strokeWeight : 3,// 边线的宽度，以像素为单位。
+			strokeOpacity : 0.8,// 边线透明度，取值范围0 - 1。
+			fillOpacity : 0.6,// 填充的透明度，取值范围0 - 1。
+			strokeStyle : 'solid' // 边线的样式，solid或dashed。
+		};
+
+		// 等候500毫秒执行
+		setTimeout(function() {
+
+			/**
+			 * 初始化线路对象，这里只初始化线路Id属性
+			 * 
+			 * @param:<id:线路ID>
+			 * @return:Line
+			 */
+			var Line = LineObj.init(id);
+
+			$("#versions").change(
+					function() {
+						var val = $(this).val();
+
+						/**
+						 * 初始化上行树
+						 * 
+						 * @param：<Line.id：线路Id；0:上行>
+						 */
+						PublicFunctions.resjtreeDate(Line.id, '0', val);
+						
+						
+						LineObj.setStatus($($("#versions").find("option:selected")[0]).attr("status"));
+						/**
+						 * 初始化下行树
+						 * 
+						 * @param：<Line.id：线路Id；1:下行>
+						 */
+						// PublicFunctions.resjtreeDate(Line.id,'1',val);
+						$('#stationDown').removeClass('active');
+						$('#stationDown').removeClass('in');
+						$('#stationDown').addClass('fade');
+						$('#inoutCarpark').removeClass('active');
+						$('#inoutCarpark').removeClass('in');
+						$('#inoutCarpark').addClass('fade');
+						$('#stationUp').addClass('active in');
+						$('#downLine').parent().removeClass('active');
+						$('#inoutLine').parent().removeClass('active');
+						$('#upLine').parent().addClass('active');
+
+						if ($($("#versions").find("option:selected")[0]).attr("status") > 0) {
+							$(".table-toolbar").show();
+						} else {
+							$(".table-toolbar").hide();
+						}
+
+					});
+
+			/**
+			 * 初始化线路标题
+			 * 
+			 * @param：<Line.id：线路ID>
+			 */
+			PublicFunctions.setTiteText(Line.id);
+
+			/**
+			 * 初始化地图对象map
+			 * 
+			 * @return:Map对象
+			 */
+			var map_ = WorldsBMap.init();
+
+			/**
+			 * 初始化绘图工具类
+			 * 
+			 * @param：<map_：map对象；styleOptions：绘图样式对象>
+			 * @return:DrawingManager对象
+			 */
+			var drawingManager_ = DrawingManagerObj.init(map_, styleOptions);
+
+			GetAjaxData.getAllLineVersions(Line.id, function(data) {
+
+				$("#versions option").remove();
+
+				var reqData = false;
+
+				for (var i = 0; i < data.length; i++) {
+
+					var ver = data[i];
+
+					if (ver.status == 1) {
+
+						/**
+						 * 初始化上行树
+						 * 
+						 * @param：<Line.id：线路Id；0:上行>
+						 */
+						PublicFunctions
+								.TreeUpOrDown(Line.id, '0', ver.versions);
+
+						/**
+						 * 初始化下行树
+						 * 
+						 * @param：<Line.id：线路Id；1:下行>
+						 */
+						PublicFunctions
+								.TreeUpOrDown(Line.id, '1', ver.versions);
+
+						reqData = true;
+
+						var option = "<option value=" + ver.versions
+								+ " status=" + ver.status + " selected>"
+								+ ver.name + " (" + ver.versions + ")"
+								+ "</option>"
+						$("#versions").append(option);
+						LineObj.setStatus(ver.status);
+						continue;
+					}
+
+					var option = "<option value=" + ver.versions + " status="
+							+ ver.status + ">" + ver.name + " (" + ver.versions
+							+ ")" + "</option>"
+					$("#versions").append(option);
+				}
+
+				if (!reqData) {
+					for (var i = 0; i < data.length; i++) {
+						if (ver.status == 2) {
+
+							/**
+							 * 初始化上行树
+							 * 
+							 * @param：<Line.id：线路Id；0:上行>
+							 */
+							PublicFunctions.TreeUpOrDown(Line.id, '0',
+									ver.versions);
+
+							/**
+							 * 初始化下行树
+							 * 
+							 * @param：<Line.id：线路Id；1:下行>
+							 */
+							PublicFunctions.TreeUpOrDown(Line.id, '1',
+									ver.versions);
+
+							GetAjaxData.getSectionRouteInfo(Line.id, dir,
+									ver.versions, function(data) {
+										/**
+										 * 在地图上画出线路走向
+										 * 
+										 * @param:<Line.id：线路Id；0：上行；data：路段数据>
+										 */
+										PublicFunctions.linePanlThree(Line.id,
+												data, dir, function(
+														polyline_center) {
+													var map = WorldsBMap
+															.getmapBValue();
+													map.panTo(polyline_center);
+												});
+
+									});
+							reqData = true;
+
+							LineObj.setStatus(ver.status);
+							break;
+						}
+					}
+
+				}
+
+			});
+
+			GetAjaxData.getLineMatchStationIsUpdate(Line.id, function(data) {
+				if (data.status == 'SUCCESS' && data.data == "1") {
+					$('.portlet-title .match_station').removeClass('hidden');
+				}
+			});
+
+			$('#esc_edit_div').on(
+					'click',
+					function() {
+						var index = layer.open({
+							title : '退出提示',
+							content : '退出编辑模式后，当前没有保存的所有操作将被还原，确定要退出吗!',
+							// type: 1,
+							// area: ['600px', '360px'],
+							// scrollbar: false,
+
+							btn : [ '确定', '取消' ],
+							yes : function(index) {
+
+								// 刷新左边树
+								
+
+								var dir = WorldsBMap.getDir();
+								
+			                    PublicFunctions.resjtreeDate(Line.id,dir,$("#versions").val());
+								// PublicFunctions.resjtreeDate(Line.id,dir);
+								// 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向>
+								// @return：data：路段数据
+//								GetAjaxData.getSectionRouteInfo(Line.id, dir,
+//										function(data) {
+//											// 在地图上画出线路走向
+//											// @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据>
+//											PublicFunctions.linePanlThree(
+//													Line.id, data, dir);
+//										});
+								PublicFunctions.editMapStatusRemove();
+								layer.msg("已退出编辑模式！");
+								layer.close(index);
+							},
+							btn2 : function() {
+								layer.closeAll(index); // 关闭当前窗口
+								layer.msg("您没有退出编辑模式，请继续完成您未完成的操作！")
+							}
+						});
+					});
+		}, 500);
+
+	} else {
+
+		// 缺少ID
+		layer.confirm('【ID缺失，请点击返回，重新进行操作】', {
+			btn : [ '返回' ],
+			icon : 3,
+			title : '提示'
+		}, function(index) {
+
+			// 关闭提示弹出层
+			layer.close(index);
+
+			// 返回线路list页面
+			loadPage('/pages/base/line/list.html');
+
+		});
+
+	}
+	$('.green-seagreen dropdown-toggle').click(function() {
+		$('.dropdown-menu').css("display", "block");
+	});
 });
 \ No newline at end of file
-/**
- * 
- * 左边树Obj : StationTreeData
- * 
- *  - - - - - - 》 upInit : 初始化上行树
- *  
- *  - - - - - - 》 downInit : 初始化下行树
- * 
- *  - - - - - - 》 upreloadeTree : 刷行上行树
- *  
- *  - - - - - - 》 dwonreloadeTree : 刷行下行树
- */
-
-var StationTreeData = function(){
-	
-	function parmasObj() {
-
-		AddStationObj.setAddStation({});
-		
-		EditStationObj.setEitdStation({});
-		
-		EditSectionObj.setEitdSection({});
-		
-	}
-
-	function TreeOnclickEvent(treeOjb) {
-		if(treeOjb==null)
-			return;
-		// 节点个数
-		var len = treeOjb.length;
-		if(len<0) {
-			return;
-		}
-	
-		// 获取数据
-		var stationData = treeOjb[0].original;
-        // 选中的节点类型
-        var chaildredType_ = stationData.chaildredType;
-        
-        if(chaildredType_ == "section") {
-            WorldsBMap.focusSection(stationData.sectionrouteId);
-        } else if(chaildredType_ == "station") {
-            WorldsBMap.openStationInfoWin(stationData);
-		} else if(chaildredType_ == "addSection") {
-            WorldsBMap.addSection(stationData);
-		}
-	}
-	var stationTree = {
-			upInit : function(treeDateJson) {
-				// 如果不为空
-				if(treeDateJson) {
-					// 加载树load事件
-				   $('#station_Up_tree').on('loaded.jstree', function(e, data){
-					   // 展开树
-					   $.jstree.reference("#station_Up_tree").open_all();
-					}).jstree({
-						'core' : {
-							'themes' : {
-								'responsive': false
-							},
-							
-							'data': treeDateJson,
-							
-							'multiple':false
-							
-						},
-						
-						'types' : {
-							
-								"default" : {
-									
-									"icon" : false
-									
-								},
-								
-								'enable_true' : {
-									
-									"icon" : 'fa fa-check  icon-lg'
-										
-								},
-								
-								'enable_false' : {
-									
-									'icon' : 'fa fa-close  icon-lg'
-										
-								},
-								
-								'group':{
-									
-									'icon' : 'fa fa-object-group  icon-lg'
-										
-								}
-						},
-						
-						'plugins': ['types']
-					
-					// 树节点单击事件
-					}).bind('click.jstree', function(event) {
-						// 获取上行选中树节点
-						var treeOjb = $.jstree.reference("#station_Up_tree").get_selected(true);
-						TreeOnclickEvent(treeOjb);
-						
-					});
-				}
-			},
-			downInit : function(treeDateJson) {
-				// 如果不为空
-				if(treeDateJson) {
-				   // 树初始化load事件
-				   $('#station_Down_tree').on('loaded.jstree', function(e, data){
-					   // 展开树
-					   $.jstree.reference("#station_Down_tree").open_all();
-					}).jstree({
-						'core' : {
-							'themes' : {
-								
-								'responsive': false
-								
-							},
-							
-							'data': treeDateJson,
-							
-							'multiple':false
-							
-						},
-						
-						'types' : {
-							
-								"default" : {
-									
-									"icon" : false
-									
-								},
-								
-								'enable_true' : {
-									
-									"icon" : 'fa fa-check  icon-lg'
-										
-								},
-								
-								'enable_false' : {
-									
-									'icon' : 'fa fa-close  icon-lg'
-										
-								},
-								
-								'group':{
-									
-									'icon' : 'fa fa-object-group  icon-lg'
-										
-								}
-						},
-						'plugins': ['types']
-					// 树节点单击事件
-					}).bind('click.jstree', function(event) {
-						// 获取下行选中树节点
-						var treeOjb = $.jstree.reference("#station_Down_tree").get_selected(true);
-						TreeOnclickEvent(treeOjb);
-					});
-				}
-			},
-			upreloadeTree : function (treeDateJson) {
-				// 获取上行树
-				var tree = $.jstree.reference('#station_Up_tree');
-				// 赋值数据
-				tree.settings.core.data = treeDateJson;
-				// 刷新上行树
-				tree.refresh();
-                // 展开树
-				setTimeout(function () {
-                    tree.open_all();
-                },500);
-            },
-			dwonreloadeTree : function (treeDateJson) {
-				// 获取下行树
-				var tree = $.jstree.reference('#station_Down_tree');
-				// 赋值数据
-				tree.settings.core.data = treeDateJson;
-				// 刷行下行树
-				tree.refresh();
-                // 展开树
-                setTimeout(function () {
-                    tree.open_all();
-                },500);
-			}
-	}
-	
-	return stationTree;
-	
+/**
+ * 
+ * 左边树Obj : StationTreeData
+ * 
+ *  - - - - - - 》 upInit : 初始化上行树
+ *  
+ *  - - - - - - 》 downInit : 初始化下行树
+ * 
+ *  - - - - - - 》 upreloadeTree : 刷行上行树
+ *  
+ *  - - - - - - 》 dwonreloadeTree : 刷行下行树
+ */
+
+var StationTreeData = function(){
+	
+	function parmasObj() {
+
+		AddStationObj.setAddStation({});
+		
+		EditStationObj.setEitdStation({});
+		
+		EditSectionObj.setEitdSection({});
+		
+	}
+
+	function TreeOnclickEvent(treeOjb) {
+		if(treeOjb==null)
+			return;
+		// 节点个数
+		var len = treeOjb.length;
+		if(len<0) {
+			return;
+		}
+	
+		// 获取数据
+		var stationData = treeOjb[0].original;
+        // 选中的节点类型
+        var chaildredType_ = stationData.chaildredType;
+
+        if(chaildredType_ == "section") {
+            WorldsBMap.focusSection(stationData.sectionrouteId);
+        } else if(chaildredType_ == "station") {
+            WorldsBMap.openStationInfoWin(stationData);
+		} else if(chaildredType_ == "addSection") {
+            WorldsBMap.addSection(stationData);
+		}
+	}
+	var stationTree = {
+			upInit : function(treeDateJson) {
+				// 如果不为空
+				if(treeDateJson) {
+					// 加载树load事件
+				   $('#station_Up_tree').on('loaded.jstree', function(e, data){
+					   // 展开树
+					   $.jstree.reference("#station_Up_tree").open_all();
+					}).jstree({
+						'core' : {
+							'themes' : {
+								'responsive': false
+							},
+							
+							'data': treeDateJson,
+							
+							'multiple':false
+							
+						},
+						
+						'types' : {
+							
+								"default" : {
+									
+									"icon" : false
+									
+								},
+								
+								'enable_true' : {
+									
+									"icon" : 'fa fa-check  icon-lg'
+										
+								},
+								
+								'enable_false' : {
+									
+									'icon' : 'fa fa-close  icon-lg'
+										
+								},
+								
+								'group':{
+									
+									'icon' : 'fa fa-object-group  icon-lg'
+										
+								}
+						},
+						
+						'plugins': ['types']
+					
+					// 树节点单击事件
+					}).bind('click.jstree', function(event) {
+						// 获取上行选中树节点
+						var treeOjb = $.jstree.reference("#station_Up_tree").get_selected(true);
+						TreeOnclickEvent(treeOjb);
+						
+					});
+				}
+			},
+			downInit : function(treeDateJson) {
+				// 如果不为空
+				if(treeDateJson) {
+				   // 树初始化load事件
+				   $('#station_Down_tree').on('loaded.jstree', function(e, data){
+					   // 展开树
+					   $.jstree.reference("#station_Down_tree").open_all();
+					}).jstree({
+						'core' : {
+							'themes' : {
+								
+								'responsive': false
+								
+							},
+							
+							'data': treeDateJson,
+							
+							'multiple':false
+							
+						},
+						
+						'types' : {
+							
+								"default" : {
+									
+									"icon" : false
+									
+								},
+								
+								'enable_true' : {
+									
+									"icon" : 'fa fa-check  icon-lg'
+										
+								},
+								
+								'enable_false' : {
+									
+									'icon' : 'fa fa-close  icon-lg'
+										
+								},
+								
+								'group':{
+									
+									'icon' : 'fa fa-object-group  icon-lg'
+										
+								}
+						},
+						'plugins': ['types']
+					// 树节点单击事件
+					}).bind('click.jstree', function(event) {
+						// 获取下行选中树节点
+						var treeOjb = $.jstree.reference("#station_Down_tree").get_selected(true);
+						TreeOnclickEvent(treeOjb);
+					});
+				}
+			},
+			inoutInit : function(treeDateJson) {
+				// 如果不为空
+				if(treeDateJson) {
+					// 树初始化load事件
+					$('#inout_carpark_tree').on('loaded.jstree', function(e, data){
+						// 展开树
+						$.jstree.reference("#inout_carpark_tree").open_all();
+					}).jstree({
+						'core' : {
+							'themes' : {
+								'responsive': false
+							},
+							'data': treeDateJson,
+							'multiple':false
+						},
+						'types' : {
+							"default" : {
+								"icon" : false
+							},
+							'enable_true' : {
+								"icon" : 'fa fa-check  icon-lg'
+							},
+							'enable_false' : {
+								'icon' : 'fa fa-close  icon-lg'
+							},
+							'group':{
+								'icon' : 'fa fa-object-group  icon-lg'
+							}
+						},
+						'plugins': ['types']
+						// 树节点单击事件
+					}).bind('click.jstree', function(event) {
+						// 获取下行选中树节点
+						var treeOjb = $.jstree.reference("#inout_carpark_tree").get_selected(true);
+						TreeOnclickEvent(treeOjb);
+					});
+				}
+			},
+			upreloadeTree : function (treeDateJson) {
+				// 获取上行树
+				var tree = $.jstree.reference('#station_Up_tree');
+				// 赋值数据
+				tree.settings.core.data = treeDateJson;
+				// 刷新上行树
+				tree.refresh();
+                // 展开树
+				setTimeout(function () {
+                    tree.open_all();
+                },500);
+            },
+			dwonreloadeTree : function (treeDateJson) {
+				// 获取下行树
+				var tree = $.jstree.reference('#station_Down_tree');
+				// 赋值数据
+				tree.settings.core.data = treeDateJson;
+				// 刷行下行树
+				tree.refresh();
+                // 展开树
+                setTimeout(function () {
+                    tree.open_all();
+                },500);
+			},
+			inoutreloadeTree : function (treeDateJson) {
+				// 获取下行树
+				var tree = $.jstree.reference('#inout_carpark_tree');
+				// 赋值数据
+				tree.settings.core.data = treeDateJson;
+				// 刷行下行树
+				tree.refresh();
+				// 展开树
+				setTimeout(function () {
+					tree.open_all();
+				},500);
+			}
+	}
+	
+	return stationTree;
+	
 }();
 \ No newline at end of file
-<link href="/pages/base/stationroute/css/bmap_base.css" rel="stylesheet" type="text/css" />
-<link rel="stylesheet" href="/assets/plugins/layer-v2.4/layer/skin/layer.css">
-
-<div class="mian-portlet-body">
-	<!-- 地图 -->
-	<div id="bmap_basic" class="bmaps"></div>
-	<!-- 搜索框 -->
-
-	<div class="search_panel">
-		<div class="search_input_panel">
-			<input class="search_input" type="text" placeholder="输入位置搜索" id="searchInput">
-			<span class="fa fa-close fa-lg clear hide" aria-hidden="true"></span >
-		</div>
-		<div class="search_button_panel">
-			<button class="fa fa-search fa-lg search_button" >
-			</button >
-		</div>
-	</div>
-	<div class="esc_edit_div" id="esc_edit_div" style="display: none">
-			<button class="esc_edit_btn" >退出编辑模式
-			</button >
-	</div>
-	<!-- 搜索下拉框-->
-	<div id="searchResultPanel" style="border:1px solid #C0C0C0;width:150px;height:auto; display:none;z-index: 199;"></div>
-	<!-- 路径规划路段 -->
-	<input class="hand" id="routePlanning" />
-	<div class="portlet box protlet-box">
-		<div class="protlet-box-layer"></div>
-		<!-- 左边标题栏 -->
-		<div class="portlet-title">
-			<div class="caption">
-				<!-- 途径站点  -->
-			</div>
-			
-			<div class="versions" style="float:right;">
-				 <select id="versions" style="height:30px;width:200px;margin-top:5px;"> </select>
-			</div>
-                                       
-			
-			<div class="match_station hidden">
-			<!--<div class="match_station hidden">-->
-				<a class="match_station_bnt ">检测到外部站点行业编码有更新</a>
-			</div>
-
-			<!--<div class="tools">
-				<a href="javascript:;" class="collapse" data-original-title="" title=""> </a>
-			</div>-->
-		</div>
-		<!-- 左边栏 -->
-		<div class="portlet-body" id="scrllmouseEvent"  style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 520px;">
-			<div class="row">
-				<!-- 上下行栏 -->
-				<div class="col-md-3 col-sm-3 col-xs-3">
-					<ul class="nav nav-tabs tabs-left" id="leftUpOrDown">
-						<li class="active">
-							<a href="#stationUp" data-toggle="tab" id="upLine" aria-expanded="true"> 上行 </a>
-						</li>
-						<li class="">
-							<a href="#stationDown" data-toggle="tab" id="downLine" aria-expanded="false"> 下行 </a>
-						</li>
-					</ul>
-				</div>
-				<div class="col-md-9 col-sm-9 col-xs-9">
-					<div class="tab-content">
-						<!-- 左边栏上行 -->
-						<div class="tab-pane  active in" id="stationUp" data-direction="0">
-							<div class="portlet-body" id="uptreeMobal" style="display: none">
-								<div class="table-toolbar">
-									<div class="row">
-									
-										<div class="col-md-6" style="float: right;">
-											<div class="btn-group" style="float: right;">
-												<div class="actions  module_tools">
-													<div class="btn-group">
-														<!--  <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具
-                                                             <i class="fa fa-angle-down"></i>
-                                                         </a> -->
-														<a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false">
-															<i class="fa fa-share"></i>
-															<span>上行操作</span>
-															<i class="fa fa-angle-down"></i>
-														</a>
-														<ul class="dropdown-menu pull-right" style="min-width:100px">
-															<li>
-																<a href="javascript:;" id="addUpStation"><i class="fa fa-plus"></i>  添加站点</a>
-															</li>
-															<li class="divider"> </li>
-															<!--<li>
-                                                                <a href="javascript:;" id="editUpStation"><i class="fa fa-pencil"></i> 修改站点</a>
-                                                            </li>
-															<li class="divider"> </li>
-															<li>
-																<a href="javascript:;" id="deleteUpStation"><i class="fa fa-close"></i>  撤销站点</a>
-															</li>
-															<li class="divider"> </li>
-															<li>
-                                                                <a href="javascript:;" id="addUpSection"><i class="fa fa-plus"></i>  添加路段</a>
-                                                            </li>
-                                                            <li class="divider"> </li>-->
-															<li>
-																<a href="javascript:;" id="batchUpDelete"><i class="fa fa-trash-o"></i>  批量撤销</a>
-															</li>
-															<li class="divider"> </li>
-															<li>
-																<a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i>  切换上下行</a>
-															</li>
-															<li class="divider"> </li>
-															<li>
-																<a href="javascript:;" id="wrenchUpDis"><i class="fa fa-wrench"></i>  设置上行站距</a>
-															</li>
-															<li class="divider"> </li>
-															<li>
-																<a href="javascript:;" id="batchUpdateIndustryCode"><i class="fa fa-wrench"></i>  设置站点行业编码</a>
-															</li>
-															<li class="divider"> </li>
-															<li>
-																<a href="javascript:;" id="quoteDown"><i class="fa fa-long-arrow-down"></i>  引用下行路段</a>
-															</li>
-															<!-- <li class="divider"> </li>
-                                                        	<!-- <li>
-                                                                <a href="javascript:;" id="editUplineTrend"><i class="fa fa-edit"></i>  编辑走向</a>
-                                                            </li> -->
-															<!-- <li>
-                                                               <a href="javascript:;" id="createUsingSingle"><i class="fa fa-edit"></i>  生成行单</a>
-                                                           </li> -->
-														</ul>
-													</div>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-								<!-- 树 -->
-								<div class="portlet-body" >
-									<div id="station_Up_tree" class="defeat-scroll" style="height: auto;max-height: 500px;"></div>
-								</div>
-							</div>
-							<!-- 无上行站点添加方式 -->
-							<div id="upToolsMobal" class="portlet-body" style="display:none">
-								<div class="row">
-									<div class="col-md-6" style="float: right;">
-										<div class="btn-group" style="float: right;">
-											<div class="actions">
-												<a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false">
-													<i class="fa fa-share"></i>
-													<span>上行规划选择</span>
-													<i class="fa fa-angle-down"></i>
-												</a>
-												<ul class="dropdown-menu pull-right" style="min-width:100px">
-													<li>
-														<a class="upManual" href="javascript:;"  data-direction="0" data-pjax><i class="fa fa-pencil"></i> 手动添加站点</a>
-													</li>
-													<li class="divider"> </li>
-													<li>
-														<a class="upSystem" href="javascript:;"  data-direction="0" data-pjax><i class="fa fa-wrench"></i> 系统规划</a>
-													</li>
-													<li class="divider"> </li>
-													<li>
-														<a class="gpsRoute" href="javascript:;"  data-direction="0" data-pjax><i class="fa fa-wrench"></i> 测点生成</a>
-													</li>
-												</ul>
-											</div>
-										</div>
-									</div>
-								</div>
-								<div class="row" style="margin-top: 10px;">
-									<div class="col-md-12">
-										<!-- 提示 -->
-										<div class="alert alert-warning" style="background-color: #3b3f51;border-color: #FFFFFF;color: #ffffff;border-radius: 6px !important;">
-											<strong>系统未初始化该线路上行站点!</strong> 请从上方【上行规划选择】里选择任意一种方式规划该线路上行站点.
-										</div>
-									</div>
-								</div>
-							</div>
-
-						</div>
-
-						<!-- 下行 -->
-						<div class="tab-pane fade" id="stationDown"  data-direction="1">
-							<div class="portlet-body" id="DowntreeMobal" style="display: none">
-								<div class="table-toolbar">
-									<div class="row">
-										<div class="col-md-6" style="float: right;">
-											<div class="btn-group" style="float: right;">
-												<div class="actions  module_tools">
-													<div class="btn-group">
-														<!-- <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具
-                                                            <i class="fa fa-angle-down"></i>
-                                                        </a> -->
-														<a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false">
-															<i class="fa fa-share"></i>
-															<span>下行操作</span>
-															<i class="fa fa-angle-down"></i>
-														</a>
-														<ul class="dropdown-menu pull-right" style="min-width:100px">
-															<li>
-																<a href="javascript:;" id="addDownStation"><i class="fa fa-plus"></i>  添加站点</a>
-															</li>
-															<li class="divider"> </li>
-															<!--<li>
-                                                                <a href="javascript:;" id="editDownStation"><i class="fa fa-pencil"></i> 修改站点</a>
-                                                            </li>
-															<li class="divider"> </li>
-															<li>
-																<a href="javascript:;" id="deleteDownStation"><i class="fa fa-close"></i>  撤销站点</a>
-															</li>
-															<li class="divider"> </li>
-															<li>
-																<a href="javascript:;" id="addDownSection"><i class="fa fa-plus"></i>  添加路段</a>
-															</li>
-			                                                <li class="divider"> </li>-->
-															<li>
-																<a href="javascript:;" id="batchDownDelete"><i class="fa fa-trash-o"></i>  批量撤销</a>
-															</li>
-															<li class="divider"> </li>
-															<li>
-																<a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i>  切换上下行</a>
-															</li>
-															<li class="divider"> </li>
-															<li>
-																<a href="javascript:;" id="wrenchDownDis"><i class="fa fa-wrench"></i>  设置下行站距</a>
-															</li>
-															<li class="divider"> </li>
-															<li>
-																<a href="javascript:;" id="batchDowndateIndustryCode"><i class="fa fa-wrench"></i>  设置站点行业编码</a>
-															</li>
-															<li class="divider"> </li>
-															<li>
-																<a href="javascript:;" id="quoteUp"><i class="fa fa-long-arrow-up"></i>  引用上行路段</a>
-															</li>
-															<!-- <li>
-                                                                <a href="javascript:;" id="editDownlineTrend"><i class="fa fa-close"></i>  编辑走向</a>
-                                                            </li> -->
-														</ul>
-													</div>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-								<!-- 树 -->
-								<div class="portlet-body">
-									<div id="station_Down_tree" class="defeat-scroll" style="height: auto;max-height: 500px;"></div>
-								</div>
-							</div>
-							<!-- 无上行站点添加方式 -->
-							<div id="downToolsMobal" class="portlet-body" style="display:none">
-								<div class="row">
-									<div class="col-md-6" style="float: right;">
-										<div class="btn-group" style="float: right;">
-											<div class="actions">
-												<a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false">
-													<i class="fa fa-share"></i>
-													<span>下行规划选择</span>
-													<i class="fa fa-angle-down"></i>
-												</a>
-												<ul class="dropdown-menu pull-right" style="min-width:100px">
-													<li>
-														<a class="downManual" href="javascript:;"  data-direction="1" data-pjax><i class="fa fa-pencil"></i> 手动添加站点</a>
-													</li>
-													<li class="divider"> </li>
-													<li>
-														<a class="downSystem" href="javascript:;"  data-direction="1" data-pjax><i class="fa fa-wrench"></i> 系统规划</a>
-													</li>
-													<li class="divider"> </li>
-													<li>
-														<a class="gpsRoute" href="javascript:;"  data-direction="1" data-pjax><i class="fa fa-wrench"></i> 测点生成</a>
-													</li>
-												</ul>
-											</div>
-										</div>
-									</div>
-								</div>
-								<div class="row" style="margin-top: 10px;">
-									<div class="col-md-12">
-										<!-- 提示 -->
-										<div class="alert alert-warning" style="background-color: #3b3f51;border-color: #FFFFFF;color: #ffffff;border-radius: 6px !important;">
-											<strong>系统未初始化该线路下行站点!</strong> 请从上方【下行规划选择】里选择任意一种方式规划该线路下行站点.
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-<!-- 线路类 -->
-<script src="/pages/base/stationroute/js/line.js"></script>
-<!-- 新增站点对象类 -->
-<script src="/pages/base/stationroute/js/addstationobj.js"></script>
-<!-- 修改站点对象类 -->
-<script src="/pages/base/stationroute/js/editstationobj.js"></script>
-<!-- 修改路段对象类 -->
-<script src="/pages/base/stationroute/js/editsection.js"></script>
-<!-- 批量撤销对象类 -->
-<script src="/pages/base/stationroute/js/deletebatch.js"></script>
-<!-- 绘图类 -->
-<script src="/pages/base/stationroute/js/drawingManager.js"></script>
-<!-- 地图类 -->
-<script src="/pages/base/stationroute/js/stationroute-list-map.js"></script>
-<!-- 函数与方法 -->
-<script src="/pages/base/stationroute/js/stationroute-list-function.js"></script>
-<!-- ajax请求类 -->
-<script src="/pages/base/stationroute/js/stationroute-ajax-getdata.js"></script>
-<!-- 树对类 -->
-<script src="/pages/base/stationroute/js/stationroute-list-treedata.js"></script>
-<!-- reload事件 -->
-<script src="/pages/base/stationroute/js/stationroute-list-reload.js"></script>
-<!-- 事件监听 -->
-<script src="/pages/base/stationroute/js/stationroute-list-events.js"></script>
-
-<script id="add_draw_polyline-temp" type="text/html">
-	<div class="add_road_search_point_wrap ">
-		<div class="buffer_edit_body" >
-			<div class="_title">绘制路段</div>
-			<div class="form-horizontal" id="add_station_form">
-				<input type="hidden" value="{{id}}" name="id">
-				<input type="hidden" id="bsectionVectorInput"> <!--路段-->
-
-				<div class="form-group">
-					<div class="col-md-12">
-						<input type="text" class="input-medium" name="sectionName" id="sectionNameInput"  placeholder="路段名">
-					</div>
-				</div>
-
-				<div class="form-group">
-					<div class="col-md-5">
-						<span class="draw_polyline_switch"><a>暂停绘制</a></span>
-					</div>
-					<div class="col-md-6 btns">
-						<button class="sbmint-btn btn-sm" id="addSectionSbmintBtn">确定</button>
-						<button class="cancel-btn btn-sm" id="addSectionCancelBtn">取消</button>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</script>
-
-<script type="text/javascript">
-    setTimeout(function () {
-        // 百度地图API功能
-        function G(id) {
-            return document.getElementById(id);
-        }
-
-        var myMap = WorldsBMap.getmapBValue();
-
-        var ac = new BMap.Autocomplete(    //建立一个自动完成的对象
-            {"input" : "searchInput"
-                ,"location" : myMap
-            });
-
-        ac.addEventListener("onhighlight", function(e) {  //鼠标放在下拉列表上的事件
-            var str = "";
-            var _value = e.fromitem.value;
-            var value = "";
-            if (e.fromitem.index > -1) {
-                value = _value.province +  _value.city +  _value.district +  _value.street +  _value.business;
-            }
-            str = "FromItem<br />index = " + e.fromitem.index + "<br />value = " + value;
-
-            value = "";
-            if (e.toitem.index > -1) {
-                _value = e.toitem.value;
-                value = _value.province +  _value.city +  _value.district +  _value.street +  _value.business;
-            }
-            str += "<br />ToItem<br />index = " + e.toitem.index + "<br />value = " + value;
-            G("searchResultPanel").innerHTML = str;
-        });
-
-        var myValue;
-        ac.addEventListener("onconfirm", function(e) {    //鼠标点击下拉列表后的事件
-            var _value = e.item.value;
-            myValue = _value.province +  _value.city +  _value.district +  _value.street +  _value.business;
-            G("searchResultPanel").innerHTML ="onconfirm<br />index = " + e.item.index + "<br />myValue = " + myValue;
-
-            setPlace();
-        });
-
-        function setPlace(){
-            // myMap.clearOverlays();    //清除地图上所有覆盖物
-            var local = new BMap.LocalSearch(myMap, { //智能搜索
-                onSearchComplete: myFun
-            });
-            function myFun(){
-                var pp = local.getResults().getPoi(0) == undefined? null:local.getResults().getPoi(0).point;
-                if(pp) {
-                    myMap.centerAndZoom(pp, 20);
-                    myMap.addOverlay(new BMap.Marker(pp));    //添加标注
-                } else {
-                    layer.msg('找不到您输入的位置！')
-                }
-            }
-            local.search(myValue);
-        }
-        $("#searchInput").on('input propertychange change', function () {
-            if($("#searchInput").val() != null && $("#searchInput").val() != "")
-                $('.search_panel .clear').removeClass('hide');
-            else {
-                // WorldsBMap.clearOtherOverlay();
-                $('.search_panel .clear').addClass('hide');
-            }
-        });
-
-        $('.search_panel .clear').on('click',function () {
-            // WorldsBMap.clearOtherOverlay();
-            $("#searchInput").val('');
-            $("#searchInput").change();
-        });
-        $('.search_panel .search_button').on('click',function () {
-            myValue = $("#searchInput").val();
-            setPlace();
-        });
-    },1000);
+<link href="/pages/base/stationroute/css/bmap_base.css" rel="stylesheet" type="text/css" />
+<link rel="stylesheet" href="/assets/plugins/layer-v2.4/layer/skin/layer.css">
+
+<div class="mian-portlet-body">
+	<!-- 地图 -->
+	<div id="bmap_basic" class="bmaps"></div>
+	<!-- 搜索框 -->
+
+	<div class="search_panel">
+		<div class="search_input_panel">
+			<input class="search_input" type="text" placeholder="输入位置搜索" id="searchInput">
+			<span class="fa fa-close fa-lg clear hide" aria-hidden="true"></span >
+		</div>
+		<div class="search_button_panel">
+			<button class="fa fa-search fa-lg search_button" >
+			</button >
+		</div>
+	</div>
+	<div class="esc_edit_div" id="esc_edit_div" style="display: none">
+			<button class="esc_edit_btn" >退出编辑模式
+			</button >
+	</div>
+	<!-- 搜索下拉框-->
+	<div id="searchResultPanel" style="border:1px solid #C0C0C0;width:150px;height:auto; display:none;z-index: 199;"></div>
+	<!-- 路径规划路段 -->
+	<input class="hand" id="routePlanning" />
+	<div class="portlet box protlet-box">
+		<div class="protlet-box-layer"></div>
+		<!-- 左边标题栏 -->
+		<div class="portlet-title">
+			<div class="caption">
+				<!-- 途径站点  -->
+			</div>
+			
+			<div class="versions" style="float:right;">
+				 <select id="versions" style="height:30px;width:200px;margin-top:5px;"> </select>
+			</div>
+                                       
+			
+			<div class="match_station hidden">
+			<!--<div class="match_station hidden">-->
+				<a class="match_station_bnt ">检测到外部站点行业编码有更新</a>
+			</div>
+
+			<!--<div class="tools">
+				<a href="javascript:;" class="collapse" data-original-title="" title=""> </a>
+			</div>-->
+		</div>
+		<!-- 左边栏 -->
+		<div class="portlet-body" id="scrllmouseEvent"  style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 520px;">
+			<div class="row">
+				<!-- 上下行栏 -->
+				<div class="col-md-3 col-sm-3 col-xs-3">
+					<ul class="nav nav-tabs tabs-left" id="leftUpOrDown">
+						<li class="active">
+							<a href="#stationUp" data-toggle="tab" id="upLine" aria-expanded="true"> 上行 </a>
+						</li>
+						<li class="">
+							<a href="#stationDown" data-toggle="tab" id="downLine" aria-expanded="false"> 下行 </a>
+						</li>
+						<li class="">
+							<a href="#inoutCarpark" data-toggle="tab" id="inoutLine" aria-expanded="false"> 进出场路径 </a>
+						</li>
+					</ul>
+				</div>
+				<div class="col-md-9 col-sm-9 col-xs-9">
+					<div class="tab-content">
+						<!-- 左边栏上行 -->
+						<div class="tab-pane  active in" id="stationUp" data-direction="0">
+							<div class="portlet-body" id="uptreeMobal" style="display: none">
+								<div class="table-toolbar">
+									<div class="row">
+									
+										<div class="col-md-6" style="float: right;">
+											<div class="btn-group" style="float: right;">
+												<div class="actions  module_tools">
+													<div class="btn-group">
+														<!--  <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具
+                                                             <i class="fa fa-angle-down"></i>
+                                                         </a> -->
+														<a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false">
+															<i class="fa fa-share"></i>
+															<span>上行操作</span>
+															<i class="fa fa-angle-down"></i>
+														</a>
+														<ul class="dropdown-menu pull-right" style="min-width:100px">
+															<li>
+																<a href="javascript:;" id="addUpStation"><i class="fa fa-plus"></i>  添加站点</a>
+															</li>
+															<li class="divider"> </li>
+															<!--<li>
+                                                                <a href="javascript:;" id="editUpStation"><i class="fa fa-pencil"></i> 修改站点</a>
+                                                            </li>
+															<li class="divider"> </li>
+															<li>
+																<a href="javascript:;" id="deleteUpStation"><i class="fa fa-close"></i>  撤销站点</a>
+															</li>
+															<li class="divider"> </li>
+															<li>
+                                                                <a href="javascript:;" id="addUpSection"><i class="fa fa-plus"></i>  添加路段</a>
+                                                            </li>
+                                                            <li class="divider"> </li>-->
+															<li>
+																<a href="javascript:;" id="batchUpDelete"><i class="fa fa-trash-o"></i>  批量撤销</a>
+															</li>
+															<li class="divider"> </li>
+															<li>
+																<a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i>  切换上下行</a>
+															</li>
+															<li class="divider"> </li>
+															<li>
+																<a href="javascript:;" id="wrenchUpDis"><i class="fa fa-wrench"></i>  设置上行站距</a>
+															</li>
+															<li class="divider"> </li>
+															<li>
+																<a href="javascript:;" id="batchUpdateIndustryCode"><i class="fa fa-wrench"></i>  设置站点行业编码</a>
+															</li>
+															<li class="divider"> </li>
+															<li>
+																<a href="javascript:;" id="quoteDown"><i class="fa fa-long-arrow-down"></i>  引用下行路段</a>
+															</li>
+															<!-- <li class="divider"> </li>
+                                                        	<!-- <li>
+                                                                <a href="javascript:;" id="editUplineTrend"><i class="fa fa-edit"></i>  编辑走向</a>
+                                                            </li> -->
+															<!-- <li>
+                                                               <a href="javascript:;" id="createUsingSingle"><i class="fa fa-edit"></i>  生成行单</a>
+                                                           </li> -->
+														</ul>
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
+								</div>
+								<!-- 树 -->
+								<div class="portlet-body" >
+									<div id="station_Up_tree" class="defeat-scroll" style="height: auto;max-height: 500px;"></div>
+								</div>
+							</div>
+							<!-- 无上行站点添加方式 -->
+							<div id="upToolsMobal" class="portlet-body" style="display:none">
+								<div class="row">
+									<div class="col-md-6" style="float: right;">
+										<div class="btn-group" style="float: right;">
+											<div class="actions">
+												<a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false">
+													<i class="fa fa-share"></i>
+													<span>上行规划选择</span>
+													<i class="fa fa-angle-down"></i>
+												</a>
+												<ul class="dropdown-menu pull-right" style="min-width:100px">
+													<li>
+														<a class="upManual" href="javascript:;"  data-direction="0" data-pjax><i class="fa fa-pencil"></i> 手动添加站点</a>
+													</li>
+													<li class="divider"> </li>
+													<li>
+														<a class="upSystem" href="javascript:;"  data-direction="0" data-pjax><i class="fa fa-wrench"></i> 系统规划</a>
+													</li>
+													<li class="divider"> </li>
+													<li>
+														<a class="gpsRoute" href="javascript:;"  data-direction="0" data-pjax><i class="fa fa-wrench"></i> 测点生成</a>
+													</li>
+												</ul>
+											</div>
+										</div>
+									</div>
+								</div>
+								<div class="row" style="margin-top: 10px;">
+									<div class="col-md-12">
+										<!-- 提示 -->
+										<div class="alert alert-warning" style="background-color: #3b3f51;border-color: #FFFFFF;color: #ffffff;border-radius: 6px !important;">
+											<strong>系统未初始化该线路上行站点!</strong> 请从上方【上行规划选择】里选择任意一种方式规划该线路上行站点.
+										</div>
+									</div>
+								</div>
+							</div>
+
+						</div>
+
+						<!-- 下行 -->
+						<div class="tab-pane fade" id="stationDown"  data-direction="1">
+							<div class="portlet-body" id="DowntreeMobal" style="display: none">
+								<div class="table-toolbar">
+									<div class="row">
+										<div class="col-md-6" style="float: right;">
+											<div class="btn-group" style="float: right;">
+												<div class="actions  module_tools">
+													<div class="btn-group">
+														<!-- <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具
+                                                            <i class="fa fa-angle-down"></i>
+                                                        </a> -->
+														<a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false">
+															<i class="fa fa-share"></i>
+															<span>下行操作</span>
+															<i class="fa fa-angle-down"></i>
+														</a>
+														<ul class="dropdown-menu pull-right" style="min-width:100px">
+															<li>
+																<a href="javascript:;" id="addDownStation"><i class="fa fa-plus"></i>  添加站点</a>
+															</li>
+															<li class="divider"> </li>
+															<!--<li>
+                                                                <a href="javascript:;" id="editDownStation"><i class="fa fa-pencil"></i> 修改站点</a>
+                                                            </li>
+															<li class="divider"> </li>
+															<li>
+																<a href="javascript:;" id="deleteDownStation"><i class="fa fa-close"></i>  撤销站点</a>
+															</li>
+															<li class="divider"> </li>
+															<li>
+																<a href="javascript:;" id="addDownSection"><i class="fa fa-plus"></i>  添加路段</a>
+															</li>
+			                                                <li class="divider"> </li>-->
+															<li>
+																<a href="javascript:;" id="batchDownDelete"><i class="fa fa-trash-o"></i>  批量撤销</a>
+															</li>
+															<li class="divider"> </li>
+															<li>
+																<a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i>  切换上下行</a>
+															</li>
+															<li class="divider"> </li>
+															<li>
+																<a href="javascript:;" id="wrenchDownDis"><i class="fa fa-wrench"></i>  设置下行站距</a>
+															</li>
+															<li class="divider"> </li>
+															<li>
+																<a href="javascript:;" id="batchDowndateIndustryCode"><i class="fa fa-wrench"></i>  设置站点行业编码</a>
+															</li>
+															<li class="divider"> </li>
+															<li>
+																<a href="javascript:;" id="quoteUp"><i class="fa fa-long-arrow-up"></i>  引用上行路段</a>
+															</li>
+															<!-- <li>
+                                                                <a href="javascript:;" id="editDownlineTrend"><i class="fa fa-close"></i>  编辑走向</a>
+                                                            </li> -->
+														</ul>
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
+								</div>
+								<!-- 树 -->
+								<div class="portlet-body">
+									<div id="station_Down_tree" class="defeat-scroll" style="height: auto;max-height: 500px;"></div>
+								</div>
+							</div>
+							<!-- 无上行站点添加方式 -->
+							<div id="downToolsMobal" class="portlet-body" style="display:none">
+								<div class="row">
+									<div class="col-md-6" style="float: right;">
+										<div class="btn-group" style="float: right;">
+											<div class="actions">
+												<a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false">
+													<i class="fa fa-share"></i>
+													<span>下行规划选择</span>
+													<i class="fa fa-angle-down"></i>
+												</a>
+												<ul class="dropdown-menu pull-right" style="min-width:100px">
+													<li>
+														<a class="downManual" href="javascript:;"  data-direction="1" data-pjax><i class="fa fa-pencil"></i> 手动添加站点</a>
+													</li>
+													<li class="divider"> </li>
+													<li>
+														<a class="downSystem" href="javascript:;"  data-direction="1" data-pjax><i class="fa fa-wrench"></i> 系统规划</a>
+													</li>
+													<li class="divider"> </li>
+													<li>
+														<a class="gpsRoute" href="javascript:;"  data-direction="1" data-pjax><i class="fa fa-wrench"></i> 测点生成</a>
+													</li>
+												</ul>
+											</div>
+										</div>
+									</div>
+								</div>
+								<div class="row" style="margin-top: 10px;">
+									<div class="col-md-12">
+										<!-- 提示 -->
+										<div class="alert alert-warning" style="background-color: #3b3f51;border-color: #FFFFFF;color: #ffffff;border-radius: 6px !important;">
+											<strong>系统未初始化该线路下行站点!</strong> 请从上方【下行规划选择】里选择任意一种方式规划该线路下行站点.
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+
+						<!-- 进出场路径 -->
+						<div class="tab-pane fade" id="inoutCarpark"  data-direction="3">
+							<div class="portlet-body" id="InoutCarparktreeMobal">
+								<div class="table-toolbar">
+									<div class="row">
+										<div class="col-md-6" style="float: right;">
+											<div class="btn-group" style="float: right;">
+												<div class="actions  module_tools">
+													<div class="btn-group">
+														<!-- <a class="btn green-haze btn-outline btn-circle btn-sm" style="background-color:#3B3F51;border-color:#FFFFFF;color:#FFFFFF" href="javascript:;" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" aria-expanded="true"> 工具
+                                                            <i class="fa fa-angle-down"></i>
+                                                        </a> -->
+														<a href="javascript:" class="btn white btn-outline btn-circle" style="border-color: #3B3F51;color: #3B3F51;" data-toggle="dropdown" aria-expanded="false">
+															<i class="fa fa-share"></i>
+															<span>进出场路径规划</span>
+															<i class="fa fa-angle-down"></i>
+														</a>
+														<ul class="dropdown-menu pull-right" style="min-width:100px">
+															<li>
+																<a href="javascript:;" id="historyGps"><i class="fa fa-wrench"></i>  历史GPS路径规划</a>
+															</li>
+														</ul>
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
+								</div>
+								<!-- 树 -->
+								<div class="portlet-body inout-search"></div>
+								<div class="portlet-body">
+									<div id="inout_carpark_tree" class="defeat-scroll" style="height: auto;max-height: 500px;"></div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<!-- 线路类 -->
+<script src="/pages/base/stationroute/js/line.js"></script>
+<!-- 新增站点对象类 -->
+<script src="/pages/base/stationroute/js/addstationobj.js"></script>
+<!-- 修改站点对象类 -->
+<script src="/pages/base/stationroute/js/editstationobj.js"></script>
+<!-- 修改路段对象类 -->
+<script src="/pages/base/stationroute/js/editsection.js"></script>
+<!-- 批量撤销对象类 -->
+<script src="/pages/base/stationroute/js/deletebatch.js"></script>
+<!-- 绘图类 -->
+<script src="/pages/base/stationroute/js/drawingManager.js"></script>
+<!-- 地图类 -->
+<script src="/pages/base/stationroute/js/stationroute-list-map.js"></script>
+<!-- 函数与方法 -->
+<script src="/pages/base/stationroute/js/stationroute-list-function.js"></script>
+<!-- ajax请求类 -->
+<script src="/pages/base/stationroute/js/stationroute-ajax-getdata.js"></script>
+<!-- 树对类 -->
+<script src="/pages/base/stationroute/js/stationroute-list-treedata.js"></script>
+<!-- reload事件 -->
+<script src="/pages/base/stationroute/js/stationroute-list-reload.js"></script>
+<!-- 事件监听 -->
+<script src="/pages/base/stationroute/js/stationroute-list-events.js"></script>
+
+<script id="add_draw_polyline-temp" type="text/html">
+	<div class="add_road_search_point_wrap ">
+		<div class="buffer_edit_body" >
+			<div class="_title">绘制路段</div>
+			<div class="form-horizontal" id="add_station_form">
+				<input type="hidden" value="{{id}}" name="id">
+				<input type="hidden" id="bsectionVectorInput"> <!--路段-->
+
+				<div class="form-group">
+					<div class="col-md-12">
+						<input type="text" class="input-medium" name="sectionName" id="sectionNameInput"  placeholder="路段名">
+					</div>
+				</div>
+
+				<div class="form-group">
+					<div class="col-md-5">
+						<span class="draw_polyline_switch"><a>暂停绘制</a></span>
+					</div>
+					<div class="col-md-6 btns">
+						<button class="sbmint-btn btn-sm" id="addSectionSbmintBtn">确定</button>
+						<button class="cancel-btn btn-sm" id="addSectionCancelBtn">取消</button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</script>
+
+<script id="inout-carpark-search-form" type="text/html">
+	<div class="form-horizontal">
+		<div class="form-group">
+			<div class="col-md-3 col-sm-3 col-xs-3">
+				<label class="uk-form-label">起点</label>
+			</div>
+			<div class="col-md-9 col-sm-9 col-xs-9">
+				<select class="form-control" name="startPoint" id="startPoint"></select>
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="col-md-3 col-sm-3 col-xs-3">
+				<label class="uk-form-label">终点</label>
+			</div>
+			<div class="col-md-9 col-sm-9 col-xs-9">
+				<select class="form-control" name="endPoint" id="endPoint"></select>
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="col-md-6"></div>
+			<div class="col-md-6 btns">
+				<button class="btn-sm" style="float: right;" id="inoutSearch">搜索</button>
+			</div>
+		</div>
+	</div>
+</script>
+
+<script type="text/javascript">
+    setTimeout(function () {
+        // 百度地图API功能
+        function G(id) {
+            return document.getElementById(id);
+        }
+
+        var myMap = WorldsBMap.getmapBValue();
+
+        var ac = new BMap.Autocomplete(    //建立一个自动完成的对象
+            {"input" : "searchInput"
+                ,"location" : myMap
+            });
+
+        ac.addEventListener("onhighlight", function(e) {  //鼠标放在下拉列表上的事件
+            var str = "";
+            var _value = e.fromitem.value;
+            var value = "";
+            if (e.fromitem.index > -1) {
+                value = _value.province +  _value.city +  _value.district +  _value.street +  _value.business;
+            }
+            str = "FromItem<br />index = " + e.fromitem.index + "<br />value = " + value;
+
+            value = "";
+            if (e.toitem.index > -1) {
+                _value = e.toitem.value;
+                value = _value.province +  _value.city +  _value.district +  _value.street +  _value.business;
+            }
+            str += "<br />ToItem<br />index = " + e.toitem.index + "<br />value = " + value;
+            G("searchResultPanel").innerHTML = str;
+        });
+
+        var myValue;
+        ac.addEventListener("onconfirm", function(e) {    //鼠标点击下拉列表后的事件
+            var _value = e.item.value;
+            myValue = _value.province +  _value.city +  _value.district +  _value.street +  _value.business;
+            G("searchResultPanel").innerHTML ="onconfirm<br />index = " + e.item.index + "<br />myValue = " + myValue;
+
+            setPlace();
+        });
+
+        function setPlace(){
+            // myMap.clearOverlays();    //清除地图上所有覆盖物
+            var local = new BMap.LocalSearch(myMap, { //智能搜索
+                onSearchComplete: myFun
+            });
+            function myFun(){
+                var pp = local.getResults().getPoi(0) == undefined? null:local.getResults().getPoi(0).point;
+                if(pp) {
+                    myMap.centerAndZoom(pp, 20);
+                    myMap.addOverlay(new BMap.Marker(pp));    //添加标注
+                } else {
+                    layer.msg('找不到您输入的位置！')
+                }
+            }
+            local.search(myValue);
+        }
+        $("#searchInput").on('input propertychange change', function () {
+            if($("#searchInput").val() != null && $("#searchInput").val() != "")
+                $('.search_panel .clear').removeClass('hide');
+            else {
+                // WorldsBMap.clearOtherOverlay();
+                $('.search_panel .clear').addClass('hide');
+            }
+        });
+
+        $('.search_panel .clear').on('click',function () {
+            // WorldsBMap.clearOtherOverlay();
+            $("#searchInput").val('');
+            $("#searchInput").change();
+        });
+        $('.search_panel .search_button').on('click',function () {
+            myValue = $("#searchInput").val();
+            setPlace();
+        });
+
+		$('#historyGps').on('click', function() {
+			$.get('/pages/base/stationroute/list_template.html', function (content) {
+				window.layerIdx = layer.open({
+					type: 1,
+					move: false,
+					area: ['800px', '600px'],
+					content: content,
+					title: '选择班次(为前一天班次，请选择GPS自动完成的班次)',
+					shift: 5,
+					scrollbar: false,
+					success: function () {
+					}
+				});
+			});
+		});
+    },1000);
 </script>
 \ No newline at end of file
+<div className="row">
+	<div className="col-md-12">
+		<!-- BEGIN VALIDATION STATES-->
+		<div className="portlet light portlet-fit portlet-form bordered">
+			<div className="portlet-body">
+				<div class="table-container" style="margin-top: 10px">
+					<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_waybill_choose">
+						<thead>
+							<tr role="row" class="heading">
+								<th width="10%">序号</th>
+								<th width="18%">线路名称</th>
+								<th width="18%">起点</th>
+								<th width="18%">终点</th>
+								<th width="18%">实际发车时间</th>
+								<th width="18%">实际到达时间</th>
+							</tr>
+						</thead>
+						<tbody></tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/html" id="waybill_choose_template">
+	{{each list as obj i }}
+	<tr>
+		<td style="vertical-align: middle;">
+			<input type="radio" class="group-checkable icheck" name="waybillRadio" data-id="{{obj.id}}">
+		</td>
+		<td style="vertical-align: middle;">
+			{{obj.xlName}}
+		</td>
+		<td>
+			{{obj.qdzName}}
+		</td>
+		<td>
+			{{obj.zdzName}}
+		</td>
+		<td>
+			{{obj.fcsjActual}}
+		</td>
+		<td>
+			{{obj.zdsjActual}}
+		</td>
+	</tr>
+	{{/each}}
+	{{if list.length == 0}}
+	<tr>
+		<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
+	</tr>
+	{{/if}}
+</script>
+<script>
+	$(function () {
+		// 异步请求获取表格数据
+		var params = {};
+		params.qdzCode_eq = $('#startPoint').val().split('_')[0];
+		params.zdzCode_eq = $('#endPoint').val().split('_')[0];
+		params.xlBm_eq = LineObj.getLineObj().id;
+		$.ajax({
+			url: "/real_control_v2/assets/imgs/time.gif",
+			type: "HEAD",
+			async: false,
+			success: function(result,status,xhr) {
+				params.scheduleDateStr_eq = moment(xhr.getResponseHeader("Date")).add(-1, 'days').format('YYYY-MM-DD');
+			}
+		})
+		$.get('/realSchedule/all',params,function(result){
+			// 把数据填充到模版中
+			var tbodyHtml = template('waybill_choose_template',{list:result});
+			// 把渲染好的模版html文本追加到表格中
+			$('#datatable_waybill_choose tbody').html(tbodyHtml);
+			$("input[name='waybillRadio']").change(function () {
+				$.post('/inout/pathPlaningByHistory', {schId: $(this).data('id'), version: $("#versions").val()}, function (result1) {
+					layer.msg('路径规划已完成');
+					// 刷新左边树
+					$('#inoutSearch').click();
+					layer.close(window.layerIdx);
+				});
+			});
+		});
+	});
+</script>
 \ No newline at end of file
@@ -269,6 +269,39 @@
 			params['type'] = "query";
 			var i = layer.load(2);
 			$post('/budget/budgetAmounts',params,function(result){
+// 				$(result).each(function(ii, ee){
+// 					for(var kk in ee){
+// 						if(kk != "key" && kk != "dataList" && kk.indexOf("com") < 0 && parseFloat(ee[kk])){
+// 							var bb = "", cc = ee[kk] + "";
+// 							if(cc.indexOf("%") > -1){
+// 								bb = "%";
+// 							}
+// 							var dd = 0;
+// 							$(ee.dataList).each(function(jj, ff){
+// 								if(parseFloat(ff[kk])){
+// 									dd += parseFloat(ff[kk]);
+// 								}
+// 							});
+// 							var aa = parseFloat(dd);
+// 							ee[kk] = parseFloat(aa.toFixed(3))+bb;
+// 						}
+// 					}
+// 					for(var yy = 0; yy <= 12; yy++){
+// 						var mon = "mon"+yy, bud = "bud"+yy, com = "com"+yy;
+// 						if(yy == 0){
+// 							mon = "monAll";
+// 							bud = "formal";
+// 							com = "complete";
+// 						}
+// 						if(ee[mon] > 0 && parseFloat(ee[mon]) && parseFloat(ee[bud])){
+// 							var comV = (parseFloat(ee[mon]) / parseFloat(ee[bud]) * 100).toFixed(2) + "%";
+// 							ee[com] = comV;
+// 						} else {
+// 							ee[com] = "0%";
+// 						}
+						
+// 					}
+// 				});
 				layer.close(i);
 				// 把数据填充到模版中
 				var tbodyHtml = template('budget_amounts',{list:result});
@@ -292,6 +325,18 @@
 			$.each(resList, function(i, g){
 				if(key == g.key){
 					var dataList = g.dataList;
+// 					$(dataList).each(function(ii, ee){
+// 						for(var kk in ee){
+// 							if(kk != "xlName" && parseFloat(ee[kk])){
+// 								var bb = "", cc = ee[kk] + "";
+// 								if(cc.indexOf("%") > -1){
+// 									bb = "%";
+// 								}
+// 								var aa = parseFloat(ee[kk]);
+// 								ee[kk] = parseFloat(aa.toFixed(3))+bb;
+// 							}
+// 						}
+// 					});
 					var tbodyHtml = template('budget_amounts_dataList', {list:dataList});
 					$("#datas_hidden").removeClass("hidden");
 					$("#datas_hidden").height($(window).height()-280);
@@ -267,6 +267,39 @@
 			params['type'] = "query";
 			var i = layer.load(2);
 			$post('/budget/budgetMileage',params,function(result){
+// 				$(result).each(function(ii, ee){
+// 					for(var kk in ee){
+// 						if(kk != "key" && kk != "dataList" && kk.indexOf("com") < 0 && parseFloat(ee[kk])){
+// 							var bb = "", cc = ee[kk] + "";
+// 							if(cc.indexOf("%") > -1){
+// 								bb = "%";
+// 							}
+// 							var dd = 0;
+// 							$(ee.dataList).each(function(jj, ff){
+// 								if(parseFloat(ff[kk])){
+// 									dd += parseFloat(ff[kk]);
+// 								}
+// 							});
+// 							var aa = parseFloat(dd);
+// 							ee[kk] = parseFloat(aa.toFixed(3))+bb;
+// 						}
+// 					}
+// 					for(var yy = 0; yy <= 12; yy++){
+// 						var mon = "mon"+yy, bud = "bud"+yy, com = "com"+yy;
+// 						if(yy == 0){
+// 							mon = "monAll";
+// 							bud = "formal";
+// 							com = "complete";
+// 						}
+// 						if(ee[mon] > 0 && parseFloat(ee[mon]) && parseFloat(ee[bud])){
+// 							var comV = (parseFloat(ee[mon]) / parseFloat(ee[bud]) * 100).toFixed(2) + "%";
+// 							ee[com] = comV;
+// 						} else {
+// 							ee[com] = "0%";
+// 						}
+						
+// 					}
+// 				});
 				layer.close(i);
 				// 把数据填充到模版中
 				var tbodyHtml = template('budget_mileage',{list:result});
@@ -290,6 +323,18 @@
 			$.each(resList, function(i, g){
 				if(key == g.key){
 					var dataList = g.dataList;
+// 					$(dataList).each(function(ii, ee){
+// 						for(var kk in ee){
+// 							if(kk != "xlName" && parseFloat(ee[kk])){
+// 								var bb = "", cc = ee[kk] + "";
+// 								if(cc.indexOf("%") > -1){
+// 									bb = "%";
+// 								}
+// 								var aa = parseFloat(ee[kk]);
+// 								ee[kk] = parseFloat(aa.toFixed(3))+bb;
+// 							}
+// 						}
+// 					});
 					var tbodyHtml = template('budget_mileage_dataList', {list:dataList});
 					$("#datas_hidden").removeClass("hidden");
 					$("#datas_hidden").height($(window).height()-280);
@@ -267,6 +267,39 @@
 			params['type'] = "query";
 			var i = layer.load(2);
 			$post('/budget/budgetPerson',params,function(result){
+// 				$(result).each(function(ii, ee){
+// 					for(var kk in ee){
+// 						if(kk != "key" && kk != "dataList" && kk.indexOf("com") < 0 && parseFloat(ee[kk])){
+// 							var bb = "", cc = ee[kk] + "";
+// 							if(cc.indexOf("%") > -1){
+// 								bb = "%";
+// 							}
+// 							var dd = 0;
+// 							$(ee.dataList).each(function(jj, ff){
+// 								if(parseFloat(ff[kk])){
+// 									dd += parseFloat(ff[kk]);
+// 								}
+// 							});
+// 							var aa = parseFloat(dd);
+// 							ee[kk] = parseFloat(aa.toFixed(3))+bb;
+// 						}
+// 					}
+// 					for(var yy = 0; yy <= 12; yy++){
+// 						var mon = "mon"+yy, bud = "bud"+yy, com = "com"+yy;
+// 						if(yy == 0){
+// 							mon = "monAll";
+// 							bud = "formal";
+// 							com = "complete";
+// 						}
+// 						if(ee[mon] > 0 && parseFloat(ee[mon]) && parseFloat(ee[bud])){
+// 							var comV = (parseFloat(ee[mon]) / parseFloat(ee[bud]) * 100).toFixed(2) + "%";
+// 							ee[com] = comV;
+// 						} else {
+// 							ee[com] = "0%";
+// 						}
+						
+// 					}
+// 				});
 				layer.close(i);
 				// 把数据填充到模版中
 				var tbodyHtml = template('budget_person',{list:result});
@@ -290,6 +323,18 @@
 			$.each(resList, function(i, g){
 				if(key == g.key){
 					var dataList = g.dataList;
+// 					$(dataList).each(function(ii, ee){
+// 						for(var kk in ee){
+// 							if(kk != "xlName" && parseFloat(ee[kk])){
+// 								var bb = "", cc = ee[kk] + "";
+// 								if(cc.indexOf("%") > -1){
+// 									bb = "%";
+// 								}
+// 								var aa = parseFloat(ee[kk]);
+// 								ee[kk] = parseFloat(aa.toFixed(3))+bb;
+// 							}
+// 						}
+// 					});
 					var tbodyHtml = template('budget_person_dataList', {list:dataList});
 					$("#datas_hidden").removeClass("hidden");
 					$("#datas_hidden").height($(window).height()-280);
@@ -277,6 +277,39 @@
 			params['type'] = "query";
 			var i = layer.load(2);
 			$post('/budget/budgetSum',params,function(result){
+// 				$(result).each(function(ii, ee){
+// 					for(var kk in ee){
+// 						if(kk != "key" && kk != "dataList" && kk.indexOf("com") < 0 && parseFloat(ee[kk])){
+// 							var bb = "", cc = ee[kk] + "";
+// 							if(cc.indexOf("%") > -1){
+// 								bb = "%";
+// 							}
+// 							var dd = 0;
+// 							$(ee.dataList).each(function(jj, ff){
+// 								if(parseFloat(ff[kk])){
+// 									dd += parseFloat(ff[kk]);
+// 								}
+// 							});
+// 							var aa = parseFloat(dd);
+// 							ee[kk] = parseFloat(aa.toFixed(3))+bb;
+// 						}
+// 					}
+// 					for(var yy = 0; yy <= 12; yy++){
+// 						var mon = "mon"+yy, bud = "bud"+yy, com = "com"+yy;
+// 						if(yy == 0){
+// 							mon = "monAll";
+// 							bud = "formal";
+// 							com = "complete";
+// 						}
+// 						if(ee[mon] > 0 && parseFloat(ee[mon]) && parseFloat(ee[bud])){
+// 							var comV = (parseFloat(ee[mon]) / parseFloat(ee[bud]) * 100).toFixed(2) + "%";
+// 							ee[com] = comV;
+// 						} else {
+// 							ee[com] = "0%";
+// 						}
+						
+// 					}
+// 				});
 				layer.close(i);
 				// 把数据填充到模版中
 				var tbodyHtml = template('budget_sum',{list:result});
@@ -300,6 +333,18 @@
 			$.each(resList, function(i, g){
 				if(key == g.key){
 					var dataList = g.dataList;
+// 					$(dataList).each(function(ii, ee){
+// 						for(var kk in ee){
+// 							if(kk != "xlName" && parseFloat(ee[kk])){
+// 								var bb = "", cc = ee[kk] + "";
+// 								if(cc.indexOf("%") > -1){
+// 									bb = "%";
+// 								}
+// 								var aa = parseFloat(ee[kk]);
+// 								ee[kk] = parseFloat(aa.toFixed(3))+bb;
+// 							}
+// 						}
+// 					});
 					var tbodyHtml = template('budget_sum_dataList', {list:dataList});
 					$("#datas_hidden").removeClass("hidden");
 					$("#datas_hidden").height($(window).height()-280);
-<style>
-    .system_change_log{
-        background: #fff;
-        color: #666;
-        box-shadow: 0 5px 15px rgba(0,0,0,0.08);
-        height: calc(100% + 10px);
-        margin-top: -10px;
-        font-size: 14px;
-        padding: 10px 0 0 15px;
-        overflow: auto;
-    }
-    .system_change_log>ul{
-        margin:0px;
-        list-style:none;
-    }
-
-    .system_change_log>ul>li.sub_title{
-        text-indent: 0;
-    }
-
-    .system_change_log>ul>li.sub_title>h6{
-        font-size: 12px;
-        font-family: 微软雅黑;
-        color: #000;
-        margin-top: 8px;
-        margin-bottom: 8px;
-    }
-
-    .system_change_log>ul>li{
-        margin: 5px 0;
-        text-indent: 25px;
-    }
-
-    .system_change_log .label{
-        width: 55px;
-        display: inline-block;
-        padding: 0 10px;
-        line-height: 1.5;
-        font-size: 12px;
-        color: #fff;
-        vertical-align: middle;
-        white-space: nowrap;
-        border-radius: 2px !important;
-        text-transform: uppercase;
-        text-align: center;
-        text-indent: 3px;
-        margin-right: 15px;
-    }
-    .system_change_log .label.s_c_add{
-        background-color: #32d296;
-    }
-
-    .system_change_log .label.s_c_change{
-        background-color: #1e87f0;
-    }
-
-    .system_change_log .label.s_c_remove{
-        background-color: #faa05a;
-    }
-</style>
-<div class="system_change_log">
-    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2021-01-07 更新说明 Changelog</h2>
-    <br><br>
-    <ul >
-        <li class="sub_title"><h6>报表</h6></li>
-        <li><span class="label s_c_change">修改</span>1.rfid线路签卡率报表中添加自编号和路牌字段</li>
-        <li><span class="label s_c_change">修改</span>2.烂班明细统计，增加直属公司所有分公司、烂班原因筛选条件</li>
-        <li class="sub_title"><h6>基础信息</h6></li>
-        <li><span class="label s_c_change">修改</span>1.基础信息->线路->站点详情，可查看历史版本，编辑当前和待更新版本</li>
-        <li class="sub_title"><h6>线调</h6></li>
-        <li><span class="label s_c_change">修改</span>1.线调->地图，点击某个设备"拨打电话"</li>
-        <li><span class="label s_c_change">修改</span>2.线调->实发调整，加入调整说明下拉框，调整说明进入备注信息</li>
-        <li><span class="label s_c_change">修改</span>3.烂班原因加入'路救'类型</li>
-        <li><span class="label s_c_change">新增</span>4.新增临时功能线路调度->临时节点->花博线计划班次导出，用于按日期导出花博线计划班次</li>
-    </ul>
-
-</div>
-
-<script type="text/javascript">
-    $.ajax({
-        url: '/eci/validate_get_destroy_info',
-        dataType: "json",
-        success: function(rs) {
-            if (rs && rs.status === "SUCCESS") {
-                if (rs.data && rs.data.length && rs.data.length > 0) {
-                    var htmlText = "";
-                    var wrapData = [];
-                    if (rs.data.length > 8) {
-                        htmlText = "<span style='font-weight: bold; font-style: italic; '>部分停用信息如下：</span></br>";
-                        wrapData = rs.data.slice(0, 8);
-                    } else {
-                        htmlText = "<span style='font-weight: bold; font-style: italic; '>所有停用信息如下：</span></br>";
-                        wrapData = rs.data;
-                    }
-                    $.each(wrapData, function(index, value) {
-                        wrapData[index] = "<span style='font-size: 14px;'>" + value + "</span>";
-                    });
-
-                    htmlText += wrapData.join("</br>");
-
-                    swal({
-                        title: "排班人员停用信息",
-                        text: htmlText,
-                        html: true,
-                        type: "warning",
-                        showCancelButton: true,
-                        cancelButtonText: "关闭",
-                        confirmButtonColor: "#3598dc",
-                        confirmButtonText: "下载所有停用信息",
-                        closeOnConfirm: false
-
-                    }, function() {
-                        window.location.href = "/eci/validate_get_destroy_info/download";
-                    });
-                }
-            }
-        }
-    });
-
-</script>
+<style>
+    .system_change_log{
+        background: #fff;
+        color: #666;
+        box-shadow: 0 5px 15px rgba(0,0,0,0.08);
+        height: calc(100% + 10px);
+        margin-top: -10px;
+        font-size: 14px;
+        padding: 10px 0 0 15px;
+        overflow: auto;
+    }
+    .system_change_log>ul{
+        margin:0px;
+        list-style:none;
+    }
+
+    .system_change_log>ul>li.sub_title{
+        text-indent: 0;
+    }
+
+    .system_change_log>ul>li.sub_title>h6{
+        font-size: 12px;
+        font-family: 微软雅黑;
+        color: #000;
+        margin-top: 8px;
+        margin-bottom: 8px;
+    }
+
+    .system_change_log>ul>li{
+        margin: 5px 0;
+        text-indent: 25px;
+    }
+
+    .system_change_log .label{
+        width: 55px;
+        display: inline-block;
+        padding: 0 10px;
+        line-height: 1.5;
+        font-size: 12px;
+        color: #fff;
+        vertical-align: middle;
+        white-space: nowrap;
+        border-radius: 2px !important;
+        text-transform: uppercase;
+        text-align: center;
+        text-indent: 3px;
+        margin-right: 15px;
+    }
+    .system_change_log .label.s_c_add{
+        background-color: #32d296;
+    }
+
+    .system_change_log .label.s_c_change{
+        background-color: #1e87f0;
+    }
+
+    .system_change_log .label.s_c_remove{
+        background-color: #faa05a;
+    }
+</style>
+<div class="system_change_log">
+    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2022-06-13 更新说明 Changelog</h2>
+    <br><br>
+    <ul >
+        <li class="sub_title"><h6>报表</h6></li>
+        <li><span class="label s_c_change">修改</span>1.统计报表->路单线路明细月报、年报 中耗电统计值偏离的问题</li>
+        <li><span class="label s_c_change">修改</span>2.统计报表->"(班次)到离站"报表，新增历史站点版本数据查询，解决站点顺序的问题</li>
+        <li class="sub_title"><h6>基础信息</h6></li>
+        <li><span class="label s_c_change">修改</span>1.调度系统车辆信息与车辆库车辆信息保持同步，调度系统取消车辆的新增、编辑功能</li>
+        <li><span class="label s_c_change">修改</span>2.调度系统人员信息与人事系统人员信息保持同步，调度系统取消人员的新增、编辑功能</li>
+        <li class="sub_title"><h6>运管处</h6></li>
+        <li><span class="label s_c_change">修改</span>1.电子路单上传至运管处时采用多次上传降低上传失败率</li>
+        <li class="sub_title"><h6>线调</h6></li>
+        <li><span class="label s_c_change">修改</span>1.线调->车载设备->设备管理 中"最后GPS时间"列显示异常修正</li>
+        <li><span class="label s_c_change">修改</span>2.无排班线路添加"临加班次"功能</li>
+    </ul>
+
+</div>
+
+<script type="text/javascript">
+    $.ajax({
+        url: '/eci/validate_get_destroy_info',
+        dataType: "json",
+        success: function(rs) {
+            if (rs && rs.status === "SUCCESS") {
+                if (rs.data && rs.data.length && rs.data.length > 0) {
+                    var htmlText = "";
+                    var wrapData = [];
+                    if (rs.data.length > 8) {
+                        htmlText = "<span style='font-weight: bold; font-style: italic; '>部分停用信息如下：</span></br>";
+                        wrapData = rs.data.slice(0, 8);
+                    } else {
+                        htmlText = "<span style='font-weight: bold; font-style: italic; '>所有停用信息如下：</span></br>";
+                        wrapData = rs.data;
+                    }
+                    $.each(wrapData, function(index, value) {
+                        wrapData[index] = "<span style='font-size: 14px;'>" + value + "</span>";
+                    });
+
+                    htmlText += wrapData.join("</br>");
+
+                    swal({
+                        title: "排班人员停用信息",
+                        text: htmlText,
+                        html: true,
+                        type: "warning",
+                        showCancelButton: true,
+                        cancelButtonText: "关闭",
+                        confirmButtonColor: "#3598dc",
+                        confirmButtonText: "下载所有停用信息",
+                        closeOnConfirm: false
+
+                    }, function() {
+                        window.location.href = "/eci/validate_get_destroy_info/download";
+                    });
+                }
+            }
+        }
+    });
+
+</script>
@@ -652,6 +652,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 	               		 layer.msg('只能操作一天内数据.');
 	               	}else{
 		                var i = layer.load(2);
+		                params["fgsdm_like"] = '';
 		                $get('/ylb/obtain', params, function () {
 		                	layer.close(i);
 		                    jsDoQuery(params, true);
+<div class="page-head">
+	<div class="page-title">
+		<h1>进出站油电信息编辑</h1>
+	</div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+	<li><span class="active">编辑权限</span></li>
+</ul>
+
+<div class="portlet light bordered">
+	<div class="portlet-title">
+		<div class="caption">
+			<i class="icon-equalizer font-red-sunglo"></i> <span
+				class="caption-subject font-red-sunglo bold uppercase"></span>
+		</div>
+	</div>
+	<div class="portlet-body form">
+		<form action="/addYlb" class="form-horizontal" id="ylb_add_form" >
+		
+		<div class="alert alert-danger display-hide">
+			<button class="close" data-close="alert"></button>
+			您的输入有误，请检查下面的输入项
+		</div>
+			<input type="hidden" value="0" name="yhlx" />
+			<div class="form-body">
+				<div class="form-group">
+					<label class="col-md-3 control-label">修改历史油/电权限：</label>
+					<div class="col-md-2">
+						<input type="text" class="form-control" name="modify_rights" id="modify_rights" readonly="readonly">
+					</div>
+					<button type="button" class="btn green" id="change" >修改</button>
+				</div>
+			</div>
+		</form>
+		<!-- END FORM-->
+	</div>
+</div>
+<script>
+(function(){
+	
+	function getModifyRights(){
+		$get('/ylb/getModifyRights',"",function(result){
+			$("#modify_rights").val(result.text);
+		});
+	}
+	getModifyRights();
+	
+	$("#change").on('click', function () {
+		var par={};
+		par["modify_rights"] = $("#modify_rights").val();
+		$get('/ylb/modifyRightsChange',par,function(result){
+			layer.msg(result.text);
+			getModifyRights();
+		});
+	});
+	
+})();
+</script>
 \ No newline at end of file
@@ -67,7 +67,7 @@
 								<input class="form-control" type="text" id="date2" style="width: 180px;"/>
 								<span class="item-label" style="width: 80px;">站点: </span>
 								<select class="form-control sreach-zd" id="zdlx"  > 
-										<option value="">请选择</option>
+										<option value=" ">请选择</option>
 										<option value="0">上行</option>
 										<option value="1">下行</option>
 								</select>
@@ -188,6 +188,19 @@
 			locale : 'zh-cn'
 		});
+		var d = new Date();
+		d.setTime(d.getTime());
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		var dt = year + "-" + month + "-" + day;
+		$("#date").val(dt);
+		$("#date1,#date2").val(dt + " 00:00");
+		
 		/* $.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -444,22 +457,26 @@
 				});
 			}
 		})
+		
 		$(".sreach-zd").on("change",initZd);
+		$("#date1,#date2").on("blur",initZd);
 		var status=false;
 		function initZd(){
 			var line = $("#line").val();
 			var zdlx = $("#zdlx").val();
-			console.log(line+"===="+zdlx);
-			if(line==null|| line =="" || zdlx ==null || zdlx==""){
+			var date1 = $("#date1").val();
+			var date2 = $("#date2").val();
+			if(line==null || line=="" || zdlx==null || zdlx==""
+					|| date1==null || date1 =="" || date2==null || date2==""){
 			}else{
-				$.get('/report/sreachZd',{line: line,zdlx:zdlx},function(result){
+				$.get('/report/sreachZd',{line:line,zdlx:zdlx,date1:date1,date2:date2},function(result){
 					var zdList=result;
 					if(status){
 						$("#zd").select2("destroy").html('');
 					}
 					var datas=[];
-					datas.push({id:" ",text:"全部"});
+					datas.push({id:" ",text:"请选择..."});
 					for(var i=0;i<zdList.length;i++){
 						datas.push({id: zdList[i]["id"], text: zdList[i]["text"]});
 					}
@@ -5,7 +5,7 @@
             border-color: #32c5d2;
         }
         .btn-group > .dropdown-menu:before {
-            border-bottom-color: #32c5d2;   
+            border-bottom-color: #32c5d2;
         }
     </style>
@@ -21,6 +21,7 @@
                 <th>旧设备编号</th>
                 <th>新设备编号</th>
                 <th style="width: 180px;">操作人/操作时间</th>
+                <th style="width: 80px;" >状态</th>
                 <th style="width: 150pt;">操作</th>
             </tr>
             <tr role="row" class="filter">
@@ -47,6 +48,11 @@
                 <td></td>
                 <td></td>
                 <td>
+                    <label class="checkbox-inline input">
+                        <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']" />报废车
+                    </label>
+                </td>
+                <td>
                     <div class="btn-group">
                         <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
                                 ng-click="ctrl.doPage()">
@@ -113,6 +119,9 @@
                 </td>
                 <td>
+                    <span ng-bind="info.isCancel | dict:'truefalseType':'未知' "></span>
+                </td>
+                <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="deviceInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
@@ -35,14 +35,25 @@
             <div class="form-body">
                 <div class="form-group">
+                    <label class="col-md-2 control-label">同步类型：</label>
+                    <div class="col-md-3">
+                        <sa-Radiogroup model="ctrl.vsTaskType" dicgroup="vsTaskType" ></sa-Radiogroup>
+                    </div>
+                </div>
+
+                <div class="form-group" ng-if="ctrl.vsTaskType === 'singleV'">
                     <label class="col-md-2 control-label">车辆自编号：</label>
                     <div class="col-md-4">
-                        <input type="text" class="form-control" ng-model="ctrl.dataSyncTask.paramClzbh"
+                        <input type="text" class="form-control" required name="paramClzbh" ng-model="ctrl.dataSyncTask.paramClzbh"
                                placeholder="请输入车辆自编号"/>
                     </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.paramClzbh.$error.required">
+                        车辆自编号必须填写
+                    </div>
                 </div>
-                <div class="form-group has-success has-feedback">
+                <div class="form-group has-success has-feedback" ng-if="ctrl.vsTaskType === 'periodT'">
                     <label class="col-md-2 control-label">开始日期*：</label>
                     <div class="col-md-3">
                         <div class="input-group">
@@ -64,7 +75,7 @@
                     </div>
                 </div>
-                <div class="form-group has-success has-feedback">
+                <div class="form-group has-success has-feedback" ng-if="ctrl.vsTaskType === 'periodT'">
                     <label class="col-md-2 control-label">结束日期*：</label>
                     <div class="col-md-3">
                         <div class="input-group">
@@ -188,6 +188,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             var self = this;
             var Task = service.getAddTaskClass();
+            // 同步任务类型
+            self.vsTaskType = "singleV";
+
             // 日期 日期控件开关
             self.paramFrom = false;
             self.paramFrom_open = function() {
@@ -204,6 +207,14 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 提交方法
             self.submit = function() {
+                // 根据同步任务类型做数据处理（和后台etl判定逻辑对应）
+                if (self.vsTaskType === "singleV") {
+                    self.dataSyncTask.paramFrom = null;
+                    self.dataSyncTask.paramTo = null;
+                } else if (self.vsTaskType === "periodT") {
+                    self.dataSyncTask.paramClzbh = null;
+                }
+
                 console.log(self.dataSyncTask);
                 self.dataSyncTask.$save(function() {
@@ -125,6 +125,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         scope[ctrlAs].$$ds = [];
                                         var errorTTInfos = 0;
+                                        var errorLpCount = 0;
                                         if (result && result.data && result.data.infos && result.data.infos.length > 0) {
                                             angular.forEach(result.data.infos, function(obj) {
@@ -140,6 +141,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                                     yybc: obj.yybc,
                                                     errorbc: obj.errorbc,
+                                                    errorlpCount: obj.errorlpCount,
+                                                    errorlpInfo: obj.errorlpInfo,
                                                     lineVersion: obj.lineVersion
@@ -147,6 +150,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                                 if (obj.errorbc > 0) {
                                                     errorTTInfos ++;
+                                                } else if (obj.errorlpCount > 0) {
+                                                    errorLpCount ++;
                                                 } else {
                                                     ttinfonames.push(obj.ttname);
                                                     ttinfoids.push(obj.ttid);
@@ -156,6 +161,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                             if (errorTTInfos > 0) {
                                                 scope[ctrlAs].$$internalmodel = undefined;
                                                 scope[ctrlAs].error = "时刻表有错误班次";
+                                            } else if (errorLpCount > 0) {
+                                                scope[ctrlAs].$$internalmodel = undefined;
+                                                scope[ctrlAs].error = "时刻表有错误路牌";
                                             } else {
                                                 scope[ctrlAs].$$internalmodel = "ok";
                                                 scope[ctrlAs].ttinfonames = ttinfonames.join(",");
@@ -228,4 +236,4 @@ angular.module(&#39;ScheduleApp&#39;).directive(
             };
         }
     ]
-);
 \ No newline at end of file
+);
@@ -56,6 +56,8 @@
                     <div><span ng-bind="info.ttname"></span></div>
                     <div><span>统计班次：{{info.allbc}}个，出场：{{info.outbc}}个，进场：{{info.inbc}}个，营运：{{info.yybc}}个</span></div>
                     <div><span>异常班次：{{info.errorbc}}个</span></div>
+                    <div><span>异常路牌：{{info.errorlpCount}}个</span></div>
+                    <div><span>异常路牌描述：{{info.errorlpInfo.join(",")}}</span></div>
                 </script>
                 <div ng-repeat="info in $saScpdateCtrl.$$ds track by $index">
@@ -68,8 +70,8 @@
                                 {{info.ttname}}
                             </a>
                         </h3>
-                        <span class="glyphicon glyphicon-ok" aria-hidden="true" ng-if="info.errorbc == 0"></span>
-                        <span class="glyphicon glyphicon-remove" aria-hidden="true" ng-if="info.errorbc > 0"></span>
+                        <span class="glyphicon glyphicon-ok" aria-hidden="true" ng-if="info.errorbc == 0 && info.errorlpCount == 0"></span>
+                        <span class="glyphicon glyphicon-remove" aria-hidden="true" ng-if="info.errorbc > 0 || info.errorlpCount > 0"></span>
                     </div>
                 </div>
             </div>
@@ -78,4 +80,4 @@
-</div>
 \ No newline at end of file
+</div>
@@ -5146,6 +5146,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         scope[ctrlAs].$$ds = [];
                                         var errorTTInfos = 0;
+                                        var errorLpCount = 0;
                                         if (result && result.data && result.data.infos && result.data.infos.length > 0) {
                                             angular.forEach(result.data.infos, function(obj) {
@@ -5161,6 +5162,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                                     yybc: obj.yybc,
                                                     errorbc: obj.errorbc,
+                                                    errorlpCount: obj.errorlpCount,
+                                                    errorlpInfo: obj.errorlpInfo,
                                                     lineVersion: obj.lineVersion
@@ -5168,6 +5171,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                                 if (obj.errorbc > 0) {
                                                     errorTTInfos ++;
+                                                } else if (obj.errorlpCount > 0) {
+                                                    errorLpCount ++;
                                                 } else {
                                                     ttinfonames.push(obj.ttname);
                                                     ttinfoids.push(obj.ttid);
@@ -5177,6 +5182,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                             if (errorTTInfos > 0) {
                                                 scope[ctrlAs].$$internalmodel = undefined;
                                                 scope[ctrlAs].error = "时刻表有错误班次";
+                                            } else if (errorLpCount > 0) {
+                                                scope[ctrlAs].$$internalmodel = undefined;
+                                                scope[ctrlAs].error = "时刻表有错误路牌";
                                             } else {
                                                 scope[ctrlAs].$$internalmodel = "ok";
                                                 scope[ctrlAs].ttinfonames = ttinfonames.join(",");
@@ -5249,7 +5257,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
             };
         }
     ]
-);
+);
+
 /**
  * saSrule指令（非通用指令，只在排班计划form中使用）。
  * 属性如下：
-/**
- * 
- * @JSName : timeTempletUpload.js(运管处js)
- *
- * @Author : bsth@zq
- *
- * @Description :  TODO(运管功能公共js)
- *
- * @Data : 2016年6月29日 上午9:21:17
- *
- * @Version 公交调度系统BS版 0.1
- *
- */
-
-(function(){
-	
-    function getComp(cb) {
-        $.get('/user/companyData',null,function(rs) {
-            return cb && cb(rs);
-        });
-    }
-
-    initLineSelect2();
-
-    function initLineSelect2(compD) {
-        getComp(function(rs) {
-            var params = {};
-            if(rs.length>0) {
-                var compA = new Array();
-                for(var c = 0 ; c<rs.length;c++) {
-                    var comC = rs[c].companyCode;
-                    var child = rs[c].children;
-                    if(child.length>0) {
-                        for(var d = 0 ;d< child.length;d++) {
-                            compA.push(comC + '_' + child[d].code);
-                        }
-                    }else {
-                        compA.push(comC);
-                    }
-                }
-                params.cgsbm_in  = compA.toString();
-            }
-            params["remove_ne"] = 1;
-            // 填充线路拉框选择值
-            $get('/line/all', params, function(array){
-                var len_ = array.length,paramsD = new Array();
-                if(len_>0) {
-                    $.each(array, function(i, g){
-                        if(g.name!='' || g.name != null) {
-                            paramsD.push({'id':g.id ,'text':g.name});
-                        }
-                    });
-                    initPinYinSelect2($('#line'),paramsD,function(selector) {
-                        selector.select2("val", storage.xlName_AgursData);
-                    });
-                }
-            });
-        });
-    }
-
-
-	// 绑定查询事件
-	$("#search").click(searchM);
-	// 绑定上传事件
-	$("#upload").click(uploadM);
-	// 绑定全部移到右边事件
-	$("#to_right").click(function() {
-		$("#left_div tbody tr:not(.muted)").click();
-	});
-	// 绑定全部移到左边事件
-	$("#to_left").click(function() {
-		$("#right_div tbody tr:not(.muted)").click();
-	});
-	// 查询方法
-	function searchM() {
-		// 清空已选定列表
-		$("#right_div table tbody").empty();
-		var params = {};
-		// 取得输入框的值
-		var inputs = $(".param input,select");
-		// 遍历数组
-        $.each(inputs, function(i, element) {
-            if($(element).attr("type") == 'checkbox'){
-                if($(element).is(':checked')){
-                    params[$(element).attr("name")] = $(element).val();
-                }
-            }else{
-                params[$(element).attr("name")] = $(element).val();
-            }
-        });
-        //params["isCancel_ne"] = true;// 过滤作废时刻表
-		var i = layer.load(2);
-		$get('/tic_ec', params, function(data) {
-			var content = data.data.content;
-			_dateFormat(content);
-			var bodyHtm = template('timeTemplet_list_temp', {
-				list : content
-			});
-			$("#left_div table tbody").empty();
-			$("#left_div table tbody").append(bodyHtm);
-			$("#left_div tbody tr:not(.muted)").click(_click);
-			layer.close(i);
-		});
-	}
-
-	// 上传方法
-	function uploadM() {
-
-		// 取得输入框的值
-		var trs = $("#right_div tbody tr input");
-		if (trs.length == 0) {
-			alert("请选择模板");
-			return;
-		}
-		var ids ="0,";
-		// 遍历数组
-		$.each(trs, function(i, element) {
-			ids +=$(element).val()+",";
-		});
-		var params = {"ids":ids};
-		$.ajax({
-			type: 'get',url: '/trmg/setSKB',
-			data: params ,dataType:'text',
-			success:function(data) {
-				alert(data);
-			}, error : function() {
-				alert("操作失败");
-			}
-
-		});
-	}
-
-	// 表格行的单击事件
-	function _click() {
-		var tmpTr = $(this).clone();
-		tmpTr.unbind("click").click(_click);
-		// 判断父DIV的ID
-		if ($(this).closest(".table-container").attr("id") == "left_div") {
-			// 把要移动行的class=".seq"的HTML的内容设成另一分类的最后一个序号
-			$(".seq", tmpTr).html(
-					$("#right_div tbody tr:not(.muted)").length + 1);
-			$("#right_div tbody").append(tmpTr);
-			nextAllChildSeqMinusOne($(this));
-		} else {
-			// 把要移动行的class=".seq"的HTML的内容设成另一分类的最后一个序号
-			$(".seq", tmpTr).html(
-					$("#left_div tbody tr:not(.muted)").length + 1);
-			$("#left_div tbody").append(tmpTr);
-			nextAllChildSeqMinusOne($(this));
-		}
-		$(this).remove();
-	}
-
-	// 后面所有兄弟节点的中class=".seq"的HTML的内容自减 1
-	function nextAllChildSeqMinusOne(theElement) {
-		$.each(theElement.nextAll(), function(i, e) {
-			$(".seq", e).html($(".seq", e).html() - 1);
-		});
-	}
-	// 保存左边空表格
-	var leftDivTemplate = $("#left_div table").clone(true);
-	// 把左边表格的格式复制到右边
-	$("#right_div").append(leftDivTemplate);
-	//转换时间格式
-	function _dateFormat(list) {
-		var fs = 'YYYY-MM-DD HH:mm';
-		$.each(list, function(i, obj) {
-			obj.qyrq = moment(obj.qyrq).format(fs);
-		});
-	}
-
-	// 绑定查询事件
-	$("#setCL").click(setCLF);
-	var params = {};
-	function setCLF() {
-		$.ajax({
-			type: 'get',url: '/trmg/setCL',
-			data: params ,dataType:'text',
-			success:function(data) {
-				alert(data);
-			}, error : function() {
-				alert("操作失败");
-			}
-
-		});
-	}
-
-	// 绑定查询事件
-	$("#setSJ").click(setSJF);
-	var params = {};
-	function setSJF() {
-		$.ajax({
-			type: 'get',url: '/trmg/setSJ',
-			data: params ,dataType:'text',
-			success:function(data) {
-				alert(data);
-			}, error : function() {
-				alert("操作失败");
-			}
-
-		});
-	}
-
-	// 绑定查询事件
-	$("#setLD").click(setLDF);
-	var params = {};
-	function setLDF() {
-		$.ajax({
-			type: 'get',url: '/trmg/setLD',
-			data: params ,dataType:'text',
-			success:function(data) {
-				alert(data);
-			}, error : function() {
-				alert("操作失败");
-			}
-
-		});
-	}
-
-    // 绑定查询事件
-    $("#setLDFile").click(setLDFileF);
-    var params = {};
-    function setLDFileF() {
-        $.ajax({
-            type: 'get',url: '/trmg/setLDFile',
-            data: params ,dataType:'text',
-            success:function(data) {
-                alert(data);
-            }, error : function() {
-                alert("操作失败");
-            }
-
-        });
-    }
-
-	// 绑定查询事件
-	$("#setLCYH").click(setLCYHF);
-	var params = {};
-	function setLCYHF() {
-		$.ajax({
-			type: 'get',url: '/trmg/setLCYH',
-			data: params ,dataType:'text',
-			success:function(data) {
-				alert(data);
-			}, error : function() {
-				alert("操作失败");
-			}
-
-		});
-	}
-
-	// 绑定查询事件
-	$("#setDDRB").click(setDDRBF);
-	var params = {};
-	function setDDRBF() {
-		$.ajax({
-			type: 'get',url: '/trmg/setDDRB',
-			data: params ,dataType:'text',
-			success:function(data) {
-				alert(data);
-			}, error : function() {
-				alert("操作失败");
-			}
-
-		});
-	}
-
-	// 绑定查询事件
-	$("#setJHBC").click(setJHBCF);
-	var params = {};
-	function setJHBCF() {
-		$.ajax({
-			type: 'get',url: '/trmg/setJHBC',
-			data: params ,dataType:'text',
-			success:function(data) {
-				alert(data);
-			}, error : function() {
-				alert("操作失败");
-			}
-
-		});
-	}
-
-	// 绑定查询事件
-	$("#setXLPC").click(setXLPCF);
-	var params = {};
-	function setXLPCF() {
-		$.ajax({
-			type: 'get',url: '/trmg/setXLPC',
-			data: params ,dataType:'text',
-			success:function(data) {
-				alert(data);
-			}, error : function() {
-				alert("操作失败");
-			}
-
-		});
-	}
-
-
-	// 绑定查询事件
-	$("#setCS").click(setCSF);
-	var params = {};
-	function setCSF() {
-		$.ajax({
-			type: 'get',url: '/trmg/setCS',
-			data: params ,dataType:'text',
-			success:function(data) {
-				alert(data);
-			}, error : function() {
-				alert("操作失败");
-			}
-
-		});
-	}
-
-	// 绑定查询事件
-	$("#downloadAllDataFile").click(getDownLoadAllDataFileF);
-	var params = {};
-	function getDownLoadAllDataFileF() {
-		$.ajax({
-			type: 'get',url: '/trmg/getDownLoadAllDataFile',
-			data: params ,dataType:'text',
-			success:function(data) {
-				alert(data);
-			}, error : function() {
-				alert("操作失败");
-			}
-
-		});
-	}
-	
+/**
+ * 
+ * @JSName : timeTempletUpload.js(运管处js)
+ *
+ * @Author : bsth@zq
+ *
+ * @Description :  TODO(运管功能公共js)
+ *
+ * @Data : 2016年6月29日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ *
+ */
+
+(function(){
+	function getDate(cb) {
+		$.ajax({
+			url: "/real_control_v2/assets/imgs/time.gif",
+			type: "HEAD"
+		}).done(function (data, textStatus, jqXHR) {
+			cb(jqXHR && jqXHR.getResponseHeader("Date"))
+		}).fail(function (jqXHR, textStatus, errorThrown) {
+			cb(jqXHR && jqXHR.getResponseHeader("Date"))
+		})
+	}
+
+    function getComp(cb) {
+        $.get('/user/companyData',null,function(rs) {
+            return cb && cb(rs);
+        });
+    }
+
+    initLineSelect2();
+
+    function initLineSelect2(compD) {
+        getComp(function(rs) {
+            var params = {};
+            if(rs.length>0) {
+                var compA = new Array();
+                for(var c = 0 ; c<rs.length;c++) {
+                    var comC = rs[c].companyCode;
+                    var child = rs[c].children;
+                    if(child.length>0) {
+                        for(var d = 0 ;d< child.length;d++) {
+                            compA.push(comC + '_' + child[d].code);
+                        }
+                    }else {
+                        compA.push(comC);
+                    }
+                }
+                params.cgsbm_in  = compA.toString();
+            }
+            params["remove_ne"] = 1;
+            // 填充线路拉框选择值
+            $get('/line/all', params, function(array){
+                var len_ = array.length,paramsD = new Array();
+                if(len_>0) {
+                    $.each(array, function(i, g){
+                        if(g.name!='' || g.name != null) {
+                            paramsD.push({'id':g.id ,'text':g.name});
+                        }
+                    });
+                    initPinYinSelect2($('#line'),paramsD,function(selector) {
+                        selector.select2("val", storage.xlName_AgursData);
+                    });
+                }
+            });
+        });
+    }
+
+
+	// 绑定查询事件
+	$("#search").click(searchM);
+	// 绑定上传事件
+	$("#upload").click(uploadM);
+	// 绑定全部移到右边事件
+	$("#to_right").click(function() {
+		$("#left_div tbody tr:not(.muted)").dblclick();
+	});
+	// 绑定全部移到左边事件
+	$("#to_left").click(function() {
+		$("#right_div tbody tr:not(.muted)").dblclick();
+	});
+	// 查询方法
+	function searchM() {
+		// 清空已选定列表
+		$("#right_div table tbody").empty();
+		var params = {};
+		// 取得输入框的值
+		var inputs = $(".param input,select");
+		// 遍历数组
+        $.each(inputs, function(i, element) {
+            if($(element).attr("type") == 'checkbox'){
+                if($(element).is(':checked')){
+                    params[$(element).attr("name")] = $(element).val();
+                }
+            }else{
+                params[$(element).attr("name")] = $(element).val();
+            }
+        });
+        //params["isCancel_ne"] = true;// 过滤作废时刻表
+		var i = layer.load(2);
+		$get('/tic_ec', params, function(data) {
+			var content = data.data.content;
+			_dateFormat(content);
+			var bodyHtm = template('timeTemplet_list_temp', {
+				list : content
+			});
+			$("#left_div table tbody").empty();
+			$("#left_div table tbody").append(bodyHtm);
+			$("#left_div tbody tr:not(.muted)").dblclick(_dblclick);
+			$('.datetime').datetimepicker({
+				format : 'YYYY-MM-DD',
+				locale: 'zh-cn',
+				minDate: moment().add(1,'days').toString()
+			});
+			layer.close(i);
+		});
+	}
+
+	// 表格行的单击事件
+	function _dblclick() {
+		if ($('.datetime').data("DateTimePicker")) {
+			$('.datetime').data("DateTimePicker").destroy();
+		}
+		var tmpTr = $(this).clone();
+		tmpTr.unbind("dblclick").dblclick(_dblclick);
+		// 判断父DIV的ID
+		if ($(this).closest(".table-container").attr("id") == "left_div") {
+			// 把要移动行的class=".seq"的HTML的内容设成另一分类的最后一个序号
+			$(".seq", tmpTr).html(
+				$("#right_div tbody tr:not(.muted)").length + 1);
+			$("#right_div tbody").append(tmpTr);
+			nextAllChildSeqMinusOne($(this));
+		} else {
+			// 把要移动行的class=".seq"的HTML的内容设成另一分类的最后一个序号
+			$(".seq", tmpTr).html(
+				$("#left_div tbody tr:not(.muted)").length + 1);
+			$("#left_div tbody").append(tmpTr);
+			nextAllChildSeqMinusOne($(this));
+		}
+		$('#left_div .datetime').attr('disabled', false).datetimepicker({format : 'YYYY-MM-DD', locale: 'zh-cn', minDate: moment().add(1,'days').toString()});
+		$('#right_div .datetime').attr('disabled', true);
+		//$("#left_div .datetime")
+		$(this).remove();
+	}
+
+	// 上传方法
+	function uploadM() {
+
+		// 取得输入框的值
+		var trs = $("#right_div tbody tr input[name='tid']"), trs1 = $("#right_div tbody tr input[name='tqyrq']");
+		if (trs.length == 0) {
+			alert("请选择模板");
+			return;
+		}
+		var ids ="0,",qyrqs = "0,";
+		// 遍历数组
+		$.each(trs, function(i, element) {
+			ids +=$(element).val()+",";
+		});
+		$.each(trs1, function(i, element) {
+			qyrqs +=$(element).val()+",";
+		});
+		var params = {"ids":ids, "qyrqs":qyrqs};
+		$.ajax({
+			type: 'get',url: '/trmg/setSKB',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
+	// 后面所有兄弟节点的中class=".seq"的HTML的内容自减 1
+	function nextAllChildSeqMinusOne(theElement) {
+		$.each(theElement.nextAll(), function(i, e) {
+			$(".seq", e).html($(".seq", e).html() - 1);
+		});
+	}
+	// 保存左边空表格
+	var leftDivTemplate = $("#left_div table").clone(true);
+	// 把左边表格的格式复制到右边
+	$("#right_div").append(leftDivTemplate);
+	//转换时间格式
+	function _dateFormat(list) {
+		var fs = 'YYYY-MM-DD HH:mm';
+		$.each(list, function(i, obj) {
+			obj.qyrq = moment(obj.qyrq).format(fs);
+		});
+	}
+
+	// 绑定查询事件
+	$("#setCL").click(setCLF);
+	var params = {};
+	function setCLF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setCL',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
+	// 绑定查询事件
+	$("#setSJ").click(setSJF);
+	var params = {};
+	function setSJF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setSJ',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
+	// 绑定查询事件
+	$("#setLD").click(setLDF);
+	var params = {};
+	function setLDF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setLD',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
+    // 绑定查询事件
+    $("#setLDFile").click(setLDFileF);
+    var params = {};
+    function setLDFileF() {
+        $.ajax({
+            type: 'get',url: '/trmg/setLDFile',
+            data: params ,dataType:'text',
+            success:function(data) {
+                alert(data);
+            }, error : function() {
+                alert("操作失败");
+            }
+
+        });
+    }
+
+	// 绑定查询事件
+	$("#setLCYH").click(setLCYHF);
+	var params = {};
+	function setLCYHF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setLCYH',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
+	// 绑定查询事件
+	$("#setDDRB").click(setDDRBF);
+	var params = {};
+	function setDDRBF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setDDRB',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
+	// 绑定查询事件
+	$("#setJHBC").click(setJHBCF);
+	var params = {};
+	function setJHBCF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setJHBC',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
+	// 绑定查询事件
+	$("#setXLPC").click(setXLPCF);
+	var params = {};
+	function setXLPCF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setXLPC',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
+
+	// 绑定查询事件
+	$("#setCS").click(setCSF);
+	var params = {};
+	function setCSF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setCS',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
+	// 绑定查询事件
+	$("#downloadAllDataFile").click(getDownLoadAllDataFileF);
+	var params = {};
+	function getDownLoadAllDataFileF() {
+		$.ajax({
+			type: 'get',url: '/trmg/getDownLoadAllDataFile',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+	
 })();
 \ No newline at end of file
-<link href="css/trafficManage.css" rel="stylesheet" type="text/css" />
-<ul class="page-breadcrumb breadcrumb">
-	<li><a href="/pages/home.html" data-pjax>首页</a> <i
-		class="fa fa-circle"></i></li>
-	<li><span class="active">运维管理</span> <i class="fa fa-circle"></i></li>
-	<li><span class="active">时刻模板上传</span></li>
-</ul>
-<div class="tab_line">
-	<div class="col-md-12">
-		<form class="form-inline" action="">
-			<div style="display: inline-block;" class="param">
-				<span class="item-label" style="width: 80px;">线路: </span>
-				<select class="form-control" name="xl.id_eq" id="line" style="width: 180px;"></select>
-			</div>
-			<div style="display: inline-block;margin-left: 15px;" class="param">
-				<span class="item-label" style="width: 80px;">模板名称（关键字）： </span>
-				<input class="form-control" type="text" id="tempName" name="name_like" style="width: 180px;"/>
-			</div>
-			<div style="display: inline-block;margin-left: 15px;" class="param">
-				<input type="checkbox" class="group-checkable icheck" name="isEnableDisTemplate_eq" value="true" checked> 是否启用
-			</div>
-			<div class="form-group" style="display: inline-block;margin-left: 15px;">
-				<input class="btn btn-default" type="button" id="search" value="查询"/>
-				<input class="btn btn-default" type="button" id="upload" value="上传"/>
-				<!-- <input class="btn btn-default" type="button" id="setXL" value="上传线路"/>
-				<input class="btn btn-default" type="button" id="setCL" value="上传车辆"/>
-				<input class="btn btn-default" type="button" id="setSJ" value="上传司机"/>
-				<input class="btn btn-default" type="button" id="setCS" value="超速"/>
-				<input class="btn btn-default" type="button" id="setXLPC" value="线路人员车辆"/>
-				<input class="btn btn-default" type="button" id="setJHBC" value="线路计划班次表"/> -->
-			</div>
-		</form>
-	</div>
-	<!-- Begin: left-div -->
-	<div class="col-md-5 panel-wrap" style="height: 60%;">
-		<div class="_panel">
-			<div class="_head" style="color: #2765A7;">待选线路模板列表</div>
-			<div class="table-container" id="left_div">
-				<table
-					class="table table-striped table-bordered table-advance pb-table head">
-					<thead>
-						<tr>
-							<th width="5%">#</th>
-							<th width="20%">线路名称</th>
-							<th width="15%">模板ID</th>
-							<th width="25%">模板名称</th>
-							<th>启用日期</th>
-						</tr>
-					</thead>
-					<tbody>
-					</tbody>
-				</table>
-			</div>
-		</div>
-	</div>
-	<div class="col-md-2" style="height: 60%;">
-		<ul class="breadcruma divVerHorCenter">
-			<li><a class="btn btn-circle blue btn-outline" id="to_right">>></a></li>
-			<li><a class="btn btn-circle blue btn-outline" id="to_left"><<</a></li>
-		</ul>
-	</div>
-	<!-- End: left-div -->
-	<!-- Begin: right-div -->
-	<div class="col-md-5 panel-wrap" style="height: 60%;">
-		<div class="_panel">
-			<div class="_head" style="color: #2765A7;">已选线路模板列表</div>
-			<div class="table-container" id="right_div"></div>
-		</div>
-	</div>
-	<!-- End: right-div -->
-</div>
-<script id="timeTemplet_list_temp" type="text/html">
-{{each list as obj i}}
-<tr>
-	<td class="seq" style="vertical-align: middle;">
-		{{i+1}}
-	</td>
-	<td>
-		{{obj.xl.name}}
-	</td>
-	<td class="ttInfoId">
-		{{obj.id}}
-		<input type="hidden" value="{{obj.id}}"/>
-	</td>
-	<td>
-		{{obj.name}}
-	</td>
-	<td >
-		{{obj.qyrq}}
-	</td>
-</tr>
-{{/each}}
-{{if list.length == 0}}
-<tr class="muted">
-	<td colspan=5 style="text-align: center;"><h6>没有找到相关数据</h6></td>
-</tr>
-{{/if}}
-	</script>
+<link href="css/trafficManage.css" rel="stylesheet" type="text/css" />
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>首页</a> <i
+		class="fa fa-circle"></i></li>
+	<li><span class="active">运维管理</span> <i class="fa fa-circle"></i></li>
+	<li><span class="active">时刻模板上传</span></li>
+</ul>
+<div class="tab_line">
+	<div class="col-md-12">
+		<form class="form-inline" action="">
+			<div style="display: inline-block;" class="param">
+				<span class="item-label" style="width: 80px;">线路: </span>
+				<select class="form-control" name="xl.id_eq" id="line" style="width: 180px;"></select>
+			</div>
+			<div style="display: inline-block;margin-left: 15px;" class="param">
+				<span class="item-label" style="width: 80px;">模板名称（关键字）： </span>
+				<input class="form-control" type="text" id="tempName" name="name_like" style="width: 180px;"/>
+			</div>
+			<div style="display: inline-block;margin-left: 15px;" class="param">
+				<input type="checkbox" class="group-checkable icheck" name="isEnableDisTemplate_eq" value="true" checked> 是否启用
+			</div>
+			<div class="form-group" style="display: inline-block;margin-left: 15px;">
+				<input class="btn btn-default" type="button" id="search" value="查询"/>
+				<input class="btn btn-default" type="button" id="upload" value="上传"/>
+				<!-- <input class="btn btn-default" type="button" id="setXL" value="上传线路"/>
+				<input class="btn btn-default" type="button" id="setCL" value="上传车辆"/>
+				<input class="btn btn-default" type="button" id="setSJ" value="上传司机"/>
+				<input class="btn btn-default" type="button" id="setCS" value="超速"/>
+				<input class="btn btn-default" type="button" id="setXLPC" value="线路人员车辆"/>
+				<input class="btn btn-default" type="button" id="setJHBC" value="线路计划班次表"/> -->
+			</div>
+		</form>
+	</div>
+	<!-- Begin: left-div -->
+	<div class="col-md-5 panel-wrap" style="height: 60%;">
+		<div class="_panel">
+			<div class="_head" style="color: #2765A7;">待选线路模板列表</div>
+			<div class="table-container" id="left_div">
+				<table
+					class="table table-striped table-bordered table-advance pb-table head">
+					<thead>
+						<tr>
+							<th width="5%">#</th>
+							<th width="20%">线路名称</th>
+							<th width="15%">模板ID</th>
+							<th width="25%">模板名称</th>
+							<th>灾备系统启用日期</th>
+						</tr>
+					</thead>
+					<tbody>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+	<div class="col-md-2" style="height: 60%;">
+		<ul class="breadcruma divVerHorCenter">
+			<li><a class="btn btn-circle blue btn-outline" id="to_right">>></a></li>
+			<li><a class="btn btn-circle blue btn-outline" id="to_left"><<</a></li>
+		</ul>
+	</div>
+	<!-- End: left-div -->
+	<!-- Begin: right-div -->
+	<div class="col-md-5 panel-wrap" style="height: 60%;">
+		<div class="_panel">
+			<div class="_head" style="color: #2765A7;">已选线路模板列表</div>
+			<div class="table-container" id="right_div"></div>
+		</div>
+	</div>
+	<!-- End: right-div -->
+</div>
+<script id="timeTemplet_list_temp" type="text/html">
+{{each list as obj i}}
+<tr>
+	<td class="seq" style="vertical-align: middle;">
+		{{i+1}}
+	</td>
+	<td>
+		{{obj.xl.name}}
+	</td>
+	<td class="ttInfoId">
+		{{obj.id}}
+		<input name="tid" type="hidden" value="{{obj.id}}"/>
+	</td>
+	<td>
+		{{obj.name}}
+	</td>
+	<td >
+		<input name="tqyrq" type="text" value="{{obj.qyrq}}" class="datetime" style="border: 0px;"/>
+	</td>
+</tr>
+{{/each}}
+{{if list.length == 0}}
+<tr class="muted">
+	<td colspan=5 style="text-align: center;"><h6>没有找到相关数据</h6></td>
+</tr>
+{{/if}}
+	</script>
 <script src="./js/timeTempletUpload.js"></script>
 \ No newline at end of file
@@ -110,12 +110,12 @@
 </script>
 <!-- 地图相关 -->
-<script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
-<script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
+<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
 <script src="/assets/js/TransGPS.js" merge="plugins"></script>
 <!-- 高德  -->
-<script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script>
+<script src="//webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script>
 <!-- jquery -->
 <script src="/real_control_v2/assets/js/jquery.min.js"></script>
 <!-- jquery actual -->
@@ -266,7 +266,7 @@
                 </div>
             </div>
             <div class="uk-form-row">
-                <label class="uk-form-label" ">分机号:</label>
+                <label class="uk-form-label">分机号:</label>
                 <div class="uk-form-controls">
                     <input type="text" name="dn" value="" >
                 </div>