Merge branch 'minhang' into pudong

潘钊
2 parents 359a20d9 f4fbc36d
Showing 75 changed files with 4113 additions and 454 deletions
pom.xml
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/PersonnelController.java
src/main/java/com/bsth/controller/SectionController.java
src/main/java/com/bsth/controller/SectionRouteController.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/pinyin/PersionPinYin.java
src/main/java/com/bsth/data/pinyin/PersionPinYinBuffer.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/f_a_l/FirstAndLastHandler.java
src/main/java/com/bsth/data/schedule/f_a_l/entity/ToGateway.java
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/entity/SectionRouteCache.java
@@ -299,6 +299,11 @@
             <version>3.3.0</version>
         </dependency>
  
+		<dependency>
+			<groupId>com.github.stuxuhai</groupId>
+			<artifactId>jpinyin</artifactId>
+			<version>1.1.8</version>
+		</dependency>
 	</dependencies>
  
 	<dependencyManagement>
@@ -129,7 +129,7 @@ public class XDApplication implements CommandLineRunner {
  
         //运管处静态数据提交
         log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
-        sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiff / 1000 + 60 * 60 * 5, 60 * 60 * 24, TimeUnit.SECONDS);
         //计算油、公里加注
         sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
  
 package com.bsth.controller;
  
+import com.bsth.common.Constants;
+import com.bsth.data.pinyin.PersionPinYin;
+import com.bsth.data.pinyin.PersionPinYinBuffer;
 import com.bsth.entity.Personnel;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.service.PersonnelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -8,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
  
@@ -21,8 +26,22 @@ public class PersonnelController extends BaseController&lt;Personnel, Integer&gt; {
     @Autowired
     private PersonnelService service;
  
+    @Autowired
+    PersionPinYinBuffer persionPinYinBuffer;
+
     @RequestMapping(value = "/sreachPersonnel", method = RequestMethod.GET)
 	public List<Map<String, String>> sreachPersonnel(@RequestParam String jobCode) {
 		return service.sreachPersonnel(jobCode);
 	}
+
+    @RequestMapping(value = "/all_py", method = RequestMethod.GET)
+	public List<PersionPinYin> findAll_PY(){
+        return persionPinYinBuffer.getAll();
+    }
+
+    @RequestMapping(value = "/list_py", method = RequestMethod.GET)
+    public List<PersionPinYin> findByCurrUser_PY(HttpServletRequest request){
+        List<CompanyAuthority> auths = (List<CompanyAuthority>) request.getSession().getAttribute(Constants.COMPANY_AUTHORITYS);
+        return persionPinYinBuffer.getAll(auths);
+    }
 }
@@ -60,6 +60,26 @@ public class SectionController extends BaseController&lt;Section, Integer&gt; {
 	 * 
 	 * @return Map<String, Object> <SUCCESS ; ERROR>
 	 */
+	@RequestMapping(value="sectionCut" , method = RequestMethod.POST)
+	public Map<String, Object> sectionCut(@RequestParam Map<String, Object> map) {
+		
+		map.put("updateBy", "");
+		
+		map.put("createBy", "");
+		
+		map.put("createDate", "");
+		
+		return service.sectionCut(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) {
  
@@ -74,6 +94,22 @@ public class SectionController extends BaseController&lt;Section, Integer&gt; {
 	}
  
 	/**
+	 * @Description :TODO(编辑缓存线路走向)
+	 */
+	@RequestMapping(value="sectionCacheUpdate" , method = RequestMethod.POST)
+	public Map<String, Object> sectionCacheUpdate(@RequestParam Map<String, Object> map) {
+		
+		map.put("updateBy", "");
+		
+		map.put("createBy", "");
+		
+		map.put("createDate", "");
+		
+		return service.sectionCacheUpdate(map);
+		
+	}
+	
+	/**
 	 * @Description :TODO(查询路段编码)
 	 * 
 	 * @return int <sectionCode路段编码>
@@ -70,6 +70,18 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
  
  
 	/**
+	 * @Description :TODO(查询路段信息)
+	 * 
+	 * @param map <line.id_eq:线路ID； directions_eq：方向>
+	 * 
+	 * @return Map<String, Object> 
+	 */
+	@RequestMapping(value = "/findSectionCache" , method = RequestMethod.GET)
+	public  List<Map<String, Object>> findPointsCache(@RequestParam Map<String, Object> map) {
+		return routeService.getSectionRouteCache(map);
+	}
+	
+	/**
 	 * @Description : TODO(根据路段路由Id查询详情)
 	 * 
 	 * @param  map <id:路段路由ID> 
@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
+import antlr.collections.List;
+
 import com.bsth.entity.Station;
 import com.bsth.service.StationService;
 import com.bsth.util.GetUIDAndCode;
@@ -36,6 +38,17 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	private StationService service;
  
 	/**
+	 * @Description :TODO(根据坐标点匹配数据库中的站点)
+	 * 
+	 * @param map: <point:坐标点； name:站点名>
+	 * 
+	 */
+	@RequestMapping(value="matchStation" , method = RequestMethod.GET)
+	public Map<String, Object> matchStation(@RequestParam Map<String, Object> map) {
+		return service.matchStation(map);
+	}	
+	
+	/**
 	 * @Description :TODO(系统规划保存数据)
 	 * 
 	 * @param map <stationJSON:站点信息；
@@ -68,6 +81,11 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 		return service.manualSave(map);
 	}
  
+	@RequestMapping(value="cacheSave" , method = RequestMethod.POST)
+	public Map<String, Object> cacheSave(@RequestParam Map<String, Object> map) {
+		return service.cacheSave(map);
+	}
+	
 	/**
 	 * @Description :TODO(新增站点保存)
 	 * 
@@ -99,6 +99,18 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	}
  
 	/**
+	 * @Description :TODO(查询线路某方向下所有站点的中心百度坐标)
+	 * 
+	 * @param map <lineId:线路ID； direction：方向>
+	 * 
+	 * @return List<Map<String, Object>> 
+	 */
+	@RequestMapping(value = "/getStationRouteCacheCenterPoints" , method = RequestMethod.GET)
+	public List<Map<String, Object>> getStationRouteCacheCenterPoints(@RequestParam Map<String, Object> map) {
+		return service.getStationRouteCacheCenterPoints(map);
+	}
+	
+	/**
 	 * @Description :TODO(撤销站点)
 	 * 
 	 * @param map <lineId:线路ID； destroy：是否撤销（0：否；1：是）>
@@ -195,12 +195,10 @@ public class GpsController {
     }
  
 	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
-	public PageObject<GpsSpeed> pagequery(@RequestParam Map<String, Object> map){
-		PageObject<GpsSpeed> pageObject = null;
+	public Map<String, Object> pagequery(@RequestParam Map<String, Object> map){
 		map.put("curPage", map.get("page").toString());
 		map.put("pageData","10");
-		pageObject=gpsService.Pagequery(map);
-		return pageObject;
+		return gpsService.Pagequery(map);
 	}
  
 }
 package com.bsth.controller.realcontrol;
  
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
@@ -60,16 +59,16 @@ public class BasicDataController {
 		return rs;
 	}
  
-	@RequestMapping("/personnel")
+	/*@RequestMapping("/personnel")
 	public Map<String, Object> findPersonnelInfo(){
 		Map<String, Object> rs = new HashMap<>();
 		PersonnelFieldFilter filter=new PersonnelFieldFilter();
 		//驾驶员
 		rs.put("jsy", JSON.parse(JSON.toJSONString(BasicData.jsyMap.values(), filter)));
 		//售票员
-		rs.put("spy", JSON.parse(JSON.toJSONString(BasicData.spyMap.values(), filter)));
+		rs.put("spy", JSON.parse(JSON.toJSONString(BasicData.spyMap.values(), filter)));*//*
 		return rs;
-	}
+	}*/
  
 	@RequestMapping("/all_personnel")
 	public Map<String, String> all_personnel(){
@@ -179,15 +178,12 @@ public class BasicDataController {
 				map.put("lineCode", line.getLineCode());
 				rs.add(map);
 			}
-				//listMultimap.put(line.getName(), nbbm);
 		}
-		//return listMultimap.asMap();
-
 		return rs;
 	}
  
 	/**
-	 * 获取站点和停车场对照表
+	 * 获取站点和停车场历时公里对照表
 	 * @param idx
 	 * @return
 	 */
@@ -335,8 +335,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/correctForm")
 	public List<SchEditInfoDto> correctForm(@RequestParam String line, @RequestParam String date,
 											@RequestParam String endDate,
-											 @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
-		return scheduleRealInfoService.correctForm(line, date, endDate, lpName, code, type);
+											 @RequestParam String lpName, @RequestParam String code, 
+											 @RequestParam String type,@RequestParam String changType) {
+		return scheduleRealInfoService.correctForm(line, date, endDate, lpName, code, type,changType);
 	}
 	/**
 	 * @Title queryListWaybill
@@ -6,12 +6,15 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
  
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.excep.ArrivalInfo;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -276,4 +279,40 @@ public class ReportController {
 	public List<Map<String, Object>> countDjg(@RequestParam Map<String, Object> map){
 		return service.countDjg(map);
 	}
+	
+	
+	@RequestMapping(value="/countDjgXx")
+	public List<Map<String, Object>> countDjgXx(@RequestParam Map<String, Object> map){
+		List<Map<String, Object>> lMap=new ArrayList<Map<String, Object>>();
+		String json =StringEscapeUtils.unescapeHtml4(map.get("listXx").toString());
+		JSONArray jsonArray=JSONArray.parseArray(json);
+		JSONObject jsonObject;
+		for (int x = 0; x < jsonArray.size(); x++) {
+			jsonObject=jsonArray.getJSONObject(x);
+			Map<String, Object> m_=new HashMap<String,Object>();
+			m_.put("fgsname", jsonObject.getString("fgsname"));
+			m_.put("xlName", jsonObject.getString("xlName"));
+			m_.put("djgde", jsonObject.getString("djgde"));
+			m_.put("qJh", jsonObject.getString("qJh"));
+			m_.put("qSj", jsonObject.getString("qSj"));
+			m_.put("hJh", jsonObject.getString("hJh"));
+			m_.put("hSj", jsonObject.getString("hSj"));
+			lMap.add(m_);
+		}
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		Map<String, Object> m = new HashMap<String, Object>();
+		m.put("date", map.get("date").toString());
+        ReportUtils ee = new ReportUtils();
+        try {
+            listI.add(lMap.iterator());
+            String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+            ee.excelReplace(listI, new Object[]{m}, path + "mould/countIntervalXx.xls",
+                    path + "export/大间隔统计表详细.xls");
+        } catch (Exception e) {
+            // TODO: handle exception
+            e.printStackTrace();
+        }
+		
+		return lMap;
+	}
 }
@@ -2,6 +2,7 @@ package com.bsth.data;
  
 import com.bsth.Application;
 import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.pinyin.PersionPinYinBuffer;
 import com.bsth.entity.*;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.*;
@@ -64,10 +65,10 @@ public class BasicData implements CommandLineRunner {
     //线路Code和shangHaiLinecode 对照
     public static Map<String, String> lineCode2ShangHaiCodeMap;
  
-    //驾驶员工号 和 personnel 对象映射
+    /*//驾驶员工号 和 personnel 对象映射
     public static Map<String, Personnel> jsyMap;
     //售票员工号 和 personnel 对象映射
-    public static Map<String, Personnel> spyMap;
+    public static Map<String, Personnel> spyMap;*/
     //所以员工和personnerl 对象映射
     public static Map<String, Personnel> perMap;
     //全量员工 工号和姓名对照
@@ -137,6 +138,9 @@ public class BasicData implements CommandLineRunner {
         @Autowired
         Station2ParkBuffer station2ParkBuffer;
  
+        @Autowired
+        PersionPinYinBuffer persionPinYinBuffer;
+
  
         @Override
         public void run() {
@@ -165,6 +169,8 @@ public class BasicData implements CommandLineRunner {
                 geoCacheData.loadData();
                 station2ParkBuffer.saveAll();
                 logger.info("加载基础数据成功！，");
+                //人员拼音转换
+                persionPinYinBuffer.refresh();
             } catch (Exception e) {
                 logger.error("加载基础数据时出现异常，", e);
             }
@@ -321,7 +327,7 @@ public class BasicData implements CommandLineRunner {
         public void loadPersonnelInfo() {
             Iterator<Personnel> iterator = personnelRepository.findAll().iterator();
  
-            Map<String, Personnel> jsyTempMap = new HashMap<>(), spyTempMap = new HashMap<>(),perTempMap=new HashMap<>();
+            Map<String, Personnel> /*jsyTempMap = new HashMap<>(), spyTempMap = new HashMap<>(),*/perTempMap=new HashMap<>();
             Map<String, String> allPersonMap = new HashMap<>();
  
             Personnel p;
@@ -333,20 +339,20 @@ public class BasicData implements CommandLineRunner {
                 if (StringUtils.isEmpty(jobCode))
                     continue;
  
-                if (p.getPosts() != null) {
+                /*if (p.getPosts() != null) {
                     if (p.getPosts().equals("1"))
                         jsyTempMap.put(jobCode, p);
                     else if (p.getPosts().equals("2"))
                         spyTempMap.put(jobCode, p);
-                }
+                }*/
  
                 perTempMap.put(jobCode, p);
  
                 allPersonMap.put(jobCode, p.getPersonnelName());
             }
  
-            jsyMap = jsyTempMap;
-            spyMap = spyTempMap;
+            //jsyMap = jsyTempMap;
+            //spyMap = spyTempMap;
             allPerson = allPersonMap;
             perMap = perTempMap;
         }
+package com.bsth.data.pinyin;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * 人员拼音映射
+ * Created by panzhao on 2017/7/19.
+ */
+public class PersionPinYin {
+
+    /**
+     * Id
+     */
+    private Integer id;
+
+    /**
+     * 工号
+     */
+    private String workId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 全拼
+     */
+    private String fullChars;
+
+    /**
+     * 简便
+     */
+    private String camelChars;
+
+    /**
+     * 所属公司编码
+     */
+    @JsonIgnore
+    private String companyId;
+
+    /**
+     * 所属分公司编码
+     */
+    @JsonIgnore
+    private String fgsCompanyId;
+
+    public String getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(String workId) {
+        this.workId = workId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getFullChars() {
+        return fullChars;
+    }
+
+    public void setFullChars(String fullChars) {
+        this.fullChars = fullChars;
+    }
+
+    public String getCamelChars() {
+        return camelChars;
+    }
+
+    public void setCamelChars(String camelChars) {
+        this.camelChars = camelChars;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getFgsCompanyId() {
+        return fgsCompanyId;
+    }
+
+    public void setFgsCompanyId(String fgsCompanyId) {
+        this.fgsCompanyId = fgsCompanyId;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+}
+package com.bsth.data.pinyin;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.Personnel;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.github.stuxuhai.jpinyin.PinyinException;
+import com.github.stuxuhai.jpinyin.PinyinFormat;
+import com.github.stuxuhai.jpinyin.PinyinHelper;
+import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 人员拼音数据映射缓存
+ * Created by panzhao on 2017/7/19.
+ */
+@Component
+public class PersionPinYinBuffer {
+
+    static ArrayListMultimap<String, PersionPinYin> listMultimap = ArrayListMultimap.create();
+    static List<PersionPinYin> all = new ArrayList<>();
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+
+    public void refresh(){
+        ArrayListMultimap<String, PersionPinYin> listMultimapCopy = ArrayListMultimap.create();
+        List<PersionPinYin> allCopy = new ArrayList<>();
+        PersionPinYin ppy;
+
+        Collection<Personnel> list = BasicData.perMap.values();
+        for(Personnel p : list){
+            ppy = new PersionPinYin();
+            ppy.setId(p.getId());
+            ppy.setCompanyId(p.getCompanyCode());
+            ppy.setFgsCompanyId(p.getBrancheCompanyCode());
+            ppy.setName(p.getPersonnelName());
+            ppy.setWorkId(p.getJobCode());
+            try {
+                ppy.setFullChars(PinyinHelper.convertToPinyinString(ppy.getName(), "" , PinyinFormat.WITHOUT_TONE));
+                ppy.setCamelChars(PinyinHelper.getShortPinyin(ppy.getName()));
+            }catch (PinyinException pye){
+                log.error("拼音转换出现异常，" + ppy.getName(), pye);
+                continue;
+            }
+
+            listMultimapCopy.put(ppy.getCompanyId() + "_" + ppy.getFgsCompanyId(), ppy);
+            allCopy.add(ppy);
+        }
+
+        if(allCopy.size() > 0){
+            all = allCopy;
+            listMultimap = listMultimapCopy;
+        }
+    }
+
+    public List<PersionPinYin> getAll(){
+        return all;
+    }
+
+    public List<PersionPinYin> getAll(List<CompanyAuthority> auths){
+        List<PersionPinYin> rs = new ArrayList<>();
+        for(CompanyAuthority ca : auths){
+            rs.addAll(listMultimap.get(ca.getCompanyCode() + "_" + ca.getSubCompanyCode()));
+        }
+        return rs;
+    }
+}
@@ -7,6 +7,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
+import com.bsth.data.schedule.f_a_l.FirstAndLastHandler;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -176,6 +177,8 @@ public class DayOfSchedule {
             //添加到缓存
             putAll(list);
  
+            //标记首末班
+            FirstAndLastHandler.marks(list);
  
             Set<String> lps = searchAllLP(list);
             for (String lp : lps) {
@@ -794,6 +797,7 @@ public class DayOfSchedule {
  
     public void save(ScheduleRealInfo sch) {
         //schRepository.save(sch);
+        sch.setUpdateDate(new Date());
         pstBuffer.add(sch);
     }
  
+package com.bsth.data.schedule.f_a_l;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.f_a_l.entity.ToGateway;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.util.db.DBUtils_MS;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 首末班处理程序
+ * Created by panzhao on 2017/7/19.
+ */
+@Component
+public class FirstAndLastHandler {
+
+    static ConcurrentHashMap<String, ToGateway> maps = new ConcurrentHashMap<>();
+
+    static Logger log = LoggerFactory.getLogger(FirstAndLastHandler.class);
+
+    static boolean flag;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    public void marks(String lineCode){
+        marks(dayOfSchedule.findByLineCode(lineCode));
+    }
+
+    /**
+     * 标记首末班
+     * @param list
+     */
+    public static void marks(List<ScheduleRealInfo> list){
+        try{
+            Collections.sort(list, new ScheduleComparator.FCSJ());
+            //按上下行分组
+            List<ScheduleRealInfo> ups = new ArrayList<>(),
+                    downs = new ArrayList<>();
+
+            for(ScheduleRealInfo sch : list){
+                if(sch.getXlDir().equals("0"))
+                    ups.add(sch);
+                else
+                    downs.add(sch);
+            }
+
+            markOneWay(ups);
+            markOneWay(downs);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    /**
+     * 标记单程，上行或下行
+     * @param list
+     */
+    private static void markOneWay(List<ScheduleRealInfo> list){
+        ScheduleRealInfo first = null, last = null;
+
+        for(ScheduleRealInfo sch: list){
+            if(sch._isInout() || sch.getBcType().equals("region")
+                    || sch.getBcType().equals("venting"))
+                continue;
+
+            if(first == null)
+                first = sch;
+
+            last = sch;
+        }
+
+        put(first, last);
+    }
+
+    private static void put(ScheduleRealInfo first, ScheduleRealInfo last){
+        if(first == null || last == null)
+            return;
+
+        ToGateway tg = new ToGateway();
+        tg.setLineCode(first.getXlBm());
+        tg.setUpDown(Integer.parseInt(first.getXlDir()));
+        tg.setsDeviceId(BasicData.deviceId2NbbmMap.inverse().get(first.getClZbh()));
+        tg.setSt(first.getDfsjT());
+
+        tg.setRq(first.getScheduleDateStr());
+
+        tg.seteDeviceId(BasicData.deviceId2NbbmMap.inverse().get(last.getClZbh()));
+        tg.setEt(last.getDfsjT());
+
+        maps.put(tg.getLineCode() + "_" + tg.getUpDown(), tg);
+        flag = true;
+    }
+
+    public static void saveAll(){
+        if(!flag)
+            return;
+
+        final List<ToGateway> pstList = new ArrayList<>(maps.values());
+        if(pstList == null || pstList.size() == 0)
+            return;
+
+        flag = false;
+        JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_MS.getDataSource());
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemp.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+        try{
+            //删除
+            jdbcTemp.update("delete from bsth_t_first_last");
+            //重新写入
+            jdbcTemp.batchUpdate("insert into bsth_t_first_last(line_code, s_device_id, st, e_device_id, et, up_down, rq) VALUES(?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                    ToGateway tg = pstList.get(i);
+                    ps.setString(1, tg.getLineCode());
+                    ps.setString(2, tg.getsDeviceId());
+                    ps.setLong(3, tg.getSt());
+                    ps.setString(4, tg.geteDeviceId());
+                    ps.setLong(5, tg.getEt());
+                    ps.setInt(6, tg.getUpDown());
+                    ps.setString(7, tg.getRq());
+                }
+
+                @Override
+                public int getBatchSize() {
+                    return pstList.size();
+                }
+            });
+
+            log.info("首末班数据入库，" + pstList.size());
+            tran.commit(status);
+        }catch (Exception e){
+            log.error("", e);
+            tran.rollback(status);
+        }
+    }
+}
+package com.bsth.data.schedule.f_a_l.entity;
+
+/**
+ * 发送给网关的首末班数据格式
+ * Created by panzhao on 2017/7/19.
+ */
+public class ToGateway {
+
+    /** 线路 */
+    private String lineCode;
+
+    /** 上下行 */
+    private int upDown;
+
+    /** 首班设备号 */
+    private String sDeviceId;
+
+    /** 首班时间 */
+    private Long st;
+
+    /** 末班设备号 */
+    private String eDeviceId;
+
+    /** 末班时间 */
+    private Long et;
+
+    /** 班次日期 */
+    private String rq;
+
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Long getSt() {
+        return st;
+    }
+
+    public void setSt(Long st) {
+        this.st = st;
+    }
+
+    public Long getEt() {
+        return et;
+    }
+
+    public void setEt(Long et) {
+        this.et = et;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getsDeviceId() {
+        return sDeviceId;
+    }
+
+    public void setsDeviceId(String sDeviceId) {
+        this.sDeviceId = sDeviceId;
+    }
+
+    public String geteDeviceId() {
+        return eDeviceId;
+    }
+
+    public void seteDeviceId(String eDeviceId) {
+        this.eDeviceId = eDeviceId;
+    }
+}
 package com.bsth.data.schedule.thread;
  
+import com.alibaba.fastjson.JSON;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.orm.jpa.JpaObjectRetrievalFailureException;
+import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Component;
  
-import javax.persistence.EntityNotFoundException;
-
 /**
  * @author PanZhao
  * @ClassName: SchedulePstThread
@@ -23,36 +23,68 @@ public class SchedulePstThread extends Thread {
     @Autowired
     ScheduleRealInfoRepository scheduleRepository;
  
+    @Autowired
+    NamedParameterJdbcTemplate jdbcTemplate;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
  
     @Override
     public void run() {
  
-        //LinkedList<ScheduleRealInfo> list = DayOfSchedule.pstBuffer;
-
         ScheduleRealInfo schedule;
         for (int i = 0; i < 1000; i++) {
             schedule = DayOfSchedule.pstBuffer.poll();
             if (null == schedule)
                 break;
  
-            if(schedule.isDeleted()){
+            if (schedule.isDeleted()) {
                 logger.error("save 发现 deleted=true 的班次，id: " + schedule.getId());
                 continue;
             }
  
-            try {
-                scheduleRepository.save(schedule);
-            }
-            catch (JpaObjectRetrievalFailureException e1){
-                logger.error("JpaObjectRetrievalFailureException error.... 可忽略");
-            }
-            catch(EntityNotFoundException e2){
-                logger.error("EntityNotFoundException error.... 可忽略");
-            }
-            catch (Exception e) {
-                logger.error("班次入库的时候出现未知异常！！", e);
-            }
+            save(schedule);
+        }
+    }
+
+    /**
+     * 班次更新到数据库，不走jpa
+     *
+     * @param sch
+     */
+    public void save(ScheduleRealInfo sch) {
+        if (sch.getId() == null) {
+            logger.error("入库的班次没有ID, " + JSON.toJSONString(sch));
+            return;
+        }
+
+        if(sch.getSaveFailCount() > 5){
+            logger.error("入库失败上限, " + JSON.toJSONString(sch));
+            return;
+        }
+
+        try {
+            String sql = "UPDATE bsth_c_s_sp_info_real" +
+                    " SET adjust_exps=:adjustExps, bc_type=:bcType, bcs=:bcs, bcsj=:bcsj, ccno=:ccno, cl_zbh=:clZbh, df_auto=:dfAuto," +
+                    " dfsj=:dfsj, directive_state=:directiveState, fcno=:fcno, fcsj=:fcsj, fcsj_actual=:fcsjActual, fgs_bm=:fgsBm, fgs_name=:fgsName, gs_bm=:gsBm, gs_name=:gsName," +
+                    " j_gh=:jGh, j_name=:jName, jhlc=:jhlc, jhlc_orig=:jhlcOrig, lp_name=:lpName, ONLINE=:online, qdz_code=:qdzCode, qdz_name=:qdzName," +
+                    " real_exec_date=:realExecDate, reissue=:reissue, remarks=:remarks, s_gh=:sGh, s_name=:sName, schedule_date=:scheduleDate," +
+                    " schedule_date_str=:scheduleDateStr, sflj=:sflj, sp_id=:spId, STATUS=:status, update_date=:updateDate, xl_bm=:xlBm, xl_dir=:xlDir, xl_name=:xlName," +
+                    " zdsj=:zdsj, zdsj_actual=:zdsjActual, zdz_code=:zdzCode, zdz_name=:zdzName" +
+                    " WHERE " +
+                    " id=:id";
+
+            jdbcTemplate.update(sql, new BeanPropertySqlParameterSource(sch));
+            sch.setSaveFailCount(0);
+        } catch (Exception e) {
+            //下次入库再试
+            sch.setSaveFailCount(sch.getSaveFailCount()+1);
+            dayOfSchedule.save(sch);
+
+            logger.error("班次 " + sch.getId() + "入库失败，" + JSON.toJSONString(sch));
+            logger.error("", e);
         }
     }
 }
@@ -5,6 +5,7 @@ import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.f_a_l.FirstAndLastHandler;
 import com.bsth.entity.realcontrol.LineConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,7 +70,9 @@ public class ScheduleRefreshThread extends Thread{
 					logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
 				}
 			}
-			
+
+			//首末班入库（给网关用的数据）
+			FirstAndLastHandler.saveAll();
 		} catch (Exception e) {
 			logger.error("", e);
 		}
+package com.bsth.entity;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+
+/**
+ * 
+ * @ClassName : SectionRoute(路段路由缓存实体类)
+ * 
+ * @Author : bsth@lq
+ * 
+ * @Description : TODO(路段路由)
+ * 
+ * @Data :2016-04-21
+ *	
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_sectionroute_cache")
+public class SectionRouteCache {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	
+	// 路段路由序号
+	private Integer sectionrouteCode;
+	
+	// 线路编号
+	private String lineCode;
+	
+	// 路段编号
+	private String sectionCode;
+	
+	// 路段路由方向
+	private Integer directions;
+	
+	// 版本号
+	private Integer versions;
+	
+	// 是否撤销
+	private Integer destroy;
+	
+	/** 是否有路段限速数据  <0：分段；1：未分段>*/
+	private Integer isRoadeSpeed;
+	
+	// 描述
+	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 Integer getIsRoadeSpeed() {
+		return isRoadeSpeed;
+	}
+
+	public void setIsRoadeSpeed(Integer isRoadeSpeed) {
+		this.isRoadeSpeed = isRoadeSpeed;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer 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 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 javax.persistence.*;
+
+import java.util.Date;
+
+/**
+ * 
+ * @ClassName : StationRouteCache(站点路由缓存实体类)
+ * 
+ * @Author : bsth@lq
+ * 
+ * @Description : TODO(站点路由)
+ * 
+ * @Data :2016-04-19
+ *	
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_stationroute_cache")
+@NamedEntityGraphs({
+    @NamedEntityGraph(name = "stationRoute_station_cache", attributeNodes = {
+            @NamedAttributeNode("station"),
+            @NamedAttributeNode("line")
+    })
+})
+public class StationRouteCache {
+	
+	//站点路由ID
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	
+	// 站点路由序号
+	private Integer stationRouteCode;
+	
+	// 站点编码
+	private String stationCode;
+	
+	// 站点名称
+	private String stationName;
+	
+	// 线路编码
+	private String lineCode;
+	
+	/**
+	 * 站点类型
+	 * 
+	 * ------ B：起点站
+	 * 
+	 * ------ Z：中途站
+	 * 
+	 * ------ E：终点站
+	 * 
+	 * ------ T：停车场
+	 * 
+	 */
+	private String stationMark;
+	
+	// 站点路由出站序号
+	private Integer outStationNmber;
+	
+	// 站点路由到站距离
+	private Double distances;
+	
+	// 站点路由到站时间
+	private Double toTime;
+	
+	// 首班时间
+	private String firstTime;
+	
+	// 末班时间
+	private String endTime;
+	
+	// 站点路由方向
+	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;
+	
+	// 站点信息
+	@ManyToOne(fetch = FetchType.LAZY)
+	private Station station;
+	
+	// 线路信息
+	@ManyToOne
+	private Line line;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getStationRouteCode() {
+		return stationRouteCode;
+	}
+
+	public void setStationRouteCode(Integer stationRouteCode) {
+		this.stationRouteCode = stationRouteCode;
+	}
+
+	public String getStationCode() {
+		return stationCode;
+	}
+
+	public void setStationCode(String stationCode) {
+		this.stationCode = stationCode;
+	}
+
+	public String getStationName() {
+		return stationName;
+	}
+
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getStationMark() {
+		return stationMark;
+	}
+
+	public void setStationMark(String stationMark) {
+		this.stationMark = stationMark;
+	}
+
+	public Integer getOutStationNmber() {
+		return outStationNmber;
+	}
+
+	public void setOutStationNmber(Integer outStationNmber) {
+		this.outStationNmber = outStationNmber;
+	}
+
+	public Double getDistances() {
+		return distances;
+	}
+
+	public void setDistances(Double distances) {
+		this.distances = distances;
+	}
+
+	public Double getToTime() {
+		return toTime;
+	}
+
+	public void setToTime(Double toTime) {
+		this.toTime = toTime;
+	}
+
+	public String getFirstTime() {
+		return firstTime;
+	}
+
+	public void setFirstTime(String firstTime) {
+		this.firstTime = firstTime;
+	}
+
+	public String getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+
+	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 Station getStation() {
+		return station;
+	}
+
+	public void setStation(Station station) {
+		this.station = station;
+	}
+
+	public Line getLine() {
+		return line;
+	}
+
+	public void setLine(Line line) {
+		this.line = line;
+	}
+}
 \ No newline at end of file
@@ -30,8 +30,9 @@ public class ScheduleRealInfo {
 	/** 计划ID */
 	private Long spId;
  
-	/** 排班计划日期 */
+	/** 排班计划日期  --no webSocket */
 	private Date scheduleDate;
+	/** 排班日期字符串 YYYY-MM-DD */
 	private String scheduleDateStr;
  
 	/** 真实执行时间 yyyy-MM-dd */
@@ -81,9 +82,9 @@ public class ScheduleRealInfo {
 	@Transient
 	private Long zdsjT;
  
-	/** 发车顺序号 */
+	/** 发车顺序号 --no webSocket*/
 	private Integer fcno;
-	/** 对应班次数 */
+	/** 对应班次数 --no webSocket*/
 	private Integer bcs;
 	/** 计划里程 */
 	private Double jhlc;
@@ -91,10 +92,12 @@ public class ScheduleRealInfo {
 	/** 原始计划里程 （原计调的数据） */
 	private Double jhlcOrig;
  
-	/** 实际里程  这个字段被废弃*/
+	/** 实际里程  --no webSocket*/
+	@Transient
+	@JsonIgnore
 	private Double realMileage;
  
-	/** 实际里程 */
+	/** 实际里程 --no webSocket */
 	@Transient
 	private String sjlc;
 	/** 班次历时 */
@@ -153,7 +156,8 @@ public class ScheduleRealInfo {
 	/** 备注*/
 	private String remarks;
  
-	/** 原计划排班备注 */
+	/** 原计划排班备注 --no webSocket */
+	@Transient
 	private String remark;
  
 	/**待发时间（格式 HH:mm） */
@@ -166,9 +170,6 @@ public class ScheduleRealInfo {
 	/** 指令下发状态  60: 已发送， 100： 设备确认收到， 200：驾驶员确认   0：失败 */
 	private Integer directiveState = -1;
  
-	/** “运营状态” 指令下发状态  60: 已发送， 100： 设备确认收到  0：失败*/
-	private Integer opDirectiveState;
-	
 	/** 起点站计划到达时间 */
 	@Transient
 	private String qdzArrDatejh;
@@ -200,7 +201,7 @@ public class ScheduleRealInfo {
 	/** 是否有补发GPS信号 */
 	private boolean reissue;
  
-	/** 发车屏 发车顺序号，不持久化，会动态变化 */
+	/** 发车屏 发车顺序号，不持久化，会动态变化 --no webSocket*/
 	@Transient
 	private int fcpSn;
  
@@ -209,6 +210,10 @@ public class ScheduleRealInfo {
 	@JsonIgnore
 	private boolean deleted;
  
+	@Transient
+	@JsonIgnore
+	private int saveFailCount=0;
+
 	public boolean isDfAuto() {
 		return dfAuto;
 	}
@@ -486,7 +491,7 @@ public class ScheduleRealInfo {
 		if(this.isSflj())
 			this.setJhlcOrig(this.getJhlc());
 	}
-	
+
 	public String getSjlc() {
 		return sjlc;
 	}
@@ -816,22 +821,6 @@ public class ScheduleRealInfo {
 		calcStatus();
 	}
  
-	public Integer getOpDirectiveState() {
-		return opDirectiveState;
-	}
-
-	public void setOpDirectiveState(Integer opDirectiveState) {
-		this.opDirectiveState = opDirectiveState;
-	}
-
-/*	public ScheduleRealInfo getTwinsSch() {
-		return twinsSch;
-	}
-
-	public void setTwinsSch(ScheduleRealInfo twinsSch) {
-		this.twinsSch = twinsSch;
-	}*/
-
 	public boolean isLate() {
 		return late;
 	}
@@ -925,4 +914,12 @@ public class ScheduleRealInfo {
 	public void setDeleted(boolean deleted) {
 		this.deleted = deleted;
 	}
+
+	public int getSaveFailCount() {
+		return saveFailCount;
+	}
+
+	public void setSaveFailCount(int saveFailCount) {
+		this.saveFailCount = saveFailCount;
+	}
 }
+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.SectionRoute;
+import com.bsth.entity.SectionRouteCache;
+
+/**
+ * 
+ * @Interface: SectionRouteRepository(路段路由Repository数据持久层接口)
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: TODO(路段路由Repository数据持久层接口)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016年05月03日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Repository
+public interface SectionRouteCacheRepository extends BaseRepository<SectionRouteCache, Integer> {
+	
+	/**
+	 * @Description :TODO(查询路段信息)
+	 * 
+	 * @param map <lineId:线路ID； directions：方向>
+	 * 
+	 * @return List<Object[]>
+	 */
+	@Query(value ="SELECT  a.sectionrouteId," +
+			 "a.sectionrouteLine," +
+			" a.sectionrouteLineCode," +
+			" a.sectionrouteSection," +
+			" a.sectionrouteSectionCode," +
+			" a.sectionrouteCode," +
+			" a.sectionrouteDirections," +
+			" b.id AS sectionId," +
+			" b.section_code AS sectionCode," +
+			" b.section_name AS sectionName," +
+			" b.croses_road AS sectionRoad," +
+			" b.end_node AS sectionEndNode," +
+			" b.start_node AS sectionStartNode," +
+			" b.middle_node AS sectionMiddleNode," +
+	        " b.section_type AS sectionType," +
+			" b.csection_vector AS sectionCsectionVector," +
+			" ST_AsText(b.bsection_vector) AS sectionBsectionVector," +
+			" ST_AsText(b.gsection_vector) AS sectionGsectionVector," +
+			" b.road_coding AS sectionRoadCoding," +
+			" b.section_distance AS sectionDistance," +
+            " b.section_time AS sectionTime," +
+			" b.db_type AS sectiondbType," +
+			" b.speed_limit AS sectionSpeedLimet ,a.destroy,a.versions,a.descriptions,a.isRoadeSpeed FROM (" +
+						"SELECT  r.id AS sectionrouteId," +
+								"r.line AS sectionrouteLine," +
+								"r.line_code AS sectionrouteLineCode," +
+								"r.section AS sectionrouteSection," +
+								"r.section_code AS sectionrouteSectionCode," +
+								"r.sectionroute_code AS sectionrouteCode," +
+								"r.directions AS sectionrouteDirections," +
+								"r.destroy AS destroy," +
+								"r.versions AS versions," +
+								"r.descriptions AS descriptions, r.is_roade_speed AS isRoadeSpeed" +
+								"  FROM bsth_c_sectionroute_cache r where r.line = ?1 and r.directions = ?2 and r.destroy=0 ) a " +
+								"	LEFT JOIN bsth_c_section b  ON a.sectionrouteSection = b.id order by a.sectionrouteCode asc", nativeQuery=true)
+	List<Object[]> getSectionRouteCache(int lineId, int directions);
+	
+	
+	/**
+	 * @Description :TODO(查询路段信息)
+	 * 
+	 * @param map <id:路段路由ID>
+	 * 
+	 * @return List<Object[]>
+	 */
+	@Query(value ="SELECT a.sectionRouteId," +
+			"a.sectionRouteLineCode," +
+			"a.sectionRouteCode," +
+			"a.sectionRouteDirections," +
+			"a.sectionRouteLine," +
+			"a.sectionRouteSection," +
+			"a.sectionRouteDescriptions," +
+			"a.sectionRouteCreateBy," +
+			"a.sectionRouteCreateDate," +
+			"a.sectionRouteUpdateBy," +
+			"a.sectionRouteUpdateDate," +
+			"a.sectionRouteVersions," +
+			"a.sectionRouteDestroy," +
+			"b.id AS sectionId," +
+			"b.section_code AS sectionCode," +
+			"b.section_name AS sectionName," +
+			"b.road_coding AS sectionRoadCoding," +
+			"b.end_node AS sectionEndCode," +
+			"b.start_node AS sectionStartNode," +
+			"b.middle_node AS sectionMiddleNode," +
+			"b.section_type AS sectionType," +
+			"ST_AsText(b.csection_vector) AS sectionCsectionVector," +
+			"ST_AsText(b.bsection_vector) AS sectionBsectionVector," +
+			"ST_AsText(b.gsection_vector) AS sectionGsectionVector," +
+			"b.section_distance AS sectionDistance," +
+			"b.section_time AS sectionTime," +
+			"b.db_type AS sectionDbtype," +
+			"b.speed_limit AS sectionSpeedLimit," +
+			"b.descriptions AS sectionDescriptions," +
+			"b.create_by AS sectionCreateBy," +
+			"b.create_date AS sectionCreateDate," +
+			"b.update_by AS sectionUpdateBy," +
+			"b.update_date AS sectionUpdateDate," +
+			"b.versions AS sectionVersion , a.isRoadeSpeed  FROM (" +
+			" SELECT s.id AS sectionRouteId," +
+			"s.line_code AS sectionRouteLineCode," +
+			"s.sectionroute_code AS sectionRouteCode," +
+			"s.directions AS sectionRouteDirections," +
+			"s.line AS sectionRouteLine," +
+			"s.section AS sectionRouteSection," +
+			"s.descriptions AS sectionRouteDescriptions," +
+			"s.create_by AS sectionRouteCreateBy," +
+			"s.create_date AS sectionRouteCreateDate," +
+			"s.update_by AS sectionRouteUpdateBy," +
+			"s.update_date AS sectionRouteUpdateDate," +
+			"s.versions AS sectionRouteVersions," +
+			"s.destroy AS sectionRouteDestroy,  s.is_roade_speed AS isRoadeSpeed " +
+			" FROM  bsth_c_sectionroute s where s.id =?1) a " +
+			" LEFT JOIN bsth_c_section b on a.sectionRouteSection = b.id", nativeQuery=true)
+	List<Object[]> findSectionRouteInfoFormId(int id);
+	
+	/**
+     * 更新路线删除线路缓存路段
+     * 
+     * @param line
+     * @param dir
+     */
+    @Modifying
+    @Query(value="delete from bsth_c_sectionroute_cache where line = ?1  and directions = ?2", nativeQuery=true)
+    public void sectionRouteCacheDel(Integer line,Integer dir);
+}
@@ -177,7 +177,17 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
  
 	@Modifying
 	@Query(value="UPDATE bsth_c_sectionroute set destroy = 1 where id = ?1", nativeQuery=true)
-	public void sectionRouteIsDestroyUpdBatch(Integer ids);
+	public void sectionRouteIsDestroyUpdBatch(Integer id);
+	
+	/**
+     * 更新路线前撤销线路原有路段
+     * 
+     * @param line
+     * @param dir
+     */
+    @Modifying
+    @Query(value="UPDATE bsth_c_sectionroute  set destroy = 1 where line = ?1  and directions = ?2", nativeQuery=true)
+    public void sectionRouteUpdDestroy(Integer line,Integer dir);
  
     @Modifying
     @Query(value="update bsth_c_sectionroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1   ", nativeQuery=true)
@@ -40,17 +40,10 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
 	/*@Query(value = "SELECT s.b_jwpoints,s.id FROM bsth_c_station s where s.station_name like  ?1"
 			, nativeQuery=true)
 	List<Object[]> findStationName(String stationName);*/
-	/*@Query(value = " SELECT t.b_jwpoints,t.id FROM (" +
-			" SELECT b.id,b.b_jwpoints,b.station_name,a.directions FROM (" +
-			" SELECT s.station,s.station_name,s.directions FROM bsth_c_stationroute s where s.destroy = 0 and s.directions = ?1) a " +
-			" LEFT JOIN bsth_c_station b on a.station = b. id) t where t.station_name LIKE ?2"
-			, nativeQuery=true)*/
 	@Query(value = " SELECT t.b_jwpoints,t.id FROM (" +
 			" SELECT b.id,b.b_jwpoints,b.station_name,a.directions FROM (" +
 			" SELECT s.station,s.station_name,s.directions FROM bsth_c_stationroute s where s.destroy = 0 and s.directions = ?1) a " +
-			" LEFT JOIN " + 
-				" (SELECT r.id,r.b_jwpoints,r.station_name from bsth_c_station r where r.destroy = 0  and r.station_name LIKE ?2 )  " + 
-			" b on a.station = b. id) t where t.station_name LIKE ?2 "
+			" LEFT JOIN bsth_c_station b on a.station = b. id) t where t.station_name LIKE ?2"
 			, nativeQuery=true)
 	List<Object[]> findStationName(Integer dir , String stationName);
  
@@ -108,24 +101,18 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
     		"y = ?9  , " +
     		"b_polygon_grid = ST_GeomFromText(?10)  , " +
     		"g_polygon_grid = ST_GeomFromText(?11)  , " +
-    		/*"destroy = ?12  , " +*/
-    		"radius = ?12  , " +
-    		"shapes_type = ?13  , " +
-    		"versions = ?14  , " +
-    		"descriptions = ?15  " +
-    		" WHERE id = ?16   ", nativeQuery=true)
+    		"destroy = ?12  , " +
+    		"radius = ?13  , " +
+    		"shapes_type = ?14  , " +
+    		"versions = ?15  , " +
+    		"descriptions = ?16  " +
+    		" WHERE id = ?17   ", nativeQuery=true)
 	public void stationUpdate(String stationCod,String stationName,String roadCoding,String dbType,String bJwpoints,
-			
-			  Float gLonx,Float gLaty,Float x,Float y, String bPolygonGrid,String gPolygonGrid,
-			  
-			  Integer radius,String shapesType, Integer versions,String descriptions,Integer stationId);
-
-	/*public void stationUpdate(String stationCod,String stationName,String roadCoding,String dbType,String bJwpoints,
  
 							  Float gLonx,Float gLaty,Float x,Float y, String bPolygonGrid,String gPolygonGrid,
  
 							  Integer  destroy, Integer radius,String shapesType, Integer versions,String descriptions,Integer stationId);
-    */
+    
  
 	@Query(value = "select st_astext(g_polygon_grid) as g_polygon_grid, shapes_type,concat(g_lonx, ' ', g_laty) as g_center_point ,radius, station_cod,station_name from bsth_c_station where station_cod=?1", nativeQuery = true)
 	public Object[][] bufferAera(String stationCode);
+package com.bsth.repository;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+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.Line;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.StationRouteCache;
+
+/**
+ * 
+ * @Interface: StationRouteRepository(站点路由Repository数据持久层接口)
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: TODO(站点路由Repository数据持久层接口)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016年5月03日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Repository
+public interface StationRouteCacheRepository extends BaseRepository<StationRouteCache, Integer> {
+	
+	/**
+	 * @Description :TODO(站点中心点坐标查询)
+	 * 
+	 * @param map <lineId:线路ID； direction：方向>
+	 * 
+	 * @return List<Object[]>
+	 */
+	/*@Query(value = "SELECT s.b_jwpoints,s.station_name FROM (" +
+						"SELECT b.station FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
+				   "LEFT JOIN bsth_c_station s on r.station = s.id", nativeQuery=true)*/
+	@Query(value = "SELECT s.b_jwpoints,r.station_name,r.station_route_code FROM (" +
+			"SELECT b.station,b.station_route_code,b.station_name FROM bsth_c_stationroute_cache b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
+	   "LEFT JOIN bsth_c_station s on r.station = s.id order by r.station_route_code asc", nativeQuery=true)
+	List<Object[]> getSelectStationRouteCenterPoints(Integer lineId,Integer direction);
+	
+	/**
+     * 查询站点路由
+     */
+    @Query("select r from StationRouteCache r where r.lineCode=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
+    public List<StationRouteCache> findstationRoute(String lineCode,Integer dir);
+	
+	/**
+     * 更新路线删除线路缓存站点
+     * 
+     * @param line
+     * @param dir
+     */
+    @Modifying
+    @Query(value="delete from bsth_c_stationroute_cache where line = ?1 and directions = ?2 ", nativeQuery=true)
+    public void stationRouteCacheDel(Integer line,Integer dir);
+    
+}
@@ -266,6 +266,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			"StationRoute s " +
 			"WHERE " +
 			"s.destroy = 0 " +
+			"and s.lineCode in(select lineCode from Line where inUse = 1) " +
 			"ORDER BY " +
 			"lineCode,directions,stationRouteCode")
 	List<Map<String, String>> findAllLineWithYgc();
@@ -282,7 +283,27 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	@Query(value="UPDATE bsth_c_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)
 	public void stationUpdStationRouteCode(Integer line,Integer dir,Integer routeCod);
  
+    /**
+     * 更新路线前撤销线路原有站点
+     * 
+     * @param line
+     * @param dir
+     */
+    @Modifying
+    @Query(value="UPDATE bsth_c_stationroute  set destroy = 1 where line = ?1  and directions = ?2", nativeQuery=true)
+    public void stationRouteUpdDestroy(Integer line,Integer dir);
+    
     @Modifying
    	@Query(value="UPDATE bsth_c_stationroute set destroy = 1 where id = ?1", nativeQuery=true)
    	public void stationRouteIsDestroyUpdBatch(Integer ids);
+    
+    /**
+     * 更新路线前撤销线路原有站点
+     * 
+     * @param line
+     * @param dir
+     */
+    @Modifying
+    @Query(value="insert into (select * from bsth_c_stationroute_cache where line = ?1  and directions = ?2) bsth_c_stationroute", nativeQuery=true)
+    public void stationRouteUpdate(Integer line,Integer dir);
 }
@@ -32,6 +32,8 @@ public interface SectionRouteService extends BaseService&lt;SectionRoute, Integer&gt; 
  
 	List<Map<String, Object>> getSectionRoute(Map<String, Object> map);
  
+	List<Map<String, Object>> getSectionRouteCache(Map<String, Object> map);
+	
 	/**
 	 * @Description : TODO(根据路段路由Id批量撤销路段)
 	 * 
@@ -60,4 +62,5 @@ public interface SectionRouteService extends BaseService&lt;SectionRoute, Integer&gt; 
 	 List<Map<String, Object>> findUpSectionRouteCode(Map<String, Object> map);
  
 	 Map<String, Object> quoteSection(Map<String, Object> map);
+	
 }
@@ -31,4 +31,8 @@ public interface SectionService extends BaseService&lt;Section, Integer&gt; {
 	Map<String, Object> sectionUpdate(Map<String, Object> map);
  
 	Map<String, Object> sectionSave(Map<String, Object> map);
+
+	Map<String, Object> sectionCut(Map<String, Object> map);
+
+	Map<String, Object> sectionCacheUpdate(Map<String, Object> map);
 }
@@ -77,6 +77,9 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	  */
 	 Map<String, Object> stationRouteIsDestroy(Map<String, Object> map);
  
+
+	List<Map<String, Object>> getStationRouteCacheCenterPoints(Map<String, Object> map);
+		
 	 /**
 	  * @Description : TODO(根据线路ID生成行单)
 	  * 
@@ -102,4 +105,5 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
  
 	 Map<String, Object> upddis(Map<String, Object> map);
  
+
 }
@@ -69,4 +69,17 @@ public interface StationService extends BaseService&lt;Station, Integer&gt; {
 	 */
 	Map<String, Object> stationUpdate(Map<String, Object> map);
  
+	/**
+	 * @Description :TODO(根据坐标点匹配数据库中的站点)
+	 * 
+	 * @param map: <point:坐标点； name:站点名>
+	 * 
+	 */
+	Map<String, Object> matchStation(Map<String, Object> map);
+
+	/**
+	 * 上传的GPS点生成的路线保存在缓存表
+	 */
+	Map<String, Object> cacheSave(Map<String, Object> map);
+	
 }
@@ -47,5 +47,5 @@ public interface GpsService {
 	List<GpsSpeed> findPosition(String deviceid, String startdate,
 			String enddate) throws ParseException;
  
-	PageObject<GpsSpeed> Pagequery(Map<String, Object> map);
+	Map<String, Object> Pagequery(Map<String, Object> map);
 }
@@ -1053,16 +1053,19 @@ public class GpsServiceImpl implements GpsService {
     }
  
     @Override
-    public PageObject<GpsSpeed> Pagequery(Map<String, Object> map) {
-
+    public Map<String, Object> Pagequery(Map<String, Object> map) {
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Integer totalDays = 0;//数据跨越天数
+		try {
+			totalDays = (int) ((sdf.parse(map.get("endDate").toString()+" 23:59:59").getTime()-sdf.parse(map.get("startDate").toString()+" 00:00:00").getTime()+1)/(3600*24*1000))+1;
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}//总页数
+		map.put("totalDays",totalDays);
         List<GpsSpeed> list=findAll(map);
         List<GpsSpeed> listResult = new ArrayList<GpsSpeed>();
-        int curPage;//页码
-        int pageData;//每页的记录条数
-        int start;//起始数据下标
-        int totalPage;//总页数
-        int totalData = 0;
+        int curPage = 0;//页码
+        int pageData = 0;//每页的记录条数
         if(list.size()>1){
             GpsSpeed GpsSpeedNow;//下标为i的车辆行驶记录
             GpsSpeed GpsSpeedLast;//下标为i-1的车辆行驶记录
@@ -1099,49 +1102,35 @@ public class GpsServiceImpl implements GpsService {
                     }
                 }
             }
-            Iterator<GpsSpeed> speedIt = listResult.iterator();
-            while(speedIt.hasNext()){
-                GpsSpeed GpsSpeed = speedIt.next();
-                if(GpsSpeed.getEndtimestamp()-GpsSpeed.getTimestamp()<=1000){
-                    speedIt.remove();
-                }
-            }
-
-            totalData = listResult.size();//总记录条数。
-            if(map.get("curPage") == null || map.get("curPage").equals("0")){
-                curPage = 0;
-            }else{
-                curPage = Integer.parseInt((String) map.get("curPage"));
-            }
-            pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
-            start = (curPage - 0) * pageData; //起始记录下标。
-            totalPage = totalData % pageData == 0 ? totalData / pageData : totalData / pageData +1;//总页数
-            if(curPage == totalPage-1){//如果当前页等于总页数。
-                listResult = listResult.subList(start, totalData);
-            }else{
-                listResult = listResult.subList(start, start+pageData);
+            if(listResult.size()>0){
+            	Iterator<GpsSpeed> speedIt = listResult.iterator();
+            	while(speedIt.hasNext()){
+            		GpsSpeed GpsSpeed = speedIt.next();
+            		if(GpsSpeed.getEndtimestamp()-GpsSpeed.getTimestamp()<=1000){
+            			speedIt.remove();
+            		}
+            	}
             }
-        }else{
-            curPage = 1;
-            pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
-            totalPage =1;
         }
+    	if(map.get("curPage") == null || map.get("curPage").equals("0")){
+    		curPage = 0;
+    	}else{
+    		curPage = Integer.parseInt((String) map.get("curPage"));
+    	}
+    	Integer totalPage = totalDays;
+    	pageData = listResult.size();//每页的记录条数就是当前页查出的全部数据。
         Map<String,Object> paramMap = new HashMap<String,Object>();
         paramMap.put("totalPage", totalPage);
-        paramMap.put("curPage", curPage);
+        paramMap.put("page", curPage);
         paramMap.put("pageData", pageData);
-        PageHelper pageHelper = new PageHelper(totalData, paramMap);
-        pageHelper.getMap();
-        PageObject<GpsSpeed> pageObject = pageHelper.getPageObject();
-        pageObject.setDataList(listResult);
-        return pageObject;
+        paramMap.put("list", listResult);
+        return paramMap;
     }
  
     static List<GpsSpeed> findAll(Map<String, Object> map) {
         Connection conn = null;
         PreparedStatement ps = null;
         ResultSet rs = null;
-        int page=Integer.parseInt(map.get("page").toString());
         List<GpsSpeed> list=new ArrayList<GpsSpeed>();
         String sql="select * from bsth_c_gps_info where 1=1 ";
         Object line=map.get("line");
@@ -1149,6 +1138,13 @@ public class GpsServiceImpl implements GpsService {
         Object updown=map.get("updown");
         Object startDate=map.get("startDate");
         Object endDate=map.get("endDate");
+        Integer totalDays = Integer.valueOf(map.get("totalDays").toString());
+        Integer curPage = 0;//页码
+        if(map.get("curPage") == null || map.get("curPage").equals("0")){
+        	curPage = 0;
+    	}else{
+    		curPage = Integer.parseInt((String) map.get("curPage"));
+    	}
  
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if(line!=null){
@@ -1167,7 +1163,7 @@ public class GpsServiceImpl implements GpsService {
         if(startDate!=null){
             if (startDate.toString().length()>0) {
                 try {
-                    Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime();
+                    Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime()+curPage*3600*24*1000;
                     sql += " and ts >="+t1;
                 } catch (ParseException e) {
                     e.printStackTrace();
@@ -1178,7 +1174,7 @@ public class GpsServiceImpl implements GpsService {
         if(endDate!=null){
             if (endDate.toString().length()>0) {
                 try {
-                    Long t2=sdf.parse(endDate.toString()+" 23:59:59").getTime();
+                    Long t2=sdf.parse(endDate.toString()+" 23:59:59").getTime()-(totalDays-1-curPage)*3600*24*1000;
                     sql += " and ts <="+t2;
                 } catch (ParseException e) {
                     e.printStackTrace();
@@ -22,6 +22,7 @@ import com.bsth.entity.SectionRoute;
 import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.SectionRepository;
+import com.bsth.repository.SectionRouteCacheRepository;
 import com.bsth.repository.SectionRouteRepository;
 import com.bsth.service.SectionRouteService;
 import com.bsth.util.GetUIDAndCode;
@@ -49,6 +50,9 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 	SectionRouteRepository repository;
  
 	@Autowired
+	SectionRouteCacheRepository Cacherepository;
+	
+	@Autowired
 	SectionRepository repository2; 
  
 	@Autowired
@@ -117,7 +121,55 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 		return resultList;
 	}
  
-	
+	/**
+	 * @Description :TODO(查询路段信息)
+	 * 
+	 * @param map <line.id_eq:线路ID； directions_eq：方向>
+	 * 
+	 * @return Map<String, Object> 
+	 */
+	@Transactional
+	@Override
+	public List<Map<String, Object>> getSectionRouteCache(Map<String, Object> map) {
+		int lineId = map.get("line.id_eq").equals("") ? 0 : Integer.parseInt(map.get("line.id_eq").toString());
+		int directions = map.get("directions_eq").equals("") ? 0 : Integer.parseInt(map.get("directions_eq").toString());
+		List<Object[]> listObjArray = Cacherepository.getSectionRouteCache(lineId, directions);
+		List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>(); 
+		if(listObjArray.size()>0) {
+			for(int i = 0 ; i<listObjArray.size() ; i++){
+				Map<String, Object> tempM = new HashMap<String, Object>();
+				tempM.put("sectionrouteId",listObjArray.get(i)[0]);
+				tempM.put("sectionrouteLine",listObjArray.get(i)[1]);
+				tempM.put("sectionrouteLineCode",listObjArray.get(i)[2]);
+				tempM.put("sectionrouteSection",listObjArray.get(i)[3]);
+				tempM.put("sectionrouteSectionCode",listObjArray.get(i)[4]);
+				tempM.put("sectionrouteCode",listObjArray.get(i)[5]);
+				tempM.put("sectionrouteDirections",listObjArray.get(i)[6]);
+				tempM.put("sectionId",listObjArray.get(i)[7]);
+				tempM.put("sectionCode",listObjArray.get(i)[8]);
+				tempM.put("sectionName",listObjArray.get(i)[9]);
+				tempM.put("sectionCrosesRoad",listObjArray.get(i)[10]);
+				tempM.put("sectionEndNode",listObjArray.get(i)[11]);
+				tempM.put("sectionStartNode",listObjArray.get(i)[12]);
+				tempM.put("sectionMiddleNode",listObjArray.get(i)[13]);
+				tempM.put("sectionType",listObjArray.get(i)[14]);
+				tempM.put("sectionCsectionVector",listObjArray.get(i)[15]);
+				tempM.put("sectionBsectionVector",listObjArray.get(i)[16]);
+				tempM.put("sectionGsectionVector",listObjArray.get(i)[17]);
+				tempM.put("sectionRoadCoding",listObjArray.get(i)[18]);
+				tempM.put("sectionDistance",listObjArray.get(i)[19]);
+				tempM.put("sectionTime",listObjArray.get(i)[20]);
+				tempM.put("sectiondbType",listObjArray.get(i)[21]);
+				tempM.put("sectionSpeedLimet",listObjArray.get(i)[22]);
+				tempM.put("destroy",listObjArray.get(i)[23]);
+				tempM.put("versions",listObjArray.get(i)[24]);
+				tempM.put("descriptions",listObjArray.get(i)[25]);
+				tempM.put("isRoadeSpeed",listObjArray.get(i)[26]);
+				resultList.add(tempM);
+			}
+		}
+		return resultList;
+	}
  
  
 	/**
@@ -239,7 +291,6 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 		if(reslutList.get(0)!=null) {
 			for(int i = 0 ; i <reslutList.size() ;i++){
 				Map<String, Object> tempM = new HashMap<String, Object>();
-				System.out.println(reslutList.get(i));
 				tempM.put("sectionrouteCode", reslutList.get(i));
 				list.add(tempM);
 			}
@@ -325,13 +376,7 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 			//int i = 0;
 			String[] idsStr = map.get("ids").toString().split(",") ;
 	        for (String id : idsStr) {
-	         /*   entityManager.persist(Integer.parseInt(id));*/
 	            repository.sectionRouteIsDestroyUpdBatch(Integer.parseInt(id));
-/*	            i++;
-	            if (i % batchSize == 0) {
-	                entityManager.flush();
-	                entityManager.clear();
-	            }*/
 	        }
 			resultMap.put("status", ResponseCode.SUCCESS);
 		} catch (Exception e) {
 package com.bsth.service.impl;
  
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
  
+import org.mozilla.javascript.ObjArray;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.Section;
 import com.bsth.entity.SectionRoute;
+import com.bsth.entity.SectionRouteCache;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.StationRouteCache;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.SectionRepository;
+import com.bsth.repository.SectionRouteCacheRepository;
 import com.bsth.repository.SectionRouteRepository;
+import com.bsth.repository.StationRouteCacheRepository;
+import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.SectionService;
+import com.bsth.util.GetUIDAndCode;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
+import com.bsth.util.Geo.GeoUtils;
+import com.bsth.util.Geo.Point;
+import com.google.gson.JsonObject;
  
 /**
  * 
@@ -49,6 +64,265 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 	@Autowired
 	SectionRouteRepository routeRepository;
  
+	@Autowired
+	SectionRouteCacheRepository routeCacheRepository;
+	
+	@Autowired
+	StationRouteRepository stationRouteRepository;
+	
+	@Autowired
+	StationRouteCacheRepository stationRouteCacheRepository;
+	
+	/**
+	 * @Description :TODO(生成新的线路走向)
+	 * 
+	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
+	 * 
+	 * @return Map<String, Object> <SUCCESS ; ERROR>
+	 */
+	@Override
+	@Transactional
+	public Map<String, Object> sectionCut(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			// 路段点List
+			List<Point> bPointsList = new ArrayList<>();
+			// 截取路段点List
+			List<Point> bPointsCutList = new ArrayList<>();
+			// 截取后的路段
+			List<Map<String, String>> sectionArrayList = new ArrayList<>();
+			String bsectionVector = map.get("sectionBsectionVector").equals("") ? "" :map.get("sectionBsectionVector").toString();
+			String bsectionVectorCutList = map.get("cutSectionList").equals("") ? "" :map.get("cutSectionList").toString();
+			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();
+					bPointsList.add(new Point(Double.parseDouble(pointsLngStr), Double.parseDouble(pointsLatStr)));
+				}
+			}
+			if(!bsectionVectorCutList.equals("")) {
+				// 转换成JSON数组
+				JSONArray sectionsArrayList = JSONArray.parseArray(bsectionVectorCutList);
+				// 截取路段在总路段中的下表
+				int firstTemp = 0;
+				int lastTemp = 0;
+				// 每个截取的路段去总路段中获取
+				for (int i = 0; i < sectionsArrayList.size(); i++) {
+					// 切点列表
+					JSONObject sectionsArray = sectionsArrayList.getJSONObject(i);
+					String sectionName = sectionsArray.get("name").toString();
+					JSONArray sectionPoints = sectionsArray.getJSONArray("section");
+					// 用两个坐标点去截取总路段
+					if (i == 0) {
+						for(int s = 0 ;s<sectionPoints.size();s++) {
+							String bpointsLngStr = sectionPoints.getJSONObject(s).get("lng").toString();
+							String bpointsLatStr = sectionPoints.getJSONObject(s).get("lat").toString();
+							Point bPointcut = new Point(Double.parseDouble(bpointsLngStr), Double.parseDouble(bpointsLatStr));
+							double distance = 0;
+							// 寻找最近点
+							for (int index = firstTemp; index < bPointsList.size(); index++) {
+								if (index == firstTemp) {
+									distance = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
+								} else {
+									double distanceTemp = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
+									if(distance > distanceTemp) {
+										distance = distanceTemp;
+										lastTemp = index;
+									}					
+								}
+							}	
+							if (s == 0) {
+								// 第一个点作为路段的起点
+								firstTemp = lastTemp;
+							}
+							// 用切点替换最近点
+							if(lastTemp == firstTemp) {
+								bPointsList.add(++lastTemp, bPointcut);
+							} else {
+								bPointsList.set(lastTemp, bPointcut);	
+							}						
+						}
+					} else {
+						String bpointsLngStr = sectionPoints.getJSONObject(1).get("lng").toString();
+						String bpointsLatStr = sectionPoints.getJSONObject(1).get("lat").toString();
+						Point bPointcut = new Point(Double.parseDouble(bpointsLngStr), Double.parseDouble(bpointsLatStr));
+						double distance = 0;
+						// 寻找最近点
+						for (int index = firstTemp; index < bPointsList.size(); index++) {
+							if (index == firstTemp) {
+								distance = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
+							} else {
+								double distanceTemp = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
+								if(distance > distanceTemp) {
+									distance = distanceTemp;
+									lastTemp = index;
+								}					
+							}
+						}
+						// 用切点替换最近点
+						if(lastTemp == firstTemp) {
+							bPointsList.add(++lastTemp, bPointcut);
+						} else {
+							bPointsList.set(lastTemp, bPointcut);	
+						}
+					}
+					// 切路段
+					if (sectionName != "" && sectionName != null ) {
+						// 原始线状图形坐标集合
+						String sectionsBpoints = "";
+						// WGS线状图形坐标集合
+						String sectionsWJPpoints = "";		
+						for (int j = firstTemp; j <= lastTemp; j++) {
+							Point point =  bPointsList.get(j);
+							String pointsLngStr = String.valueOf(point.getLon());
+							String pointsLatStr = String.valueOf(point.getLat());
+							/** to WGS坐标 */
+							Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
+							String WGSLngStr = String.valueOf(resultPoint.getLng());
+							String WGSLatStr = String.valueOf(resultPoint.getLat());
+							if(j == firstTemp) {
+								sectionsBpoints = pointsLngStr + " " + pointsLatStr;
+								sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
+							}else {
+								sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
+								sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
+							}
+						}
+						Map<String, String> sectionCutMap = new HashMap<String, String>();
+						sectionCutMap.put("sectionName", sectionName);
+						sectionCutMap.put("sectionsBpoints", sectionsBpoints);
+						sectionCutMap.put("sectionsWJPpoints", sectionsWJPpoints);
+						sectionArrayList.add(sectionCutMap);
+					}
+					// 上一个路段的终点作为下一个路段的起点
+					firstTemp = lastTemp;	
+				}		
+			}			
+			
+			// 原坐标类型
+			String dbType = map.get("sectiondbType").equals("") ? "" : map.get("sectiondbType").toString();
+			// 说明
+			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
+			// 是否撤销
+			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
+			// 方向
+			Integer directions = map.get("sectionrouteDirections").equals("") ? null : Integer.parseInt(map.get("sectionrouteDirections").toString());
+			// 线路ID
+			Integer sectionRouteLine = map.get("sectionrouteLine").equals("") ? null : Integer.parseInt(map.get("sectionrouteLine").toString());
+			// 道路编码
+			String roadCoding = map.get("sectionRoadCoding").equals("") ? "" : map.get("sectionRoadCoding").toString();
+			// 路段长度
+			Double sectionDistance = 0.0;
+			// 路段路由Id
+			Integer sectionRouteId = map.get("sectionrouteId").equals("") ? null : Integer.valueOf(map.get("sectionrouteId").toString());
+			// 线路编码
+			String lineCode =map.get("sectionrouteLineCode").equals("") ? "" : map.get("sectionrouteLineCode").toString();
+			// 路段时长
+			Double  sectionTime = 0.0;
+			// 路段路由
+			Integer sectionrouteCode = map.get("sectionrouteCode").equals("") ? null : Integer.valueOf(map.get("sectionrouteCode").toString());
+			// 限速
+			Double speedLimit = map.get("sectionSpeedLimet").equals("") ? null : Double.valueOf(map.get("sectionSpeedLimet").toString());
+			// 版本
+			Integer version = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
+			
+			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());
+			Integer isRoadeSpeed = map.get("isRoadeSpeed").equals("") ? null : Integer.valueOf(map.get("isRoadeSpeed").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="";
+			String csectionVector="";	
+			// 撤销原有路段
+			routeRepository.sectionRouteUpdDestroy(Integer.parseInt(lineCode),directions);
+			// 路段保存
+			for (int i = 0; i < sectionArrayList.size(); i++) {
+				long sectionMaxId = GetUIDAndCode.getSectionId();
+				// 路段编码
+				String sectionCode = String.valueOf(sectionMaxId);
+				// 路段ID
+				int sectionId = (int)sectionMaxId;
+				String sectionName = sectionArrayList.get(i).get("sectionName").toString();
+				String sectionsBpoints = sectionArrayList.get(i).get("sectionsBpoints").toString();
+				String sectionsWJPpoints = sectionArrayList.get(i).get("sectionsWJPpoints").toString();
+				// WGS坐标点集合
+				String gsectionVector = null;
+				if(!sectionsWJPpoints.equals(""))
+					gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+				// 原坐标点集合
+				String bsectionVectorS = null;
+				if(!sectionsBpoints.equals(""))
+					 bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";				
+				repository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, gsectionVector, bsectionVectorS, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, version, sectionId);
+				SectionRoute route = new SectionRoute();
+				Line line = lineRepository.findOne(sectionRouteLine);
+				Section section = repository.findOne(sectionId);
+				route.setSectionrouteCode(sectionrouteCode+i*100);
+				route.setLineCode(lineCode);
+				route.setSectionCode(sectionCode);
+				route.setDirections(directions);
+				route.setVersions(version);
+				route.setDestroy(destroy);
+				route.setDescriptions(descriptions);
+				route.setCreateBy(createBy);
+				route.setUpdateBy(updateBy);
+				route.setLine(line);
+				route.setSection(section);
+				route.setIsRoadeSpeed(isRoadeSpeed);
+				routeRepository.save(route);
+			}
+			// 删除缓存路段
+			routeCacheRepository.sectionRouteCacheDel(Integer.parseInt(lineCode),directions);
+			// 撤销原有站点
+			stationRouteRepository.stationRouteUpdDestroy(Integer.parseInt(lineCode),directions);
+			// 站点保存
+			List<StationRouteCache> stationRouteList = stationRouteCacheRepository.findstationRoute(lineCode,directions);			
+			for(int i=0; i < stationRouteList.size(); i++) {
+				StationRouteCache stationRouteCache = stationRouteList.get(i);				
+				StationRoute stationRoute = new StationRoute();
+				stationRoute.setLine(stationRouteCache.getLine());
+				stationRoute.setStation(stationRouteCache.getStation());
+				stationRoute.setStationName(stationRouteCache.getStationName());
+				stationRoute.setStationRouteCode(stationRouteCache.getStationRouteCode());
+				stationRoute.setLineCode(stationRouteCache.getLineCode());
+				stationRoute.setStationCode(stationRouteCache.getStationCode());
+				stationRoute.setStationMark(stationRouteCache.getStationMark());
+				stationRoute.setOutStationNmber(stationRouteCache.getOutStationNmber());
+				stationRoute.setDirections(stationRouteCache.getDirections());
+				stationRoute.setDistances(stationRouteCache.getDistances());
+				stationRoute.setToTime(stationRouteCache.getToTime());
+				stationRoute.setFirstTime(stationRouteCache.getFirstTime());
+				stationRoute.setEndTime(stationRouteCache.getEndTime());
+				stationRoute.setDescriptions(stationRouteCache.getDescriptions());
+				stationRoute.setDestroy(stationRouteCache.getDestroy());
+				stationRoute.setVersions(stationRouteCache.getVersions());
+				stationRoute.setCreateBy(stationRouteCache.getCreateBy());
+				stationRoute.setCreateDate(stationRouteCache.getCreateDate());
+				stationRoute.setUpdateBy(stationRouteCache.getCreateBy());
+				stationRoute.setUpdateDate(stationRouteCache.getUpdateDate());
+				stationRouteRepository.save(stationRoute);
+			}
+			// 删除缓存站点
+			stationRouteCacheRepository.stationRouteCacheDel(Integer.parseInt(lineCode),directions);
+			
+			resultMap.put("status", ResponseCode.SUCCESS);			
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
+	
 	/**
 	 * @Description :TODO(编辑线路走向)
 	 * 
@@ -177,6 +451,130 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 		return resultMap;
 	}
  
+	/**
+	 * @Description :TODO(编辑缓存线路走向)
+	 */
+	@Override
+	public Map<String, Object> sectionCacheUpdate(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坐标 */
+					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 = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
+			// 是否撤销
+			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
+			Integer sectionRouteId = map.get("sectionRouteId").equals("") ? null : Integer.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 = map.get("sectionrouteCode").equals("") ? null : Integer.valueOf(map.get("sectionrouteCode").toString());
+			SectionRouteCache resultS = routeCacheRepository.findOne(sectionRouteId);
+			int old_code = resultS.getSectionrouteCode();
+			if(sectionrouteCode!=null) {
+				int new_code = sectionrouteCode+100;
+				if(new_code==old_code){
+					sectionrouteCode = new_code;
+				}else {
+					sectionrouteCode = new_code-100+1;
+				}
+			 }else {
+				 sectionrouteCode = old_code;
+			 }
+			// 限速
+			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());
+			// 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());
+			Integer isRoadeSpeed = map.get("isRoadeSpeed").equals("") ? null : Integer.valueOf(map.get("isRoadeSpeed").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="";
+			// 更新
+			repository.sectionUpdate(sectionId, gsectionVector, bsectionVectorS, sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, sectionType, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, version, createBy, createDate, updateBy, updateDate);
+			SectionRouteCache route = new SectionRouteCache();
+			Line line = lineRepository.findOne(sectionRouteLine);
+			Section section = repository.findOne(sectionId);
+			route.setId(sectionRouteId);
+			route.setSectionrouteCode(sectionrouteCode);
+			route.setLineCode(lineCode);
+			route.setSectionCode(sectionCode);
+			route.setDirections(directions);
+			route.setVersions(version);
+			route.setDestroy(destroy);
+			route.setDescriptions(descriptions);
+			route.setCreateBy(createBy);
+			route.setUpdateBy(updateBy);
+			route.setLine(line);
+			route.setSection(section);
+			route.setIsRoadeSpeed(isRoadeSpeed);
+			routeCacheRepository.save(route);
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
+	
 	/** 百度坐标转WGS坐标 */
 	public Location FromBDPointToWGSPoint(String bLonx,String bLatx) {
  
@@ -8,6 +8,7 @@ import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.SectionRouteRepository;
 import com.bsth.repository.StationRepository;
+import com.bsth.repository.StationRouteCacheRepository;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.StationRouteService;
 import com.bsth.util.FTPClientUtils;
@@ -51,6 +52,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	private StationRouteRepository repository;
  
 	@Autowired
+	private StationRouteCacheRepository cacheRepository;
+	
+	@Autowired
 	private SectionRouteRepository routeRepository;
  
 	@Autowired
@@ -493,6 +497,46 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		return resultList;
 	}
  
+	
+	 /**
+	  * @Description :TODO(查询线路某方向下所有站点的中心百度坐标)
+	  * 
+	  * @param map <lineId:线路ID； direction：方向>
+	  * 
+	  * @return List<Map<String, Object>> 
+	  */
+	@Override
+	public List<Map<String, Object>> getStationRouteCacheCenterPoints(Map<String, Object> map) {
+		
+		List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();
+		
+		// 线路ID
+		Integer lineId = map.get("lineId").equals("") ? null : Integer.parseInt(map.get("lineId").toString());
+		
+		// 方向
+		Integer direction = map.get("direction").equals("") ? null : Integer.parseInt(map.get("direction").toString());
+		
+		List<Object[]> list = cacheRepository.getSelectStationRouteCenterPoints(lineId, direction);
+		
+		if(list.size()>0) {
+			
+			for(int i = 0;i<list.size();i++) {
+				
+				Map<String, Object> tempM = new HashMap<String,Object>();
+				
+				tempM.put("bJwpoints", list.get(i)[0]);
+				
+				tempM.put("stationName", list.get(i)[1]);
+				
+				resultList.add(tempM);
+				
+			}
+			
+		}
+		
+		return resultList;
+	}
+	
 	/**
 	 * @Description :TODO(撤销站点)
 	 * 
@@ -668,6 +712,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	 * @return String
 	 */ 
 	public String  newTextFileToFTP(List<Object[]> objects,Integer lineId) {
+
 		// 返回值String
 		String stationRStr = "";
 		// windows下的文本文件换行符
@@ -771,6 +816,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 		}
 		return stationRStr;
+	
 	}
  
 	public String hxTextFileToFtp(List<Object[]> objects,Integer lineId) {
@@ -2,6 +2,7 @@ package com.bsth.service.impl;
  
 import java.math.BigDecimal;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
  
@@ -20,18 +21,23 @@ import com.bsth.entity.Line;
 import com.bsth.entity.LineInformation;
 import com.bsth.entity.Section;
 import com.bsth.entity.SectionRoute;
+import com.bsth.entity.SectionRouteCache;
 import com.bsth.entity.Station;
 import com.bsth.entity.StationRoute;
+import com.bsth.entity.StationRouteCache;
 import com.bsth.repository.LineInformationRepository;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.SectionRepository;
+import com.bsth.repository.SectionRouteCacheRepository;
 import com.bsth.repository.SectionRouteRepository;
 import com.bsth.repository.StationRepository;
+import com.bsth.repository.StationRouteCacheRepository;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.StationService;
 import com.bsth.util.GetUIDAndCode;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
+import com.bsth.util.Geo.Circle;
 import com.bsth.util.Geo.GeoUtils;
 import com.bsth.util.Geo.Point;
  
@@ -61,6 +67,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	private StationRouteRepository routeRepository;
  
 	@Autowired
+	private StationRouteCacheRepository routeCacheRepository;
+
+	@Autowired
 	private LineInformationRepository informationRepository;
  
 	@Autowired 
@@ -72,6 +81,11 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	@Autowired
 	private SectionRouteRepository sectionRouteRepository;
  
+	@Autowired
+	private SectionRouteCacheRepository sectionRouteCacheRepository;
+	
+	private GeoUtils geoUtils;
+		
 	Logger logger = LoggerFactory.getLogger(this.getClass());
  
 	/**
@@ -118,6 +132,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Map<String, Object> resultSaveMapm = new HashMap<String,Object>();
 			String baseRes = map.get("baseRes").equals("") ? "" : map.get("baseRes").toString();
 			if(!stationJSON.equals("")) {
+				// 保存前先撤销原有站点
+				
 				// 保存站点与站点路由信息
 				resultSaveMapm = savaStationAndStationRouteInfo( stationJSON, sectionDistance, sectionDuration, dbType,radius, shapesType, destroy, versions, sumUpOrDownMileage, directions, resultLine,baseRes);
 			}
@@ -930,8 +946,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Float x = map.get("x").equals("") ? null  : Float.parseFloat(map.get("x").toString());
 			Float y = map.get("y").equals("") ?  null  : Float.parseFloat(map.get("y").toString());
 			// 更新
-			/*repository.stationUpdate(stationCod, zdmc, roadCoding, dbType, bJwpoints, gLonx, gLaty, x, y, bPloygonGrid, gPloygonGrid, destroy, radius, shapesType, versions, descriptions, stationId);*/
-			repository.stationUpdate(stationCod, zdmc, roadCoding, dbType, bJwpoints, gLonx, gLaty, x, y, bPloygonGrid, gPloygonGrid, radius, shapesType, versions, descriptions, stationId);
+			repository.stationUpdate(stationCod, zdmc, roadCoding, dbType, bJwpoints, gLonx, gLaty, x, y, bPloygonGrid, gPloygonGrid, destroy, radius, shapesType, versions, descriptions, stationId);
 			// 站点路由Id
 			Integer stationRouteId = map.get("stationRouteId").equals("") ? null : Integer.parseInt(map.get("stationRouteId").toString());
 			StationRoute resultS = routeRepository.findOne(stationRouteId); 
@@ -1000,7 +1015,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
  
 	}
  
-	
+	@Transactional
 	@Override
 	public Map<String, Object> manualSave(Map<String, Object> map) {
 		Map<String, Object> resultMap = new HashMap<String,Object>();
@@ -1073,6 +1088,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 												 Integer destroy,Integer directions) {
 		// 转换成JSON数组
 		JSONArray sectionsArray = JSONArray.parseArray(sectionJSON);
+		// 更新路线前撤销线路原有路段
+		sectionRouteRepository.sectionRouteUpdDestroy(Integer.parseInt(resultLine.getLineCode()),directions);
 		// 遍历
 		for(int s = 0 ;s<sectionsArray.size();s++) {
 			// 站点名称
@@ -1093,11 +1110,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					if(p==pointsArray.size()-1){
 						sectionsBpoints = sectionsBpoints + pointsLngStr + " " + pointsLatStr;
 						sectionsWJPpoints =  sectionsWJPpoints + WGSLngStr + " " + WGSLatStr;
-						// sectionsWJPpoints = sectionsWJPpoints + pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lng") + " " +pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lat");
 					}else {
 						sectionsBpoints = sectionsBpoints + pointsArray.getJSONObject(p).get("lng").toString() + " " +pointsArray.getJSONObject(p).get("lat").toString()+",";
 						sectionsWJPpoints =  sectionsWJPpoints + WGSLngStr + " " + WGSLatStr + ",";
-						// sectionsWJPpoints = sectionsWJPpoints + pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lng") + " " +pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lat") +",";
 					}
 				}
 			}
@@ -1150,10 +1165,369 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			sectionRoute.setVersions(versions);
 			sectionRoute.setDestroy(destroy);
 			// 方向
-			sectionRoute.setDirections(directions);
+			sectionRoute.setDirections(directions);			
+			// 保存路段
 			sectionRouteRepository.save(sectionRoute);
 		}
  
 	}
  
+	/**
+	 * @Description :TODO(根据坐标点匹配数据库中的站点)
+	 * 
+	 * @param map: <point:坐标点； name:站点名>
+	 * 
+	 */
+	@Override
+	@Transactional
+	public Map<String, Object> matchStation(Map<String, Object> map) {
+		boolean isMatch = false;
+		double lat = Double.parseDouble(map.get("potion[lat]").toString());
+		double lon = Double.parseDouble(map.get("potion[lng]").toString());
+		Point point = new Point(lon, lat);		
+		Iterable<Station> Stations = repository.findAll();
+		for (Station s : Stations) {
+			String libraryPointstr =  s.getbJwpoints();
+			String points[] = libraryPointstr.toString().split(" ");
+			Point center = new Point(Double.parseDouble(points[0]), Double.parseDouble(points[1]));
+			// 在100m内认为是同一个站点
+			Circle circle = new Circle(center, 100);
+			// 匹配到了用数据库中的点替换
+			if (geoUtils.isPointInCircle(point, circle)) {
+				map.put("name", s.getStationName().toString());
+				map.put("potion_lng", points[0]);
+				map.put("potion_lat", points[1]);
+				map.put("isHave", "true");
+				map.put("id", s.getId());
+				isMatch = true;
+				break;
+			}
+		}
+		// 如果没有匹配到站点就用这个点
+		if (!isMatch) {
+			map.put("potion_lng", lon);
+			map.put("potion_lat", lat);
+			map.put("isHave", "false");
+			map.put("id", "");
+		}
+		return map;
+	}
+	
+	/**
+	 * @Description :TODO(把上传Gps生成的路线放到缓存表中)
+	 * 
+	 * @param map: 站点和坐标
+	 * 
+	 */
+	@Transactional
+	@Override
+	public Map<String, Object> cacheSave(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String,Object>();
+		try {
+			// 站点信息字符传
+		    String stationJSON = map.get("stationJSON").equals("")  ? "" : map.get("stationJSON").toString();
+		    // 路段信息字符串
+		    String sectionJSON = map.get("sectionJSON").equals("")  ? "" : map.get("sectionJSON").toString();
+		    // 方向
+		    int directions = Integer.parseInt(map.get("directions").toString());
+		    // 是否撤销
+		    int destroy = map.get("destroy").equals("") ? 0 : Integer.parseInt(map.get("destroy").toString());
+		    // 版本
+		    int versions = map.get("versions").equals("") ? 0 : Integer.parseInt(map.get("versions").toString());
+			// 坐标类型
+			String dbType =  map.get("dbType").equals("") ? "" : map.get("dbType").toString();
+			// 限速
+			String speedLimitStr = map.get("speedLimit").equals("") ? "" : map.get("speedLimit").toString();
+			// 线路ID
+			int lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
+			// 半径
+			int radius =  map.get("radius").equals("") ? 0 : Integer.parseInt(map.get("radius").toString());
+			// 图形类型
+			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
+			// 线路信息
+			Line resultLine = lineRepository.findOne(lineId);
+			// 路段距离
+			Double sectionDistance = 0.0d;
+			// 路段时长
+			Double sectionDuration = 0.0d;
+			// 里程(上或者下)
+			double sumUpOrDownMileage = 0.0d;
+			Map<String, Object> resultSaveMapm = new HashMap<String,Object>();
+			String baseRes = map.get("baseRes").equals("") ? "" : map.get("baseRes").toString();
+			
+			if(!stationJSON.equals("")) {
+				// 保存站点与站点路由信息
+				resultSaveMapm = savaStationAndStationRouteCacheInfo( stationJSON, sectionDistance, sectionDuration, dbType,radius, shapesType, destroy, versions, sumUpOrDownMileage, directions, resultLine,baseRes);
+			}
+			// 路段长度
+			sectionDistance = Double.valueOf(resultSaveMapm.get("sectionDistance").toString());
+			// 路段时长
+			sectionDuration = Double.valueOf(resultSaveMapm.get("sectionDuration").toString());
+			// 如果路段信息JSON字符串不为空
+			if(!sectionJSON.equals("")) {
+				SaveSectionAndSectionRouteCache(sectionJSON, speedLimitStr, sectionDistance, sectionDuration, dbType, versions, resultLine, destroy, directions);
+			}
+			// 里程
+			sumUpOrDownMileage = Double.valueOf(resultSaveMapm.get("sumUpOrDownMileage").toString());
+			BigDecimal s = new BigDecimal(sumUpOrDownMileage);
+			sumUpOrDownMileage = s.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+			// 更新里程
+			// updateLineInfoUpOrDownMileage( resultLine , directions, sumUpOrDownMileage);
+			if(directions==0) {
+				// lineUpdateStationName(resultLine);
+			}
+			resultMap.put("status", ResponseCode.SUCCESS);
+			resultMap.put("stationData", resultSaveMapm.get("stationdata"));
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		
+		return resultMap;
+	}
+	
+	/**
+	 * @param isHaveId 存在站点的id
+	 * @param isHave 是否存在站点
+	 * @Description :TODO(保存站点和缓存站点路由信息)
+	 * 
+	 */
+	public Map<String, Object> savaStationAndStationRouteCacheInfo(String stationJSON,double sectionDistance,double sectionDuration,String dbType,
+			int radius,String shapesType,int destroy,int versions,double sumUpOrDownMileage,int directions,Line resultLine,String baseRes) throws Exception{
+		Map<String, Object> paramsMeleageAndDistncDura = new HashMap<String,Object>();
+		JSONArray stationsArray = JSONArray.parseArray(stationJSON);
+		if(stationsArray.size()>0) {
+			// 更新路线前删除线路缓存站点
+			routeCacheRepository.stationRouteCacheDel(Integer.parseInt(resultLine.getLineCode()),directions);
+			for(int i = 0;i <stationsArray.size();i++) {
+				// 站点名称
+				String stationName = stationsArray.getJSONObject(i).equals("") ? "" : stationsArray.getJSONObject(i).get("name").toString();
+				Double distance = stationsArray.getJSONObject(i).get("distance").equals("") ? 0.0d : Double.parseDouble(stationsArray.getJSONObject(i).get("distance").toString());
+				// 转成公里
+				distance = distance/1000;
+				BigDecimal d = new BigDecimal(distance);
+				distance = d.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+				sectionDistance= distance + sectionDistance;
+				Double duration = stationsArray.getJSONObject(i).get("duration").equals("") ? 0.0d : Double.parseDouble(stationsArray.getJSONObject(i).get("duration").toString());
+				// 转成分钟
+				duration = duration/60;
+				BigDecimal t = new BigDecimal(duration);
+				duration = t.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+				sectionDuration = duration + sectionDuration;
+				// 百度经纬度坐标
+				String bJwpoints = "";
+				// 百度坐标经度
+				String bLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lng").toString();
+				bLonx = bLonx==null || bLonx.equals("") ? "0" : bLonx;
+				// 百度坐标纬度
+				String bLatx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lat").toString();
+				bLatx = bLatx==null || bLatx.equals("") ? "0" : bLatx;
+				List<Object[]> stationNameList = repository.findStationName(directions,stationName);
+				//Map<String, Object> isHaveMap = isHaveStationname(bLonx,bLatx,stationNameList);
+				// 初始化站点对象
+				Station arg0 =  new Station();
+				// 存在的点就不添加到数据库
+				if(Boolean.parseBoolean(stationsArray.getJSONObject(i).get("isHave").toString())) {
+					Integer stationId = Integer.parseInt(stationsArray.getJSONObject(i).get("id").toString());
+					arg0 = repository.findOne(stationId);
+				}else {
+					// 站点编码
+					long stationCode = GetUIDAndCode.getStationId();
+					arg0.setStationCod(String.valueOf(stationCode));
+					arg0.setId((int)stationCode);
+					arg0.setStationName(stationName);
+					// 原坐标类型
+					arg0.setDbType(dbType);
+					String gLonxStr = JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("x").equals("") ? null : JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("x").toString();
+					String gLatyStr = JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("y").equals("") ? null : JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("y").toString();
+					float gLonx = 0.0f;
+					float gLaty = 0.0f;
+					Location resultPoint = null;
+					if(baseRes.equals("No")){
+						/** BD to WGS坐标 */
+						resultPoint = FromBDPointToWGSPoint(bLonx,bLatx);
+						if(gLonxStr==null) 
+							gLonx = (float)resultPoint.getLng();
+						else 
+							gLonx =  Float.valueOf(gLonxStr);
+						if(gLatyStr==null)
+							gLaty = (float)resultPoint.getLat();
+						else 
+							gLaty =  Float.valueOf(gLatyStr);
+						arg0.setgLonx(gLonx);
+						arg0.setgLaty(gLaty);
+						// 百度经纬度
+						bJwpoints = bLonx + " " + bLatx;
+						arg0.setbJwpoints(bJwpoints);
+					}else if(baseRes.equals("GCJ02")){
+						Location bdLoc = TransGPS.LocationMake(Double.valueOf(gLonxStr), Double.valueOf(gLatyStr));
+						Location location = TransGPS.bd_encrypt(bdLoc);
+						String GCJLng = String.valueOf(location.getLng());
+						String GCJLat = String.valueOf(location.getLat());
+						resultPoint = FromBDPointToWGSPoint(GCJLng,GCJLat);
+						bJwpoints = GCJLng + " "  +GCJLat;
+						arg0.setgLonx((float)location.getLng());
+						arg0.setgLaty((float)location.getLat());
+						arg0.setbJwpoints(bJwpoints);
+					}else if(baseRes.equals("BD09")){
+						resultPoint = FromBDPointToWGSPoint(gLonxStr, gLatyStr);
+						bJwpoints = gLonxStr+ " " + gLatyStr;
+						arg0.setgLonx((float)resultPoint.getLng());
+						arg0.setgLaty((float)resultPoint.getLat());
+					}else if(baseRes.equals("WGS84")){
+						Location bdLoc = TransGPS.LocationMake(Double.valueOf(gLonxStr), Double.valueOf(gLatyStr));
+						Location gcjLoc = TransGPS.transformFromWGSToGCJ(bdLoc);
+						Location bdEn = TransGPS.bd_encrypt(gcjLoc);
+						bJwpoints = String.valueOf(bdEn.getLng()) + " " + String.valueOf(bdEn.getLat()); 
+						arg0.setbJwpoints(bJwpoints);
+						arg0.setgLonx(Float.valueOf(gLonxStr));
+						arg0.setgLaty(Float.valueOf(gLatyStr));
+					}
+					arg0.setRadius(radius);
+					arg0.setShapesType(shapesType);
+					// 是否想撤销
+					arg0.setDestroy(destroy);
+					// 版本号
+					arg0.setVersions(versions);
+					arg0.setbJwpoints(bJwpoints);
+					// 插入站点信息
+					repository.save(arg0);
+					
+				}
+				// 站点路由对象
+				StationRouteCache route = new StationRouteCache();
+				// 站点名称
+				route.setStationName(stationName);
+				route.setDistances(distance);
+				sumUpOrDownMileage =  sumUpOrDownMileage + distance;
+				route.setToTime(duration);
+				// 站点编码
+				route.setStationCode(arg0.getStationCod());
+				// 站点序号
+				route.setStationRouteCode((i+1)*100);
+				// 站点类型
+				if(i==0) {
+					// 起始站
+					route.setStationMark("B");
+				}else if(i==stationsArray.size()-1) {
+					// 终点站
+					route.setStationMark("E");
+				}else {
+					// 中途站
+					route.setStationMark("Z");
+				}
+				// 版本号
+				route.setVersions(versions);
+				// 站点ID
+				route.setStation(arg0);
+				// 方向
+				route.setDirections(directions);
+				// 线路ID
+				route.setLine(resultLine);
+				// 线路编码
+				route.setLineCode(resultLine.getLineCode());
+				route.setDestroy(destroy);
+				// 插入站点路由信息 
+				routeCacheRepository.save(route);
+				
+			}
+			paramsMeleageAndDistncDura.put("sumUpOrDownMileage", sumUpOrDownMileage);
+			paramsMeleageAndDistncDura.put("sectionDistance", sectionDistance);
+			paramsMeleageAndDistncDura.put("sectionDuration", sectionDuration);
+			paramsMeleageAndDistncDura.put("stationdata",stationsArray);
+		}
+		return paramsMeleageAndDistncDura;
+	}
+	
+	/**
+	 * @Description :TODO(保存路段和缓存路段路由信息)
+	 * 
+	 */
+	public void SaveSectionAndSectionRouteCache(String sectionJSON,String speedLimitStr,double sectionDistance, double sectionTime,
+			String dbType,Integer versions,Line resultLine,Integer destroy,Integer directions) {
+		// 转换成JSON数组
+		JSONArray sectionsArray = JSONArray.parseArray(sectionJSON);
+		// 更新路线前删除线路缓存路段
+		sectionRouteCacheRepository.sectionRouteCacheDel(Integer.parseInt(resultLine.getLineCode()),directions);
+		// 遍历
+		for(int s = 0 ;s<sectionsArray.size();s++) {
+			// 站点名称
+			String sectionName = sectionsArray.getJSONObject(s).equals("") ? "" : sectionsArray.getJSONObject(s).get("sectionName").toString();
+			String pointsStr = sectionsArray.getJSONObject(s).equals("") ? "" : sectionsArray.getJSONObject(s).get("points").toString();
+			// 原始线状图形坐标集合
+			String sectionsBpoints = "";
+			// WGS线状图形坐标集合
+			String sectionsWJPpoints = "";
+			if(!pointsStr.equals("")){
+				JSONArray pointsArray = JSONArray.parseArray(pointsStr);
+				for(int p =0;p<pointsArray.size();p++){
+					String pointsLngStr = pointsArray.getJSONObject(p).get("lng").toString();
+					String pointsLatStr = pointsArray.getJSONObject(p).get("lat").toString();
+					Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
+					String WGSLngStr = String.valueOf(resultPoint.getLng());
+					String WGSLatStr = String.valueOf(resultPoint.getLat());
+					if(p==pointsArray.size()-1){
+						sectionsBpoints = sectionsBpoints + pointsLngStr + " " + pointsLatStr;
+						sectionsWJPpoints =  sectionsWJPpoints + WGSLngStr + " " + WGSLatStr;
+					}else {
+						sectionsBpoints = sectionsBpoints + pointsArray.getJSONObject(p).get("lng").toString() + " " +pointsArray.getJSONObject(p).get("lat").toString()+",";
+						sectionsWJPpoints =  sectionsWJPpoints + WGSLngStr + " " + WGSLatStr + ",";
+					}
+				}
+			}
+			long sectionMaxId = GetUIDAndCode.getSectionId();
+			String sectionCode = String.valueOf(sectionMaxId);
+			int sectionId = (int) (sectionMaxId);
+			// 交出路
+			String crosesRoad = "";
+			// 终止节点
+			String endNode = "";
+			// 开始节点
+			String startNode = "";
+			// 中间节点
+			String middleNode = "";
+			// WGS坐标点集合
+			String gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+			// 原坐标点集合
+			String bsectionVector = "LINESTRING(" + sectionsBpoints + ")";
+			// 城建坐标点集合
+			String csectionVector = "";
+			// 路段类型
+			String sectionType = "";
+			// 道路编码
+			String roadCoding = "";
+			// 限速
+			double speedLimit = Double.parseDouble(speedLimitStr);
+			// 说明
+			String descriptions = "";
+			sectionRepository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, 
+										
+										 middleNode, gsectionVector, bsectionVector, sectionType, csectionVector, 
+										 
+										 roadCoding, sectionDistance, sectionTime, dbType, speedLimit, 
+										 
+										 descriptions, versions,sectionId);
+			Section section = sectionRepository.findOne(Integer.parseInt(sectionCode));
+			// 路段路由
+			SectionRouteCache sectionRoute = new SectionRouteCache();
+			// 路段序号
+			sectionRoute.setSectionrouteCode((s+1)*100);
+			// 线路编码
+			sectionRoute.setLineCode(resultLine.getLineCode());
+			// 路段ID
+			sectionRoute.setSection(section);
+			// 线路ID
+			sectionRoute.setLine(resultLine);
+			// 路段编码
+			sectionRoute.setSectionCode(sectionCode);
+			// 版本
+			sectionRoute.setVersions(versions);
+			sectionRoute.setDestroy(destroy);
+			// 方向
+			sectionRoute.setDirections(directions);			
+			// 保存路段
+			sectionRouteCacheRepository.save(sectionRoute);
+		}
+		
+	}
 }
@@ -105,7 +105,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,Object>> accountPx(String line,String date,String code,String xlName, String px);
  
  
-	List<SchEditInfoDto> correctForm(String line,String date,String endDate,String lpName,String code, String type);
+	List<SchEditInfoDto> correctForm(String line,String date,String endDate,String lpName,String code, String type,String changType);
  
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
  
@@ -1810,7 +1810,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
     @Override
     public List<SchEditInfoDto> correctForm(String line,String date,String endDate,
-    		String lpName,String code, String type) {
+    		String lpName,String code, String type,String changType) {
  
 //        var types = {'DFTZ': '待发调整', 'FCXXWT':'发车信息微调', 'JHLB': '计划烂班', 'CXLB': '撤销烂班', 
 //    	'CXZX': '撤销执行', 'CXSF': '撤销实发', 'SFTZ': '实发调整', 'TZRC': '调整人车'};
@@ -1824,6 +1824,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     	map.put("SFTZ", "实发调整");
     	map.put("TZRC", "调整人车");
  
+    	SimpleDateFormat sdf1=new SimpleDateFormat("HH:mm");
+    	SimpleDateFormat sdf2=new SimpleDateFormat("yyyy-MM-dd HH:mm");
     	String cont = "";
          cont = " and xl_bm ='"+line +"'";
          if(!lpName.equals("")){
@@ -1832,7 +1834,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          if(!code.equals("")){
         	 cont +=" and cl_zbh ='"+code+"'";
          }
-         String sql = "select t1.*, "
+         String sql = "select t1.*, t2.real_exec_date,"
          		+ "t2.fcsj,t2.lp_name,t2.cl_zbh,t2.j_gh,t2.j_name,"
          		+ "t2.xl_dir,t2.real_exec_date from (select * from "
          		+ "logger_sch_modify where rq BETWEEN ? and  ? and line_code=? )"
@@ -1843,9 +1845,39 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         		 new BeanPropertyRowMapper(SchEditInfoDto.class),date,endDate, line);
          List<SchEditInfoDto> lists=new ArrayList<SchEditInfoDto>();
          for (int i = 0; i < list.size(); i++) {
+        	 Long fcsjs=0l;
+			 Long updsj=0l;
         	 SchEditInfoDto t=list.get(i);
         	 if(map.get(t.getType())!=null){
-        		 t.setType2(t.getUser()+"于"+t.getTimeStr()+"进行"+map.get(t.getType()).toString()+";");
+        		 
+        		 if(changType.equals("")){
+            		 t.setType2(t.getUser()+"于"+t.getTimeStr()+"进行"+map.get(t.getType()).toString()+";");
+        		 }else{
+        			 String fcsj="";
+        			 String updtime="";
+        			 try {
+        				 fcsj= sdf1.format(sdf1.parse(t.getFcsj()));
+        				 updtime=sdf1.format(sdf1.parse(t.getTimeStr()));
+        				 fcsjs=sdf2.parse(t.getRealExecDate()+" "+fcsj).getTime();
+        				 updsj=sdf2.parse(t.getRq()+" "+updtime).getTime();
+        			 } catch (ParseException e) {
+ 						// TODO Auto-generated catch block
+ 						e.printStackTrace();
+ 					}
+	        		 if(changType.equals("1")){
+	        			if(fcsjs>updsj){
+	               		    t.setType2(t.getUser()+"于"+t.getTimeStr()+"进行"+map.get(t.getType()).toString()+";");
+	        			}else{
+	        				t.setType2("");
+	        			}
+	        		 }else if(changType.equals("2")){
+	        			 if(fcsjs<updsj){
+		               		    t.setType2(t.getUser()+"于"+t.getTimeStr()+"进行"+map.get(t.getType()).toString()+";");
+		        		 }else{
+		        				t.setType2("");
+		        		 }
+	        		 }
+        		 }
         	 }else{
         		 t.setType2("");
         	 }
@@ -1859,7 +1891,19 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			}
  
         	 if(fage){
-        		 lists.add(t);
+        		 if(changType.equals("")){
+        			 lists.add(t);
+				 } else {
+					if (changType.equals("1")) {
+						if (fcsjs > updsj) {
+							lists.add(t);
+						}
+					} else if (changType.equals("2")) {
+						if (fcsjs < updsj) {
+							lists.add(t);
+						} 
+					}
+				}
         	 }
 		 }
  
@@ -4,6 +4,7 @@ import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.excep.ArrivalInfo;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -2234,6 +2235,7 @@ public class ReportServiceImpl implements ReportService{
 			String date=map.get("date").toString();
 			String gsbm=map.get("gsbm").toString();
 			String fgsbm=map.get("fgsbm").toString();
+			String type=map.get("type").toString();
 			List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
 			if(line.equals("")){
 				list=scheduleRealInfoRepository.scheduleByDateAndLineByGs(gsbm, fgsbm, date);
@@ -2273,7 +2275,6 @@ public class ReportServiceImpl implements ReportService{
 				}
 			});
  
- 			
  			 for (int i = 0; i < xlList.size(); i++) {
  				 String lineCode=xlList.get(i).get("line").toString();
  				 String grade =xlList.get(i).get("grade").toString();
@@ -2309,6 +2310,7 @@ public class ReportServiceImpl implements ReportService{
 						e.printStackTrace();
 					}
 				 }
+ 				 
  				 if(listInfo.size()>0){
  					 int sjbcs=culateService.culateSjbc(list_, "")+culateService.culateLjbc(list_, "");
  					 Map<String, Object> m=listDjg(gsbm,fgsbm,lineCode,sjbcs,peak,trough,listInfo,grade);
@@ -2316,6 +2318,21 @@ public class ReportServiceImpl implements ReportService{
  				 }
  
 			}
+ 			 if(type.equals("export")){
+		    	    List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		            Map<String, Object> m = new HashMap<String, Object>();
+		            m.put("date", date);
+		            ReportUtils ee = new ReportUtils();
+		            try {
+		                listI.add(lMap.iterator());
+		                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+		                ee.excelReplace(listI, new Object[]{m}, path + "mould/countInterval.xls",
+		                        path + "export/大间隔统计表.xls");
+		            } catch (Exception e) {
+		                // TODO: handle exception
+		                e.printStackTrace();
+		            }
+		       }
 			return lMap;
 		}
  
@@ -7,6 +7,8 @@ import com.bsth.service.schedule.CarDeviceService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
  
@@ -21,7 +23,7 @@ public class CarDeviceServiceImpl extends BServiceImpl&lt;CarDevice, Long&gt; implemen
     @Autowired
     private CarsService carsService;
  
-    @Transactional
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     @Override
     public CarDevice save(CarDevice carDevice) {
         // 查找对应的车辆基础信息，更新设备编号数据
@@ -144,6 +144,11 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
         return ttInfoDetailForEdit.getEditInfo(xlid, ttid, maxfcno);
     }
  
+    public static void main(String[] args) {
+        String test = "中1中111";
+        System.out.println(test.replaceAll("(\\d+)$", ""));
+    }
+
     @Override
     public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename) throws ScheduleException {
         try {
@@ -162,8 +167,9 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                         if (StringUtils.isEmpty(cell_con)) {
                             throw new Exception(String.format("第1行，第%d列数据不能为空", i + 1));
                         } else {
-                            // 正则表达式去除数字
-                            cell_con = cell_con.replaceAll("[\\d+]", "");
+                            // 正则表达式去除右侧数字
+//                            cell_con = cell_con.replaceAll("[\\d+]", "");
+                            cell_con = cell_con.replaceAll("(\\d+)$", "");
  
                             if (i == 0) { // 第一列必须是路牌2个字
                                 if (!"路牌".equals(cell_con.trim())) {
@@ -828,7 +828,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; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x4e2d;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x5c;d&#x2b;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname</name>
         <rename>qdzname</rename>
         <type>String</type>
@@ -828,7 +828,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; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x4e2d;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x5c;d&#x2b;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname</name>
         <rename>qdzname</rename>
         <type>String</type>
+#bmap_basic{
+	min-width: 100%;
+	width: calc(100% + 26px); 
+	margin-top: -28px;
+	border: 2px solid #fdfdfd;
+	min-height: 1200px;
+	height:100%;
+	overflow: hidden;
+}
+
+html,body{
+	overflow:hidden;
+}
+
+.caption {
+    color: #B7B7B7;
+    font-size: 18px;
+  
+    position: relative;
+    margin: 15px;
+   
+    font-family: 微软;
+}
+
+.cut-section{ position:absolute; right:40px; top:50px; background:#12527f; width:320px;max-height: 700px;min-height: 300px;} 
+
+.rm3_image {
+	width: 120px;
+    height: 26px;
+	
+}
+
+/* 隐藏百度地图logo */
+.anchorBL,
+.anchorBL,
+.amap-logo,
+.amap-copyright{
+	display: none;
+}
+
+
+.BMap_pop {
+	
+	box-shadow: 0 12px 15px 0 rgba(204, 204, 204, 0.33),0 17px 50px 0 rgba(204, 204, 204, 0.33)!important;
+	
+}
@@ -191,46 +191,7 @@
 	                <!-- 是否撤销 START -->
                  </div>
                  <!-- 表单分组组件 form-group END -->
-                  <!-- 表单分组组件 form-group START -->
-                 <div class="form-group">
-                 	<!-- 是否营运START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5">
-							<span class="required"> * </span>是否营运线路&nbsp;&nbsp;&nbsp;&nbsp;:
-						</label>
-	                 	<div class="col-md-4">
-	              			<div class="md-radio-inline">
-	              				<div class="md-radio">
-	              					<input type="radio" id="radio18" name="sfyy" class="md-radiobtn" value="1" data-title="是" checked="checked" >
-									<label for="radio18">
-										<span></span>
-										<span class="check"></span>
-										<span class="box"></span> 是
-									</label>
-	                			</div>
-	                			<div class="md-radio has-error">
-	                				<input type="radio" id="radio19" name="sfyy" class="md-radiobtn" value="0" data-title="否" >
-	                				<label for="radio19" style="color:#FFC0CB">
-		                               	<span></span>
-		                               	<span class="check"></span>
-		                               	<span class="box"></span> 否
-	                     			</label>
-	              				</div>
-	               			</div>
-						 </div>
-	                </div>
-	                <!-- 是否营运 END -->
-	                <!-- 权证车辆数 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 权证车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-                    	<div class="col-md-4">
-                     		<input type="text" class="form-control" name="warrantCar" id="warrantCarInput" placeholder="权证车辆数">
-                    	</div>
-	                </div>
-	                <!-- 权证车辆数 END -->
-	               
-                 </div>
-                 <!-- 表单分组组件 form-group END -->
+                 
                  <!-- 表单分组组件 form-group START -->
                  <div class="form-group">
 					<!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) -->
@@ -321,20 +282,14 @@
 	                </div>
 	                <!-- 线路规划类型 (* 必填项) END -->
  
-	                 <!--大间隔等级 START　-->
+	                 <!-- 开辟日期 START　-->
 					<div class="col-md-6">
-						<label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
 	                    <div class="col-md-4">
-	                     	<select name="spacGrade" class="form-control" id="spacGradeSelect">
-								<option value="">-- 请选择大间隔等级 --</option>
-								<option value="1">一级</option>
-								<option value="2">二级</option>
-								<option value="3">三级</option>
-								<option value="4">四级</option>
-							</select>
+	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
 	                    </div>
 	                </div>
-	                <!-- 大间隔等级END　-->
+	                <!-- 开辟日期 END　-->
                  </div>
                  <!-- 表单分组组件 form-group START -->
  
@@ -436,15 +391,6 @@
 	                    </div>
 	                </div>
 	                <!-- 空调车辆数 END -->
-	                
-	                <!-- 开辟日期 START　-->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-	                    <div class="col-md-4">
-	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
-	                    </div>
-	                </div>
-	                <!-- 开辟日期 END　-->
                  </div>
                  <!-- 表单分组组件 form-group END -->
  
@@ -43,7 +43,7 @@
 			<!-- 表单内容 START -->
 			<div class="form-body">
 				<input type="hidden" name="id" id="lineId">
-				<input type="hidden" name="inUse" id="inUse">
+				
 				<!-- 表单分组组件 form-group START -->
 				<div class="form-group">
 					<!-- 线路编码 (* 必填项) START -->
@@ -199,46 +199,7 @@
 	                <!-- 是否撤销 START -->
                  </div>
                  <!-- 表单分组组件 form-group END -->
-                  <!-- 表单分组组件 form-group START -->
-                 <div class="form-group">
-                 	<!-- 是否营运START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5">
-							<span class="required"> * </span>是否营运线路&nbsp;&nbsp;&nbsp;&nbsp;:
-						</label>
-	                 	<div class="col-md-4">
-	              			<div class="md-radio-inline">
-	              				<div class="md-radio">
-	              					<input type="radio" id="radio18" name="sfyy" class="md-radiobtn" value="1" data-title="是" checked="checked" >
-									<label for="radio18">
-										<span></span>
-										<span class="check"></span>
-										<span class="box"></span> 是
-									</label>
-	                			</div>
-	                			<div class="md-radio has-error">
-	                				<input type="radio" id="radio19" name="sfyy" class="md-radiobtn" value="0" data-title="否" >
-	                				<label for="radio19" style="color:#FFC0CB">
-		                               	<span></span>
-		                               	<span class="check"></span>
-		                               	<span class="box"></span> 否
-	                     			</label>
-	              				</div>
-	               			</div>
-						 </div>
-	                </div>
-	                <!-- 是否营运 END -->
-	                
-	               <!-- 权证车辆数 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 权证车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-                    	<div class="col-md-4">
-                     		<input type="text" class="form-control" name="warrantCar" id="warrantCarInput" placeholder="权证车辆数">
-                    	</div>
-	                </div>
-	                <!-- 权证车辆数 END -->
-                 </div>
-                 <!-- 表单分组组件 form-group END -->
+                 
                  <!-- 表单分组组件 form-group START -->
                  <div class="form-group">
 					<!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) -->
@@ -329,20 +290,14 @@
 	                </div>
 	                <!-- 线路规划类型 (* 必填项) END -->
  
-	                <!--大间隔等级 START　-->
+	                 <!-- 开辟日期 START　-->
 					<div class="col-md-6">
-						<label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
 	                    <div class="col-md-4">
-	                     	<select name="spacGrade" class="form-control" id="spacGradeSelect">
-								<option value="">-- 请选择大间隔等级 --</option>
-								<option value="1">一级</option>
-								<option value="2">二级</option>
-								<option value="3">三级</option>
-								<option value="4">四级</option>
-							</select>
+	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
 	                    </div>
 	                </div>
-	                <!-- 大间隔等级END　-->
+	                <!-- 开辟日期 END　-->
                  </div>
                  <!-- 表单分组组件 form-group START -->
  
@@ -444,15 +399,6 @@
 	                    </div>
 	                </div>
 	                <!-- 空调车辆数 END -->
-	                
-	                 <!-- 开辟日期 START　-->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-	                    <div class="col-md-4">
-	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
-	                    </div>
-	                </div>
-	                <!-- 开辟日期 END　-->
                  </div>
                  <!-- 表单分组组件 form-group END -->
  
+<!-- 手动添加站点 -->
+<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-9">
+							<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;">
+                            		&nbsp;请在文本域中按顺序依次输坐标点（如果是站点，请将在坐标后面用【Tab】键隔开后加(站点名/stop);没有(站点名/stop)默认是路段点）,每输入完一个坐标时请按回车键【Enter】换行.
+                            		例如：<br>
+                            		121.715623	31.224058	042408.000<br>
+									121.715623	31.224065	042409.000	Stop<br>
+									121.715623	31.224065	042410.000<br>
+                            	</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" 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();
+	});
+	// 表单验证
+	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();
+			editRoute.setLineDir(directionData);
+			// 弹出正在加载层
+			var i = layer.load(0,{offset:['200px', '280px']});
+			// 表单序列化
+			var paramsForm = form.serializeJSON();
+			// 切割坐标点
+			var array = paramsForm.points.split('\r\n');
+			// 把坐标点转换为站点或路段
+			var arrayFormat = inputStationValueFormat(array);
+			var stationList = arrayFormat.stationList;			
+			var sectionListTemp = arrayFormat.sectionList;
+			var sectionList = [];
+			// 隔50个取一个点（相当于50s）
+			for(var i = 0; i*40 < sectionListTemp.length; i++) {
+				sectionList[i] = sectionListTemp[i*40];
+			}
+			
+			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 = '100';
+					// 限速
+					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;
+			}
+		              
+		}
+		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;
+	}
+	
+	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();
+				// 查询路段信息
+				$get('/sectionroute/findSectionCache',{'line.id_eq' : lineid , 'directions_eq' : directionData},function(data) {
+					// 在地图上画出线路走向
+					fun.linePanlThree(lineid,data,directionData);
+				});
+				$('#upload_show').removeClass('hidden');
+				//$('#Undo').removeClass('hidden');
+				//$('#cut_section').removeClass('hidden');
+				//$('#uploadRoute').addClass('hidden');
+				$('#upload').addClass('hidden');
+				layer.msg('请先编辑路段，并保存！！！');
+			}else {
+				layer.msg('生成路线失败！');
+			}
+		});		
+	} 
+});
+</script>
 \ No newline at end of file
+<!-- 编辑路段 -->
+<div class="modal fade" id="edit_section_mobal_cache" 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_cache" action="" method="post">
+					<div class="alert alert-danger display-hide"> <button class="close" data-close="alert"></button>
+						您的输入有误，请检查下面的输入项
+					</div>
+					<!-- 线路ID -->
+					<input type="hidden" name="sectionId" id="sectionIdInput">
+					<input type="hidden" name="sectionRouteId" id="sectionRouteIdInput">
+					<input type="hidden" name="sectionRouteLine" id="sectionRouteLineInput">
+					<input type="hidden" name="lineCode" id="lineCodeInput">
+					<input type="hidden" name="bsectionVector" id="bsectionVectorInput" />
+					<input type="hidden" name="csectionVector" id="csectionVectorInput" value=""/>
+					<input type="hidden" name="dbType" id="dbTypeInput" value="b"/>
+					<input type="hidden" name="isRoadeSpeed" id="isRoadeSpeedInput"/>
+					<!-- 路段名称 -->
+					<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="sectionNameInput" placeholder="路段名称"> 
+							</div>
+						</div>
+					</div>
+					<!-- 路段编码 -->
+					<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="sectionCode" id="sectionCodeInput" placeholder="路段编码"  readonly="readonly">
+							</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="sectionrouteCodeSelect" style="width:100%"></select>
+								<span class="help-block">说明:选择的路段将作为本站序号的参考，成为选择路段的下一个路段。 </span>
+							</div>
+						</div>
+					</div>
+					<!-- 路段方向 -->
+					<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">
+								<select name="directions" class="form-control" id="directionsSection">
+									<option value="">-- 请选择路段类型 --</option>
+									<option value="0">上行</option>
+									<option value="1">下行</option>
+								</select>
+							</div>
+						</div>
+					</div>
+					<!-- 路段限速 -->
+					<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="speedLimit" id="speedLimitInput" placeholder="路段限速">
+							</div>
+						</div>
+					</div>
+					<!-- 是否撤销 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="col-md-3 control-label"><span class="required"> * </span>是否撤销:</label>
+							<div class="col-md-6">
+								<select name="destroy" class="form-control" id="destroySelect">
+									<option value="">-- 请选择撤销类型 --</option>
+									<option value="0">否</option>
+									<option value="1">是</option>
+								</select>
+							</div>
+						</div>
+					</div>
+					<!-- 道路编码-->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">道路编码:</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="roadCoding" id="roadCodingCodInput" placeholder="道路编码">
+							</div>
+						</div>
+					</div>
+					<!-- 路段长度 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="col-md-3 control-label">路段长度:</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="sectionDistance" id="sectionDistanceInput" placeholder="路段长度">
+								<span class="help-block">单位:公里(km)</span>
+							</div>
+						</div>
+					</div>
+					<!-- 路段历时 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="col-md-3 control-label">路段历时:</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="sectionTime" id="sectionTimeInput" placeholder="路段历时">
+								<span class="help-block">单位:分钟(min)</span>
+							</div>
+						</div>
+					</div>
+					<!-- 版本号 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;:</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="versions" id="versionsInput" Readonly>
+							</div>
+						</div>
+					</div>
+					<!-- 描述/说明 -->
+	                <div class="form-group">
+	                	<label class="control-label col-md-3"> 描述/说明: </label>
+                 		<div class="col-md-6">
+                     		<textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea" placeholder="描述/说明"></textarea>
+                    	</div>
+	                </div>
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-primary" id="editSectionCacheButton">提交数据</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+
+$('#edit_section_mobal_cache').on('editSectionMobalCache_show', function(e, map_,ajaxd,section,fun){
+	var Section = section.getEitdSection();
+	fun.setSectionFormValue(Section);
+	// 方向
+	var dir = Section.sectionrouteDirections;
+	var lineId = Section.sectionrouteLine;
+	// 获取路段号元素，并添加下拉属性值
+	ajaxd.getStation(lineId,dir,function(treeData) {
+		var array = treeData[0].children[1].children,paramsD =new Array();	
+		var eq_scetionRouteCode =  Section.sectionrouteCode;
+		paramsD.push({'id':'请选择...','text':'请选择...'});
+		// 遍历.
+		$.each(array, function(i, g){
+			// 判断.
+			if(g.sectionName!='' || g.sectionName != null) {
+				var ptions_v = g.sectionrouteCode;
+				if(eq_scetionRouteCode != ptions_v){
+					// 添加拼音检索下拉框格式数据数组.
+					paramsD.push({'id':ptions_v,
+								  'text':g.sectionName + '(' + ptions_v + ')' + '  --' + fun.dirdmToName(g.sectionrouteDirections)});
+				}
+			}
+		});
+		// 初始化上一个路段拼音检索下拉框.
+		initPinYinSelect2($('#sectionrouteCodeSelect'),paramsD,function(selector) {
+			$('#sectionDirSelect').val('');// 设值方向.
+			ajaxd.findUpSectionRouteCode(lineId,dir,eq_scetionRouteCode,function(str) {
+				if(str.length>0){
+					var upStationRouteCode = str[0].sectionrouteCode;
+					$('#sectionrouteCodeSelect').select2('val',upStationRouteCode);
+				}else {
+					$('#sectionrouteCodeSelect').select2('val','请选择...');
+				}
+			});
+		});
+	});
+	// 显示mobal
+	$('#edit_section_mobal_cache').modal({show : true,backdrop: 'static',keyboard: false});
+	// 当调用 hide 实例方法时触发
+	$('#edit_section_mobal_cache').on('hide.bs.modal', function () {
+		closeMobleSetClean();
+	});
+	function closeMobleSetClean() {
+		// 清除地图覆盖物
+		map_.clearMarkAndOverlays();
+		/** 设置修改路段集合对象为空 */
+		section.setEitdSection({});
+		// fun.editAChangeCssRemoveDisabled();
+		$get('/sectionroute/findSectionCache',{'line.id_eq' : lineId , 'directions_eq' : dir},function(data) {
+			fun.linePanlThree(lineId,data,dir);
+		});	
+	}
+	
+	// 编辑表单元素
+	var form = $('#edit_section_form_cache');
+	// 获取错误提示元素
+	var error = $('.alert-danger', form);
+	// 提交数据按钮事件
+	$('#editSectionCacheButton').on('click', function() {
+		// 表单提交
+		form.submit();
+	});
+	// 表单验证
+	form.validate({
+		errorElement : 'span', 
+		errorClass : 'help-block help-block-error', 
+		focusInvalid : false, 
+		rules : {
+			'sectionName' : {required : true,maxlength:50},// 路段名称  必填项
+			'sectionCode': {required : true,},// 路段编码  必填项
+			'directions' : {required : true,},// 路段方向 必填项
+			'speedLimit' : {required : true,number : true},// 路段限速 必须输入合法的数字（负数，小数）。
+			'destroy' : {required : true,},// 是否撤销 必填项.
+			'roadCoding' : {number : true},// 道路编码 必须输入合法的数字（负数，小数）。
+			'sectionTime' : {number : true},// 路段时长 必须输入合法的数字（负数，小数）。
+			'sectionDistance' : {number : true},//  路段长度 必须输入合法的数字（负数，小数）。
+			'descriptions' : {maxlength: 150}// 描述与说明 最大长度.
+		},
+		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 params = form.serializeJSON();
+			error.hide();
+			if(params.sectionrouteCode=='请选择...') {
+				params.sectionrouteCode='';
+			}
+			$post('/section/sectionCacheUpdate',params,function(resuntDate) {
+				if(resuntDate.status=='SUCCESS') {
+					// 弹出添加成功提示消息
+					layer.msg('路段保存成功，将地图放到最大，用右击路段进行截取，确认截取完毕后提交！！！');
+				}else {
+					// 弹出添加失败提示消息
+					layer.msg('路段保存失败，请重新编辑路段！！！');
+				}
+				$('#edit_section_mobal_cache').modal('hide');
+				closeMobleSetClean();
+			}); 
+		}
+	});
+});
+</script>
 \ No newline at end of file
+/**  生成路线类  */
+var EditRoute = function(){	
+	
+	var line={};
+	
+	/** 定义修改线路对象 */
+	
+	var editRoute = {
+			getLineObj : function() {
+				return line;
+			},			
+			setLineId : function(id) {
+				line.id = id;
+			},			
+			setLineDir : function(dir) {
+				
+				line.dir = dir;
+			},
+	};
+	
+	return editRoute;
+}();
@@ -94,7 +94,7 @@ $(function(){
 		// 需要验证的表单元素
 		rules : {
 			'name' : {required : true,maxlength: 30},// 线路名称 必填项、 最大长度.
-			'lineCode' : {required : true,maxlength: 30},// 线路编码 必填项、最大长度.
+			'lineCode' : {required : true,maxlength: 6},// 线路编码 必填项、最大长度.
 			'company' : {required : true,maxlength: 30},// 所属公司  必填项、最大长度.
 			'brancheCompany' : {required : true,maxlength: 30},// 所属分公司  必填项、最大长度.
 			'level' : {required : true,maxlength: 30},// 线路等级 必填项、最大长度.
@@ -116,7 +116,6 @@ $(function(){
 			'carSumNumber' : {number : true,digits : true,maxlength: 8},// 车辆总数 必须输入合法的数字（负数，小数）。必须输入整数。最大长度.
 			'hvacCarNumber' : {number : true,digits : true,maxlength: 8},// 空调车辆数 必须输入合法的数字（负数，小数）。 必须输入整数。 最大长度.
 			'ordCarNumber' : {number : true,digits : true,maxlength: 8},// 普通车辆数 必须输入合法的数字（负数，小数）。 必须输入整数。最大长度.
-			'warrantCar' : {number : true,digits : true,maxlength: 8},
 			'history' : {maxlength: 200},// 线路沿革 输入长度最多是 200 的字符串（汉字算一个字符）。
 			'descriptions' : {maxlength: 200}// 描述/说明 输入长度最多是 200 的字符串（汉字算一个字符）。
 		},
@@ -149,7 +149,7 @@
 		// 需要验证的表单元素
 		rules : {
 			'name' : {required : true,maxlength: 30},// 线路名称 必填项、 最大长度.
-			'lineCode' : {required : true,maxlength: 30},// 线路编码 必填项、最大长度.
+			'lineCode' : {required : true,maxlength: 6},// 线路编码 必填项、最大长度.
 			'company' : {required : true,maxlength: 30},// 所属公司  必填项、最大长度.
 			'brancheCompany' : {required : true,maxlength: 30},// 所属分公司  必填项、最大长度.
 			'level' : {required : true,maxlength: 30},// 线路等级 必填项、最大长度.
@@ -171,7 +171,6 @@
 			'carSumNumber' : {number : true,digits : true,maxlength: 8},// 车辆总数 必须输入合法的数字（负数，小数）。必须输入整数。最大长度.
 			'hvacCarNumber' : {number : true,digits : true,maxlength: 8},// 空调车辆数 必须输入合法的数字（负数，小数）。 必须输入整数。 最大长度.
 			'ordCarNumber' : {number : true,digits : true,maxlength: 8},// 普通车辆数 必须输入合法的数字（负数，小数）。 必须输入整数。最大长度.
-			'warrantCar' : {number : true,digits : true,maxlength: 8},
 			'history' : {maxlength: 200},// 线路沿革 输入长度最多是 200 的字符串（汉字算一个字符）。
 			'descriptions' : {maxlength: 200}// 描述/说明 输入长度最多是 200 的字符串（汉字算一个字符）。
 		},
+var PublicFunctions = function () {
+	var PubFun = {
+			/** 初始化线路标题与ID */
+			setTiteText : function(lineId) {
+				// 根据线路ID获取线路名称
+				GetAjaxData.getIdLineName(lineId,function(data) {
+					// 定义线路名称
+					var lineNameV = data.name;
+					$('.portlet-title .caption').text(lineNameV);
+				});
+			},
+			setSectionFormValue : function(Section) {
+				$('#isRoadeSpeedInput').val(Section.isRoadeSpeed);
+				// 路段ID
+				$('#sectionIdInput').val(Section.sectionId);
+				// 路段路由ID
+				$('#sectionRouteIdInput').val(Section.sectionrouteId);
+				// 线路ID
+				$('#sectionRouteLineInput').val(Section.sectionrouteLine);
+				// 线路编码
+				$('#lineCodeInput').val(Section.sectionrouteLineCode);
+				// 折线坐标集合
+				$('#bsectionVectorInput').val(Section.sectionBsectionVector);
+				// 路段名称
+				$('#sectionNameInput').val(Section.sectionName);
+				// 路段编码
+				$('#sectionCodeInput').val(Section.sectionCode);
+				// 路段序号
+				$('#sectionrouteCodeSelect').val(Section.sectionrouteCode);
+				// 路段方向
+				$('#directionsSection').val(Section.sectionrouteDirections);
+				// 道路编码
+				$('#roadCodingCodInput').val(Section.sectionRoadCoding);
+				// 道路限速
+				$('#speedLimitInput').val(Section.sectionSpeedLimet);
+				// 路段长度
+				$('#sectionDistanceInput').val(Section.sectionDistance);
+				// 时长
+				$('#sectionTimeInput').val(Section.sectionTime);
+				// 版本号
+				$('#versionsInput').val(Section.versions);
+				// 是否撤销
+				$('#destroySelect').val(Section.destroy);
+				// 描述/说明
+				$('#descriptionsTextarea').val(Section.descriptions);
+			},		
+			/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */
+			linePanlThree : function(lineId,data,direction) {
+				/** 获取站点路由信息 @param:<Line.id：线路Id；0：上行> @return：<resultdata：站点路由数据> */
+				$get('/stationroute/getStationRouteCacheCenterPoints',{lineId:lineId,direction:direction},function(resultdata) {
+					WorldsBMapLine.clearMarkAndOverlays();
+					var polyline_center;
+					// 如果站点路由数据不为空
+					if(resultdata.length>0) {
+						var ceter_index = Math.floor(resultdata.length / 2);
+				  		var ceterPointsStr = resultdata[ceter_index].bJwpoints;
+				  		var ceterPointsArray = ceterPointsStr.split(' ');
+		  				polyline_center = new BMap.Point(ceterPointsArray[0],ceterPointsArray[1]);
+						// 遍历站点路由数据
+			  			for(var s = 0 ; s<resultdata.length;s++) {
+			  				// 中心点坐标字符串
+			  				var bJwpointsStr = resultdata[s].bJwpoints;
+			  				var stationName = resultdata[s].stationName;
+			  				// 起个中心点坐标字符串
+			  				var bJwpointsArray = bJwpointsStr.split(' ');
+			  				// 设置中心点
+			  				var point_center = new BMap.Point(bJwpointsArray[0],bJwpointsArray[1]);
+			  				/** 在地图上画点 @param：<point_center：中心坐标点> */
+			  				WorldsBMapLine.drawingUpStationPoint(point_center,stationName,s+1);
+			  			}
+			  			
+			  		}
+					// 路段数据长度
+					var dataLen = data.length;
+					//debugger;
+					// 如果大于零
+					if(dataLen>0) {
+						// 编辑路段数据
+						for(var d= 0; d<dataLen;d++){
+							// 地图折线坐标点集合
+							var polylineArray = [];
+							// 获取路段折线坐标字符串
+							var sectionBsectionVectorStr = data[d].sectionBsectionVector;
+							if(sectionBsectionVectorStr==null) 
+								continue;
+							// 切割段折线坐标字符串
+							var tempStr = sectionBsectionVectorStr.substring(11,sectionBsectionVectorStr.length-1);
+							// 分割折线坐标字符串
+							var lineArray = tempStr.split(',');
+							for(var i = 0;i<lineArray.length;i++) {
+								polylineArray.push(new BMap.Point(lineArray[i].split(' ')[0],lineArray[i].split(' ')[1]));
+							}
+							/** 在地图上画出线路走向 @param：<polylineArray：地图折线坐标点集合；resultdata：站点路由数据> */
+							WorldsBMapLine.drawingUpline01(polylineArray,polyline_center,data[d]);
+						}
+					}
+				});	
+			},
+			// 方向代码转名称.
+			dirdmToName : function(value){
+				var srStr = '';
+				if(value=='0')
+					srStr = '上行';
+				else if(value=='1')
+					srStr = '下行';
+				return srStr;
+			},
+//			editAChangeCssRemoveDisabled : function() {
+//				$('#downLine').removeClass('btn disabled');
+//				$('.btn-circle').removeClass('disabled');
+//				$('#upLine').removeClass('btn disabled');
+//			},
+	}
+	return PubFun ;
+}();
 \ No newline at end of file
+/**
+ * 百度地图
+ * 
+ * - - - - - -》init：地图初始化
+ * 
+ * - - - - - -》getDistanceAndDuration：获取距离与时间
+ * 
+ * - - - - - -》drawingUpline：在地图上画出上行线路走向
+ * 
+ * - - - - - -》stationsPointsToLibraryPoint：根据站点坐标匹配库中的公交站点（手动规划）
+ */
+
+var WorldsBMapLine = function () {
+	
+	/** WorldsBMapLine 全局变量定义 mapBValue：地图对象；polyUpline：走向折线；sectionList：截取过的路段 ；pointIndex：计算路段被切的次数;
+	 * firstPoint:截取路段的第一个点;iseditStatus：路段是否在编辑状态；isCutSection ： 获取路段是否在截取状态*/
+	var mapBValue = '', polyUpline='', sectionList = [], pointIndex = 0, iseditStatus = false, firstPoint = {}, isCutSection = false;
+	
+	var Bmap = {
+			
+			init : function() {
+				
+				// 设置中心点,
+				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
+				
+				// 百度API Key
+				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				
+				// 初始化百度地图
+				mapBValue = new BMap.Map("bmap_basic");
+				
+				//中心点和缩放级别
+				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
+				
+				//启用地图拖拽事件，默认启用(可不写)
+				mapBValue.enableDragging(); 
+				
+				//启用地图滚轮放大缩小
+				mapBValue.enableScrollWheelZoom(); 
+				
+				//禁用鼠标双击放大
+				mapBValue.disableDoubleClickZoom();
+				
+				//启用键盘上下左右键移动地图
+				mapBValue.enableKeyboard();
+				
+				return mapBValue;
+			},
+			/** 获取第一个切路段的点  @return Point*/
+			getFirstPoint : function() {
+				return firstPoint;
+			},
+			/** 获取地图对象 @return 地图对象map */
+			getmapBValue : function() {
+				
+				return mapBValue;
+				
+			},
+			
+			getPolyUpline : function() {
+				
+				return polyUpline;
+			},
+			
+			/** 获取截取过的路段 @return 路段对象List */
+			getSectionList : function() {
+				
+				return sectionList;
+				
+			},
+			setSectionList : function(list) {
+				
+				sectionList = list;
+			},
+			initCutSectionPoint : function() {
+				sectionList = [];
+				var tbodyHtml = template('section_list',{list : sectionList});
+				$('#section_table tbody').html(tbodyHtml);
+			},
+			/** 获取切路段的点下标  @return int*/
+			setPointIndex : function(index) {
+				pointIndex = index;
+			},
+			getPointIndex : function() {
+				
+				return pointIndex;
+				
+			},
+			/** 获取路段是否在编辑状态 @return boolean*/
+			getIsEditStatus : function() {
+				return iseditStatus;
+			},			
+			setIsEditStatus : function(v) {
+				iseditStatus = v ;
+			},
+					
+			/** 获取路段是否在截取状态 @return boolean*/
+			getIsCutSection : function() {
+				return isCutSection;
+			},			
+			setIsCutSection : function(v) {
+				isCutSection = v ;
+			},
+			
+			/** 获取距离与时间 @param <points：坐标点集合> */
+			getDistanceAndDuration : function(points,callback){
+				
+				// 获取长度
+				var len = points.length;
+				(function(){
+					
+					if (!arguments.callee.count) {
+						 
+						 arguments.callee.count = 0;
+						 
+					 }
+					 
+					 arguments.callee.count++;
+					 
+					 var index = parseInt(arguments.callee.count) - 1;
+					 
+					 if (index >= len-1) {
+						 
+						 callback && callback(points);
+			        	  
+			              return;
+			          }
+					 
+					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
+					 var f = arguments.callee;
+					 // 起点坐标 <坐标格式：40.056878,116.30815>
+					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
+					 
+					 // 终点坐标 <坐标格式：40.056878,116.30815>
+					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
+					 var region = '上海';
+					 
+					 var origin_region = '上海';
+					 
+					 var destination_region = '上海';
+					 
+					 var output = 'json';
+					 
+					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
+					 
+					 /** 
+					  *  origin：起点名称或经纬度；
+					  * 
+					  *  destination：终点名称或经纬度；
+					  *  
+					  *  origin_region：起始点所在城市，驾车导航时必填。
+					  *  
+					  *  destination_region：终点所在城市，驾车导航时必填。
+					  * 
+					  *  output :表示输出类型，可设置为xml或json，默认为xml。
+					  *  
+					  **/
+					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
+					 
+					 /** @description :未认证开发者默认配额为：2000次/天。 */
+					 $.ajax({
+						  
+						  // 百度地图根据坐标获取两点之间的时间与距离
+			              url: 'http://api.map.baidu.com/direction/v1?mode=transit',
+			              
+			              data: paramsB,
+			              
+			              dataType: 'jsonp',
+			              
+			              success: function(r){
+			            	  
+			            	  if(r) {
+			            		  
+			            		  if(r.message=='ok') {
+			            			  
+			            			  if(r.result.taxi==null) {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = 0;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = 0;
+			            				  
+			            			  }else {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = r.result.taxi.distance;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = r.result.taxi.duration;
+			            				  
+			            			  }
+			            			  
+			            			  
+			            		  }
+			            		  
+			            	  }
+			            	  
+			            	  f();
+			              }
+			          });
+					
+				})();
+				
+			},
+			// 在地图上画出上行线路走向
+			drawingUpline01 : function (polylineArray,polyline_center,data) {
+				var polyUpline01 = 'polyline' + '_' + data.sectionrouteId;
+				// 创建线路走向
+				polyUpline01 = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
+				polyUpline01.data = data;
+				// 把折线添加到地图上
+				mapBValue.addOverlay(polyUpline01);
+				var sectionPoint = [];
+				// 线路单击事件
+				polyUpline01.addEventListener('click',function(e) {
+					if(WorldsBMapLine.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					if(WorldsBMapLine.getIsCutSection()) {
+						layer.msg('请先撤销所有切路段的点...');
+						return false;
+					}
+					polyUpline01.enableEditing();
+					WorldsBMapLine.setIsEditStatus(true);
+				});
+				
+				// 添加路段双击事件
+				polyUpline01.addEventListener("dblclick",function(e){
+					if(WorldsBMapLine.getIsCutSection()) {
+						layer.msg('请先撤销所有切路段的点...');
+						return false;
+					}
+					WorldsBMapLine.setIsEditStatus(false);
+					// 关闭
+					layer.closeAll();
+					polyUpline01.disableEditing();
+					EditSectionObj.setEitdSection(polyUpline01.data);
+					// 获取折线坐标集合
+					var editPloyLineArray = polyUpline01.getPath();
+					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					sectionList = [];
+					var tbodyHtml = template('section_list',{list : sectionList});
+					// 截取路段
+					$('#section_table tbody').html(tbodyHtml);
+					// 加载修改路段弹出层mobal页面
+					$.get('editsection.html', function(m){
+						$(pjaxContainer).append(m);
+						$('#edit_section_mobal_cache').trigger('editSectionMobalCache_show', [WorldsBMapLine,GetAjaxData,EditSectionObj,PublicFunctions]);
+					});
+				});
+				
+				// 路段右击事件
+				var editSection = function(e,ee,marker){
+					if(WorldsBMapLine.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					var lng = e.lng;
+					var lat = e.lat;	
+					var sectionName = null;
+					var marker = new BMap.Marker(new BMap.Point(lng, lat)); // 创建点
+					marker.isFlag = true;
+					if(pointIndex == 0) {
+						sectionPoint[pointIndex] = {lng:lng , lat:lat};
+						layer.msg('进入切路段状态，请选择本路段的终点！');
+						mapBValue.addOverlay(marker);// 添加覆盖物
+						firstPoint = {lng:lng, lat:lat};
+						pointIndex++;
+						EditSectionObj.setEitdSection(polyUpline01.data);
+						// 获取折线坐标集合
+						var editPloyLineArray = polyUpline01.getPath();
+						EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					} else if (pointIndex > 0) {
+						layer.prompt({title: '请输入路段名！'}, function(sectionName, index){
+							pointList = [];
+							sectionPoint[pointIndex] = {lng:lng , lat:lat};
+							pointList[0] = sectionPoint[pointIndex-1];
+							pointList[1] = sectionPoint[pointIndex];
+							sectionList.push({name:sectionName, section:pointList});	
+							layer.close(index);
+							layer.msg('路段截取成功，请选择下一个路段的终点');
+							mapBValue.addOverlay(marker);// 添加覆盖物
+							var tbodyHtml = template('section_list',{list : sectionList});
+							// 截取路段
+							$('#section_table tbody').html(tbodyHtml);
+							pointIndex++;
+						});
+					}
+					WorldsBMapLine.setIsCutSection(true);
+				}
+				var markerMenu=new BMap.ContextMenu();
+				markerMenu.addItem(new BMap.MenuItem('切路段',editSection.bind(polyUpline01)));
+				polyUpline01.addContextMenu(markerMenu);
+				
+				
+		  		var PanOptions_ ={noAnimation :true};
+		  		mapBValue.reset();
+		  		mapBValue.panTo(polyline_center,PanOptions_);
+		  		mapBValue.panBy(500,-510,PanOptions_);
+		  		mapBValue.setZoom(14);
+			},
+			// 删除点刷新cutSectionTable
+			refreshCutSectionTable : function() {
+				var tbodyHtml = template('section_list',{list : sectionList});
+				$('#section_table tbody').html(tbodyHtml);
+			},
+			// 删除点刷新覆盖物
+			deleteCutSectionPoint : function(point) {
+				var lng = point.lng;
+				var lat = point.lat;
+				var allOverlay = mapBValue.getOverlays();
+				// 删除最后一个点
+				for (var i = 0; i < allOverlay.length -1; i++){
+					if(allOverlay[i].isFlag) {
+						if(allOverlay[i].point.lng == lng && allOverlay[i].point.lat == lat){
+							mapBValue.removeOverlay(allOverlay[i]);
+							break;
+						}
+					}
+				}		
+			},			
+			/** 在地图上画点 @param：<point_center：中心坐标点> */
+			drawingUpStationPoint : function(point_center,stationName,s) {
+				
+				// 自定义标注物图片
+			  	var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/gjzd.png',new BMap.Size(10, 10));
+			  		
+			  	var html2 = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -10px; top: -35px; 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: 15px; top: -35px;"><span style="float: left; color: #fdfdfd; margin-left: -22px;  font-size: 6px;">'+ s+'</span>'+ stationName+'</label>';
+						 
+						
+				var	myRichMarker1 = new BMapLib.RichMarker(html2, point_center,{
+                        "anchor" : new BMap.Size(-10,8),
+						  "enableDragging" : true});
+				
+			
+				myRichMarker1.disableDragging();
+				mapBValue.addOverlay(myRichMarker1);
+		  		
+		  		
+		  		// 创建标注物
+		  		marker = new BMap.Marker(point_center,{icon : icon_target});
+  				
+		  		// 允许覆盖物在map.clearOverlays方法中被清除。
+		  		marker.enableMassClear();
+		  		
+		  		mapBValue.addOverlay(marker);
+			},
+			
+			// 根据站点坐标匹配库中的公交站点（手动规划）
+			stationsPointsToLibraryPoint : function(arra,callback) {
+				// 获取长度
+				var len = arra.length;
+				var station = {};
+				var stationList = [];
+				(function(){
+					if (!arguments.callee.count) {
+						arguments.callee.count = 0;
+					}
+					arguments.callee.count++;
+					var index = parseInt(arguments.callee.count) - 1;
+					if (index >= len) {
+						callback && callback(stationList);
+			        	return ; 
+			        }
+					var f = arguments.callee;
+					station = arra[index];					
+					if(arra[index].name!=''){
+						
+						$.get('/station/matchStation',station,function(resultStation) {
+							stationList.push({name:resultStation.name ,wgs:arra[index].wgs,potion:{lng:resultStation.potion_lng, lat:resultStation.potion_lat}, isHave:resultStation.isHave , id:resultStation.id});
+							f();
+						});							 
+					 }else {
+						 f();
+					 }	
+				})()
+			},
+			clearMarkAndOverlays : function() {
+				
+				// 清楚地图覆盖物
+				mapBValue.clearOverlays();
+				
+				mapBValue.removeOverlay();
+				
+			}
+			
+	}
+	
+	return Bmap;
+	
+}();
 \ No newline at end of file
@@ -116,7 +116,7 @@
 	}
 	function getComp(cb) {
 		$.get('/user/companyData',null,function(rs) {
-			 return cb && cb(rs);
+			return cb && cb(rs);
 		});
 	}
 	function getParams() {
@@ -330,4 +330,44 @@
 			});
     	}
 	});	
+	/** 生成路线（路段和站点） */
+	$('#datatable_ajax_tools #editRoute').on('click', function() {
+		// 获取选中行.
+    	var arrChk = $("input[type='checkbox']:checked");
+    	var len = arrChk.length;
+    	// 选中行ID与线路名称
+    	var id = '', lineName = '';
+    	if(len>1) {
+    		// 弹出添加成功提示消息
+			layer.msg('存在多选，请只选中一行!');
+			return ;
+    	}else  if(len==0) {
+    		// 弹出添加成功提示消息
+			layer.msg('请选中一条线路！');
+			return ;
+    	}else {
+    		id = arrChk.data('id');
+    		/*$('#uploadRoute').on('click', function() {
+    			EditRoute.setLineId(id);
+    			EditRoute.setLineDir(direction);
+    			$.get('editRoute.html', function(m){
+    				$(pjaxContainer).append(m);
+    				$('#edit_route_mobal').trigger('editRouteMobal.show',[TransGPS,EditRoute,WorldsBMapLine,DrawingManagerObj,GetAjaxData,PublicFunctions]);
+    			});
+    			// 更新section_table 和缓存中的一切过的点数
+    			WorldsBMapLine.initCutSectionPoint();
+    			WorldsBMapLine.setPointIndex(0);
+    		});*/
+    		// 设置路线的线路id
+    		//var a =  EditRoute.setLineId(id);
+    		// 显示地图
+    		/*var param = {};
+    		var list = [1,2,3];
+    		param.id = id;
+    		param.list = list;
+    		
+    		$get('/pages/base/line/map.html',param);*/
+ 			window.location.href = "/pages/base/line/map.html?no="+id;
+    	}
+	});	
 })();
 \ No newline at end of file
+/** 转换坐标点工具 */
+var TransGPS = function () {
+
+	var location = {lng:'', lat:''};
+	
+	var pi = 3.14159265358979324;
+	
+	var a = 6378245.0;
+	var ee = 0.00669342162296594323;
+	
+	var x_pi = 3.14159265358979324 * 3000.0 / 180.0;
+	
+	var transGPS = {
+			getLocation : function(){
+				return location;
+			},
+			locationMake : function(lng, lat) {
+				var loc = transGPS.getLocation();
+				loc.lng = lng;
+				loc.lat = lat;
+				return loc;
+			},
+			outOfChina : function(lat,lng) {
+				if (lng < 72.004 || lng > 137.8347)
+					return 1;
+				if (lat < 0.8293 || lat > 55.8271)
+					return 1;
+				return 0;
+			},
+			transformLat : function(x, y) {
+				var ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(x > 0 ? x : -x);
+				ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
+				ret += (20.0 * Math.sin(y * pi) + 40.0 * Math.sin(y / 3.0 * pi)) * 2.0 / 3.0;
+				ret += (160.0 * Math.sin(y / 12.0 * pi) + 320 * Math.sin(y * pi / 30.0)) * 2.0 / 3.0;
+				return ret;
+			},
+			transformlng : function(x, y) {
+				var ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(x > 0 ? x : -x);
+				ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
+				ret += (20.0 * Math.sin(x * pi) + 40.0 * Math.sin(x / 3.0 * pi)) * 2.0 / 3.0;
+				ret += (150.0 * Math.sin(x / 12.0 * pi) + 300.0 * Math.sin(x / 30.0 * pi)) * 2.0 / 3.0;
+				return ret;
+			},
+			transformFromWGSToGCJ : function(wgLoc) {
+				var mgLoc = {};
+				if (1 == transGPS.outOfChina(wgLoc.lat, wgLoc.lng)) {
+					mgLoc = wgLoc;
+					return mgLoc;
+				}
+				var dLat = transGPS.transformLat(wgLoc.lng - 105.0, wgLoc.lat - 35.0);
+				var dlng = transGPS.transformlng(wgLoc.lng - 105.0, wgLoc.lat - 35.0);
+				var radLat = wgLoc.lat / 180.0 * pi;
+				var magic = Math.sin(radLat);
+				magic = 1 - ee * magic * magic;
+				var sqrtMagic = Math.sqrt(magic);
+				dLat = parseFloat((dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi));
+				dlng = parseFloat((dlng * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi)) ;
+				mgLoc.lat = parseFloat(wgLoc.lat) + dLat;
+				mgLoc.lng = parseFloat(wgLoc.lng) + dlng; 
+		
+				return mgLoc;
+			},
+			bd_encrypt : function(gcLoc) {
+				var x = gcLoc.lng, y = gcLoc.lat;
+				var z = Math.sqrt((x*x)+(y*y)) + 0.00002 * Math.sin((y * x_pi));
+				var theta = Math.atan2(y, x) + 0.000003 * Math.cos((x * x_pi));
+				var lng = (z*Math.cos(theta)+0.0065);
+				var lat = (z*Math.sin(theta)+0.006);
+				return transGPS.locationMake(lng, lat);
+			},
+			/*bd_decrypt : function(bdLoc) {
+				var x = bdLoc.lng - 0.0065, y = bdLoc.lat - 0.006;
+				var z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi);
+				var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi);
+				return transGPS.locationMake(z * Math.cos(theta), z * Math.sin(theta));
+			}*/
+	}
+			
+	return transGPS;	
+	
+}();
@@ -37,6 +37,9 @@
 						<li>
 							<a href="javascript:;" data-action="0" id="createUsingSingle" class="tool-action"> <i class="fa fa-file-zip-o"></i> 生成路单文件</a>
 						</li>
+						<li>
+							<a href="javascript:;" data-action="1" id="editRoute" class="tool-action"> <i class="fa fa-level-up"></i>上传GPS生成路线</a>
+						</li>
 						<!-- <li><a href="javascript:;" data-action="0" class="tool-action"> <i class="fa fa-print"></i> 打印
 						</a></li>
 						<li><a href="javascript:;" data-action="1" class="tool-action"> <i class="fa fa-copy"></i> 复制
@@ -353,6 +356,5 @@
 		</tr>
 	{{/if}}
 </script>
-<!-- <script src="/pages/base/line/js/tipso.js"></script> -->
 <!-- 线路信息片段JS模块 -->
 <script src="/pages/base/line/js/line-list-table.js"></script>
 \ No newline at end of file
+< <link href="/pages/base/line/css/bmap_base.css" rel="stylesheet" type="text/css" /> 
+<div class="portlet-body">
+	<!-- 地图 -->
+	<div  id="bmap_basic" class="bmaps"></div>	
+	
+	<div class="cut-section">
+		<div class="portlet-title" >
+			<div class="caption" >
+				途径站点 
+			</div>
+		</div>	
+		 <div class="portlet-body">
+           	<div class="table-toolbar" style="text-align:center;" id="upload">
+				<button class="btn btn-circle blue" id="uploadRoute" ><i class="fa fa-plus"></i> 生成路线 </button>						
+           	</div>
+           	<div class="portlet-body hidden" id="upload_show">
+           		<div class="defeat-scroll" style="height: auto;max-height:600px;overflow-y:auto; border-left: 10px;">
+					<table class="table table-bordered table-hover table-checkable " id="section_table" style="color:#B7B7B7;">
+						<thead>
+							<tr role="row" class="heading">
+								<th >截取路段</th>
+							</tr>
+						</thead>
+						<tbody></tbody>
+					</table>
+				</div>
+	           	<div class="table-toolbar" style="text-align:center;">
+	           		<button class="btn btn-circle blue" id="cutSection">提交路段</button>
+					<button class="btn btn-circle blue" id="Undo">撤销切点</button>			
+	           	</div>
+           	</div>	           	
+		</div>
+	</div>
+	
+	<div class="portlet box protlet-box" style="top:20px;border-radius: 6px !important;box-shadow: 10px 10px 5px #888888;">
+		左边标题栏
+		<div class="portlet-title" style="background-color:#12527f;">
+			<div class="caption">
+				途径站点 
+			</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: 300px">
+			<div class="row">
+	            <div class="portlet-body">
+	            	<div class="table-toolbar" style="text-align:center;">
+						<button class="btn btn-circle blue" id="uploadRoute" ><i class="fa fa-plus"></i> 生成路线 </button>
+						<button class="btn btn-circle blue hidden" id="cutSection"><i class="fa fa-level-up"></i> 提交路段</button>
+						<button class="btn btn-circle blue hidden" id="Undo"><i class="fa fa-remove"></i> 撤销切点</button>
+	            	</div>
+	            	<div class="portlet-body" >
+	            		<div class="defeat-scroll" style="height: auto;max-height: 400px;overflow-y:auto;">
+							<table class="table table-striped table-bordered table-hover table-checkable " id="section_table">
+								<thead>
+									<tr role="row" class="heading">
+										<th >已截取路段</th>
+									</tr>
+								</thead>
+								<tbody ></tbody>
+							</table>
+						</div>
+	            	</div>				
+				</div>
+			</div>
+		</div>	
+	</div>
+</div>
+<script type="text/html" id="section_list">
+	{{each list as obj i }}
+		<tr>
+			<td style="vertical-align: middle;">
+				{{obj.name}}：[{{obj.section[0].lng}},{{obj.section[0].lat}}],[{{obj.section[1].lng}},{{obj.section[1].lat}}]
+			</td>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan=13><h6 class="muted">沒有相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<!--上传GPS坐标生成路线监听事件 -->
+<<script type="text/javascript">
+$(function(){
+	// 关闭左侧栏
+	if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
+	// 线路id
+	var id = $.url().param('no');
+	// 方向 （0：上行；1：下行）默认上行
+	var direction = 0;
+	// 如果线路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(){
+			
+			/** 初始化线路标题 @param：<id：线路ID> */
+			PublicFunctions.setTiteText(id);
+			
+			/** 初始化地图对象map @return:Map对象 */
+			var map_ = WorldsBMapLine.init();
+			
+			/** 初始化绘图工具类 @param：<map_：map对象；styleOptions：绘图样式对象> @return:DrawingManager对象 */
+			DrawingManagerObj.init(map_,styleOptions);
+			
+			layer.msg('请生成路线！！！');
+						
+		},500);
+	}else {
+		
+		// 缺少ID
+		layer.confirm('【ID缺失，请点击返回，重新进行操作】', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){
+			
+			// 关闭提示弹出层
+			layer.close(index);
+			
+			// 返回线路list页面
+			loadPage('/pages/base/line/list.html');
+			
+		});
+		
+	}
+	
+	// 上传GPS坐标生成路线事件
+	$('#uploadRoute').on('click', function() {
+		EditRoute.setLineId(id);
+		EditRoute.setLineDir(direction);
+		$.get('editRoute.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#edit_route_mobal').trigger('editRouteMobal.show',[TransGPS,EditRoute,WorldsBMapLine,DrawingManagerObj,GetAjaxData,PublicFunctions]);
+		});
+		// 更新section_table 和缓存中的一切过的点数
+		WorldsBMapLine.initCutSectionPoint();
+		WorldsBMapLine.setPointIndex(0);
+	});
+	
+	// 提交截取事件
+	$('#cutSection').on('click', function() {
+		layer.confirm('提交会把原有的站点和路段覆盖，您确定要提交吗？', {
+			btn: ['提交','取消'] //按钮
+		}, function(){
+			if(WorldsBMapLine.getPointIndex() > 0) {
+				var sectionList = WorldsBMapLine.getSectionList();
+				var data = {};
+				var section = EditSectionObj.getEitdSection();
+				var josnSectionList = JSON.stringify(sectionList);
+				section.cutSectionList = josnSectionList;
+				$.post('/section/sectionCut', section, function(resuntDate){
+					if(resuntDate.status=='SUCCESS') {
+						// 弹出添加成功提示消息
+						layer.msg('提交成功，跳转到线路详情页面！');
+						window.location.href = "/pages/base/stationroute/list.html?no="+id+","+EditRoute.getLineObj().dir;
+						WorldsBMapLine.initCutSectionPoint();
+						WorldsBMapLine.setPointIndex(0);					
+					}else {
+						// 弹出添加失败提示消息
+						layer.msg('提交失败...');
+					}
+				});
+			} else {
+				layer.msg("请先截取路段！！！");
+			}
+		});		
+	});	
+	
+	// 删除最后一个路段
+	$('#Undo').on('click', function() {
+		if(WorldsBMapLine.getPointIndex() > 1) {
+			// 点总数-1
+			var pointIndex = WorldsBMapLine.getPointIndex() - 1;
+			WorldsBMapLine.setPointIndex(pointIndex);
+			// 截取的路段list
+			var sectionList = WorldsBMapLine.getSectionList();
+			var sectionListLen = sectionList.length;
+			// 要删除的点
+			var point = sectionList[sectionListLen-1].section[1];
+			sectionList.splice(sectionListLen-1,1);
+			WorldsBMapLine.setSectionList(sectionList);
+			WorldsBMapLine.deleteCutSectionPoint(point);
+			WorldsBMapLine.refreshCutSectionTable();
+		} else if(WorldsBMapLine.getPointIndex() == 1 ) {
+			// 点总数-1			
+			var pointIndex = WorldsBMapLine.getPointIndex() - 1;
+			WorldsBMapLine.setPointIndex(pointIndex);
+			var firstPoint = WorldsBMapLine.getFirstPoint();
+			WorldsBMapLine.deleteCutSectionPoint(firstPoint);
+			WorldsBMapLine.setIsCutSection(false);
+		} else {
+			layer.msg("没有截取路段，不可以删除！！！");
+		}
+	});	
+});
+</script>
+<!--编辑路线类 -->
+<script src="/pages/base/line/js/editRoute.js"></script>
+ <!--坐标转换类 -->
+<script src="/pages/base/line/js/transGPS.js"></script>
+<!-- 地图类 -->
+<script src="/pages/base/line/js/line-list-map.js"></script>
+<!-- 函数与方法 -->
+<script src="/pages/base/line/js/line-list-function.js"></script>
+<!-- 修改路段对象类 -->
+<script src="/pages/base/stationroute/js/editsection.js"></script>
+<!-- 绘图类 -->
+<script src="/pages/base/stationroute/js/drawingManager.js"></script>
+<!-- ajax请求类 -->
+<script src="/pages/base/stationroute/js/stationroute-ajax-getdata.js"></script>
 \ No newline at end of file
@@ -9,7 +9,23 @@ $(function(){
 	// 关闭左侧栏
 	if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
 	// 获取参数线路ID
-	var id = $.url().param('no');
+	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 = {
@@ -39,13 +55,13 @@ $(function(){
 			/** 初始化上行树 @param：<Line.id：线路Id；0:上行> */
 			PublicFunctions.TreeUpOrDown(Line.id,'0');
  
-			/** 初始化下行树 @param：<Line.id：线路Id；0:下行> */
+			/** 初始化下行树 @param：<Line.id：线路Id；1:下行> */
 			PublicFunctions.TreeUpOrDown(Line.id,'1');
  
-			/** 查询路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
-			GetAjaxData.getSectionRouteInfo(Line.id,'0',function(data) {
+			/** 查询路段信息 @param:<Line.id：线路Id；dir：方向> @return：data：路段数据 */
+			GetAjaxData.getSectionRouteInfo(Line.id,dir,function(data) {
 				/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
-				PublicFunctions.linePanlThree(Line.id,data,'0');
+				PublicFunctions.linePanlThree(Line.id,data,dir);
  
 			});
  
@@ -20,30 +20,6 @@
 						class="caption-subject font-dark sbold uppercase">超速异常数据表</span>
 				</div>
 				<div class="actions">
-<!-- 					<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加用户</a> -->
-					<!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> ɾ���û�</button> -->
-					<!-- <div class="btn-group">
-						<a class="btn red btn-outline btn-circle" href="javascript:;"
-							data-toggle="dropdown"> <i class="fa fa-share"></i> <span
-							class="hidden-xs"> 系统工具</span> <i class="fa fa-angle-down"></i>
-						</a>
-						<ul class="dropdown-menu pull-right" id="datatable_ajax_tools">
-							<li><a href="javascript:;" data-action="0"
-								class="tool-action"> <i class="fa fa-print"></i>打印
-							</a></li>
-							<li><a href="javascript:;" data-action="1"
-								class="tool-action"> <i class="fa fa-copy"></i> 复制
-							</a></li>
-							<li><a href="javascript:;" data-action="3"
-								class="tool-action"> <i class="fa fa-file-excel-o"></i>
-									导出Excel
-							</a></li>
-							<li class="divider"></li>
-							<li><a href="javascript:;" data-action="5"
-								class="tool-action"> <i class="fa fa-refresh"></i> 刷新数据
-							</a></li>
-						</ul>
-					</div> -->
 				</div>
 			</div>
 			<div class="portlet-body">
@@ -54,23 +30,22 @@
 						<thead>
 							<tr role="row" class="heading">
 								<th width="3%">#</th>
-								<th width="8%">线路</th>
-								<th width="10%">车辆自编号</th>
-								<!-- <th width="100">工号/名字</th>
-								<th width="11%">路牌名</th> -->
-								<th width="10%">上下行</th>
-								<th width="20%">超速时间</th>
-								<th width="6%">持续时间</th>
-								<th width="10%">查看轨迹</th>
-								<th width="18%">操作</th>
+								<th width="4%">线路</th>
+								<th width="6%">车辆自编号</th>
+								<th width="8%">上下行</th>
+								<th width="10%">开始时间</th>
+								<th width="10%">结束时间</th>
+								<th width="8%">持续时间</th>
+								<th width="8%">查看轨迹</th>
+								<th width="6%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
 								<td></td>
 								<td>
-										<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+										<select class="form-control" name="line" id="line" style="width: 100px;"></select>
 								</td>
 								<td>
-										<select class="form-control" name="nbbm" id="nbbm" style="width: 150px;"></select>
+										<select class="form-control" name="nbbm" id="nbbm" style="width: 100px;"></select>
 								</td>
 								<!-- <td>
  
@@ -78,18 +53,19 @@
 								<td>
 								</td> -->
 								<td>
-									<select class="form-control form-filter " name="updown">
+									<select class="form-control form-filter " name="updown" style="width: 90px;">
                                          <option value="">请选择...</option>
                                          <option value="0">上行</option>
                                          <option value="1">下行</option>
                                          <option value="-1">无效</option>
                                      </select>
 								</td>
-								<td nowrap="nowrap"> 
-									<input class="form-control" type="date" name="startDate" style="width: 180px;"/>
+								<td> 
+									<input class="form-control" type="date" name="startDate" />
 									-
-									<input class="form-control" type="date" name="endDate" style="width: 180px;"/>
-								
+									<input class="form-control" type="date" name="endDate" />
+								</td>
+								<td>
 								</td>
 								<td>
 								</td>
@@ -128,9 +104,9 @@
 		{{obj.vehicle}}
 	</td>
 	<td>
-		{{if obj.upDown==0}}
+		{{if obj.up_down==0}}
 			上行
-		{{else if obj.upDown==1}}
+		{{else if obj.up_down==1}}
 			下行 
 		{{else}}
 			无效
@@ -140,10 +116,18 @@
 		{{obj.timestampDate}}
 	</td>
 	<td>
-		{{obj.durationTime}}秒
+		{{obj.endtimestampDate}}
 	</td>
 	<td>
-		
+		{{(obj.endtimestamp-obj.timestamp)/1000}}秒
+	</td>
+	<td>
+		<a class="btn default blue-stripe btn-sm lookTrajectory" data-vehicle ="{{obj.vehicle}}"
+			data-startdate="{{obj.timestampDate}}" data-enddate="{{obj.endtimestampDate}}"
+			data-lon="{{obj.lon}}"  data-lat="{{obj.lat}}" 
+			data-endlon="{{obj.endlon}}"  data-endlat="{{obj.endlat}}" >
+			查看轨迹
+		</a>
 	</td>
 	<td>
  
@@ -157,6 +141,8 @@
 {{/if}}
 </script>
  
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+
 <script>
 $(function(){
 	var page = 0, initPagination;
@@ -171,7 +157,6 @@ $(function(){
  
  	var endTime = dateTime-week*24*3600*1000;//上周末、格式为时间戳。
 	var startTime = endTime-6*24*3600*1000;//上周一、格式为时间戳。
-	
 	var endDate = timeToData(endTime);
 	var startDate = timeToData(startTime);
  	//表单默认选择上周一到上周日的超速信息。
@@ -180,15 +165,27 @@ $(function(){
  	var parameter = new Object();
  	parameter.endDate = $("input[name='endDate']")[0].value;
  	parameter.startDate = $("input[name='startDate']")[0].value;
-	//jsDoQuery(parameter,true);
-	jsDoQuery(null,true);
+ 	 
+ 	//搜索线路
+	$.get('/basic/lineCode2Name',function(result){
+		var data=[];
+		data.push({id: " ", text: "全部线路"});
+		for(var code in result){
+			data.push({id: code, text: result[code]});
+		}
+		initPinYinSelect2($('#line'),data,function(ldmcSelector) {
+			ldmcSelector.select2("val",data[1].id);//因为数据量太大，所以默认一条线路作为查询参数
+		});
+		parameter.line = data[1].id;
+		jsDoQuery(parameter,true);
+	});
  
 	//时间戳转换为年月日
 	function timeToData(time){
 		var date = new Date(time);
 		var year = date.getFullYear();
 		var Month = date.getMonth()+1>10?date.getMonth()+1:"0"+(date.getMonth()+1); 
- 		var Day = date.getDate()>10?date.getDate():"0"+date.getDate();
+ 		var Day = date.getDate()>9?date.getDate():"0"+date.getDate();
 		return year+"-"+Month+"-"+Day;
 	}
  
@@ -219,7 +216,7 @@ $(function(){
 	/*
 	* 获取数据 p: 要提交的参数， pagination: 是否重新分页
 	*/
-	function jsDoQuery(p, pagination){
+ 	function jsDoQuery(p, pagination){
 		var params = {};
 		if(p)
 			params = p;
@@ -227,20 +224,40 @@ $(function(){
 		params['order'] = 'lastLoginDate';
 		params['page'] = page;
 		var i = layer.load(2);
-		$get('/speeding/pagequery' ,params, function(data){
-// 			$.each(data.content, function(i, obj) {
-//                 obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
-//             });
-			var bodyHtm = template('speeding_list_temp', {list: data.dataList});
+		$.get('/gps/pagequery' ,params, function(data){
+			var bodyHtm = template('speeding_list_temp', {list: data.list});
 			$('#datatable_speeding tbody').html(bodyHtm)
 					.find('.icheck').iCheck(icheckOptions)
 					.on('ifChanged', iCheckChange);
-			if(pagination && data.dataList.length > 0){
+			if(pagination){
 				//重新分页
 				initPagination = true;
 				showPagination(data);
 			}
 			layer.close(i);
+  			$(".lookTrajectory").click(function(){
+  				var vehicle = $(this).data('vehicle');
+  				var startDate = $(this).data('startdate');
+  				var endDate = $(this).data('enddate');
+  				var lon = $(this).data('lon');
+  				var lat = $(this).data('lat');
+  				var endLon = $(this).data('endlon');
+  				var endLat = $(this).data('endlat');
+  				var storage = window.localStorage;
+  				storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat);
+ 				$.get('/pages/excep/speedingMap.html?',function (result) {
+			    	layer.open({
+						type: 1,
+						title:'<i class="uk-icon-play-circle"></i>轨迹回放',
+						shadeClose: true,
+						shade: true,
+						scrollbar: false,
+						maxmin: false, //开启最大化最小化按钮
+						area: ['100%', '100%'],
+					    content:result,//内容
+					});
+			    });
+			}) 
 		});
 	}
  
@@ -291,6 +308,7 @@ $(function(){
 		});
 	}
  
+	
 	//删除
 	$('#removeButton').on('click', function(){
 		if($(this).attr('disabled'))
@@ -302,17 +320,6 @@ $(function(){
 			$('tr.filter .filter-submit').click();
 		});
 	});
-	
-	//搜索线路
-	$.get('/basic/lineCode2Name',function(result){
-		var data=[];
-		data.push({id: " ", text: "全部线路"});
-		for(var code in result){
-			data.push({id: code, text: result[code]});
-		}
-		initPinYinSelect2('#line',data,'');
-
-	});
  
 $("#line").on("change",initXl);
 function initXl(){
@@ -329,6 +336,7 @@ $(&#39;#nbbm&#39;).select2({
            	    xlbm:$('#line').val()}; 	
         },
         processResults: function (data) {
+        	console.log(data);
             return {
                 results: data
             };
@@ -365,7 +373,6 @@ $(&#39;#nbbm&#39;).select2({
  
 //改变状态
 function changeEnabled(id,enabled){
-	debugger
 	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
 		jsDoQuery(null, true);
 	})
@@ -20,30 +20,6 @@
 						class="caption-subject font-dark sbold uppercase">超速异常数据表</span>
 				</div>
 				<div class="actions">
-<!-- 					<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加用户</a> -->
-					<!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> ɾ���û�</button> -->
-					<!-- <div class="btn-group">
-						<a class="btn red btn-outline btn-circle" href="javascript:;"
-							data-toggle="dropdown"> <i class="fa fa-share"></i> <span
-							class="hidden-xs"> 系统工具</span> <i class="fa fa-angle-down"></i>
-						</a>
-						<ul class="dropdown-menu pull-right" id="datatable_ajax_tools">
-							<li><a href="javascript:;" data-action="0"
-								class="tool-action"> <i class="fa fa-print"></i>打印
-							</a></li>
-							<li><a href="javascript:;" data-action="1"
-								class="tool-action"> <i class="fa fa-copy"></i> 复制
-							</a></li>
-							<li><a href="javascript:;" data-action="3"
-								class="tool-action"> <i class="fa fa-file-excel-o"></i>
-									导出Excel
-							</a></li>
-							<li class="divider"></li>
-							<li><a href="javascript:;" data-action="5"
-								class="tool-action"> <i class="fa fa-refresh"></i> 刷新数据
-							</a></li>
-						</ul>
-					</div> -->
 				</div>
 			</div>
 			<div class="portlet-body">
@@ -181,7 +157,6 @@ $(function(){
  
  	var endTime = dateTime-week*24*3600*1000;//上周末、格式为时间戳。
 	var startTime = endTime-6*24*3600*1000;//上周一、格式为时间戳。
-	
 	var endDate = timeToData(endTime);
 	var startDate = timeToData(startTime);
  	//表单默认选择上周一到上周日的超速信息。
@@ -210,7 +185,7 @@ $(function(){
 		var date = new Date(time);
 		var year = date.getFullYear();
 		var Month = date.getMonth()+1>10?date.getMonth()+1:"0"+(date.getMonth()+1); 
- 		var Day = date.getDate()>10?date.getDate():"0"+date.getDate();
+ 		var Day = date.getDate()>9?date.getDate():"0"+date.getDate();
 		return year+"-"+Month+"-"+Day;
 	}
  
@@ -249,12 +224,12 @@ $(function(){
 		params['order'] = 'lastLoginDate';
 		params['page'] = page;
 		var i = layer.load(2);
-		$get('/gps/pagequery' ,params, function(data){
-			var bodyHtm = template('speeding_list_temp', {list: data.dataList});
+		$.get('/gps/pagequery' ,params, function(data){
+			var bodyHtm = template('speeding_list_temp', {list: data.list});
 			$('#datatable_speeding tbody').html(bodyHtm)
 					.find('.icheck').iCheck(icheckOptions)
 					.on('ifChanged', iCheckChange);
-			if(pagination && data.dataList.length > 0){
+			if(pagination){
 				//重新分页
 				initPagination = true;
 				showPagination(data);
@@ -28,26 +28,35 @@
 			<div class="portlet-title">
 				<form class="form-inline" action="">
 					<div style="display: inline-block;">
-                        <span class="item-label" style="width: 80px;">线路: </span>
+                        <span class="item-label" style="width: 140px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 136px;"></select>
                     </div>
                     <div style="display: inline-block;margin-left: 15px;">
                         <span class="item-label" style="width: 80px;">开始时间: </span>
-                        <input class="form-control" type="text" id="date" style="width: 120px;"/>
+                        <input class="form-control" type="text" id="date" style="width: 160px;"/>
                     </div>
                     <div style="display: inline-block;margin-left: 15px;">
                         <span class="item-label" style="width: 80px;">结束时间: </span>
-                        <input class="form-control" type="text" id="endDate" style="width: 120px;"/>
+                        <input class="form-control" type="text" id="endDate" style="width: 160px;"/>
                     </div>
-                    <div style="display: inline-block;margin-left: 15px">
-                        <span class="item-label" style="width: 140px;">路牌： </span>
+                    <div style="margin-top: 10px"></div>	
+                    <div style="display: inline-block;">
+                        <span class="item-label" style="width: 140px;">路牌: </span>
                         <select class="form-control" name="lpName" id="lpName" style="width: 136px;"></select>
                     </div>
                     <div style="display: inline-block;margin-left: 15px">
-                        <span class="item-label" style="width: 140px;">内部编码： </span>
-                        <select class="form-control" name="code" id="code" style="width: 145px;"></select>
+                        <span class="item-label" style="width: 80px;">内部编码: </span>
+                        <select class="form-control" name="code" id="code" style="width: 120px;"></select>
                     	<input class="btn btn-default" type="button" id="czcl" value="X"/>
                     </div>
+                    <div style="display: inline-block;margin-left: 15px">
+                        <span class="item-label" style="width: 140px;">修改类型: </span>
+                        <select class="form-control" name="code" id="changType" style="width: 160px;">
+                        	<option value="">全部</option>
+                        	<option value="1">前修改</option>
+                        	<option value="2">后修改</option>
+                        </select>
+                    </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="筛选"/>
                         <input class="btn btn-default" type="button" id="export" value="导出"/>
@@ -220,14 +229,16 @@
 	    var lpName = $("#lpName").val();
 	    var endDate = $("#endDate").val();
 	    var code = $("#code").val();
+	    var changType=$("#changType").val();
 		$("#query").on("click",function(){
 		    line = $("#line").val();
 		    date = $("#date").val();
 		    lpName = $("#lpName").val();
 		    code = $("#code").val();
 		    endDate = $("#endDate").val();
+		    changType=$("#changType").val();
 		    var type = "query";
-		    $get("/realSchedule/correctForm",{line:line,date:date,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
+		    $get("/realSchedule/correctForm",{line:line,date:date,endDate:endDate,lpName:lpName,code:code,type:type,changType:changType},function(result){
 		        var list_correctForm = template('list_correctForm',{list:result});
                 // 把渲染好的模版html文本追加到表格中
                 $('#forms .list_correctForm').html(list_correctForm);
@@ -245,7 +256,7 @@
  
 		$("#export").on("click",function(){
 			var type = "export";
-			$get('/realSchedule/correctForm',{line:line,date:date,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
+			$get('/realSchedule/correctForm',{line:line,date:date,endDate:endDate,lpName:lpName,code:code,type:type,changType:changType},function(result){
 				window.open("/downloadFile/download?fileName=修正报表"+date);
 			});
 		});
+我在iframe 里面
 \ No newline at end of file
+<iframe src="/pages/permission/authorize_all/authorize.html?origin=real_control_iframe" frameborder="0"></iframe>
 \ No newline at end of file
@@ -160,10 +160,13 @@ $(function(){
  
 	//模块下拉框
 	getModuleTreeData(function(treeData){
+
 		var options = '';
 		$.each(treeData, function(i, g){
 			var dArray = g.children;
-			
+
+            if(!dArray)
+                return true;
 			for(var i = 0,d; d = dArray[i++];){
 				options += '<optgroup label="'+d.name+'">';
 				if(!d.children)
@@ -53,6 +53,7 @@
 				<div class="row"  class="col-md-12">
 					<div class="col-md-5">
 						<div  id="left_table" style="margin-top: 10px;overflow:auto;height: 860px">
+							<input class="btn btn-default hidden" type="button" id="export" value="导出"/>
 							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info_inter">
 								<thead>
 									<tr class="hidden">
@@ -71,7 +72,8 @@
 						</div>
 					</div>
 					<div class="col-md-7"  id="printArea">
-						<div class="table-container" id="table" style="margin-top: 10px;overflow:auto;">
+						<div class="table-container" id="table" style="margin-top: 10px;overflow:auto;">
+							<input class="btn btn-default hidden" type="button" id="exportXx" value="导出详细"/>
 							<table class="table table-bordered table-hover table-checkable" id="forms">
 								<thead class="hidden">
 									<tr >
@@ -196,7 +198,7 @@
 			}
 		});
  
-		var date = '';
+		var date = "";
 		var gsbm="";
 		var fgsbm="";
 		var listRe=null;
@@ -211,8 +213,9 @@
 			date = $("#date").val();
 			gsbm =$("#gsdm").val();
 			fgsbm=$("#fgsdm").val();
-			$(".hidden").removeClass("hidden");
-			$get('/report/countDjg',{line:line,date:date,gsbm:gsbm,fgsbm:fgsbm},function(result){
+			$(".hidden").removeClass("hidden");
+			var i = layer.load(2);
+			$get('/report/countDjg',{line:line,date:date,gsbm:gsbm,fgsbm:fgsbm,type:"query"},function(result){
 				listRe=result;
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_inter_info',{list:result});
@@ -220,17 +223,17 @@
 				$('#info_inter tbody').html(tbodyHtml);
  
 				$('.btn-intervalList').on('click', showIntervalList);
-
-				
+				layer.close(i);
+				$("#info_inter").height($(window).height()-180);
 			});
 		});
-		
+		var listXx;
 		function showIntervalList(){
  
 			$("#info_inter tbody tr td button").css('background-color', 'blue');
 			$(this).css('background-color', '#99CCFF');
 			var line_ = $(this).data('id');
-			var listXx;
+			
 			 $.each(listRe, function (i, obj) {
 				if(obj.line==line_){
 					listXx=obj.djgxx;
@@ -240,19 +243,35 @@
 				 $(".hidden").removeClass("hidden");
 				var interList = template('list_inter_info_xx',{list:listXx});
 				$('#forms tbody').html(interList);
-				$("html,body").animate({scrollTop:$("#forms_1").offset().top},1000); 
+// 				$("html,body").animate({scrollTop:$("#forms_1").offset().top},1000); 
 // 			 }
  
 		}
  
-		/* $("#export").on("click",function(){
-			$get('/realSchedule/historyMessage',{line:line,date:date,code:jName,type:"export_msg"},function(result){
-				window.open("/downloadFile/download?fileName=调度消息分析"+moment(date).format("YYYYMMDD"));
+		 $("#export").on("click",function(){
+			 var i = layer.load(2);
+			$get('/report/countDjg',{line:line,date:date,gsbm:gsbm,fgsbm:fgsbm,type:"export"},function(result){
+				layer.close(i);
+				window.open("/downloadFile/download?fileName=大间隔统计表");
 			});
-		}); */
-		
+		}); 
  
  
+		 $("#exportXx").on("click",function(){
+			 
+			 if(listXx.length>0){
+				 var i = layer.load(2);
+				 var params = {};
+		        	params['listXx']=JSON.stringify(listXx);
+		        	params['date']=date;
+				$get('/report/countDjgXx',params,function(result){
+					layer.close(i);
+					window.open("/downloadFile/download?fileName=大间隔统计表详细");
+				});
+			 }else{
+				 layer.msg("无数据");
+			 }
+		}); 
 	});
 </script>
 <script type="text/html" id="list_inter_info">
@@ -67,28 +67,48 @@ ScheduleApp.factory(&#39;DataStore&#39;, [
             // 简拼数据
             dataMap.cl = result.data.data;
             angular.forEach(result.data.data, function(obj) {
+                //// 全拼
+                //obj["$fullChars"] = pinyin.getFullChars(obj.insideCode ? obj.insideCode: "");
+                //// 简拼
+                //obj["$camelChars"] = pinyin.getCamelChars(obj.insideCode ? obj.insideCode: "");
                 // 全拼
-                obj["$fullChars"] = pinyin.getFullChars(obj.insideCode ? obj.insideCode: "");
+                obj["$fullChars"] = obj.insideCode? obj.insideCode: "";
                 // 简拼
-                obj["$camelChars"] = pinyin.getCamelChars(obj.insideCode ? obj.insideCode: "");
+                obj["$camelChars"] = obj.insideCode? obj.insideCode: "";
                 // 原值
                 obj["$calcu_str"] = obj.insideCode? obj.insideCode: "";
             });
         });
  
+        //$http({
+        //    method: 'GET',
+        //    url: '/ee/all'
+        //}).then(function(result) {
+        //    // 简拼数据
+        //    dataMap.ry = result.data.data;
+        //    angular.forEach(result.data.data, function(obj) {
+        //        // 全拼
+        //        obj["$fullChars"] = pinyin.getFullChars(obj.personnelName + "-" + obj.jobCode);
+        //        // 简拼
+        //        obj["$camelChars"] = pinyin.getCamelChars(obj.personnelName + "-" + obj.jobCode);
+        //        // 原值
+        //        obj["$calcu_str"] = obj.personnelName + "-" + obj.jobCode;
+        //    });
+        //});
+
         $http({
             method: 'GET',
-            url: '/ee/all'
+            url: '/personnel/all_py'
         }).then(function(result) {
             // 简拼数据
-            dataMap.ry = result.data.data;
-            angular.forEach(result.data.data, function(obj) {
+            dataMap.ry = result.data;
+            angular.forEach(result.data, function(obj) {
                 // 全拼
-                obj["$fullChars"] = pinyin.getFullChars(obj.personnelName + "-" + obj.jobCode);
+                obj["$fullChars"] = obj.fullChars;
                 // 简拼
-                obj["$camelChars"] = pinyin.getCamelChars(obj.personnelName + "-" + obj.jobCode);
+                obj["$camelChars"] = obj.camelChars;
                 // 原值
-                obj["$calcu_str"] = obj.personnelName + "-" + obj.jobCode;
+                obj["$calcu_str"] = obj.name + "-" + obj.workId;
             });
         });
  
@@ -84,9 +84,9 @@
                                     icname="id"
                                     dsparams="{{ {type: 'local', param: 'ry' } | json }}"
                                     iterobjname="item"
-                                    iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
+                                    iterobjexp="item.name + '<' + item.workId + '>'"
                                     searchph="请输拼音..."
-                                    searchexp="this.personnelName + '<' + this.jobCode + '>'"
+                                    searchexp="this.name + '<' + this.workId + '>'"
                                     required >
                         </sa-Select5>
                         <input type="hidden" name="jsy_h" ng-model="ctrl.employeeConfigForSave.jsy.id"
@@ -116,9 +116,9 @@
                                     icname="id"
                                     dsparams="{{ {type: 'local', param: 'ry' } | json }}"
                                     iterobjname="item"
-                                    iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
+                                    iterobjexp="item.name + '<' + item.workId + '>'"
                                     searchph="请输拼音..."
-                                    searchexp="this.personnelName + '<' + this.jobCode + '>'"
+                                    searchexp="this.name + '<' + this.workId + '>'"
                                 >
                         </sa-Select5>
                         <input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id"
@@ -84,9 +84,9 @@
                                     icname="id"
                                     dsparams="{{ {type: 'local', param: 'ry' } | json }}"
                                     iterobjname="item"
-                                    iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
+                                    iterobjexp="item.name + '<' + item.workId + '>'"
                                     searchph="请输拼音..."
-                                    searchexp="this.personnelName + '<' + this.jobCode + '>'"
+                                    searchexp="this.name + '<' + this.workId + '>'"
                                     required >
                         </sa-Select5>
                         <input type="hidden" name="jsy_h" ng-model="ctrl.employeeConfigForSave.jsy.id"
@@ -116,9 +116,9 @@
                                     icname="id"
                                     dsparams="{{ {type: 'local', param: 'ry' } | json }}"
                                     iterobjname="item"
-                                    iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
+                                    iterobjexp="item.name + '<' + item.workId + '>'"
                                     searchph="请输拼音..."
-                                    searchexp="this.personnelName + '<' + this.jobCode + '>'"
+                                    searchexp="this.name + '<' + this.workId + '>'"
                                 >
                         </sa-Select5>
                         <input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id"
@@ -96,9 +96,9 @@
                                             icname="id"
                                             dsparams="{{ {type: 'local', param: 'ry' } | json }}"
                                             iterobjname="item"
-                                            iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                            iterobjexp="item.name + '（' + item.workId + '）'"
                                             searchph="请输拼音..."
-                                            searchexp="this.personnelName"
+                                            searchexp="this.name"
                                             required
                                         >
                                 </sa-Select5>
@@ -119,9 +119,9 @@
                                             icname="id"
                                             dsparams="{{ {type: 'local', param: 'ry' } | json }}"
                                             iterobjname="item"
-                                            iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                            iterobjexp="item.name + '（' + item.workId + '）'"
                                             searchph="请输拼音..."
-                                            searchexp="this.personnelName"
+                                            searchexp="this.name"
                                         >
                                 </sa-Select5>
                             </div>
@@ -137,9 +137,9 @@
                                             icname="id"
                                             dsparams="{{ {type: 'local', param: 'ry' } | json }}"
                                             iterobjname="item"
-                                            iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                            iterobjexp="item.name + '（' + item.workId + '）'"
                                             searchph="请输拼音..."
-                                            searchexp="this.personnelName"
+                                            searchexp="this.name"
                                         >
                                 </sa-Select5>
                             </div>
@@ -155,9 +155,9 @@
                                             icname="id"
                                             dsparams="{{ {type: 'local', param: 'ry' } | json }}"
                                             iterobjname="item"
-                                            iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                            iterobjexp="item.name + '（' + item.workId + '）'"
                                             searchph="请输拼音..."
-                                            searchexp="this.personnelName"
+                                            searchexp="this.name"
                                         >
                                 </sa-Select5>
                             </div>
@@ -173,9 +173,9 @@
                                             icname="id"
                                             dsparams="{{ {type: 'local', param: 'ry' } | json }}"
                                             iterobjname="item"
-                                            iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                            iterobjexp="item.name + '（' + item.workId + '）'"
                                             searchph="请输拼音..."
-                                            searchexp="this.personnelName"
+                                            searchexp="this.name"
                                         >
                                 </sa-Select5>
                             </div>
@@ -191,9 +191,9 @@
                                             icname="id"
                                             dsparams="{{ {type: 'local', param: 'ry' } | json }}"
                                             iterobjname="item"
-                                            iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                            iterobjexp="item.name + '（' + item.workId + '）'"
                                             searchph="请输拼音..."
-                                            searchexp="this.personnelName"
+                                            searchexp="this.name"
                                         >
                                 </sa-Select5>
                             </div>
@@ -56,16 +56,15 @@ var gb_data_basic = (function () {
         ep.emit('all_personnel', data);
     });
     function loadAllPersonnel(cb) {
-        $.get('/basic/all_personnel', function (rs) {
+        $.get('/personnel/all_py', function (rs) {
             //转换成自动补全组件需要的数据
-            var data = [], name, code;
-            for (var jobCode in rs) {
-                name = rs[jobCode];
-                code = jobCode.indexOf('-')!=-1?jobCode.split('-')[1]:jobCode;
+            var data = [], code;
+            for(var i =0, p; p = rs[i++];){
+                code = p['workId'].indexOf('-')!=-1?p['workId'].split('-')[1]:p['workId'];
                 data.push({
-                    value: code + '/' + name,
-                    fullChars: pinyin.getFullChars(name).toUpperCase(),
-                    camelChars: pinyin.getCamelChars(name)
+                    value: code + '/' + p.name,
+                    fullChars: p.fullChars,
+                    camelChars: p.camelChars
                 });
             }
             cb && cb(data);
@@ -31,15 +31,6 @@
           "id": 1.41,
           "text": "班次修正日志",
           "event": "sch_edit_info"
-        },
-        {
-          "id": 1.5,
-          "divider": true
-        },
-        {
-          "id": 1.6,
-          "text": "数据迁移和校验工具",
-          "event": "data_move_and_verification"
         }
       ],
       [
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-07-17',
-        text: '<h5>1、修复了一个蛮蠢的bug，这个bug曾经导致在分班进场班次发出晚20分钟的时候，有一定几率实发时间跳到下午首班营运班次上。</h5>'
+        date: '2017-07-21',
+        text: '<h5>1、修复一个蛮严肃的问题，这个问题有极低的概率导致个别班次的操作不会同步到路单！！！</h5>'
     };
  
     var storage = window.localStorage