1.百度地图key替换

2.区间子线路+线路文件、报站文件生成的完善，以及线调的处理变化 3.js打包兼容es6

1.百度地图key替换
2.区间子线路+线路文件、报站文件生成的完善，以及线调的处理变化 3.js打包兼容es6
王通
1 parent 44c30450
Showing 35 changed files with 2287 additions and 2149 deletions
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/data/directive/DirectiveCreator.java
src/main/java/com/bsth/data/forecast/ArrivalDataLoader.java
src/main/java/com/bsth/data/gpsdata_v2/entity/GpsEntity.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/GpsStateProcess.java
src/main/java/com/bsth/data/msg_queue/DirectivePushQueue.java
src/main/java/com/bsth/entity/directive/D64.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/directive/DirectiveService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/util/IFlyUtils.java
src/main/resources/fatso/handle_real_ctl.js
src/main/resources/fatso/minifier.js
src/main/resources/fatso/package.json
src/main/resources/static/gpsTest/test.html
src/main/resources/static/pages/base/carpark/add.html
-package com.bsth.controller.directive;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.entity.directive.D80;
-import com.bsth.entity.directive.DC0_A3;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import com.bsth.service.directive.DirectiveService;
-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 java.util.List;
-import java.util.Map;
-
-/**
- * 
- * @ClassName: DirectiveController 
- * @Description: TODO(页面下发调度指令) .0
- * @author PanZhao
- * @date 2016年6月8日 上午9:34:51 
- *
- */
-@RestController
-@RequestMapping("/directive")
-public class DirectiveController {
-	
-	@Autowired
-	DirectiveService directiveService;
-
-	/**
-	 * 
-	 * @Title: send60 
-	 * @Description: TODO(60协议短语下发) 
-	 * @throws
-	 */
-	@RequestMapping(value = "/phrase", method = RequestMethod.POST)
-	public int send60Phrase(@RequestParam String nbbm, @RequestParam String text){
-		SysUser user = SecurityUtils.getCurrentUser();
-		return directiveService.send60Phrase(nbbm, text, user.getUserName());
-	}
-	
-	/**
-	 * 
-	 * @Title: send60Dispatch 
-	 * @Description: TODO(班次信息下发) 
-	 * @param @param id
-	 * @throws
-	 */
-	@RequestMapping(value = "/dispatch", method = RequestMethod.POST)
-	public int send60Dispatch(@RequestParam Long id){
-		SysUser user = SecurityUtils.getCurrentUser();
-		return directiveService.send60Dispatch(id, user.getUserName());
-	}
-	
-	/**
-	 * 
-	 * @Title: lineChange 
-	 * @Description: TODO(切换线路) 
-	 * @param @param nbbm 车辆内部编码
-	 * @param @param lineId 新线路编码
-	 * @throws
-	 */
-	@RequestMapping(value = "/lineChnage", method = RequestMethod.POST)
-	public int lineChange(@RequestParam String nbbm, @RequestParam String lineId){
-		SysUser user = SecurityUtils.getCurrentUser();
-		return directiveService.lineChange(nbbm, lineId, user.getUserName());
-	}
-
-	/**
-	 *
-	 * @Title: lineChangeByDevice
-	 * @Description: TODO(切换线路)
-	 * @param @param deviceId 设备编码
-	 * @param @param lineId 新线路编码
-	 * @throws
-	 */
-	@RequestMapping(value = "/lineChangeByDevice", method = RequestMethod.POST)
-	public int lineChangeByDevice(@RequestParam String deviceId, @RequestParam String lineId){
-		SysUser user = SecurityUtils.getCurrentUser();
-		return directiveService.lineChangeByDeviceId(deviceId, lineId, user.getUserName());
-	}
-
-	/**
-	 * 刷新线路文件
-	 * @param deviceId 设备号
-	 * @return
-	 */
-	@RequestMapping(value = "/refreshLineFile", method = RequestMethod.POST)
-	public int refreshLineFile(@RequestParam String deviceId){
-		return directiveService.refreshLineFile(deviceId);
-	}
-	
-	/**
-	 * 
-	 * @Title: upDownChange 
-	 * @Description: TODO(上下行切换) 
-	 * @param @param nbbm 车辆内部编码
-	 * @param @param upDon
-	 * @throws
-	 */
-	@RequestMapping(value = "/upDownChange", method = RequestMethod.POST)
-	public int upDownChange(@RequestParam String nbbm, @RequestParam Integer upDown){
-		SysUser user = SecurityUtils.getCurrentUser();
-		return directiveService.send60Operation(nbbm, 0, upDown, user.getUserName());
-	}
-
-	/**
-	 *
-	 * @Title: upDownChange
-	 * @Description: TODO(状态切换，营运状态 和 上下行)
-	 * @param @param nbbm 车辆内部编码
-	 * @param @param upDon
-	 * @throws
-	 */
-	@RequestMapping(value = "/stateChange", method = RequestMethod.POST)
-	public int stateChange(@RequestParam String nbbm, @RequestParam Integer upDown, @RequestParam Integer state){
-		SysUser user = SecurityUtils.getCurrentUser();
-		return directiveService.send60Operation(nbbm, state, upDown, user.getUserName());
-	}
-	
-	/**
-	 * 
-	 * @Title: findNoCofm80 
-	 * @Description: TODO(根据线路获取未确认的80驾驶员上报数据) 
-	 * @throws
-	 */
-	@RequestMapping(value = "/findNoCofm80", method = RequestMethod.GET)
-	public Map<String, List<D80>> findNoCofm80(@RequestParam String lineCodes){
-		return directiveService.findNoCofm80(lineCodes);
-	}
-	
-	@RequestMapping(value = "/findAll80", method = RequestMethod.GET)
-	public Map<String, Object> findAll80(@RequestParam Map<String, Object> map,
-			@RequestParam(defaultValue = "0") int page,
-			@RequestParam(defaultValue = "12") int size){
-		
-		return directiveService.findAll80(map, page,size);
-	}
-	
-	/**
-	 * 
-	 * @Title: reply80 
-	 * @Description: TODO(回复80) 
-	 * @param @param reply 0：同意  -1：不同意
-	 * @throws
-	 */
-	@RequestMapping(value = "/reply80", method = RequestMethod.POST)
-	public Map<String, Object> reply80(@RequestParam int id, @RequestParam int reply){
-		return directiveService.reply80(id, reply);
-	}
-	
-	/**
-	 * 
-	 * @Title: findDirective 
-	 * @Description: TODO(查询调度指令) 
-	 * @param @param nbbm 车辆
-	 * @param @param dType 类型
-	 * @param @param page 页号
-	 * @param @param size 每页数量
-	 * @throws
-	 */
-	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Map<String, Object> findDirective(String nbbms,@RequestParam int dType
-							, @RequestParam(defaultValue = "0") int page,
-							@RequestParam(defaultValue = "10") int size){
-		
-		return directiveService.findDirective(nbbms, dType, page, size);
-	}
-	
-	@RequestMapping(value = "/c0a4", method = RequestMethod.POST)
-	public Map<String, Object> c0a4(@RequestParam String nbbm){
-		return directiveService.sendC0A4(nbbm);
-	}
-	
-	@RequestMapping(value = "/c0a3", method = RequestMethod.POST)
-	public int c0a3(String json){
-		json = StringEscapeUtils.unescapeHtml4(json);
-		DC0_A3 c0a3 = JSON.toJavaObject(JSONObject.parseObject(json), DC0_A3.class);
-		return directiveService.sendC0A3(c0a3);
-	}
-	
-	@RequestMapping(value = "/c0a5", method = RequestMethod.POST)
-	public int c0a5(String json){
-		json = StringEscapeUtils.unescapeHtml4(json);
-		return directiveService.sendC0A5(json);
-	}
-
-	/**
-	 * 设备参数查询
-	 * @return
-	 */
-	@RequestMapping(value = "/deviceCofigList", method = RequestMethod.GET)
-	public Map<String, Object> deviceCofigList(
-			@RequestParam Map<String, String> map,
-			@RequestParam(defaultValue = "0") int page,
-			@RequestParam(defaultValue = "10") int size){
-		return directiveService.deviceCofigList(map, page, size);
-	}
-}
+package com.bsth.controller.directive;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.entity.directive.D80;
+import com.bsth.entity.directive.DC0_A3;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.directive.DirectiveService;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ * @ClassName: DirectiveController 
+ * @Description: TODO(页面下发调度指令) .0
+ * @author PanZhao
+ * @date 2016年6月8日 上午9:34:51 
+ *
+ */
+@RestController
+@RequestMapping("/directive")
+public class DirectiveController {
+	
+	@Autowired
+	DirectiveService directiveService;
+
+	/**
+	 * 
+	 * @Title: send60 
+	 * @Description: TODO(60协议短语下发) 
+	 * @throws
+	 */
+	@RequestMapping(value = "/phrase", method = RequestMethod.POST)
+	public int send60Phrase(@RequestParam String nbbm, @RequestParam String text){
+		SysUser user = SecurityUtils.getCurrentUser();
+		return directiveService.send60Phrase(nbbm, text, user.getUserName());
+	}
+	
+	/**
+	 * 
+	 * @Title: send60Dispatch 
+	 * @Description: TODO(班次信息下发) 
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value = "/dispatch", method = RequestMethod.POST)
+	public int send60Dispatch(@RequestParam Long id){
+		SysUser user = SecurityUtils.getCurrentUser();
+		return directiveService.send60Dispatch(id, user.getUserName());
+	}
+	
+	/**
+	 * 
+	 * @Title: lineChange 
+	 * @Description: TODO(切换线路) 
+	 * @param @param nbbm 车辆内部编码
+	 * @param @param lineId 新线路编码
+	 * @throws
+	 */
+	@RequestMapping(value = "/lineChnage", method = RequestMethod.POST)
+	public int lineChange(@RequestParam String nbbm, @RequestParam String lineId){
+		SysUser user = SecurityUtils.getCurrentUser();
+		return directiveService.lineChange(nbbm, lineId, user.getUserName());
+	}
+
+	/**
+	 *
+	 * @Title: lineChangeByDevice
+	 * @Description: TODO(切换线路)
+	 * @param @param deviceId 设备编码
+	 * @param @param lineId 新线路编码
+	 * @throws
+	 */
+	@RequestMapping(value = "/lineChangeByDevice", method = RequestMethod.POST)
+	public int lineChangeByDevice(@RequestParam String deviceId, @RequestParam String lineId, HttpServletRequest request){
+		SysUser user = SecurityUtils.getCurrentUser();
+		int seq = 0;
+		if (request.getParameter("seq") != null) {
+			seq = Integer.parseInt(request.getParameter("seq"));
+		}
+		return directiveService.lineChangeByDeviceId(deviceId, lineId, user.getUserName(), seq);
+	}
+
+	/**
+	 * 刷新线路文件
+	 * @param deviceId 设备号
+	 * @return
+	 */
+	@RequestMapping(value = "/refreshLineFile", method = RequestMethod.POST)
+	public int refreshLineFile(@RequestParam String deviceId){
+		return directiveService.refreshLineFile(deviceId);
+	}
+	
+	/**
+	 * 
+	 * @Title: upDownChange 
+	 * @Description: TODO(上下行切换) 
+	 * @param @param nbbm 车辆内部编码
+	 * @param @param upDon
+	 * @throws
+	 */
+	@RequestMapping(value = "/upDownChange", method = RequestMethod.POST)
+	public int upDownChange(@RequestParam String nbbm, @RequestParam Integer upDown){
+		SysUser user = SecurityUtils.getCurrentUser();
+		return directiveService.send60Operation(nbbm, 0, upDown, user.getUserName());
+	}
+
+	/**
+	 *
+	 * @Title: upDownChange
+	 * @Description: TODO(状态切换，营运状态 和 上下行)
+	 * @param @param nbbm 车辆内部编码
+	 * @param @param upDon
+	 * @throws
+	 */
+	@RequestMapping(value = "/stateChange", method = RequestMethod.POST)
+	public int stateChange(@RequestParam String nbbm, @RequestParam Integer upDown, @RequestParam Integer state){
+		SysUser user = SecurityUtils.getCurrentUser();
+		return directiveService.send60Operation(nbbm, state, upDown, user.getUserName());
+	}
+	
+	/**
+	 * 
+	 * @Title: findNoCofm80 
+	 * @Description: TODO(根据线路获取未确认的80驾驶员上报数据) 
+	 * @throws
+	 */
+	@RequestMapping(value = "/findNoCofm80", method = RequestMethod.GET)
+	public Map<String, List<D80>> findNoCofm80(@RequestParam String lineCodes){
+		return directiveService.findNoCofm80(lineCodes);
+	}
+	
+	@RequestMapping(value = "/findAll80", method = RequestMethod.GET)
+	public Map<String, Object> findAll80(@RequestParam Map<String, Object> map,
+			@RequestParam(defaultValue = "0") int page,
+			@RequestParam(defaultValue = "12") int size){
+		
+		return directiveService.findAll80(map, page,size);
+	}
+	
+	/**
+	 * 
+	 * @Title: reply80 
+	 * @Description: TODO(回复80) 
+	 * @param @param reply 0：同意  -1：不同意
+	 * @throws
+	 */
+	@RequestMapping(value = "/reply80", method = RequestMethod.POST)
+	public Map<String, Object> reply80(@RequestParam int id, @RequestParam int reply){
+		return directiveService.reply80(id, reply);
+	}
+	
+	/**
+	 * 
+	 * @Title: findDirective 
+	 * @Description: TODO(查询调度指令) 
+	 * @param @param nbbm 车辆
+	 * @param @param dType 类型
+	 * @param @param page 页号
+	 * @param @param size 每页数量
+	 * @throws
+	 */
+	@RequestMapping(value = "/list", method = RequestMethod.GET)
+	public Map<String, Object> findDirective(String nbbms,@RequestParam int dType
+							, @RequestParam(defaultValue = "0") int page,
+							@RequestParam(defaultValue = "10") int size){
+		
+		return directiveService.findDirective(nbbms, dType, page, size);
+	}
+	
+	@RequestMapping(value = "/c0a4", method = RequestMethod.POST)
+	public Map<String, Object> c0a4(@RequestParam String nbbm){
+		return directiveService.sendC0A4(nbbm);
+	}
+	
+	@RequestMapping(value = "/c0a3", method = RequestMethod.POST)
+	public int c0a3(String json){
+		json = StringEscapeUtils.unescapeHtml4(json);
+		DC0_A3 c0a3 = JSON.toJavaObject(JSONObject.parseObject(json), DC0_A3.class);
+		return directiveService.sendC0A3(c0a3);
+	}
+	
+	@RequestMapping(value = "/c0a5", method = RequestMethod.POST)
+	public int c0a5(String json){
+		json = StringEscapeUtils.unescapeHtml4(json);
+		return directiveService.sendC0A5(json);
+	}
+
+	/**
+	 * 设备参数查询
+	 * @return
+	 */
+	@RequestMapping(value = "/deviceCofigList", method = RequestMethod.GET)
+	public Map<String, Object> deviceCofigList(
+			@RequestParam Map<String, String> map,
+			@RequestParam(defaultValue = "0") int page,
+			@RequestParam(defaultValue = "10") int size){
+		return directiveService.deviceCofigList(map, page, size);
+	}
+}
@@ -4,6 +4,7 @@ import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.LoggerContext;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
+import com.bsth.data.LineConfigData;
 import com.bsth.data.SystemParamCache;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.directive.DirectivesPstThread;
@@ -98,6 +99,9 @@ public class AdminUtilsController {
     @Autowired
     private SsoConfig ssoConfig;
  
+    @Autowired
+    private LineConfigData lineConfigData;
+
     /**
      * 出现重复班次的车辆
      *
@@ -312,6 +316,19 @@ public class AdminUtilsController {
         return "error";
     }
  
+    @RequestMapping("/reload-line-config")
+    public String reloadLineConfig() {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            lineConfigData.reload();
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "error";
+    }
+
     @RequestMapping("/setInjectStr")
     public String setInjectStr(@RequestParam String injectStr) {
         Map<String, Object> result = new HashMap<>();
-package com.bsth.data;
-
-import com.bsth.Application;
-import com.bsth.entity.Line;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.service.LineService;
-import com.bsth.service.realcontrol.LineConfigService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author PanZhao
- * @ClassName: LineConfigData
- * @Description: TODO(线路配置数据管理)
- * @date 2016年8月15日 下午2:50:19
- */
-@Component
-@Order(value = 2)
-public class LineConfigData implements CommandLineRunner {
-
-    static Logger logger = LoggerFactory.getLogger(LineConfigData.class);
-
-    // 线路编码和配置
-    private Map<String, LineConfig> lineConfMap;
-
-    @Autowired
-    LineConfigService lineConfigService;
-
-    @Autowired
-    LineService lineService;
-
-    //入库缓冲
-    static LinkedList<LineConfig> saveBuffers = new LinkedList<>();
-
-    @Autowired
-    LineConfigPersistThread configPersistThread;
-
-    @Override
-    public void run(String... arg0) throws Exception {
-        lineConfMap = new HashMap<>();
-
-        Iterator<LineConfig> itr = lineConfigService.findAll().iterator();
-        while (itr.hasNext())
-            setBuffer(itr.next());
-
-        //异步入库
-        Application.mainServices.scheduleWithFixedDelay(configPersistThread, 60, 60, TimeUnit.SECONDS);
-    }
-
-    /**
-     * 起点发出，应用缓冲区设置参数
-     * @param sch
-     * @param timestamp
-     * @return
-     */
-    public long applyOut(ScheduleRealInfo sch, Long timestamp) {
-        LineConfig config = lineConfMap.get(sch.getXlBm());
-        int diff = sch.getXlDir().equals("0")?config.getUpOutDiff():config.getDownOutDiff();
-        return timestamp - (diff * 1000);
-    }
-
-    /**
-     * 终点到达，应用缓冲区设置参数
-     * @param sch
-     * @param timestamp
-     * @return
-     */
-    public long applyIn(ScheduleRealInfo sch, Long timestamp){
-        LineConfig config = lineConfMap.get(sch.getXlBm());
-        int diff = sch.getXlDir().equals("0")?config.getUpInDiff():config.getDownInDiff();
-        return timestamp + (diff * 1000);
-    }
-
-    @Component
-    private static class LineConfigPersistThread extends Thread {
-
-        @Autowired
-        LineConfigService lineConfigService;
-
-        @Override
-        public void run() {
-            LineConfig config;
-            for (int i = 0; i < 800; i++) {
-                config = saveBuffers.poll();
-                if (config == null)
-                    break;
-
-                try {
-                    lineConfigService.save(config);
-                }catch (Exception e){
-                    logger.error("", e);
-                }
-            }
-        }
-    }
-
-    public LineConfig get(String lineCode) {
-        return lineConfMap.get(lineCode);
-    }
-
-    public Collection<LineConfig> getAll() {
-        return lineConfMap.values();
-    }
-
-    public void set(LineConfig conf) {
-        //lineConfigService.save(conf);
-        saveBuffers.add(conf);
-        setBuffer(conf);
-    }
-
-    public void setBuffer(LineConfig conf) {
-        lineConfMap.put(conf.getLine().getLineCode(), conf);
-    }
-
-    /**
-     * @Title: init
-     * @Description: TODO(初始化配置信息)
-     */
-    public void init(String lineCode) throws Exception {
-        LineConfig conf = new LineConfig();
-        //线路
-        Line line = lineService.findByLineCode(lineCode);
-        if (null == line)
-            throw new NullPointerException("异常的lineCode");
-
-        conf.setReadReverse(true);
-        conf.setLine(line);
-        //开始运营时间
-        conf.setStartOpt("02:00");
-        //出场时间类型
-        conf.setOutConfig(0);
-        //调度指令模板
-        conf.setSchDirectiveTemp("");
-
-        //应急停靠默认值
-        conf.setYjtkStart("00:00");
-        conf.setYjtkEnd("23:59");
-
-        set(conf);
-    }
-}
+package com.bsth.data;
+
+import com.bsth.Application;
+import com.bsth.entity.Line;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.LineService;
+import com.bsth.service.realcontrol.LineConfigService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author PanZhao
+ * @ClassName: LineConfigData
+ * @Description: TODO(线路配置数据管理)
+ * @date 2016年8月15日 下午2:50:19
+ */
+@Component
+@Order(value = 2)
+public class LineConfigData implements CommandLineRunner {
+
+    static Logger logger = LoggerFactory.getLogger(LineConfigData.class);
+
+    // 线路编码和配置
+    private Map<String, LineConfig> lineConfMap;
+
+    @Autowired
+    LineConfigService lineConfigService;
+
+    @Autowired
+    LineService lineService;
+
+    //入库缓冲
+    static LinkedList<LineConfig> saveBuffers = new LinkedList<>();
+
+    @Autowired
+    LineConfigPersistThread configPersistThread;
+
+    @Override
+    public void run(String... arg0) throws Exception {
+        lineConfMap = new HashMap<>();
+
+        Iterator<LineConfig> itr = lineConfigService.findAll().iterator();
+        while (itr.hasNext())
+            setBuffer(itr.next());
+
+        //异步入库
+        Application.mainServices.scheduleWithFixedDelay(configPersistThread, 60, 60, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 起点发出，应用缓冲区设置参数
+     * @param sch
+     * @param timestamp
+     * @return
+     */
+    public long applyOut(ScheduleRealInfo sch, Long timestamp) {
+        LineConfig config = lineConfMap.get(sch.getXlBm());
+        int diff = sch.getXlDir().equals("0")?config.getUpOutDiff():config.getDownOutDiff();
+        return timestamp - (diff * 1000);
+    }
+
+    /**
+     * 终点到达，应用缓冲区设置参数
+     * @param sch
+     * @param timestamp
+     * @return
+     */
+    public long applyIn(ScheduleRealInfo sch, Long timestamp){
+        LineConfig config = lineConfMap.get(sch.getXlBm());
+        int diff = sch.getXlDir().equals("0")?config.getUpInDiff():config.getDownInDiff();
+        return timestamp + (diff * 1000);
+    }
+
+    @Component
+    private static class LineConfigPersistThread extends Thread {
+
+        @Autowired
+        LineConfigService lineConfigService;
+
+        @Override
+        public void run() {
+            LineConfig config;
+            for (int i = 0; i < 800; i++) {
+                config = saveBuffers.poll();
+                if (config == null)
+                    break;
+
+                try {
+                    lineConfigService.save(config);
+                }catch (Exception e){
+                    logger.error("", e);
+                }
+            }
+        }
+    }
+
+    public LineConfig get(String lineCode) {
+        return lineConfMap.get(lineCode);
+    }
+
+    public Collection<LineConfig> getAll() {
+        return lineConfMap.values();
+    }
+
+    public void set(LineConfig conf) {
+        //lineConfigService.save(conf);
+        saveBuffers.add(conf);
+        setBuffer(conf);
+    }
+
+    public void setBuffer(LineConfig conf) {
+        lineConfMap.put(conf.getLine().getLineCode(), conf);
+    }
+
+    /**
+     * @Title: init
+     * @Description: TODO(初始化配置信息)
+     */
+    public void init(String lineCode) throws Exception {
+        LineConfig conf = new LineConfig();
+        //线路
+        Line line = lineService.findByLineCode(lineCode);
+        if (null == line)
+            throw new NullPointerException("异常的lineCode");
+
+        conf.setReadReverse(true);
+        conf.setLine(line);
+        //开始运营时间
+        conf.setStartOpt("02:00");
+        //出场时间类型
+        conf.setOutConfig(0);
+        //调度指令模板
+        conf.setSchDirectiveTemp("");
+
+        //应急停靠默认值
+        conf.setYjtkStart("00:00");
+        conf.setYjtkEnd("23:59");
+
+        set(conf);
+    }
+
+    /**
+     * 重新从数据库加载
+     */
+    public void reload() {
+        Iterator<LineConfig> itr = lineConfigService.findAll().iterator();
+        while (itr.hasNext())
+            setBuffer(itr.next());
+    }
+}
@@ -142,10 +142,6 @@ public class DayOfDirectives {
 				logger.warn("64响应 data is null ，json： " + json);
 			else {
 				logger.info(d64.getDeviceId() + "_" + d64.getData().getLineId() + "响应：" + data.getShort("requestAck"));
-				ScheduleRealInfo sch = d64.getSch();
-				if (sch != null) {
-					sch.setRegionSwitchState(1);
-				}
 				/*d64.setRespAck(data.getShort("requestAck"));
 				// 持久化*/
 				//64 响应不入库了...
@@ -136,7 +136,7 @@ public class DirectiveCreator {
 		return create64(deviceId, lineCode, t);
 	}*/
  
-	public D64 create64(String deviceId, String lineCode, ScheduleRealInfo sch, long t){
+	public D64 create64(String deviceId, String lineCode, long t, int seq){
 		D64 change = new D64();
 		D64Data data = new D64Data();
 		data.setCityCode(cityCode);
@@ -145,20 +145,12 @@ public class DirectiveCreator {
 		//线路编码补满6位数
 		String lineCodeStr = padLeft(lineCode, 6, '0');
 		data.setLineId(lineCodeStr);
-		int seq = 0;
-		if (sch != null) {
-			String regionId = sch.getLineRegion();
-			if (StringUtils.hasText(regionId)) {
-				seq = Integer.parseInt(regionId.split("_")[1]);
-			}
-		}
 		data.setSeq(seq);
  
 		change.setDeviceId(deviceId);
 		change.setOperCode((short) 0X64);
 		change.setTimestamp(t);
 		change.setData(data);
-		change.setSch(sch);
  
 		return change;
 	}
@@ -169,9 +161,10 @@ public class DirectiveCreator {
 	 * @Description: TODO(线路刷新指令（用于切换线路后，要求设置重新下载线路文件）) 
 	 * @param @param deviceId 设备编号
 	 * @param @param lineId  线路ID
+	 * @param seq 子线路
 	 * @throws
 	 */
-	public String createDeviceRefreshData(String deviceId, String lineCode) {
+	public String createDeviceRefreshData(String deviceId, String lineCode, int seq) {
 		Long t = System.currentTimeMillis();
 		Map<String, Object> param = new HashMap<>();
 		param.put("deviceId", deviceId);
@@ -189,7 +182,7 @@ public class DirectiveCreator {
 		String lineCodeStr = padLeft(lineCode, 6, '0');
  
 		data.put("lineId", lineCodeStr);
-		data.put("lineVersion", 0);
+		data.put("lineVersion", seq);
 		data.put("carparkDataVersion", 0);
 		param.put("data", data);
  
-package com.bsth.data.forecast;
-
-import com.bsth.data.BasicData;
-import com.bsth.data.LineConfigData;
-import com.bsth.data.forecast.entity.ArrivalEntity;
-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.stereotype.Component;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-/**
- * 
- * @ClassName: DataLoader 
- * @Description: TODO(从数据库加载进出站数据) 
- * @author PanZhao 
- * @date 2016年8月19日 上午9:59:21 
- *
- */
-@Component
-public class ArrivalDataLoader {
-	
-	private static Long prveLoadTime;
-	
-	private final static long DAY_TIME = 1000 * 60 * 60 * 24;
-	
-	private Logger logger = LoggerFactory.getLogger(this.getClass());
-	
-	@Autowired
-	LineConfigData lineConfigData;
-	
-	/**
-	 * 
-	 * @Title: load 
-	 * @Description: TODO(根据上次加载时间，查询之后的增量数据) 
-
-	public List<ArrivalEntity> load(){
-		List<ArrivalEntity> list = null;
-		
-		if(null == prveLoadTime)
-			list = recovery();
-		else{
-			Calendar cal = Calendar.getInstance();
-			//周数，表分区字段
-			int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
-			
-			Connection conn = null;
-			PreparedStatement ps = null;
-			ResultSet rs = null;
-			
-			String sql = "select * from bsth_c_arrival_info where weeks_year=? AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by create_date";
-			try{
-				long t = System.currentTimeMillis();
-				
-				conn = DBUtils_MS.getConnection();
-				ps = conn.prepareStatement(sql);
-				ps.setInt(1, weeks_year);
-				ps.setLong(2, prveLoadTime);
-				ps.setLong(3, t);
-				rs = ps.executeQuery();
-				
-				list = resultSet2Set(rs);
-				
-				prveLoadTime = t;
-			}catch(Exception e){
-				logger.error("", e);
-			}finally {
-				DBUtils_MS.close(rs, ps, conn);
-			}
-		}
-		return list;
-	}*/
-	
-	/**
-	 * 
-	 * @Title: recovery 
-	 * @Description: TODO(从数据库恢复数据，按照线路的开始运营时间恢复) 
-
-	public List<ArrivalEntity> recovery(){
-		Collection<LineConfig> confs = lineConfigData.getAll();
-		long t = System.currentTimeMillis()
-			,st;
-		
-		List<ArrivalEntity> all = new ArrayList<>();
-		for(LineConfig conf : confs){
-			st = conf.getCurrStartTime();
-			if(t < st)
-				st = st - DAY_TIME;
-			try{
-				all.addAll(loadByLineAndTime(conf.getLine().getLineCode(), st, t));
-			}catch(Exception e){
-				logger.error("", e);
-			}
-		}
-		
-		prveLoadTime = t;
-		return all;
-	}*/
-	
-	/**
-	 * 
-	 * @Title: loadByLineAndStartTime 
-	 * @Description: TODO(根据线路和时间戳加载数据) 
-	 */
-	public List<ArrivalEntity> loadByLineAndTime(String lineCode, long st, long et){
-		Calendar cal = Calendar.getInstance();
-		cal.setTimeInMillis(st);
-		int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
-		
-		Connection conn = null;
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-		
-		List<ArrivalEntity> list = new ArrayList<>();
-		String sql = "select * from bsth_c_arrival_info where weeks_year=? and line_id=? AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by ts";
-		try{
-			conn = DBUtils_MS.getConnection();
-			ps = conn.prepareStatement(sql);
-			ps.setInt(1, weeks_year);
-			ps.setString(2, lineCode);
-			ps.setLong(3, st);
-			ps.setLong(4, et);
-			rs = ps.executeQuery();
-			
-			list = resultSet2Set(rs);
-		}catch(Exception e){
-			logger.error("", e);
-		}finally {
-			DBUtils_MS.close(rs, ps, conn);
-		}
-		return list;
-	}
-	
-	/**
-	 * 
-	 * @Title: loadByLineAndStartTime 
-	 * @Description: TODO(根据线路，走向和时间戳加载数据) 
-	 */
-	public List<ArrivalEntity> loadByLineAndTime(String lineCode, int updown, long st, long et){
-		Calendar cal = Calendar.getInstance();
-		cal.setTimeInMillis(st);
-		int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
-		
-		Connection conn = null;
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-		
-		List<ArrivalEntity> list = new ArrayList<>();
-		String sql = "select * from bsth_c_arrival_info where weeks_year=? and line_id=? and up_down=? and in_out=0 AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by ts";
-		try{
-			conn = DBUtils_MS.getConnection();
-			ps = conn.prepareStatement(sql);
-			ps.setInt(1, weeks_year);
-			ps.setString(2, lineCode);
-			ps.setInt(3, updown);
-			ps.setLong(4, st);
-			ps.setLong(5, et);
-			rs = ps.executeQuery();
-			
-			list = resultSet2Set(rs);
-		}catch(Exception e){
-			logger.error("", e);
-		}finally {
-			DBUtils_MS.close(rs, ps, conn);
-		}
-		return list;
-	}
-	
-	public List<ArrivalEntity> resultSet2Set(ResultSet rs) throws SQLException{
-		List<ArrivalEntity> list = new ArrayList<>();
-		
-		ArrivalEntity arr;
-		while(rs.next()){
-			arr = new ArrivalEntity();
-			arr.setDeviceId(rs.getString("device_id"));
-			arr.setNbbm(BasicData.deviceId2NbbmMap.get(arr.getDeviceId()));
-			if(null == arr.getNbbm()){
-				logger.warn("未注册的设备号，" + arr.getDeviceId());
-				continue;
-			}
-			
-			arr.setTs(rs.getLong("ts"));
-			arr.setLineCode(rs.getString("line_id"));
-			arr.setUpDown(rs.getInt("up_down"));
-			arr.setStopNo(rs.getString("stop_no"));
-			arr.setStopName(BasicData.stationCode2NameMap.get(arr.getStopNo()));
-			arr.setInOut(rs.getInt("in_out"));
-			arr.setCreateDate(rs.getLong("create_timestamp"));
-			arr.setWeeksYear(rs.getInt("weeks_year"));
-			arr.setEnable(true);
-			
-			list.add(arr);
-		}
-		return list;
-	}
-	
-	public static void setPrveLoadTime(long t){
-		prveLoadTime = t;
-	}
-}
+package com.bsth.data.forecast;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.LineConfigData;
+import com.bsth.data.forecast.entity.ArrivalEntity;
+import com.bsth.util.db.DBUtils_MS;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+/**
+ * 
+ * @ClassName: DataLoader 
+ * @Description: TODO(从数据库加载进出站数据) 
+ * @author PanZhao 
+ * @date 2016年8月19日 上午9:59:21 
+ *
+ */
+@Component
+public class ArrivalDataLoader {
+	
+	private static Long prveLoadTime;
+	
+	private final static long DAY_TIME = 1000 * 60 * 60 * 24;
+	
+	private Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	@Autowired
+	LineConfigData lineConfigData;
+	
+	/**
+	 * 
+	 * @Title: load 
+	 * @Description: TODO(根据上次加载时间，查询之后的增量数据) 
+
+	public List<ArrivalEntity> load(){
+		List<ArrivalEntity> list = null;
+		
+		if(null == prveLoadTime)
+			list = recovery();
+		else{
+			Calendar cal = Calendar.getInstance();
+			//周数，表分区字段
+			int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
+			
+			Connection conn = null;
+			PreparedStatement ps = null;
+			ResultSet rs = null;
+			
+			String sql = "select * from bsth_c_arrival_info where weeks_year=? AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by create_date";
+			try{
+				long t = System.currentTimeMillis();
+				
+				conn = DBUtils_MS.getConnection();
+				ps = conn.prepareStatement(sql);
+				ps.setInt(1, weeks_year);
+				ps.setLong(2, prveLoadTime);
+				ps.setLong(3, t);
+				rs = ps.executeQuery();
+				
+				list = resultSet2Set(rs);
+				
+				prveLoadTime = t;
+			}catch(Exception e){
+				logger.error("", e);
+			}finally {
+				DBUtils_MS.close(rs, ps, conn);
+			}
+		}
+		return list;
+	}*/
+	
+	/**
+	 * 
+	 * @Title: recovery 
+	 * @Description: TODO(从数据库恢复数据，按照线路的开始运营时间恢复) 
+
+	public List<ArrivalEntity> recovery(){
+		Collection<LineConfig> confs = lineConfigData.getAll();
+		long t = System.currentTimeMillis()
+			,st;
+		
+		List<ArrivalEntity> all = new ArrayList<>();
+		for(LineConfig conf : confs){
+			st = conf.getCurrStartTime();
+			if(t < st)
+				st = st - DAY_TIME;
+			try{
+				all.addAll(loadByLineAndTime(conf.getLine().getLineCode(), st, t));
+			}catch(Exception e){
+				logger.error("", e);
+			}
+		}
+		
+		prveLoadTime = t;
+		return all;
+	}*/
+	
+	/**
+	 * 
+	 * @Title: loadByLineAndStartTime 
+	 * @Description: TODO(根据线路和时间戳加载数据) 
+	 */
+	public List<ArrivalEntity> loadByLineAndTime(String lineCode, long st, long et){
+		Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(st);
+		int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
+		
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		
+		List<ArrivalEntity> list = new ArrayList<>();
+		String sql = "select * from bsth_c_arrival_info where weeks_year=? and line_id=? AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by ts";
+		try{
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setInt(1, weeks_year);
+			ps.setString(2, lineCode);
+			ps.setLong(3, st);
+			ps.setLong(4, et);
+			rs = ps.executeQuery();
+			
+			list = resultSet2Set(rs);
+		}catch(Exception e){
+			logger.error("", e);
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		return list;
+	}
+	
+	/**
+	 * 
+	 * @Title: loadByLineAndStartTime 
+	 * @Description: TODO(根据线路，走向和时间戳加载数据) 
+	 */
+	public List<ArrivalEntity> loadByLineAndTime(String lineCode, int updown, long st, long et){
+		DateTime start = new DateTime(st), end = new DateTime(et);
+		if (start.getYear() != end.getYear()) {
+			throw new IllegalArgumentException("请选择同一年");
+		}
+		if (et - st > 14 * 24 * 60 * 60 * 1000) {
+			throw new IllegalArgumentException("时间区间过长");
+		}
+		Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(st);
+		int weeksYear1 = cal.get(Calendar.WEEK_OF_YEAR), weeksYear2 = cal.get(Calendar.WEEK_OF_YEAR);
+		
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		
+		List<ArrivalEntity> list = new ArrayList<>();
+		String sql = "select * from bsth_c_arrival_info_" + start.getYear() + " where weeks_year between ? and ? and line_id=? and up_down=? and in_out=0 AND create_timestamp BETWEEN ? AND ? AND ABS(create_timestamp - ts) < 3600000 order by ts";
+		try{
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setInt(1, weeksYear1);
+			ps.setInt(2, weeksYear2);
+			ps.setString(3, lineCode);
+			ps.setInt(4, updown);
+			ps.setLong(5, st);
+			ps.setLong(6, et);
+			rs = ps.executeQuery();
+			
+			list = resultSet2Set(rs);
+		}catch(Exception e){
+			logger.error("", e);
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		return list;
+	}
+	
+	public List<ArrivalEntity> resultSet2Set(ResultSet rs) throws SQLException{
+		List<ArrivalEntity> list = new ArrayList<>();
+		
+		ArrivalEntity arr;
+		while(rs.next()){
+			arr = new ArrivalEntity();
+			arr.setDeviceId(rs.getString("device_id"));
+			arr.setNbbm(BasicData.deviceId2NbbmMap.get(arr.getDeviceId()));
+			if(null == arr.getNbbm()){
+				logger.warn("未注册的设备号，" + arr.getDeviceId());
+				continue;
+			}
+			
+			arr.setTs(rs.getLong("ts"));
+			arr.setLineCode(rs.getString("line_id"));
+			arr.setUpDown(rs.getInt("up_down"));
+			arr.setStopNo(rs.getString("stop_no"));
+			arr.setStopName(BasicData.stationCode2NameMap.get(arr.getStopNo()));
+			arr.setInOut(rs.getInt("in_out"));
+			arr.setCreateDate(rs.getLong("create_timestamp"));
+			arr.setWeeksYear(rs.getInt("weeks_year"));
+			arr.setEnable(true);
+			
+			list.add(arr);
+		}
+		return list;
+	}
+	
+	public static void setPrveLoadTime(long t){
+		prveLoadTime = t;
+	}
+}
@@ -20,6 +20,11 @@ public class GpsEntity implements Cloneable{
 	/** 线路编码 */
 	private String lineId;
  
+	/**
+	 * 子线路ID
+	 */
+	private int subLineId;
+
 	/** 设备编码 */
 	private String deviceId;
  
@@ -228,6 +233,14 @@ public class GpsEntity implements Cloneable{
 		this.lineId = lineId;
 	}
  
+	public int getSubLineId() {
+		return subLineId;
+	}
+
+	public void setSubLineId(int subLineId) {
+		this.subLineId = subLineId;
+	}
+
 	public Long getSchId() {
 		return schId;
 	}
@@ -75,7 +75,12 @@ public class GpsStateProcess {
         }
  
         // 线路编码不一致或者未接收到切换区间线的响应
-        if (!sch.getXlBm().equals(gps.getLineId()) || StringUtils.hasText(sch.getLineRegion()) && sch.getRegionSwitchState() == 0) {
+        String regionId = sch.getLineRegion();
+        int seq = 0;
+        if (!StringUtils.isEmpty(regionId)) {
+            seq = Integer.parseInt(regionId.split("_")[1]);
+        }
+        if (!sch.getXlBm().equals(gps.getLineId()) || gps.getSubLineId() != seq) {
             //切换车载的 线路编码
             gpsStatusManager.changeLine(gps.getNbbm(), sch, "同步@系统");
         }
@@ -159,7 +159,7 @@ public class DirectivePushQueue implements ApplicationContextAware {
                             log.info("directive 60_03 nbbm: " + qd.getNbbm());
                         }
                         else if(code.equals("64")){
-                            directiveService.lineChange(qd.getNbbm(), qd.getLineCode(), qd.getSch(), qd.getSender());
+                            directiveService.lineChange(qd.getNbbm(), qd.getLineCode(), qd.getSender(), qd.getSch().getLineRegion());
                             log.info("directive 64 nbbm: " + qd.getNbbm() + " lineCode: " + qd.getLineCode());
                         } 
  
@@ -29,10 +29,6 @@ public class D64 extends Directive{
  
 	private D64Data data;
  
-	@Transient
-	@JsonIgnore
-	private ScheduleRealInfo sch;
-
 	@Embeddable
 	public static class D64Data {
  
@@ -115,14 +111,6 @@ public class D64 extends Directive{
 		this.respAck = respAck;
 	}
  
-	public ScheduleRealInfo getSch() {
-		return sch;
-	}
-
-	public void setSch(ScheduleRealInfo sch) {
-		this.sch = sch;
-	}
-
 	@Override
 	public void setDeviceId(String deviceId) {
 		if(this.data != null)
@@ -268,12 +268,6 @@ public class ScheduleRealInfo implements Cloneable{
 	private String blockStations;
  
 	/**
-	 * 区间切换状态 0 未发或未成功 1 成功
-	 */
-	@Transient
-	private int regionSwitchState;
-
-	/**
 	 *大客流进度 0下发驾驶员，1下发车辆，2，班次就位
 	 */
 	@Transient
@@ -1102,14 +1096,6 @@ public class ScheduleRealInfo implements Cloneable{
 		this.blockStations = blockStations;
 	}
  
-	public int getRegionSwitchState() {
-		return regionSwitchState;
-	}
-
-	public void setRegionSwitchState(int regionSwitchState) {
-		this.regionSwitchState = regionSwitchState;
-	}
-
 	@Override
 	public ScheduleRealInfo clone() throws CloneNotSupportedException {
 		ScheduleRealInfo cloned = (ScheduleRealInfo) super.clone();
@@ -60,11 +60,11 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	 */
 	int lineChange(String nbbm, String lineId, String sender);
  
-	int lineChange(String nbbm, String lineId, ScheduleRealInfo sch, String sender);
+	int lineChange(String nbbm, String lineId, String sender, String lineRegion);
  
     int lineChangeByDeviceId(String deviceId, String lineCode, String sender);
  
-    int lineChangeByDeviceId(String deviceId, String lineCode, ScheduleRealInfo sch, String sender);
+    int lineChangeByDeviceId(String deviceId, String lineCode, String sender, int seq);
  
     /**
 	 * 
@@ -388,28 +388,32 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
  
     @Override
     public int lineChange(String nbbm, String lineCode, String sender) {
-        return lineChangeByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm), lineCode, null, sender);
+        return lineChangeByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm), lineCode, sender, 0);
     }
  
     /**
      * 线路切换
      */
     @Override
-    public int lineChange(String nbbm, String lineCode, ScheduleRealInfo sch, String sender) {
-        return lineChangeByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm), lineCode, sch, sender);
+    public int lineChange(String nbbm, String lineCode, String sender, String lineRegion) {
+        int seq = 0;
+        if (lineRegion != null) {
+            seq = Integer.parseInt(lineRegion.split("_")[1]);
+        }
+        return lineChangeByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm), lineCode, sender, seq);
     }
  
     @Override
     public int lineChangeByDeviceId(String deviceId, String lineCode, String sender) {
-        return lineChangeByDeviceId(deviceId, lineCode, null, sender);
+        return lineChangeByDeviceId(deviceId, lineCode, sender, 0);
     }
  
     @Override
-    public int lineChangeByDeviceId(String deviceId, String lineCode, ScheduleRealInfo sch, String sender) {
+    public int lineChangeByDeviceId(String deviceId, String lineCode, String sender, int seq) {
         DirectiveCreator crt = new DirectiveCreator();
         Long t = System.currentTimeMillis();
         //生成64数据包
-        D64 d64 = crt.create64(deviceId, lineCode, sch, t);
+        D64 d64 = crt.create64(deviceId, lineCode, t, seq);
  
         if (null != sender)
             d64.setSender(sender);
@@ -425,10 +429,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         }
         // 入库
         d64.setHttpCode(code);
-        d64.getData().setTxtContent("切换线路[" + BasicData.lineCode2NameMap.get(lineCode) + "]");
+        d64.getData().setTxtContent("切换线路[" + BasicData.lineCode2NameMap.get(lineCode) + "]" + (seq != 0 ? "[" + seq + "]" : ""));
         // 通知设备刷新线路文件，忽略结果
         if (code == 0)
-            GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
+            GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode, seq));
         else
             d64.setErrorText(" 网关通讯失败, code: " + code);
  
@@ -699,7 +703,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         if (gps == null)
             return -1;
  
-        return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
+        return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId(), 0));
     }
  
 /*    @Override
@@ -26,19 +26,19 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
  
 /**
- * 
+ *
  * @ClassName: StationRouteServiceImpl(站点路由service业务层实现类)
- * 
+ *
  * @Extends : BaseService
- * 
+ *
  * @Description: TODO(站点路由service业务层)
- * 
+ *
  * @Author bsth@lq
- * 
+ *
  * @Date 2016年5月03日 上午9:21:17
  *
  * @Version 公交调度系统BS版 0.1
- * 
+ *
  */
  
 @Service
@@ -49,16 +49,16 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 	@Value("${path.speech.line}")
 	private String linePathPattern;
-	
+
 	@Autowired
 	private StationRouteRepository stationRouteRepository;
-	
+
 	@Autowired
 	private SectionRouteRepository sectionRouteRepository;
-	
+
 	@Autowired
 	private LineRepository lineRepository;
-	
+
 	@Autowired
 	private StationRepository stationRepository;
  
@@ -84,7 +84,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 		return stationRouteRepository.findAll(new CustomerSpecs<>(map), Sort.by(orders));
 	}
-	
+
 	@Override
 	public Map<String, Object> getSectionRouteExport(Integer id, HttpServletResponse resp) {
 		Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,12 +136,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}
 		return resultMap;
 	}
-	
+
 	/**
 	 * @Description :TODO(查询树站点与路段数据)
-	 * 
+	 *
 	 * @param map <line.id_eq:线路ID； directions_eq：方向>
-	 * 
+	 *
 	 * @return List<Map<String, Object>>
 	 */
 	@Override
@@ -155,26 +155,26 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 		return result;
 	}
-	
+
 	@Override
 	public Map<String, Object> systemQuote(Map<String, Object> map) {
 		Map<String, Object> resultmap = new HashMap<>();
 		try{
-			
+
 			StationRoute route = new StationRoute();
-			
+
 			Integer lineId = map.get("lineId").equals("") ? null : Integer.parseInt(map.get("lineId").toString());
-			
+
 			Integer stationId = map.get("stationId").equals("") ? null : Integer.parseInt(map.get("stationId").toString());
-			
+
 			Line line = lineRepository.findById(lineId).get();
-			
+
 			Station station = stationRepository.findById(stationId).get();
-			
+
 			route.setLine(line);
-			
+
 			route.setStation(station);
-			
+
 			//baseRepository.save(t);
 			resultmap.put("status", ResponseCode.SUCCESS);
 		}catch(Exception e){
@@ -183,13 +183,13 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}
 		return resultmap;
 	}
-	
+
 	/**
 	 * @Description :TODO(查询线路某方向下的站点序号与类型)
-	 * 
+	 *
 	 * @param map <lineId:线路ID； direction：方向；stationRouteCode：站点编码>
-	 * 
-	 * @return List<Map<String, Object>> 
+	 *
+	 * @return List<Map<String, Object>>
 	 */
 	@Override
 	public List<Map<String, Object>> findUpStationRouteCode(Map<String, Object> map) {
@@ -304,40 +304,40 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 	/**
 	  * @Description :TODO(查询线路某方向下所有站点的中心百度坐标)
-	  * 
+	  *
 	  * @param map <lineId:线路ID； direction：方向>
-	  * 
-	  * @return List<Map<String, Object>> 
+	  *
+	  * @return List<Map<String, Object>>
 	  */
 	@Override
 	public List<Map<String, Object>> getStationRouteCenterPoints(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 = stationRouteRepository.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;
 	}
  
@@ -355,7 +355,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}
 		map.put("destroy_eq", 0);
 		List<LsStationRoute> stationRoutes = lsStationRouteRepository.findAll(new CustomerSpecs<>(map), Sort.by(Direction.ASC, "stationRouteCode"));
-		
+
 		List<Map<String, Object>> resultList = new ArrayList<>();
  
 		int len = stationRoutes.size();
@@ -366,44 +366,44 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}
 		return resultList;
 	}
-	
+
 	/**
 	 * @Description :TODO(撤销站点)
-	 * 
+	 *
 	 * @param map <lineId:线路ID； destroy：是否撤销（0：否；1：是）>
-	 * 
+	 *
 	 * @return Map<String, Object> <SUCCESS ; ERROR>
 	 */
 	@Override
 	public Map<String, Object> stationRouteIsDestroy(Map<String, Object> map) {
 		Map<String, Object> resultMap = new HashMap<String,Object>();
-		
+
 		try {
-			
+
 			Integer stationRouteId = map.get("stationRouteId").equals("") ? 0 : Integer.parseInt(map.get("stationRouteId").toString());
-			
+
 			Integer destroy = map.get("destroy").equals("") ? 0 : Integer.parseInt(map.get("destroy").toString());
  
 			lsStationRouteRepository.deleteById(stationRouteId);
  
 			resultMap.put("status", ResponseCode.SUCCESS);
-			
+
 		} catch (Exception e) {
-			
+
 			resultMap.put("status", ResponseCode.ERROR);
-			
+
 			logger.error("save erro.", e);
-			
+
 		}
-		
+
 		return resultMap;
 	}
-	
+
 	/**
 	 * @Description : TODO(根据线路ID生成行单)
-	 * 
+	 *
 	 * @param map <lineId:线路ID>
-	 * 
+	 *
 	 * @return Map<String, Object> <SUCCESS ; ERROR ; NOTDATA>
 	 */
 	@Override
@@ -440,7 +440,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				languages.add("cn");
 				languages.add("sh");
 				languages.add("en");
-				InputStream tts = ttsAndZip(objects, line, languages);
+				ttsAndZip(objects, line, languages, lineRegions);
 				/** 获取配置文件里的ftp登录参数 */
 				Map<String, Object> FTPParamMap = readPropertiesGetFTPParam();
 				// 压缩文件名
@@ -505,23 +505,26 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 				input = new ByteArrayInputStream(textStr.getBytes("gbk"));
  
+				// 线路文件上传(全程)
 				clientUtils.uploadFile(url, port, username, password, remotePath + "/voice/", textFileName, input);
+				String linePath = String.format(linePathPattern, lineId), voicePath = String.format("%s%s.zip", linePath, lineId);
+				// 报站文件上传(全程)
+				clientUtils.deleteFtpFile(url, port, username, password, remotePath + "/voice/", String.format("%s.zip", line.getLineCode()));
+				clientUtils.FTPUpLoadFromDisk(new File(voicePath), String.format("%s.zip", line.getLineCode()), url, port, username, password, remotePath + "/voice/");
  
-//				textFile.delete();
 				// 线路区间
 				if (lineRegions.size() > 0) {
 					FTPClientUtils.deleteFileByPrefix(String.format("%s-", line.getLineCode()), url, port, username, password, String.format("%s/voice/", remotePath));
 					for (LineRegion lineRegion : lineRegions) {
+						voicePath = String.format("%s%s-%d.zip", linePath, lineId, lineRegion.getSeq());
 						textStr = String.format("%s\r\n%s", head, subLine2Ftp(lineRegion));
 						input = new ByteArrayInputStream(textStr.getBytes("gbk"));
 						clientUtils.uploadFile(url, port, username, password, remotePath + "/voice/", String.format("%s-%d.txt", line.getLineCode(), lineRegion.getSeq()), input);
+						clientUtils.deleteFtpFile(url, port, username, password, remotePath + "/voice/", String.format("%s-%d.zip", line.getLineCode(), lineRegion.getSeq()));
+						clientUtils.FTPUpLoadFromDisk(new File(voicePath), String.format("%s-%d.zip", line.getLineCode(), lineRegion.getSeq()), url, port, username, password, remotePath + "/voice/");
 					}
 				}
  
-
-				clientUtils.deleteFtpFile(url, port, username, password, remotePath + "/voice/", String.format("%s.zip", line.getLineCode()));
-				clientUtils.uploadFile(url, port, username, password, remotePath + "/voice/", String.format("%s.zip", line.getLineCode()), tts);
-
 				resultMap.put("status", ResponseCode.SUCCESS);
 			}else {
 				resultMap.put("status","NOTDATA");
@@ -533,22 +536,22 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			return resultMap;
 		}
 	}
-	
+
 	/**
 	 * @Description : TODO(形成行单文件内容)
-	 * 
+	 *
 	 * @param objects ：站点路由信息
-	 * 	
+	 *
 	 * 					{[0]：g_lonx（GPS经度）；[1]：g_laty（GPS纬度）；[2]：b_jwpoints（百度经纬度坐标）
-	 * 							
+	 *
 	 * 					[3]：station_mark（站点类型）；[4]：station_route_code（站点序号）；[5]：station_cod（站点编码）；
-	 * 
+	 *
 	 * 				    [6]：distances（站点距离）；[7]：station_name（站点名称）；[8]：directions（方向）}
-	 * 
+	 *
 	 * @param lineId ：线路ID
-	 * 
+	 *
 	 * @return String
-	 */ 
+	 */
 	public String  newTextFileToFTP(List<Object[]> objects,Integer lineId) {
  
 		// 返回值String
@@ -563,34 +566,34 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				defaultZdxh ++ ;
 				// 经度
 				String lng = objects.get(i)[0].equals("") ? "0" : objects.get(i)[0].toString();
-				
+
 				// 纬度
 				String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
-				
+
 				Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
-				
+
 				lat = "\t" +  lat;
-				
+
 				// 站点类型
 				String stationMakeStr =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
-				
+
 				String stationMake = "";
-				
+
 				if(stationMakeStr.equals("E")) {
 					stationMake = "\t2";
 				}else {
 					stationMake ="\t1";
 				}
-				
-				// 站点序号 
+
+				// 站点序号
 				// String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
 				String stationNo =  String.valueOf(defaultZdxh);
-				
+
 				stationNo = "\t" + stationNo;
-				
+
 				// 站点编码
 				String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
-				
+
 				int len = stationCode.length();
 				if(len<8) {
 					int dx = 8 - len;
@@ -602,24 +605,24 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				}else if(len>8){
 					stationCode = stationCode.substring(8);
 				}
-				
+
 				stationCode =  "\t" +stationCode;
-				
+
 				double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
-				
+
 				String tempDistc = String.valueOf((int) dis);
-				
+
 				// 站点距离
 				String staitondistance = "\t" + tempDistc;
-				
+
 				// 站点名称
 				String stationName =  objects.get(i)[7].equals("") ? "" : objects.get(i)[7].toString();
-				
+
 				stationName = "\t" +stationName;
-				
+
 				// 限速
 				// String sleepStr = " " + "60";
-				
+
 				// 限速
 				String sleepStr = "";
 				// 方向
@@ -649,16 +652,16 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 						}
 					}
 				}
-				if(sleepStr.equals("")) 
+				if(sleepStr.equals(""))
 					sleepStr  =  "\t" + "60";
 				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 			}
-			
+
 		}
 		return stationRStr;
-	
+
 	}
-	
+
 	public String  newTextVoiceFileToFTP(List<Object[]> objects,Integer lineId) {
  
 		// 返回值String
@@ -673,34 +676,34 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				defaultZdxh ++ ;
 				// 经度
 				String lng = objects.get(i)[0].equals("") ? "0" : objects.get(i)[0].toString();
-				
+
 				// 纬度
 				String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
-				
+
 				Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
-				
+
 				lat = "\t" +  lat;
-				
+
 				// 站点类型
 				String stationMakeStr =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
-				
+
 				String stationMake = "";
-				
+
 				if(stationMakeStr.equals("E")) {
 					stationMake = "\t2";
 				}else {
 					stationMake ="\t1";
 				}
-				
-				// 站点序号 
+
+				// 站点序号
 				// String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
 				String stationNo =  String.valueOf(defaultZdxh);
-				
+
 				stationNo = "\t" + stationNo;
-				
+
 				// 站点编码
 				String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
-				
+
 				int len = stationCode.length();
 				if(len<8) {
 					int dx = 8 - len;
@@ -712,31 +715,31 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				}else if(len>8){
 					stationCode = stationCode.substring(8);
 				}
-				
+
 				stationCode =  "\t" +stationCode;
-				
+
 				double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
-				
+
 				String tempDistc = String.valueOf((int) dis);
-				
+
 				// 站点距离
 				String staitondistance = "\t" + tempDistc;
-				
+
 				// 站点名称
 				String stationName =  objects.get(i)[7].equals("") ? " " : objects.get(i)[7].toString();
-				
+
 				String stationNameEn = " ";
 				if(objects.get(i)[9] != null){
 					stationNameEn =  objects.get(i)[9].equals("") ? " " : objects.get(i)[9].toString();
 				}
-				
-				
+
+
 				stationName = "\t" +stationName;
 				stationNameEn = "\t" +stationNameEn;
-				
+
 				// 限速
 				// String sleepStr = " " + "60";
-				
+
 				// 限速
 				String sleepStr = "";
 				// 方向
@@ -769,16 +772,16 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 						}
 					}
 				}
-				if(sleepStr.equals("")) 
+				if(sleepStr.equals(""))
 					sleepStr  =  "\t" + "60";
 				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + stationNameEn + enterStr;
 			}
-			
+
 		}
 		return stationRStr;
-	
+
 	}
-	
+
 	public String hxTextFileToFtp(List<Object[]> objects,Integer lineId) {
 		String restStr = "";
 		// windows下的文本文件换行符
@@ -791,10 +794,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				if(Integer.valueOf(objects.get(i)[8].toString())==0) {
 					// 经度
 					String lng = objects.get(i)[0].equals("") ? "0" : objects.get(i)[0].toString();
-					
+
 					// 纬度
 					String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
-					
+
 					Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
 					lat = "\t" +  lat;
 					// 站点类型
@@ -805,7 +808,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					}else {
 						stationMake ="\t1";
 					}
-					// 站点序号 
+					// 站点序号
 					// String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
 					String stationNo = "\t" + xh;
 					// 站点编码
@@ -861,7 +864,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 							}
 						}
 					}
-					if(sleepStr.equals("")) 
+					if(sleepStr.equals(""))
 						sleepStr  =  "\t" + "60";
 					xh++;
 					restStr = restStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
@@ -871,70 +874,70 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		System.out.println(restStr);
 		return restStr;
 	}
-	
+
 	public boolean isPointOnPolyline (Map<String, Object> point, List<Map<String, Object>> listMap ){
-		
+
 		boolean success = false;
-		
+
 		for(int l = 0; l < listMap.size() - 1; l	++){
-			
+
 			Map<String, Object> tempM = listMap.get(l);
-			
+
 			Map<String, Object> nextTempM = listMap.get(l+1);
-			
+
 			 if (Double.valueOf(point.get("lng").toString())>= Math.min(Double.valueOf(tempM.get("lng").toString()), Double.valueOf(nextTempM.get("lng").toString())) && Double.valueOf(point.get("lng").toString()) <= Math.max(Double.valueOf(tempM.get("lng").toString()), Double.valueOf(nextTempM.get("lng").toString())) &&
 					 Double.valueOf(point.get("lat").toString()) >= Math.min(Double.valueOf(tempM.get("lat").toString()), Double.valueOf(nextTempM.get("lat").toString())) &&  Double.valueOf(point.get("lat").toString()) <= Math.max(Double.valueOf(tempM.get("lat").toString()), Double.valueOf(nextTempM.get("lat").toString()))){
-				 
-				 
-				 double precision = (Double.valueOf(tempM.get("lng").toString()) - Double.valueOf(point.get("lng").toString())) * (Double.valueOf(nextTempM.get("lat").toString()) - Double.valueOf(point.get("lat").toString())) - 
+
+
+				 double precision = (Double.valueOf(tempM.get("lng").toString()) - Double.valueOf(point.get("lng").toString())) * (Double.valueOf(nextTempM.get("lat").toString()) - Double.valueOf(point.get("lat").toString())) -
 		                    (Double.valueOf(nextTempM.get("lng").toString()) - Double.valueOf(tempM.get("lng").toString())) * (Double.valueOf(tempM.get("lat").toString()) - Double.valueOf(nextTempM.get("lat").toString()));
-				 
+
 				 if(precision < 2e-10 && precision > -2e-10){
-					 
+
 					//实质判断是否接近0
 					 success = true;
-	                
-				 }  
-				 
+
+				 }
+
 			 }
-			
+
 		}
-		
+
 		return success;
 	}
-	
+
 	/**
 	 * @Description：TOOD(获取FTP登录参数) 这里暂时只做一个map值返回，以后可以作为ftp登录类提出来
-	 * 
+	 *
 	 * @return ： Map<String, Object> <url：IP；port：端口；username：用户名；password：密码；remotePath：相对路径>
 	 */
 	public Map<String, Object> readPropertiesGetFTPParam(){
-		
+
 		// 返回值map
 		Map<String, Object> resultMap = new HashMap<String, Object>();
-		
+
 		Properties env = new Properties();
-		
+
 		try {
-			
+
 			env.load(DBUtils_MS.class.getClassLoader().getResourceAsStream("ftp.properties"));
-			
+
 			resultMap.put("url", env.getProperty("ftp.url"));
-			
+
 			resultMap.put("port", env.getProperty("ftp.port"));
-			
+
 			resultMap.put("username", env.getProperty("ftp.username"));
-			
+
 			resultMap.put("password", env.getProperty("ftp.password"));
-			
+
 			resultMap.put("remotePath", env.getProperty("ftp.path"));
-			
+
 		} catch (Exception e) {
  
 			e.printStackTrace();
-			
+
 		}
-		
+
 		return resultMap ;
 	}
  
@@ -961,7 +964,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			}
 			//过滤部分字段
 			/*String jsonStr = JSON.toJSONString(list, new PropertyFilter() {
-				
+
 				@Override
 				public boolean apply(Object object, String name, Object value) {
 					if(name.equals("line"))
@@ -969,14 +972,14 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					return true;
 				}
 			});*/
-			
+
 			rs.put("status", ResponseCode.SUCCESS);
 			rs.put("list", list);
 		}catch(Exception e){
 			logger.error("", e);
 			rs.put("status", ResponseCode.ERROR);
 		}
-		
+
 		return rs;
 	}
  
@@ -1065,7 +1068,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	 * @param line
 	 * @param languages 语言 如：cn、en、sh
 	 */
-	private InputStream ttsAndZip(List<Object[]> objects, Line line, Set<String> languages) throws Exception {
+	private void ttsAndZip(List<Object[]> objects, Line line, Set<String> languages, List<LineRegion> lineRegions) throws Exception {
 		String lineId = line.getLineCode();
 		StringBuilder cnBuilder = new StringBuilder(line.getName()).append("[p1000]"), enBuilder = new StringBuilder("Hello[p1000]");
 		int ups = 0, downs = 0;
@@ -1094,75 +1097,116 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				downs++;
 			}
 		}
-		cnBuilder.delete(cnBuilder.length() - 8, cnBuilder.length() - 1);
-		enBuilder.delete(enBuilder.length() - 8, enBuilder.length() - 1);
+		cnBuilder.delete(cnBuilder.length() - 7, cnBuilder.length());
+		enBuilder.delete(enBuilder.length() - 7, enBuilder.length());
  
 		// 文本转语音并进行分割
 		// 音频存放及压缩文件路径
 		String linePath = String.format(linePathPattern, lineId), voicePath = String.format("%s%s.zip", linePath, lineId);
-		try {
-			String path = String.format("%scn.mp3", linePath);
-			IFlyUtils.textToSpeechCn(cnBuilder.toString(), path);
-			AudioOperationUtils.splitBySilence(path, String.format("%scn", linePath), 500, -40);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-		if (languages.contains("sh")) {
-            try {
-				String path = String.format("%ssh.mp3", linePath);
-                IFlyUtils.textToSpeechSh(cnBuilder.toString(), path);
-				AudioOperationUtils.splitBySilence(path, String.format("%ssh", linePath), 500, -40);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-		if (languages.contains("en")) {
+		// 先清理历史生成的文件
+		cleanHistoryAudio(new File(linePath));
+		for (String language : languages) {
 			try {
-				String path = String.format("%sen.mp3", linePath);
-				IFlyUtils.textToSpeechEn(enBuilder.toString(), path);
-				AudioOperationUtils.splitBySilence(path, String.format("%sen", linePath), 500, -40);
+				String path = String.format("%s%s.mp3", linePath, language);
+				if ("cn".equals(language) || "sh".equals(language)) {
+					IFlyUtils.textToSpeech(cnBuilder.toString(), language, path);
+				} else if ("en".equals(language)) {
+					IFlyUtils.textToSpeech(enBuilder.toString(), language, path);
+				}
+				AudioOperationUtils.splitBySilence(path, String.format("%s%s", linePath, language), 500, -40);
 			} catch (Exception e) {
 				throw new RuntimeException(e);
 			}
 		}
-		// 删除原线路音频
-		File file = new File(linePath);
-		for (File f : file.listFiles()) {
-			if (f.isFile() && f.getName().endsWith(".mp3")) {
-				file.delete();
+
+		// 合并每站起步、到达语音(全程)
+		int seq = 1;
+		List<SeqStationLevel> seqs = new ArrayList<>();
+		for (int i = seq;i <= ups;i++) {
+			seqs.add(new SeqStationLevel(i, i));
+		}
+		seq = merge(lineId, "0", seq, seqs, languages);
+		if (line.getLinePlayType() != 1) {
+			seqs.clear();
+			for (int i = seq;i < ups + downs;i++) {
+				seqs.add(new SeqStationLevel(i, i + 1, 1));
+			}
+			merge(lineId, "0", seq, seqs, languages);
+		}
+		zipAudio(String.format("%s%s/", linePath, "0"), voicePath, lineId);
+
+		// 线路区间
+		Map<String, List<SeqStationLevel>> region2map = new HashMap<>();
+		for (LineRegion lineRegion : lineRegions) {
+			for (int i = 0;i < objects.size();i++) {
+				Object[] objArr = objects.get(i);
+				String stationCode = (String) objArr[5];
+				int direction = (int) objArr[8];
+				if (lineRegion.getDirection() == direction) {
+					for (int j = 0;j < lineRegion.getStationRoutes().size();j++) {
+						LsStationRoute stationRoute = lineRegion.getStationRoutes().get(j);
+						if (stationCode.equals(stationRoute.getStationCode())) {
+							List<SeqStationLevel> map = region2map.get(lineRegion.getSeq().toString());
+							if (map == null) {
+								map = new ArrayList<>();
+								region2map.put(lineRegion.getSeq().toString(), map);
+							}
+							map.add(new SeqStationLevel(j + 1, i + 1, direction));
+							break;
+						}
+					}
+				}
 			}
 		}
+		for (Map.Entry<String, List<SeqStationLevel>> entry : region2map.entrySet()) {
+			String subLineId = entry.getKey();
+			List<SeqStationLevel> map = entry.getValue();
+			seq = 1;
+			merge(lineId, subLineId, seq, map, languages);
+			zipAudio(String.format("%s%s/", linePath, subLineId), String.format("%s%s-%s.zip", linePath, lineId, subLineId), String.format("%s-%s", lineId, subLineId));
+		}
+	}
  
-		// 合并每站起步、到达语音
-		int seq = 1, startSeq = 1, direction = 0;
-		seq = merge(lineId, seq, startSeq, direction, ups, languages);
-		startSeq = ups + 1;
-		direction = 1;
-		merge(lineId, seq, startSeq, direction, ups + downs, languages);
+	private void cleanHistoryAudio(File file) throws Exception {
+		if (file.isDirectory()) {
+			File[] files = file.listFiles();
+			for (File f : files) {
+				cleanHistoryAudio(f);
+			}
+		} else {
+			if (file.getName().endsWith(".mp3") || file.getName().endsWith(".zip")) {
+				file.delete();
+			}
+		}
+	}
  
-		// 压缩音频到zip
+	/**
+	 * 压缩音频到zip
+	 * @param subLinePath 子线路文件夹
+	 * @param voicePath 语音报站文件压缩包路径
+	 */
+	private void zipAudio(String subLinePath, String voicePath, String zipFolder) throws Exception {
+		File file = new File(subLinePath);
 		ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(voicePath));
 		for (File f : file.listFiles()) {
 			if (f.isFile() && f.getName().endsWith(".mp3")) {
-				addFileToZip(zos, f);
+				addFileToZip(zos, f, zipFolder);
 			}
 		}
 		// Key打头音频
 		file = new File(commonPath);
 		for (File f : file.listFiles()) {
 			if (f.isFile() && f.getName().startsWith("Key-")) {
-				addFileToZip(zos, f);
+				addFileToZip(zos, f, zipFolder);
 			}
 		}
 		zos.flush();
 		zos.close();
-
-		return new FileInputStream(voicePath);
 	}
  
-	private static void addFileToZip(ZipOutputStream zos, File file) throws IOException {
+	private static void addFileToZip(ZipOutputStream zos, File file, String zipFolder) throws IOException {
 		FileInputStream fis = new FileInputStream(file);
-		ZipEntry zipEntry = new ZipEntry(file.getName());
+		ZipEntry zipEntry = new ZipEntry(String.format("%s/%s", zipFolder, file.getName()));
 		zos.putNextEntry(zipEntry);
  
 		byte[] bytes = new byte[4096];
@@ -1175,21 +1219,32 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		fis.close();
 	}
  
-	private int merge(String lineId, int seq, int startSeq, int direction, int terminal, Set<String> languages) throws Exception {
-		for (int i = startSeq;i <= terminal;i++) {
-			if (i > startSeq) {
-				if (i == startSeq + 1) {
+	/**
+	 *
+	 * @param lineId 线路编码
+	 * @param seq 线路站级序号(全局)
+	 * @param seqs 当前方向站级序号
+	 * @param languages 语种
+	 * @return
+	 * @throws Exception
+	 */
+	private int merge(String lineId, String subLineId, int seq, List<SeqStationLevel> seqs, Set<String> languages) throws Exception {
+		SeqStationLevel startSeq = seqs.get(0), terminal = seqs.get(seqs.size() - 1);
+		for (int i = 0;i < seqs.size();i++) {
+			SeqStationLevel current = seqs.get(i);
+			if (current.getStationLevel() > startSeq.getStationLevel()) {
+				if (i == 1) {
 					// 生成首站
-					mergeOriginStart(lineId, seq, i, direction, terminal, languages);
-					mergeNormalArrive(lineId, seq, i, direction, terminal, languages);
-				} else if (i == terminal) {
+					mergeOriginStart(lineId, subLineId, seq, current, terminal, languages);
+					mergeNormalArrive(lineId, subLineId, seq, current, terminal, languages);
+				} else if (current.getStationLevel() == terminal.getStationLevel()) {
 					// 生成终点站
-					mergeNormalStart(lineId, seq, i, direction, terminal, languages);
-					mergeTerminalArrive(lineId, seq, i, direction, terminal, languages);
+					mergeNormalStart(lineId, subLineId, seq, current, terminal, languages);
+					mergeTerminalArrive(lineId, subLineId, seq, current, terminal, languages);
 				} else {
 					// 生成中途站
-					mergeNormalStart(lineId, seq, i, direction, terminal, languages);
-					mergeNormalArrive(lineId, seq, i, direction, terminal, languages);
+					mergeNormalStart(lineId, subLineId, seq, current, terminal, languages);
+					mergeNormalArrive(lineId, subLineId, seq, current, terminal, languages);
 				}
 				seq++;
 			}
@@ -1198,9 +1253,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		return seq;
 	}
  
-	private void mergeOriginStart(String lineId, int seq, int stationLevel, int direction, int terminal, Set<String> languages) throws Exception {
+	private void mergeOriginStart(String lineId, String subLineId, int seq, SeqStationLevel current, SeqStationLevel terminal, Set<String> languages) throws Exception {
+		// 子线路路径
 		String linePath = String.format(linePathPattern, lineId);
-		List<String> arr = Arrays.asList(commonPath + "cn_origin_1.mp3", linePath + String.format("cn/%03d.mp3", 0), commonPath + "cn_origin_2.mp3", linePath + String.format("cn/%03d.mp3", terminal), commonPath + "sh_origin_1.mp3", linePath + String.format("sh/%03d.mp3", 0), commonPath + "sh_origin_2.mp3", linePath + String.format("cn/%03d.mp3", terminal), commonPath + "cn_start_1.mp3", linePath + String.format("cn/%03d.mp3", stationLevel), commonPath + "cn_start_2.mp3", commonPath + "sh_start_1.mp3", linePath + String.format("sh/%03d.mp3", stationLevel), commonPath + "sh_start_2.mp3", commonPath + "en_1.mp3", linePath + String.format("en/%03d.mp3", stationLevel), commonPath + "cn_start_3.mp3", commonPath + "sh_start_3.mp3");
+		String subLinePath = String.format("%s%s/", linePath, subLineId);
+		int direction = current.getDirection();
+		List<String> arr = Arrays.asList(commonPath + "cn_origin_1.mp3", linePath + String.format("cn/%03d.mp3", 0), commonPath + "cn_origin_2.mp3", linePath + String.format("cn/%03d.mp3", terminal.getStationLevel()), commonPath + "sh_origin_1.mp3", linePath + String.format("sh/%03d.mp3", 0), commonPath + "sh_origin_2.mp3", linePath + String.format("cn/%03d.mp3", terminal.getStationLevel()), commonPath + "cn_start_1.mp3", linePath + String.format("cn/%03d.mp3", current.getStationLevel()), commonPath + "cn_start_2.mp3", commonPath + "sh_start_1.mp3", linePath + String.format("sh/%03d.mp3", current.getStationLevel()), commonPath + "sh_start_2.mp3", commonPath + "en_1.mp3", linePath + String.format("en/%03d.mp3", current.getStationLevel()), commonPath + "cn_start_3.mp3", commonPath + "sh_start_3.mp3");
 		List<String> inputPaths = new ArrayList<>();
 		for (String path : arr) {
 			for (String lang : languages) {
@@ -1210,12 +1268,14 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				}
 			}
 		}
-		AudioOperationUtils.merge(inputPaths, String.format("%s%03da%s-%03d-%s-Start.mp3", linePath, seq, direction == 0 ? "u" : "d", direction == 0 ? stationLevel : terminal - stationLevel + 1, direction == 0 ? "Up" : "Dn"));
+		AudioOperationUtils.merge(inputPaths, String.format("%s%03da%s-%03d-%s-Start.mp3", subLinePath, seq, direction == 0 ? "u" : "d", direction == 0 ? current.getSeq() : terminal.getSeq() - current.getSeq() + 1, direction == 0 ? "Up" : "Dn"));
 	}
  
-	private void mergeNormalStart(String lineId, int seq, int stationLevel, int direction, int terminal, Set<String> languages) throws Exception {
+	private void mergeNormalStart(String lineId, String subLineId, int seq, SeqStationLevel current, SeqStationLevel terminal, Set<String> languages) throws Exception {
 		String linePath = String.format(linePathPattern, lineId);
-		List<String> arr = Arrays.asList(commonPath + "cn_start.mp3", linePath + String.format("cn/%03d.mp3", stationLevel), commonPath + "cn_start_2.mp3", commonPath + "sh_start_1.mp3", linePath + String.format("sh/%03d.mp3", stationLevel), commonPath + "sh_start_2.mp3", commonPath + "en_1.mp3", linePath + String.format("en/%03d.mp3", stationLevel), commonPath + "cn_start_3.mp3", commonPath + "sh_start_3.mp3");
+		String subLinePath = String.format("%s%s/", linePath, subLineId);
+		int direction = current.getDirection();
+		List<String> arr = Arrays.asList(commonPath + "cn_start.mp3", linePath + String.format("cn/%03d.mp3", current.getStationLevel()), commonPath + "cn_start_2.mp3", commonPath + "sh_start_1.mp3", linePath + String.format("sh/%03d.mp3", current.getStationLevel()), commonPath + "sh_start_2.mp3", commonPath + "en_1.mp3", linePath + String.format("en/%03d.mp3", current.getStationLevel()), commonPath + "cn_start_3.mp3", commonPath + "sh_start_3.mp3");
 		List<String> inputPaths = new ArrayList<>();
 		for (String path : arr) {
 			for (String lang : languages) {
@@ -1225,26 +1285,28 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				}
 			}
 		}
-		AudioOperationUtils.merge(inputPaths, String.format("%s%03da%s-%03d-%s-Start.mp3", linePath, seq, direction == 0 ? "u" : "d", direction == 0 ? stationLevel : terminal - stationLevel + 1, direction == 0 ? "Up" : "Dn"));
+		AudioOperationUtils.merge(inputPaths, String.format("%s%03da%s-%03d-%s-Start.mp3", subLinePath, seq, direction == 0 ? "u" : "d", direction == 0 ? current.getSeq() : terminal.getSeq() - current.getSeq() + 1, direction == 0 ? "Up" : "Dn"));
 	}
  
-	private void mergeNormalArrive(String lineId, int seq, int stationLevel, int direction, int terminal, Set<String> languages) throws Exception {
+	private void mergeNormalArrive(String lineId, String subLineId, int seq, SeqStationLevel current, SeqStationLevel terminal, Set<String> languages) throws Exception {
 		String linePath = String.format(linePathPattern, lineId);
-		List<String> arr = new ArrayList<>(Arrays.asList(commonPath + "cn_arrive.mp3", linePath + String.format("cn/%03d.mp3", stationLevel), commonPath + "cn_arrive_1.mp3", linePath + String.format("sh/%03d.mp3", stationLevel), commonPath + "sh_arrive_1.mp3", commonPath + "en_2.mp3", linePath + String.format("en/%03d.mp3", stationLevel)));
+		String subLinePath = String.format("%s%s/", linePath, subLineId);
+		int direction = current.getDirection();
+		List<String> arr = new ArrayList<>(Arrays.asList(commonPath + "cn_arrive.mp3", linePath + String.format("cn/%03d.mp3", current.getStationLevel()), commonPath + "cn_arrive_1.mp3", linePath + String.format("sh/%03d.mp3", current.getStationLevel()), commonPath + "sh_arrive_1.mp3", commonPath + "en_2.mp3", linePath + String.format("en/%03d.mp3", current.getStationLevel())));
 		List<String> inputPaths = new ArrayList<>();
 		if (languages.contains("sh")) {
 			for (int i = 0;i < 3;i++) {
 				arr.add(linePath + String.format("cn/%03d.mp3", 0));
 				arr.add(commonPath + "cn_origin_2.mp3");
-				arr.add(linePath + String.format("cn/%03d.mp3", terminal));
+				arr.add(linePath + String.format("cn/%03d.mp3", terminal.getStationLevel()));
 				arr.add(linePath + String.format("sh/%03d.mp3", 0));
 				arr.add(commonPath + "sh_origin_2.mp3");
-				arr.add(linePath + String.format("sh/%03d.mp3", terminal));
+				arr.add(linePath + String.format("sh/%03d.mp3", terminal.getStationLevel()));
 			}
 		} else {
 			arr.add(linePath + String.format("cn/%03d.mp3", 0));
 			arr.add(commonPath + "cn_origin_2.mp3");
-			arr.add(linePath + String.format("cn/%03d.mp3", terminal));
+			arr.add(linePath + String.format("cn/%03d.mp3", terminal.getStationLevel()));
 		}
 		for (String path : arr) {
 			for (String lang : languages) {
@@ -1254,12 +1316,14 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				}
 			}
 		}
-		AudioOperationUtils.merge(inputPaths, String.format("%s%03db%s-%03d-%s-Arrive.mp3", linePath, seq, direction == 0 ? "u" : "d", direction == 0 ? stationLevel : terminal - stationLevel + 1, direction == 0 ? "Up" : "Dn"));
+		AudioOperationUtils.merge(inputPaths, String.format("%s%03db%s-%03d-%s-Arrive.mp3", subLinePath, seq, direction == 0 ? "u" : "d", direction == 0 ? current.getSeq() : terminal.getSeq() - current.getSeq() + 1, direction == 0 ? "Up" : "Dn"));
 	}
  
-	private void mergeTerminalArrive(String lineId, int seq, int stationLevel, int direction, int terminal, Set<String> languages) throws Exception {
+	private void mergeTerminalArrive(String lineId, String subLineId, int seq, SeqStationLevel current, SeqStationLevel terminal, Set<String> languages) throws Exception {
 		String linePath = String.format(linePathPattern, lineId);
-		List<String> arr = Arrays.asList(commonPath + "cn_terminal.mp3", linePath + String.format("cn/%03d.mp3", stationLevel), commonPath + "cn_arrive_1.mp3", commonPath + "sh_terminal.mp3", linePath + String.format("sh/%03d.mp3", stationLevel), commonPath + "sh_arrive_1.mp3", commonPath + "en_3.mp3", linePath + String.format("en/%03d.mp3", stationLevel), commonPath + "terminal_music.mp3");
+		String subLinePath = String.format("%s%s/", linePath, subLineId);
+		int direction = current.getDirection();
+		List<String> arr = Arrays.asList(commonPath + "cn_terminal.mp3", linePath + String.format("cn/%03d.mp3", current.getStationLevel()), commonPath + "cn_arrive_1.mp3", commonPath + "sh_terminal.mp3", linePath + String.format("sh/%03d.mp3", current.getStationLevel()), commonPath + "sh_arrive_1.mp3", commonPath + "en_3.mp3", linePath + String.format("en/%03d.mp3", current.getStationLevel()), commonPath + "terminal_music.mp3");
 		List<String> inputPaths = new ArrayList<>();
 		for (String path : arr) {
 			for (String lang : languages) {
@@ -1269,7 +1333,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				}
 			}
 		}
-		AudioOperationUtils.merge(inputPaths, String.format("%s%03db%s-%03d-%s-Arrive.mp3", linePath, seq, direction == 0 ? "u" : "d", direction == 0 ? stationLevel : terminal - stationLevel + 1, direction == 0 ? "Up" : "Dn"));
+		AudioOperationUtils.merge(inputPaths, String.format("%s%03db%s-%03d-%s-Arrive.mp3", subLinePath, seq, direction == 0 ? "u" : "d", direction == 0 ? current.getSeq() : terminal.getSeq() - current.getSeq() + 1, direction == 0 ? "Up" : "Dn"));
 	}
  
 	private void description() {
@@ -1294,4 +1358,50 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		// 终点站(沪) (sh_terminal.mp3)
 		// 终点音乐 (terminal_music.mp3)
 	}
+
+	/**
+	 * 站序和站级的映射，全程和区间时会不一致
+	 */
+	private final static class SeqStationLevel {
+
+		private Integer seq;
+
+		private Integer stationLevel;
+
+		private int direction;
+
+		private SeqStationLevel(Integer seq, Integer stationLevel) {
+			this(seq, stationLevel, 0);
+		}
+
+		private SeqStationLevel(Integer seq, Integer stationLevel, int direction) {
+			this.seq = seq;
+			this.stationLevel = stationLevel;
+			this.direction = direction;
+		}
+
+		public Integer getSeq() {
+			return seq;
+		}
+
+		public void setSeq(Integer seq) {
+			this.seq = seq;
+		}
+
+		public Integer getStationLevel() {
+			return stationLevel;
+		}
+
+		public void setStationLevel(Integer stationLevel) {
+			this.stationLevel = stationLevel;
+		}
+
+		public int getDirection() {
+			return direction;
+		}
+
+		public void setDirection(int direction) {
+			this.direction = direction;
+		}
+	}
 }
@@ -31,71 +31,37 @@ public class IFlyUtils {
  
     private final static String appId = "b4b21ad4";
  
-    /**
-     * 生成普通话语音
-     * text以","进行分割
-     * @param text
-     */
-    public static void textToSpeechCn(String text, String outputPath) throws Exception {
-        File file = new File(outputPath);
-        if (!file.getParentFile().exists()) {
-            file.getParentFile().mkdirs();
-        }
-        String wsUrl = getAuthUrl("https://tts-api.xfyun.cn/v2/tts", apiKey, apiSecret).replace("https://", "wss://");
-        SpeechRequest request = new SpeechRequest();
-        request.getCommon().put("app_id", appId);
-        request.getBusiness().put("aue", "lame");
-        request.getBusiness().put("sfl", 1);
-        request.getBusiness().put("vcn", "x4_lingxiaoshan_profnews");
-        request.getData().put("text", Base64.getEncoder().encodeToString(text.replace(",", "[p1000]").getBytes("GBK")));
-        request.getData().put("status", 2);
-        websocketWork(wsUrl, request, new FileOutputStream(file));
-        while (!request.isCompleted()) {
-            Thread.sleep(500);
-        }
+    private static Map<String, String> language2vcn = new HashMap<>();
+
+    static {
+        language2vcn.put("cn", "x4_lingxiaoshan_profnews");
+        language2vcn.put("sh", "x3_ziling");
+        language2vcn.put("en", "x4_enus_luna_assist");
     }
  
-    /**
-     * 生成上海话语音
-     * text以","进行分割
-     * @param text
-     */
-    public static void textToSpeechSh(String text, String outputPath) throws Exception {
+    public static void textToSpeech(String text, String language, String outputPath) throws Exception {
         File file = new File(outputPath);
         if (!file.getParentFile().exists()) {
             file.getParentFile().mkdirs();
         }
+        String vcn = language2vcn.get(language);
+        if (vcn == null) {
+            throw new IllegalArgumentException("Language is not supported: " + language);
+        }
         String wsUrl = getAuthUrl("https://tts-api.xfyun.cn/v2/tts", apiKey, apiSecret).replace("https://", "wss://");
         SpeechRequest request = new SpeechRequest();
         request.getCommon().put("app_id", appId);
         request.getBusiness().put("aue", "lame");
         request.getBusiness().put("sfl", 1);
-        request.getBusiness().put("vcn", "x3_ziling");
-        request.getData().put("text", Base64.getEncoder().encodeToString(text.replace(",", "[p1000]").getBytes("GBK")));
-        request.getData().put("status", 2);
-        websocketWork(wsUrl, request, new FileOutputStream(file));
-        while (!request.isCompleted()) {
-            Thread.sleep(500);
+        request.getBusiness().put("vcn", vcn);
+        String charset = "GBK";
+        if ("en".equals(language)) {
+            charset = "UTF-8";
         }
-    }
-
-    /**
-     * 生成英语语音
-     * text以","进行分割
-     * @param text
-     */
-    public static void textToSpeechEn(String text, String outputPath) throws Exception {
-        File file = new File(outputPath);
-        if (!file.getParentFile().exists()) {
-            file.getParentFile().mkdirs();
+        if ("en".equals(language) || "sh".equals(language)) {
+            request.getBusiness().put("volume", 100);
         }
-        String wsUrl = getAuthUrl("https://tts-api.xfyun.cn/v2/tts", apiKey, apiSecret).replace("https://", "wss://");
-        SpeechRequest request = new SpeechRequest();
-        request.getCommon().put("app_id", appId);
-        request.getBusiness().put("aue", "lame");
-        request.getBusiness().put("sfl", 1);
-        request.getBusiness().put("vcn", "x4_enus_luna_assist");
-        request.getData().put("text", Base64.getEncoder().encodeToString(text.replace(",", "[p1000]").getBytes(StandardCharsets.UTF_8)));
+        request.getData().put("text", Base64.getEncoder().encodeToString(text.replace(",", "[p1000]").getBytes(charset)));
         request.getData().put("status", 2);
         websocketWork(wsUrl, request, new FileOutputStream(file));
         while (!request.isCompleted()) {
@@ -183,8 +149,8 @@ public class IFlyUtils {
         String authorization = String.format("api_key=\"%s\", algorithm=\"%s\", headers=\"%s\", signature=\"%s\"", apiKey, "hmac-sha256", "host date request-line", sha);
         StringBuilder sb = new StringBuilder(hostUrl);
         sb.append("?authorization=").append(Base64.getEncoder().encodeToString(authorization.getBytes(StandardCharsets.UTF_8)))
-        .append("&date=").append(URLEncoder.encode(date))
-        .append("&host=").append(URLEncoder.encode(url.getHost()));
+                .append("&date=").append(URLEncoder.encode(date))
+                .append("&host=").append(URLEncoder.encode(url.getHost()));
 //        // 拼接地址
 //        HttpUrl httpUrl = Objects.requireNonNull(HttpUrl.parse("https://" + url.getHost() + url.getPath())).newBuilder().//
 //                addQueryParameter("authorization", Base64.getEncoder().encodeToString(authorization.getBytes(StandardCharsets.UTF_8))).//
@@ -194,4 +160,4 @@ public class IFlyUtils {
  
         return sb.toString();
     }
 -}
+}
 \ No newline at end of file
-/**
- * 处理线调文件
- */
-var fs = require('fs')
-    , cheerio = require('cheerio')
-    , minifier = require('./minifier')
-    , crypto = require("crypto")
-    , CleanCSS = require('clean-css')
-    , UglifyJS = require("uglify-js");
-;
-
-var platform = process.platform;
-var iswin = platform=='win32';
-var sp = platform=='win32'?'\\':'/';
-//不参与的目录
-var pName = 'bsth_control'
-    , path = process.cwd()
-    //根目录
-    , root = path.substr(0, path.indexOf(sp + 'src'+sp+'main'))
-    , workspace = root.substr(0, root.lastIndexOf(sp + pName))
-    //临时目录
-    , dest = (workspace + sp + pName + '@fatso_copy')//.replace(/\//g, '\\')
-    , _static = sp + 'src'+sp+'main'+sp+'resources'+sp+'static';
-
-
-var mainFile = dest + _static + sp + 'real_control_v2'+sp+'main.html';
-var aloneMapWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'map'+sp+'alone_wrap.html';
-var aloneHomeWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'home'+sp+'home_wrap.html';
-var mapFile = dest + _static + sp + 'real_control_v2'+sp+'mapmonitor'+sp+'real.html';
-var realCtl = {
-    /**
-     * 处理线调首页
-     */
-    handleMain: function (cb) {
-        //处理main.html
-        var data = fs.readFileSync(mainFile, 'utf-8'),
-            $ = cheerio.load(data);
-        handleCss($, function () {
-            handleJs($, mainFile, cb);
-        });
-
-
-    },
-    /**
-     * 处理地图模块
-     * @param cb
-     */
-    handleMap: function (cb) {
-        //读取文件
-        var data = fs.readFileSync(mapFile, 'utf-8')
-            , $ = cheerio.load(data);
-
-        handleCss($, function () {
-            handleJs($, mapFile, cb);
-        });
-    },
-    /**
-     * 处理单屏地图页面
-     * @param cb
-     */
-    handleAlonePage: function (cb) {
-        var data = fs.readFileSync(aloneMapWrapFile, 'utf-8');
-        var $ = cheerio.load(data);
-        handleCss($, function () {
-            handleJs($, aloneMapWrapFile, cb);
-        });
-    },
-    /**
-     * 处理单屏主页
-     * @param cb
-     */
-    handleAloneHomePage: function (cb) {
-        var data = fs.readFileSync(aloneHomeWrapFile, 'utf-8');
-        var $ = cheerio.load(data);
-        handleCss($, function () {
-            handleJs($, aloneHomeWrapFile, cb);
-        });
-    }
-
-};
-
-/**
- * 处理css
- * @type {any}
- */
-var handleCss = function ($, cb) {
-    var cssArray = $('link[rel=stylesheet][merge]');
-    //按 merge 值分组
-    var cssMap = {}, mergeName;
-    for (var i = 0, c; c = cssArray[i++];) {
-        mergeName = $(c).attr('merge');
-        if (!cssMap[mergeName])
-            cssMap[mergeName] = [];
-        cssMap[mergeName].push(dest + _static + $(c).attr('href'));
-        //remove
-        $(c).remove();
-    }
-    //按 merge 合并压缩css
-    var ks = get_keys(cssMap), index = 0;
-    (function () {
-        if (index >= ks.length) {
-            cb && cb();
-            return;
-        }
-        var k = ks[index];
-        index++;
-        var f = arguments.callee;
-        //合并css
-        new CleanCSS().minify(cssMap[k], function (error, out) {
-            var data = out.styles;
-            var fName = (k + '_' + md5(data)) + '.css';
-            //写入 assets css 目录下
-            var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'css' + sp + fName;
-            fs.open(descFile, 'a', function (err, fd) {
-
-                fs.write(fd, data, function () {
-                    var tag = '<link rel="stylesheet" href="/real_control_v2/assets/css/' + fName + '"/>';
-                    if ($('head').length > 0)
-                        $('head').append(tag);
-                    else {
-                        if($('link').length > 0)
-                            $('link').last().before(tag);
-                        else
-                            $('div').first().before(tag);
-                    }
-                    console.log(k + ' css', '结束，下一个');
-                    f();
-                });
-            });
-        });
-    })();
-};
-
-/**
- * 处理js
- */
-var handleJs = function ($, file, cb) {
-    var scriptArray = $('script[merge]');
-    //按 merge 值分组
-    var jsMap = {}, mergeName;
-    for (var i = 0, s; s = scriptArray[i++];) {
-        mergeName = $(s).attr('merge');
-        if (!jsMap[mergeName])
-            jsMap[mergeName] = [];
-        jsMap[mergeName].push(dest + _static + $(s).attr('src'));
-        //remove
-        $(s).remove();
-    }
-
-    //按 merge 合并压缩js
-    var ks = get_keys(jsMap), index = 0;
-    (function () {
-        if (index >= ks.length) {
-            write(file, $.html());
-            console.log(file + ' 结束'.green);
-            cb && cb();
-            return;
-        }
-        var k = ks[index];
-        index++;
-        var f = arguments.callee;
-        //合并压缩js
-        var result = UglifyJS.minify(jsMap[k]);
-        var data = result.code;
-        var fName = (k + '_' + md5(data)) + '.js';
-        //写入 assets js 目录下
-        var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'js' + sp + fName;
-        fs.open(descFile, 'a', function (err, fd) {
-
-            fs.write(fd, data, function () {
-                var tag = '<script src="/real_control_v2/assets/js/' + fName + '"></script>';
-                if ($('body').length > 0)
-                    $('body').append(tag);
-                else {
-                    //没有body 就写在尾部
-                    $('*').last().after(tag);
-                }
-                console.log(k + ' js', '结束，下一个');
-                f();
-            });
-        });
-    })();
-};
-
-var get_keys = function (json) {
-    var array = [];
-    for (var key in json) {
-        array.push(key);
-    }
-    return array;
-};
-
-function md5(text) {
-    return crypto.createHash("md5").update(text).digest("hex");
-}
-
-function write(file, text) {
-    fs.writeFile(file, text, function (err) {
-        if (err) {
-            console.log(err.toString().red);
-            process.exit();
-        }
-        console.log(file.green);
-    });
-}
-
+/**
+ * 处理线调文件
+ */
+var fs = require('fs')
+    , cheerio = require('cheerio')
+    , minifier = require('./minifier')
+    , crypto = require("crypto")
+    , CleanCSS = require('clean-css');
+;
+
+var platform = process.platform;
+var iswin = platform=='win32';
+var sp = platform=='win32'?'\\':'/';
+//不参与的目录
+var pName = 'bsth_control'
+    , path = process.cwd()
+    //根目录
+    , root = path.substr(0, path.indexOf(sp + 'src'+sp+'main'))
+    , workspace = root.substr(0, root.lastIndexOf(sp + pName))
+    //临时目录
+    , dest = (workspace + sp + pName + '@fatso_copy')//.replace(/\//g, '\\')
+    , _static = sp + 'src'+sp+'main'+sp+'resources'+sp+'static';
+
+
+var mainFile = dest + _static + sp + 'real_control_v2'+sp+'main.html';
+var aloneMapWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'map'+sp+'alone_wrap.html';
+var aloneHomeWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'home'+sp+'home_wrap.html';
+var mapFile = dest + _static + sp + 'real_control_v2'+sp+'mapmonitor'+sp+'real.html';
+var realCtl = {
+    /**
+     * 处理线调首页
+     */
+    handleMain: function (cb) {
+        //处理main.html
+        var data = fs.readFileSync(mainFile, 'utf-8'),
+            $ = cheerio.load(data);
+        handleCss($, function () {
+            handleJs($, mainFile, cb);
+        });
+
+
+    },
+    /**
+     * 处理地图模块
+     * @param cb
+     */
+    handleMap: function (cb) {
+        //读取文件
+        var data = fs.readFileSync(mapFile, 'utf-8')
+            , $ = cheerio.load(data);
+
+        handleCss($, function () {
+            handleJs($, mapFile, cb);
+        });
+    },
+    /**
+     * 处理单屏地图页面
+     * @param cb
+     */
+    handleAlonePage: function (cb) {
+        var data = fs.readFileSync(aloneMapWrapFile, 'utf-8');
+        var $ = cheerio.load(data);
+        handleCss($, function () {
+            handleJs($, aloneMapWrapFile, cb);
+        });
+    },
+    /**
+     * 处理单屏主页
+     * @param cb
+     */
+    handleAloneHomePage: function (cb) {
+        var data = fs.readFileSync(aloneHomeWrapFile, 'utf-8');
+        var $ = cheerio.load(data);
+        handleCss($, function () {
+            handleJs($, aloneHomeWrapFile, cb);
+        });
+    }
+
+};
+
+/**
+ * 处理css
+ * @type {any}
+ */
+var handleCss = function ($, cb) {
+    var cssArray = $('link[rel=stylesheet][merge]');
+    //按 merge 值分组
+    var cssMap = {}, mergeName;
+    for (var i = 0, c; c = cssArray[i++];) {
+        mergeName = $(c).attr('merge');
+        if (!cssMap[mergeName])
+            cssMap[mergeName] = [];
+        cssMap[mergeName].push(dest + _static + $(c).attr('href'));
+        //remove
+        $(c).remove();
+    }
+    //按 merge 合并压缩css
+    var ks = get_keys(cssMap), index = 0;
+    (function () {
+        if (index >= ks.length) {
+            cb && cb();
+            return;
+        }
+        var k = ks[index];
+        index++;
+        var f = arguments.callee;
+        //合并css
+        new CleanCSS().minify(cssMap[k], function (error, out) {
+            var data = out.styles;
+            var fName = (k + '_' + md5(data)) + '.css';
+            //写入 assets css 目录下
+            var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'css' + sp + fName;
+            fs.open(descFile, 'a', function (err, fd) {
+
+                fs.write(fd, data, function () {
+                    var tag = '<link rel="stylesheet" href="/real_control_v2/assets/css/' + fName + '"/>';
+                    if ($('head').length > 0)
+                        $('head').append(tag);
+                    else {
+                        if($('link').length > 0)
+                            $('link').last().before(tag);
+                        else
+                            $('div').first().before(tag);
+                    }
+                    console.log(k + ' css', '结束，下一个');
+                    f();
+                });
+            });
+        });
+    })();
+};
+
+/**
+ * 处理js
+ */
+var handleJs = function ($, file, cb) {
+    var scriptArray = $('script[merge]');
+    //按 merge 值分组
+    var jsMap = {}, mergeName;
+    for (var i = 0, s; s = scriptArray[i++];) {
+        mergeName = $(s).attr('merge');
+        if (!jsMap[mergeName])
+            jsMap[mergeName] = [];
+        jsMap[mergeName].push(dest + _static + $(s).attr('src'));
+        //remove
+        $(s).remove();
+    }
+
+    //按 merge 合并压缩js
+    var ks = get_keys(jsMap), index = 0;
+    (function () {
+        if (index >= ks.length) {
+            write(file, $.html());
+            console.log(file + ' 结束'); // 移除.green调用
+            cb && cb();
+            return;
+        }
+        var k = ks[index];
+        index++;
+        var f = arguments.callee;
+        //合并压缩js
+        try {
+            // 先合并文件内容
+            let code = '';
+            for(let j = 0; j < jsMap[k].length; j++) {
+                code += fs.readFileSync(jsMap[k][j], 'utf8') + '\n';
+            }
+            // 使用Terser压缩
+            var data = minifier.mini(code);
+            if (code !== '' && data === '') {
+                console.error('压缩出错')
+                process.exit();
+            }
+            var fName = (k + '_' + md5(data)) + '.js';
+            //写入 assets js 目录下
+            var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'js' + sp + fName;
+            fs.open(descFile, 'a', function (err, fd) {
+                fs.write(fd, data, function () {
+                    var tag = '<script src="/real_control_v2/assets/js/' + fName + '"></script>';
+                    if ($('body').length > 0)
+                        $('body').append(tag);
+                    else {
+                        //没有body 就写在尾部
+                        $('*').last().after(tag);
+                    }
+                    console.log(k + ' js', '结束，下一个');
+                    f();
+                });
+            });
+        } catch (e) {
+            console.error('合并压缩错误:', e);
+            process.exit();
+        }
+    })();
+};
+
+var get_keys = function (json) {
+    var array = [];
+    for (var key in json) {
+        array.push(key);
+    }
+    return array;
+};
+
+function md5(text) {
+    return crypto.createHash("md5").update(text).digest("hex");
+}
+
+function write(file, text) {
+    fs.writeFile(file, text, function (err) {
+        if (err) {
+            console.log(err.toString()); // 移除.red调用
+            process.exit();
+        }
+        console.log(file); // 移除.green调用
+    });
+}
+
 module.exports = realCtl;
 \ No newline at end of file
-/**
- * @author PanZhao 
- * @date 2016年3月17日 下午12:44:06 
- */
-var fs = require('fs');
-var UglifyJS = require("uglify-js");
-
-var platform = process.platform;
-var iswin = platform=='win32';
-var separator = platform=='win32'?'\\':'/';
-var minifier = {
-	
-	mergeAndMini: function(fileArray,scriptString, root, file){
-		var len = fileArray.length;
-		for(var i = 0; i < len; i ++){
-			fileArray[i] = root  + fileArray[i].split('/').join(separator);
-		}
-		
-		var result, indoorRs;
-		
-		try {
-			if(fileArray && len > 0)
-				result = UglifyJS.minify(fileArray);
-			
-			if(scriptString)
-				indoorRs = UglifyJS.minify(scriptString, {fromString: true});
-		} catch (e) {
-			console.log(e);
-			console.log(file.red);
-			process.exit();
-		}
-		
-		return {outside: result?result.code:'', inside: indoorRs?indoorRs.code:''};
-	},
-	mini: function(file){
-		return UglifyJS.minify(file).code;
-	}
-}
-
+var fs = require('fs');
+var Terser = require('terser');
+
+var platform = process.platform;
+var iswin = platform=='win32';
+var separator = platform=='win32'?'\\':'/';
+var minifier = {
+
+	mergeAndMini: function(fileArray, scriptString, root, file) {
+		var len = fileArray.length;
+		for(var i = 0; i < len; i ++){
+			fileArray[i] = root + fileArray[i].split('/').join(separator);
+		}
+
+		var result, indoorRs;
+
+		try {
+			if(fileArray && len > 0) {
+				// Terser可以直接接受文件路径数组
+				result = Terser.minify_sync(fs.readFileSync(fileArray[0], 'utf8'));
+				// 如果有多个文件，需要先合并内容
+				if(len > 1) {
+					let code = '';
+					for(let j = 0; j < len; j++) {
+						code += fs.readFileSync(fileArray[j], 'utf8') + '\n';
+					}
+					result = Terser.minify_sync(code);
+				}
+			}
+
+			if(scriptString) {
+				// Terser不需要fromString选项，直接传递代码字符串
+				indoorRs = Terser.minify_sync(scriptString);
+			}
+		} catch (e) {
+			console.log(e);
+			console.log(file); // 移除.red调用，除非有chalk等库
+			process.exit();
+		}
+
+		return {outside: result && !result.error ? result.code : '', inside: indoorRs && !indoorRs.error ? indoorRs.code : ''};
+	},
+
+	mini: function(file) {
+		try {
+			// 检查file是文件路径还是代码字符串
+			if(typeof file === 'string' && fs.existsSync(file)) {
+				const code = fs.readFileSync(file, 'utf8');
+				const result = Terser.minify_sync(code);
+				return result && !result.error ? result.code : '';
+			} else {
+				// 假设是代码字符串
+				const result = Terser.minify_sync(file);
+				return result && !result.error ? result.code : '';
+			}
+		} catch (e) {
+			console.log(e);
+			return '';
+		}
+	}
+};
+
 module.exports = minifier;
 \ No newline at end of file
-{
-  "name": "fatso",
-  "version": "1.0.0",
-  "description": "子页面js检查、合并、压缩等处理",
-  "main": "start.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "panzhaov5",
-  "license": "ISC",
-  "dependencies": {
-    "cheerio": "^0.20.0",
-    "clean-css": "^4.0.12",
-    "colors": "^1.3.3",
-    "eventproxy": "^0.3.5",
-    "uglify-js": "^2.6.2"
-  }
-}
+{
+  "name": "fatso",
+  "version": "1.0.0",
+  "description": "子页面js检查、合并、压缩等处理",
+  "main": "start.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "panzhaov5",
+  "license": "ISC",
+  "dependencies": {
+    "cheerio": "^0.20.0",
+    "clean-css": "^4.0.12",
+    "colors": "^1.3.3",
+    "eventproxy": "^0.3.4",
+    "terser": "^5.44.0",
+    "uglify-js": "^2.6.2"
+  }
+}
@@ -84,7 +84,7 @@ form .item select {
 	<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
 	<script src="/assets/plugins/jquery.serializejson.js"></script>
 	<script
-		src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+		src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"></script>
 	<script type="text/javascript"
 		src="//api.map.baidu.com/library/DistanceTool/1.2/src/DistanceTool_min.js"></script>
 	<!-- moment.js 日期处理类库 -->
-<link href="/pages/base/carpark/css/carpark-add.css" rel="stylesheet" type="text/css" />
-<div class="page-head">
-	<div class="page-title">
-		<h1>添加停车场</h1>
-	</div>
-</div>
-
-<ul class="page-breadcrumb breadcrumb">
-	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
-	<li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
-	<li><a href="/pages/base/carpark/list.html" data-pjax>停车场信息</a> <i class="fa fa-circle"></i></li>
-	<li><span class="active">添加停车场</span></li>
-</ul>
-
-<div class="portlet light bordered" id="form-wizard-info">
-	<div class="portlet-title">
-		<div class="caption">
-			<i class="icon-equalizer font-red-sunglo"></i> 
-			<span class="caption-subject font-red-sunglo bold uppercase">添加停车场
-				 <span class="step-title"> 1 - 4 </span>
-				 <i class="fa fa-question-circle tipso-animation" style="color: rgba(158, 158, 158, 0.49);"></i>
-			</span>
-		</div>
-		
-		<div class="actions">
-			<div class="btn-group btn-group-devided" data-toggle="buttons">
-				<a class="btn btn-circle default" href="/pages/base/carpark/list.html" style="float: right;padding: 4px 23px;" data-pjax=""><i class="fa fa-reply"></i> 退出</a>
-			</div>
-		</div>
-	</div>
-	<div class="portlet-body form">
-	
-		<!-- START FORM -->
-		<form class="form-horizontal" id="submit_carpark_form"  action="/" method="POST" novalidate="novalidate">
-			<div class="form-wizard">
-				<div class="form-body">
-					<ul class="nav nav-pills nav-justified steps">
-						<li class="active">
-							<a href="#tab1" data-toggle="tab" class="step" aria-expanded="true">
-								<span class="number"> 1 </span>
-								<span class="desc">
-								<i class="fa fa-check"></i> 获取停车场位置方式 </span>
-							</a>
-						</li>
-						<li>
-							<a href="#tab2" data-toggle="tab" class="step">
-								<span class="number"> 2 </span>
-								<span class="desc">
-								<i class="fa fa-check"></i> 确定停车场位置 </span>
-							</a>
-						</li>
-						<li>
-							<a href="#tab3" data-toggle="tab" class="step active">
-								<span class="number"> 3 </span>
-								<span class="desc">
-								<i class="fa fa-check"></i> 填写停车场信息 </span>
-							</a>
-						</li>
-						<li>
-							<a href="#tab4" data-toggle="tab" class="step">
-								<span class="number"> 4 </span>
-								<span class="desc">
-								<i class="fa fa-check"></i> 确认并提交 </span>
-							</a>
-						</li>
-					</ul>
-					
-					<!-- 进度条 -->
-					<div id="bar" class="progress progress-striped" role="progressbar">
-						<div class="progress-bar progress-bar-success" style="width: 25%;"></div>
-					</div>
-					
-					<div class="tab-content">
-						<div class="alert alert-danger display-hide">
-							<button class="close" data-close="alert"></button>
-							您的输入有误，请检查下面的输入项
-						</div>
-						<div class="alert alert-success display-none">
-							<button class="close" data-dismiss="alert"></button> 
-							Your form validation is successful! 
-						</div>
-						
-						<!-- 选择添加站点方式 -->
-                       	<div class="tab-pane active" id="tab1">
-                       		<h3 class="block"> 获取停车场位置方式 </h3>
-                      		<!--停车场名称 -->
-							<div class="form-group" id="formRequ">
-								<label class="col-md-3 control-label"><span class="required"> * </span>停车场名称&nbsp;&nbsp;&nbsp;:</label>
-								<div class="col-md-9">
-									<input type="text" class="form-control input-medium" id="parkNamebooxtInput" name="parkNamebooxt" placeholder="请输入停车场名称">
-								</div>
-							</div>
-							<!-- 新增方式 -->
-							<div class="form-group">
-								<label class="col-md-3 control-label"><span class="required"> * </span>选择获取方式:</label>
-								<div class="col-md-9">
-									<div class="icheck-list">
-										<label>
-												<input type="radio" class="icheck" name="baseRes" value=0 checked> 系统生成
-										</label>
-										<label >
-											<input type="radio" class="icheck" name="baseRes" value=1 > 手动绘制
-										</label>
-									</div>
-								</div>
-							 </div>
-                        </div>
-                        <!--停车场位置 -->
-                        <div class="tab-pane" id="tab2">
-                        	<h3 class="block"> 停车场位置  </h3>
-                            <div id="addCarParkbmap_basic"></div>
-                            <div class="leftUtils">
-								<div class="btn-group" style="left: 100px;">
-								    <a class="btn btn-sm green-seagreen dropdown-toggle" style="width: 98px;" href="javascript:;" data-toggle="dropdown" aria-expanded="false"> 绘制工具
-								        <i class="fa fa-angle-down"></i>
-								    </a>
-								    <ul class="dropdown-menu pull-right" style="min-width:100px">
-								        <li>
-								            <a href="javascript:;" id="oppenDrawingManager"><i class="fa fa-pencil"></i> 打开 </a>
-								        </li>
-								        <li>
-								            <a href="javascript:;" id = "closeDrawingManager"> <i class="fa fa-reply"></i> 关闭 </a>
-								        </li>
-								         
-								    </ul>
-								</div>
-							</div>
-                        </div>
-                        <!--停车场信息 -->
-                        <div class="tab-pane" id="tab3">
-                        	<h3 class="block"> 停车场信息 </h3>
-							<input type="hidden" name="bParkPoint" id="bParkPointInput" />
-							<input type="hidden" name="gParkPoint" id="gParkPointInput" />
-							<input type="hidden" name="dbType" id="dbTypeInput" value="b"/>
-							<!-- 停车场名称 -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="control-label col-md-3">
-		          						<span class="required"> * </span> 停车场名称&nbsp;&nbsp;&nbsp; :
-		                    		</label>
-									<div class="col-md-6">
-										<input type="text" class="form-control" name="parkName" id="parkNameInput" placeholder="请输入站点名称" readonly="readonly"> 
-									</div>
-								</div>
-							</div>
-							<!-- 停车场编码 -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="control-label col-md-3">
-		          						<span class="required"> * </span>停车场编码&nbsp;&nbsp;&nbsp;:
-		                    		</label>
-									<div class="col-md-6">
-										<input type="text" class="form-control"  name="parkCode" id="parkCodeInput" 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">
-										<input type="text" class="form-control" name="bCenterPoint" id="bCenterPointInput" readonly="readonly" 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">
-										<input type="text" class="form-control" name="shapesType" id="shapesTypeSelect" readonly="readonly" placeholder="请输入几何图形类型">
-									</div>
-								</div>
-							</div>
-							<!-- 圆形半径 -->
-							<div class="form-body" id="radiusGroup">
-								<div class="form-group">
-									<label class="col-md-3 control-label"><span class="required"> * </span> 圆形半径&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-									<div class="col-md-6">
-										<input type="text" class="form-control" name="radius" id="radiusInput" placeholder="请输入圆形半径">
-									</div>
-								</div>
-							</div>
-							<!-- 是否撤销 -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="col-md-3 control-label"><span class="required"> * </span>是否撤销&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</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="col-md-3 control-label">面积&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-									<div class="col-md-6">
-										<input type="text" class="form-control" name="area" id="areaInput" placeholder="请输入面积">
-										<span class="help-block">单位：平方米(㎡)</span>
-									</div>
-								</div>
-							</div>
-							<!-- 所属公司 -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="col-md-3 control-label"><span class="required"> * </span>所属公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-									<div class="col-md-6">
-										<select name="company" class="form-control" style="width:100%" id="companySelect"></select>
-									</div>
-								</div>
-							</div>
-							<!-- 所属分公司 -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="col-md-3 control-label"><span class="required"> * </span>所属分公司&nbsp;&nbsp;&nbsp;:</label>
-									<div class="col-md-6">
-										<select name="brancheCompany" class="form-control" style="width:100%" id="brancheCompanySelect">
-										</select>
-									</div>
-								</div>
-							</div>
-							<!-- 版本号 -->
-							<div class="form-body">
-								<div class="form-group">
-									<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-									<div class="col-md-6">
-										<input type="text" class="form-control" name="versions" value='1' Readonly placeholder="请输入版本号">
-									</div>
-								</div>
-							</div>
-							<!-- 描述/说明 -->
-			                <div class="form-group">
-			                	<label class="control-label col-md-3"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-		                 		<div class="col-md-6">
-		                     		<textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea" placeholder="请输入描述/说明"></textarea>
-		                    	</div>
-			                </div>
-                        	 
-                        </div>
-                        <!-- 确定提交资料信息 -->
-                        <div class="tab-pane" id="tab4">
-                           <h3 class="block"> 确认您提交的停车场信息 </h3>
-                           <h4 class="form-section"> 地理位置 </h4>
-                           <div class="form-group">
-                               <label class="control-label col-md-3"> 几何图形类型: </label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="shapesType"> </p>
-                               </div>
-                           </div>
-                           <div class="form-group">
-                               <label class="control-label col-md-3"> 圆形半径&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="radius"> </p>
-                               </div>
-                           </div> 
-                           
-                           <div class="form-group">
-                               <label class="control-label col-md-3"> 经纬度坐标点: </label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="bCenterPoint"> </p>
-                               </div>
-                           </div> 
-                           <h4 class="form-section"> 停车场信息 </h4>
-                           <div class="form-group">
-                               <label class="control-label col-md-3">停车场名称&nbsp;&nbsp;&nbsp;:</label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="parkName"> </p>
-                               </div>
-                           </div>
-                           <div class="form-group">
-                              <label class="control-label col-md-3">停车场编码&nbsp;&nbsp;&nbsp;:</label>
-                              <div class="col-md-4">
-                                  <p class="form-control-static" data-display="parkCode"> </p>
-                              </div>
-                           </div>
-                           <div class="form-group">
-                               <label class="control-label col-md-3">是否撤销&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="destroy"> </p>
-                               </div>
-                           </div>
-                           <div class="form-group">
-                              <label class="control-label col-md-3">面积&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-                              <div class="col-md-4">
-                                  <p class="form-control-static" data-display="area"> </p>
-                              </div>
-                           </div>
-                           <div class="form-group">
-                               <label class="control-label col-md-3">所属公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="company"> </p>
-                               </div>
-                           </div>
-                           <div class="form-group">
-                               <label class="control-label col-md-3">分公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="brancheCompany"> </p>
-                               </div>
-                           </div>
-                            <div class="form-group">
-                               <label class="control-label col-md-3">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="versions"> </p>
-                               </div>
-                           </div>
-                           <div class="form-group">
-                               <label class="control-label col-md-3">描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-                               <div class="col-md-4">
-                                   <p class="form-control-static" data-display="descriptions"> </p>
-                               </div>
-                           </div>
-                        </div>
-                   </div>
-              </div>
-              <div class="form-actions">
-                 <div class="row">
-                     <div class="col-md-offset-3 col-md-9">
-                         <a href="javascript:;" class="btn default button-previous disabled" style="display: none;">
-                             <i class="fa fa-angle-left"></i> 返回 </a>
-                         <a href="javascript:;" class="btn btn-outline green button-next"> 下一步
-                             <i class="fa fa-angle-right"></i>
-                         </a>
-                         <a href="javascript:;" class="btn green button-submit" style="display: none;" id="submintBtn"> 提交
-                             <i class="fa fa-check"></i>
-                         </a>
-                     </div>
-                 </div>
-              </div>
-        	</div>
-        </form>
-		<!-- END FORM-->
-	</div>
-</div>
-<!-- 函数方法JS类库 -->
-<script src="/pages/base/carpark/js/add-input-function.js"></script>
-<!-- 表单向导JS类库 -->
-<script src="/pages/base/carpark/js/add-form-wizard.js"></script>
-<!-- reload事件 -->
-<script src="/pages/base/carpark/js/add-form-reload.js"></script>
-<!-- 地图JS类库 -->
-<script src="/pages/base/carpark/js/add-vmap-world.js"></script>
-<!-- 表单元素事件JS类库 -->
+<link href="/pages/base/carpark/css/carpark-add.css" rel="stylesheet" type="text/css" />
+<div class="page-head">
+	<div class="page-title">
+		<h1>添加停车场</h1>
+	</div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
+	<li><a href="/pages/base/carpark/list.html" data-pjax>场站信息</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">添加停车场</span></li>
+</ul>
+
+<div class="portlet light bordered" id="form-wizard-info">
+	<div class="portlet-title">
+		<div class="caption">
+			<i class="icon-equalizer font-red-sunglo"></i> 
+			<span class="caption-subject font-red-sunglo bold uppercase">添加停车场
+				 <span class="step-title"> 1 - 4 </span>
+				 <i class="fa fa-question-circle tipso-animation" style="color: rgba(158, 158, 158, 0.49);"></i>
+			</span>
+		</div>
+		
+		<div class="actions">
+			<div class="btn-group btn-group-devided" data-toggle="buttons">
+				<a class="btn btn-circle default" href="/pages/base/carpark/list.html" style="float: right;padding: 4px 23px;" data-pjax=""><i class="fa fa-reply"></i> 退出</a>
+			</div>
+		</div>
+	</div>
+	<div class="portlet-body form">
+	
+		<!-- START FORM -->
+		<form class="form-horizontal" id="submit_carpark_form"  action="/" method="POST" novalidate="novalidate">
+			<div class="form-wizard">
+				<div class="form-body">
+					<ul class="nav nav-pills nav-justified steps">
+						<li class="active">
+							<a href="#tab1" data-toggle="tab" class="step" aria-expanded="true">
+								<span class="number"> 1 </span>
+								<span class="desc">
+								<i class="fa fa-check"></i> 获取停车场位置方式 </span>
+							</a>
+						</li>
+						<li>
+							<a href="#tab2" data-toggle="tab" class="step">
+								<span class="number"> 2 </span>
+								<span class="desc">
+								<i class="fa fa-check"></i> 确定停车场位置 </span>
+							</a>
+						</li>
+						<li>
+							<a href="#tab3" data-toggle="tab" class="step active">
+								<span class="number"> 3 </span>
+								<span class="desc">
+								<i class="fa fa-check"></i> 填写场站信息 </span>
+							</a>
+						</li>
+						<li>
+							<a href="#tab4" data-toggle="tab" class="step">
+								<span class="number"> 4 </span>
+								<span class="desc">
+								<i class="fa fa-check"></i> 确认并提交 </span>
+							</a>
+						</li>
+					</ul>
+					
+					<!-- 进度条 -->
+					<div id="bar" class="progress progress-striped" role="progressbar">
+						<div class="progress-bar progress-bar-success" style="width: 25%;"></div>
+					</div>
+					
+					<div class="tab-content">
+						<div class="alert alert-danger display-hide">
+							<button class="close" data-close="alert"></button>
+							您的输入有误，请检查下面的输入项
+						</div>
+						<div class="alert alert-success display-none">
+							<button class="close" data-dismiss="alert"></button> 
+							Your form validation is successful! 
+						</div>
+						
+						<!-- 选择添加站点方式 -->
+                       	<div class="tab-pane active" id="tab1">
+                       		<h3 class="block"> 获取停车场位置方式 </h3>
+                      		<!--停车场名称 -->
+							<div class="form-group" id="formRequ">
+								<label class="col-md-3 control-label"><span class="required"> * </span>停车场名称&nbsp;&nbsp;&nbsp;:</label>
+								<div class="col-md-9">
+									<input type="text" class="form-control input-medium" id="parkNamebooxtInput" name="parkNamebooxt" placeholder="请输入停车场名称">
+								</div>
+							</div>
+							<!-- 新增方式 -->
+							<div class="form-group">
+								<label class="col-md-3 control-label"><span class="required"> * </span>选择获取方式:</label>
+								<div class="col-md-9">
+									<div class="icheck-list">
+										<label>
+												<input type="radio" class="icheck" name="baseRes" value=0 checked> 系统生成
+										</label>
+										<label >
+											<input type="radio" class="icheck" name="baseRes" value=1 > 手动绘制
+										</label>
+									</div>
+								</div>
+							 </div>
+                        </div>
+                        <!--停车场位置 -->
+                        <div class="tab-pane" id="tab2">
+                        	<h3 class="block"> 停车场位置  </h3>
+                            <div id="addCarParkbmap_basic"></div>
+                            <div class="leftUtils">
+								<div class="btn-group" style="left: 100px;">
+								    <a class="btn btn-sm green-seagreen dropdown-toggle" style="width: 98px;" href="javascript:;" data-toggle="dropdown" aria-expanded="false"> 绘制工具
+								        <i class="fa fa-angle-down"></i>
+								    </a>
+								    <ul class="dropdown-menu pull-right" style="min-width:100px">
+								        <li>
+								            <a href="javascript:;" id="oppenDrawingManager"><i class="fa fa-pencil"></i> 打开 </a>
+								        </li>
+								        <li>
+								            <a href="javascript:;" id = "closeDrawingManager"> <i class="fa fa-reply"></i> 关闭 </a>
+								        </li>
+								         
+								    </ul>
+								</div>
+							</div>
+                        </div>
+                        <!--场站信息 -->
+                        <div class="tab-pane" id="tab3">
+                        	<h3 class="block"> 场站信息 </h3>
+							<input type="hidden" name="bParkPoint" id="bParkPointInput" />
+							<input type="hidden" name="gParkPoint" id="gParkPointInput" />
+							<input type="hidden" name="dbType" id="dbTypeInput" value="b"/>
+							<!-- 停车场名称 -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="control-label col-md-3">
+		          						<span class="required"> * </span> 停车场名称&nbsp;&nbsp;&nbsp; :
+		                    		</label>
+									<div class="col-md-6">
+										<input type="text" class="form-control" name="parkName" id="parkNameInput" placeholder="请输入站点名称" readonly="readonly"> 
+									</div>
+								</div>
+							</div>
+							<!-- 停车场编码 -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="control-label col-md-3">
+		          						<span class="required"> * </span>停车场编码&nbsp;&nbsp;&nbsp;:
+		                    		</label>
+									<div class="col-md-6">
+										<input type="text" class="form-control"  name="parkCode" id="parkCodeInput" 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">
+										<input type="text" class="form-control" name="bCenterPoint" id="bCenterPointInput" readonly="readonly" 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">
+										<input type="text" class="form-control" name="shapesType" id="shapesTypeSelect" readonly="readonly" placeholder="请输入几何图形类型">
+									</div>
+								</div>
+							</div>
+							<!-- 圆形半径 -->
+							<div class="form-body" id="radiusGroup">
+								<div class="form-group">
+									<label class="col-md-3 control-label"><span class="required"> * </span> 圆形半径&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+									<div class="col-md-6">
+										<input type="text" class="form-control" name="radius" id="radiusInput" placeholder="请输入圆形半径">
+									</div>
+								</div>
+							</div>
+							<!-- 是否撤销 -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="col-md-3 control-label"><span class="required"> * </span>是否撤销&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</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="col-md-3 control-label">面积&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+									<div class="col-md-6">
+										<input type="text" class="form-control" name="area" id="areaInput" placeholder="请输入面积">
+										<span class="help-block">单位：平方米(㎡)</span>
+									</div>
+								</div>
+							</div>
+							<!-- 所属公司 -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="col-md-3 control-label"><span class="required"> * </span>所属公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+									<div class="col-md-6">
+										<select name="company" class="form-control" style="width:100%" id="companySelect"></select>
+									</div>
+								</div>
+							</div>
+							<!-- 所属分公司 -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="col-md-3 control-label"><span class="required"> * </span>所属分公司&nbsp;&nbsp;&nbsp;:</label>
+									<div class="col-md-6">
+										<select name="brancheCompany" class="form-control" style="width:100%" id="brancheCompanySelect">
+										</select>
+									</div>
+								</div>
+							</div>
+							<!-- 版本号 -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+									<div class="col-md-6">
+										<input type="text" class="form-control" name="versions" value='1' Readonly placeholder="请输入版本号">
+									</div>
+								</div>
+							</div>
+							<!-- 描述/说明 -->
+			                <div class="form-group">
+			                	<label class="control-label col-md-3"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+		                 		<div class="col-md-6">
+		                     		<textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea" placeholder="请输入描述/说明"></textarea>
+		                    	</div>
+			                </div>
+                        	 
+                        </div>
+                        <!-- 确定提交资料信息 -->
+                        <div class="tab-pane" id="tab4">
+                           <h3 class="block"> 确认您提交的场站信息 </h3>
+                           <h4 class="form-section"> 地理位置 </h4>
+                           <div class="form-group">
+                               <label class="control-label col-md-3"> 几何图形类型: </label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="shapesType"> </p>
+                               </div>
+                           </div>
+                           <div class="form-group">
+                               <label class="control-label col-md-3"> 圆形半径&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="radius"> </p>
+                               </div>
+                           </div> 
+                           
+                           <div class="form-group">
+                               <label class="control-label col-md-3"> 经纬度坐标点: </label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="bCenterPoint"> </p>
+                               </div>
+                           </div> 
+                           <h4 class="form-section"> 场站信息 </h4>
+                           <div class="form-group">
+                               <label class="control-label col-md-3">停车场名称&nbsp;&nbsp;&nbsp;:</label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="parkName"> </p>
+                               </div>
+                           </div>
+                           <div class="form-group">
+                              <label class="control-label col-md-3">停车场编码&nbsp;&nbsp;&nbsp;:</label>
+                              <div class="col-md-4">
+                                  <p class="form-control-static" data-display="parkCode"> </p>
+                              </div>
+                           </div>
+                           <div class="form-group">
+                               <label class="control-label col-md-3">是否撤销&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="destroy"> </p>
+                               </div>
+                           </div>
+                           <div class="form-group">
+                              <label class="control-label col-md-3">面积&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                              <div class="col-md-4">
+                                  <p class="form-control-static" data-display="area"> </p>
+                              </div>
+                           </div>
+                           <div class="form-group">
+                               <label class="control-label col-md-3">所属公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="company"> </p>
+                               </div>
+                           </div>
+                           <div class="form-group">
+                               <label class="control-label col-md-3">分公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="brancheCompany"> </p>
+                               </div>
+                           </div>
+                            <div class="form-group">
+                               <label class="control-label col-md-3">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="versions"> </p>
+                               </div>
+                           </div>
+                           <div class="form-group">
+                               <label class="control-label col-md-3">描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                               <div class="col-md-4">
+                                   <p class="form-control-static" data-display="descriptions"> </p>
+                               </div>
+                           </div>
+                        </div>
+                   </div>
+              </div>
+              <div class="form-actions">
+                 <div class="row">
+                     <div class="col-md-offset-3 col-md-9">
+                         <a href="javascript:;" class="btn default button-previous disabled" style="display: none;">
+                             <i class="fa fa-angle-left"></i> 返回 </a>
+                         <a href="javascript:;" class="btn btn-outline green button-next"> 下一步
+                             <i class="fa fa-angle-right"></i>
+                         </a>
+                         <a href="javascript:;" class="btn green button-submit" style="display: none;" id="submintBtn"> 提交
+                             <i class="fa fa-check"></i>
+                         </a>
+                     </div>
+                 </div>
+              </div>
+        	</div>
+        </form>
+		<!-- END FORM-->
+	</div>
+</div>
+<!-- 函数方法JS类库 -->
+<script src="/pages/base/carpark/js/add-input-function.js"></script>
+<!-- 表单向导JS类库 -->
+<script src="/pages/base/carpark/js/add-form-wizard.js"></script>
+<!-- reload事件 -->
+<script src="/pages/base/carpark/js/add-form-reload.js"></script>
+<!-- 地图JS类库 -->
+<script src="/pages/base/carpark/js/add-vmap-world.js"></script>
+<!-- 表单元素事件JS类库 -->
 <script src="/pages/base/carpark/js/add-form-events.js"></script>
 \ No newline at end of file
@@ -145,7 +145,7 @@
 <script type="text/javascript">
  
 $('#editPoitsions_carpark_mobal').on('editCarParkMobal_show', function(e, map,fun,carP,ajaxd){
-	/** 获取停车场信息对象 */
+	/** 获取场站信息对象 */
 	var CarParkObj = carP.getEitdCarPark();
 	// 获取修改停车场对象ID
 	var carParkId = CarParkObj.carParkId;
-var addCarParkVmapWorlds = function() {
-	var mapB = '', circle = '', drawingManager = '',circle='',marker='';
-	var Bmap = {
-			init : function() {
-				// 设置中心点,
-				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
-				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
-				// 初始化百度地图
-				mapB = new BMap.Map("addCarParkbmap_basic");
-				//中心点和缩放级别
-				mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
-				//启用地图拖拽事件，默认启用(可不写)
-				mapB.enableDragging(); 
-				//启用地图滚轮放大缩小
-				mapB.enableScrollWheelZoom(); 
-				//禁用鼠标双击放大
-				mapB.disableDoubleClickZoom();
-				//启用键盘上下左右键移动地图
-				mapB.enableKeyboard();
-				var styleOptions = {
-						//边线颜色。
-						strokeColor : "blue",
-						//填充颜色。当参数为空时，圆形将没有填充效果。
-						fillColor : "blue",
-						//边线的宽度，以像素为单位。
-						strokeWeight : 3,
-						//边线透明度，取值范围0 - 1。
-						strokeOpacity : 0.8,
-						//填充的透明度，取值范围0 - 1。
-						fillOpacity : 0.6,
-						//边线的样式，solid或dashed。
-						strokeStyle : 'solid' 
-				};
-				// 创建鼠标绘制管理类
-				drawingManager = new BMapLib.DrawingManager(mapB, {
-					//是否开启绘制模式
-					isOpen : false,
-					//是否显示工具栏
-					enableDrawingTool : false,
-					drawingToolOptions : {
-						//位置
-						anchor : BMAP_ANCHOR_TOP_RIGHT,
-						//偏离值
-						offset : new BMap.Size(5, 5),
-						//工具栏缩放比例
-						scale : 0.8
-					},
-					//线的样式
-					polygonOptions : styleOptions
-				});
-				// 添加绘画完成事件
-				drawingManager.addEventListener('polygoncomplete', function(e) {
-					drawingManager.close();
-					if (e.getPath().length <= 2) {
-						// 弹出提示消息
-						layer.msg('坐标点不能小于等于两个...');
-						 // 清除地图覆盖物
-						mapB.clearOverlays();
-						drawingManager.open();
-						 return false;
-					 }else {
-						 var pointE = e;
-						 // 多变行质心点
-						 var addSttationPoints_ = pointE.getBounds().getCenter().lng+ ' ' + pointE.getBounds().getCenter().lat;
-						 var addPolyGonLen_ = pointE.getPath().length;
-						 for(var k =0;k<addPolyGonLen_;k++) {
-							 if(k==0) {
-								 bPloygonGrid = pointE.getPath()[k].lng + ' ' + pointE.getPath()[k].lat;
-							 }else {
-								 bPloygonGrid = bPloygonGrid + ',' + pointE.getPath()[k].lng + ' ' + pointE.getPath()[k].lat;
-							 }
-						 }
-						 bPloygonGrid  = bPloygonGrid + ',' + pointE.getPath()[0].lng + ' ' + pointE.getPath()[0].lat;
-						 PublicFunctions.setFormInputValue(addSttationPoints_,bPloygonGrid,'d','');
-					 }
-				});
-				return mapB;
-			},
-			// 根据地理名称获取百度经纬度坐标
-			localSearchFromAdreesToPoint: function(Address,cb) {
-				// 创建一个搜索类实例
-				var localSearch = new BMap.LocalSearch(mapB);
-				// 检索完成后的回调函数。
-				localSearch.setSearchCompleteCallback(function (searchResult) {
-					var resultPoints = '';
-					if(searchResult) {
-						// 返回索引指定的结果。索引0表示第1条结果
-						var poi = searchResult.getPoi(0);
-						if(poi) {
-							//获取经度和纬度
-            				var stationNameChangePoint = new BMap.Point( poi.point.lng, poi.point.lat);
-            		  		marker = new BMap.Marker(stationNameChangePoint); 
-            		  		var PanOptions ={noAnimation :true};
-            		  		mapB.panTo(stationNameChangePoint,PanOptions);
-            		  		// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
-            		  		mapB.setZoom(18);
-            		  		mapB.panBy(0,-80);
-            		  		// 将标注添加到地图中
-            		  		mapB.addOverlay(marker);  
-            		  		//跳动的动画
-            		  		marker.setAnimation(BMAP_ANIMATION_BOUNCE); 
-            		  		cb && cb(stationNameChangePoint);
-						}else {
-							// 弹出添加成功提示消息
-							layer.msg('无法获取停车场【'+Address+'】地理位置！');
-							cb && cb(false);
-						}
-					}else {
-						// 弹出添加成功提示消息
-						layer.msg('无法获取停车场【'+Address+'】地理位置！');
-						cb && cb(false);
-					}
-				});
-				// 根据检索词发起检索。
-				localSearch.search(Address);
-			},
-			
-			// 画圆
-			pointsCircle : function(stationNameChangePoint) {
-				//创建圆
-		  		circle = new BMap.Circle(stationNameChangePoint,100,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5});
-		  		// 百度地图添加覆盖物圆
-		  		mapB.addOverlay(circle);
-		  		// 开启编辑功能
-				circle.enableEditing();
-				// 编辑圆监听事件
-				circle.addEventListener('remove',function() {
-					// 清除marker
-					mapB.removeOverlay(marker);
-					// 返回圆形的半径，单位为米。
-					var newRadius = circle.getRadius();
-					// 返回圆形的中心点坐标。
-					var newCenter = circle.getCenter().lng + ' ' + circle.getCenter().lat;
-					var centre_New = [{potion:{lng:circle.getCenter().lng,lat:circle.getCenter().lat}}];
-					circle = '';
-					PublicFunctions.setFormInputValue(newCenter,'','r',Math.round(newRadius));
-				});
-			},
-			// 打开绘画工具
-			drawingManagerOpen : function() {
-				// 打开鼠标绘画工具
-				drawingManager.open();
-				// 设置属性
-				drawingManager.setDrawingMode(BMAP_DRAWING_POLYGON);
-			},
-			drawingManagerClose : function() {
-				drawingManager.close();
-			},
-			clearMarkAndOverlays : function() {
-				// 清楚地图覆盖物
-				mapB.clearOverlays();
-			}
-	}
-	return Bmap;
+var addCarParkVmapWorlds = function() {
+	var mapB = '', circle = '', drawingManager = '',circle='',marker='';
+	var Bmap = {
+			init : function() {
+				// 设置中心点,
+				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
+				// 百度API Key
+				var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
+				// 初始化百度地图
+				mapB = new BMap.Map("addCarParkbmap_basic");
+				//中心点和缩放级别
+				mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
+				//启用地图拖拽事件，默认启用(可不写)
+				mapB.enableDragging(); 
+				//启用地图滚轮放大缩小
+				mapB.enableScrollWheelZoom(); 
+				//禁用鼠标双击放大
+				mapB.disableDoubleClickZoom();
+				//启用键盘上下左右键移动地图
+				mapB.enableKeyboard();
+				var styleOptions = {
+						//边线颜色。
+						strokeColor : "blue",
+						//填充颜色。当参数为空时，圆形将没有填充效果。
+						fillColor : "blue",
+						//边线的宽度，以像素为单位。
+						strokeWeight : 3,
+						//边线透明度，取值范围0 - 1。
+						strokeOpacity : 0.8,
+						//填充的透明度，取值范围0 - 1。
+						fillOpacity : 0.6,
+						//边线的样式，solid或dashed。
+						strokeStyle : 'solid' 
+				};
+				// 创建鼠标绘制管理类
+				drawingManager = new BMapLib.DrawingManager(mapB, {
+					//是否开启绘制模式
+					isOpen : false,
+					//是否显示工具栏
+					enableDrawingTool : false,
+					drawingToolOptions : {
+						//位置
+						anchor : BMAP_ANCHOR_TOP_RIGHT,
+						//偏离值
+						offset : new BMap.Size(5, 5),
+						//工具栏缩放比例
+						scale : 0.8
+					},
+					//线的样式
+					polygonOptions : styleOptions
+				});
+				// 添加绘画完成事件
+				drawingManager.addEventListener('polygoncomplete', function(e) {
+					drawingManager.close();
+					if (e.getPath().length <= 2) {
+						// 弹出提示消息
+						layer.msg('坐标点不能小于等于两个...');
+						 // 清除地图覆盖物
+						mapB.clearOverlays();
+						drawingManager.open();
+						 return false;
+					 }else {
+						 var pointE = e;
+						 // 多变行质心点
+						 var addSttationPoints_ = pointE.getBounds().getCenter().lng+ ' ' + pointE.getBounds().getCenter().lat;
+						 var addPolyGonLen_ = pointE.getPath().length;
+						 for(var k =0;k<addPolyGonLen_;k++) {
+							 if(k==0) {
+								 bPloygonGrid = pointE.getPath()[k].lng + ' ' + pointE.getPath()[k].lat;
+							 }else {
+								 bPloygonGrid = bPloygonGrid + ',' + pointE.getPath()[k].lng + ' ' + pointE.getPath()[k].lat;
+							 }
+						 }
+						 bPloygonGrid  = bPloygonGrid + ',' + pointE.getPath()[0].lng + ' ' + pointE.getPath()[0].lat;
+						 PublicFunctions.setFormInputValue(addSttationPoints_,bPloygonGrid,'d','');
+					 }
+				});
+				return mapB;
+			},
+			// 根据地理名称获取百度经纬度坐标
+			localSearchFromAdreesToPoint: function(Address,cb) {
+				// 创建一个搜索类实例
+				var localSearch = new BMap.LocalSearch(mapB);
+				// 检索完成后的回调函数。
+				localSearch.setSearchCompleteCallback(function (searchResult) {
+					var resultPoints = '';
+					if(searchResult) {
+						// 返回索引指定的结果。索引0表示第1条结果
+						var poi = searchResult.getPoi(0);
+						if(poi) {
+							//获取经度和纬度
+            				var stationNameChangePoint = new BMap.Point( poi.point.lng, poi.point.lat);
+            		  		marker = new BMap.Marker(stationNameChangePoint); 
+            		  		var PanOptions ={noAnimation :true};
+            		  		mapB.panTo(stationNameChangePoint,PanOptions);
+            		  		// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
+            		  		mapB.setZoom(18);
+            		  		mapB.panBy(0,-80);
+            		  		// 将标注添加到地图中
+            		  		mapB.addOverlay(marker);  
+            		  		//跳动的动画
+            		  		marker.setAnimation(BMAP_ANIMATION_BOUNCE); 
+            		  		cb && cb(stationNameChangePoint);
+						}else {
+							// 弹出添加成功提示消息
+							layer.msg('无法获取停车场【'+Address+'】地理位置！');
+							cb && cb(false);
+						}
+					}else {
+						// 弹出添加成功提示消息
+						layer.msg('无法获取停车场【'+Address+'】地理位置！');
+						cb && cb(false);
+					}
+				});
+				// 根据检索词发起检索。
+				localSearch.search(Address);
+			},
+			
+			// 画圆
+			pointsCircle : function(stationNameChangePoint) {
+				//创建圆
+		  		circle = new BMap.Circle(stationNameChangePoint,100,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5});
+		  		// 百度地图添加覆盖物圆
+		  		mapB.addOverlay(circle);
+		  		// 开启编辑功能
+				circle.enableEditing();
+				// 编辑圆监听事件
+				circle.addEventListener('remove',function() {
+					// 清除marker
+					mapB.removeOverlay(marker);
+					// 返回圆形的半径，单位为米。
+					var newRadius = circle.getRadius();
+					// 返回圆形的中心点坐标。
+					var newCenter = circle.getCenter().lng + ' ' + circle.getCenter().lat;
+					var centre_New = [{potion:{lng:circle.getCenter().lng,lat:circle.getCenter().lat}}];
+					circle = '';
+					PublicFunctions.setFormInputValue(newCenter,'','r',Math.round(newRadius));
+				});
+			},
+			// 打开绘画工具
+			drawingManagerOpen : function() {
+				// 打开鼠标绘画工具
+				drawingManager.open();
+				// 设置属性
+				drawingManager.setDrawingMode(BMAP_DRAWING_POLYGON);
+			},
+			drawingManagerClose : function() {
+				drawingManager.close();
+			},
+			clearMarkAndOverlays : function() {
+				// 清楚地图覆盖物
+				mapB.clearOverlays();
+			}
+	}
+	return Bmap;
 }();
 \ No newline at end of file
-/**
- * GetAjaxData ：ajax异步请求
- * 
- */
-var GetAjaxData = function(){
-	var ajaxData = {
-			// 查询停车场信息
-			getCarParkInfo : function(carParkId,callback){
-				$get('/carpark/findCarParkInfoFormId',{id:carParkId},function(r) {
-					return callback && callback(r);
-				});
-			},
-			 carParkUpdate : function(params,callback){
-				 $post('/carpark/carParkUpdate',params,function(data) {
-					callback && callback(data);
-				});
-			 }
-	}
-	return ajaxData;
+/**
+ * GetAjaxData ：ajax异步请求
+ * 
+ */
+var GetAjaxData = function(){
+	var ajaxData = {
+			// 查询场站信息
+			getCarParkInfo : function(carParkId,callback){
+				$get('/carpark/findCarParkInfoFormId',{id:carParkId},function(r) {
+					return callback && callback(r);
+				});
+			},
+			 carParkUpdate : function(params,callback){
+				 $post('/carpark/carParkUpdate',params,function(data) {
+					callback && callback(data);
+				});
+			 }
+	}
+	return ajaxData;
 }();
 \ No newline at end of file
@@ -5,15 +5,15 @@
  
 var PublicFunctions = function () {
 	var PubFun = {
-			/** 停车场信息初始化 @param：<id：停车场ID> */
+			/** 场站信息初始化 @param：<id：停车场ID> */
 			initCarPark : function(id) {
-				/** 获取停车场信息 @param：<id：停车场Id> */
+				/** 获取场站信息 @param：<id：停车场Id> */
 				GetAjaxData.getCarParkInfo(id,function(r) {
 					// 获取返回数据长度
 					var len = r.length;
 					// 如果大于零
 					if(len>0) {
-						// 获取停车场信息数据
+						// 获取场站信息数据
 						var carParkObj = r[0];
 						/** 设置停车场对象值 @param：<carParkObj：停车场对象值> */
 						EditCarParkObj.setEitdCarPark(carParkObj);
@@ -133,10 +133,10 @@ var PublicFunctions = function () {
 									enableAutoPan:true
 							};
 						if(stationShapesType == 'r') {
-							/**  画圆 @param：<r：停车场信息；point：中心点；htm：信息窗口html文本；pots：信息窗口参数属性> */
+							/**  画圆 @param：<r：场站信息；point：中心点；htm：信息窗口html文本；pots：信息窗口参数属性> */
 							CarParkPWorldsBMap.pointsCircle(r,point,htm,opts);
 						}else if(stationShapesType == 'd'){
-							/** 画多边形 @param：<r：停车场信息；point：中心点；htm：信息窗口html文本；pots：信息窗口参数属性> */ 
+							/** 画多边形 @param：<r：场站信息；point：中心点；htm：信息窗口html文本；pots：信息窗口参数属性> */ 
 							CarParkPWorldsBMap.pointsPolygon(r,point,htm,opts);
 						}
 					} 
-/**
- * 百度地图
- * 
- */
-
-var CarParkPWorldsBMap = function () {
-	
-	var mapValue='',drawingManager='',marker='',circle='',polygon='';
-	
-	var Bmap = {
-			init : function() {
-				// 设置中心点,
-				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
-				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
-				// 初始化百度地图
-				mapValue = new BMap.Map("carParkbmap_basic");
-				//中心点和缩放级别
-				mapValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
-				//启用地图拖拽事件，默认启用(可不写)
-				mapValue.enableDragging(); 
-				//启用地图滚轮放大缩小
-				mapValue.enableScrollWheelZoom(); 
-				//禁用鼠标双击放大
-				mapValue.disableDoubleClickZoom();
-				//启用键盘上下左右键移动地图
-				mapValue.enableKeyboard();
-				var styleOptions = {
-						//边线颜色。
-						strokeColor : "blue",
-						//填充颜色。当参数为空时，圆形将没有填充效果。
-						fillColor : "blue",
-						//边线的宽度，以像素为单位。
-						strokeWeight : 3,
-						//边线透明度，取值范围0 - 1。
-						strokeOpacity : 0.8,
-						//填充的透明度，取值范围0 - 1。
-						fillOpacity : 0.6,
-						//边线的样式，solid或dashed。
-						strokeStyle : 'solid' 
-				};
-				// 创建鼠标绘制管理类
-				drawingManager = new BMapLib.DrawingManager(mapValue, {
-					//是否开启绘制模式
-					isOpen : false,
-					//是否显示工具栏
-					enableDrawingTool : false,
-					drawingToolOptions : {
-						//位置
-						anchor : BMAP_ANCHOR_TOP_RIGHT,
-						//偏离值
-						offset : new BMap.Size(5, 5),
-						//工具栏缩放比例
-						scale : 0.8
-					},
-					//线的样式
-					polygonOptions : styleOptions
-				});
-				// 添加绘画完成事件
-				drawingManager.addEventListener('polygoncomplete', function(e) {
-					 drawingManager.close();
-					 if (e.getPath().length <= 2) {
-						// 弹出提示消息
-						layer.msg('坐标点不能小于等于两个...');
-						 // 清除地图覆盖物
-						Bmap.clearMarkAndOverlays();
-						// 加载该线路下所有站点位置添加到地图上
-						return false;
-					 }else {
-						 var pointE = e;
-						 // 多变行质心点
-						 var addSttationPoints_ = pointE.getBounds().getCenter().lng+ ' ' + pointE.getBounds().getCenter().lat;
-						 var addPolyGonLen_ = pointE.getPath().length;
-						 for(var k =0;k<addPolyGonLen_;k++) {
-							 if(k==0) {
-								 bPloygonGrid = pointE.getPath()[k].lng + ' ' + pointE.getPath()[k].lat;
-							 }else {
-								 bPloygonGrid = bPloygonGrid + ',' + pointE.getPath()[k].lng + ' ' + pointE.getPath()[k].lat;
-							 }
-								
-						 }
-						 bPloygonGrid  = bPloygonGrid + ',' + pointE.getPath()[0].lng + ' ' + pointE.getPath()[0].lat;
-						 /** 设置修改停车场集合对象图形质心点属性 @param：<addSttationPoints_：多边形质心点> */
-						 EditCarParkObj.setCarParkBcenterPoint(addSttationPoints_);
-						 /** 设置修改停车场集合对象图形类型属性 @param：<shapeType：图形类型> */
-						 EditCarParkObj.setCarParkShapesType('d');
-						 /** 设置修改停车场集合对象圆形半径属性 @param：<radius：圆形半径> */
-						 EditCarParkObj.setCarParkRadius('');
-						 /** 设置修改停车场集合对象名称 @param：<bParkPoint：多边形图形坐标集合> */
-						 EditCarParkObj.setCarParkBparkPoint(bPloygonGrid);
-						 $.get('edit.html', function(m){
-							 $(pjaxContainer).append(m);
-							 $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
-						 });
-					 }
-				});
-				return mapValue;
-			},
-			openDrawingManager : function() {
-				// 清楚地图覆盖物
-				// mapValue.clearOverlays();
-				// 打开鼠标绘画工具
-				drawingManager.open();
-				// 设置属性
-				drawingManager.setDrawingMode(BMAP_DRAWING_POLYGON);
-			},
-			drawingManagerClose : function() {
-				drawingManager.close();
-			},
-			localSearchFromAdreesToPoint: function(Address) {
-				// 创建一个搜索类实例
-				var localSearch = new BMap.LocalSearch(mapValue);
-				// 检索完成后的回调函数。
-				localSearch.setSearchCompleteCallback(function (searchResult) {
-					var resultPoints = '';
-					if(searchResult) {
-						// 返回索引指定的结果。索引0表示第1条结果
-						var poi = searchResult.getPoi(0);
-						if(poi) {
-							//获取经度和纬度
-							var Points = poi.point.lng + ' ' + poi.point.lat;
-							var BJwpointsArray = Points.split(' ');
-            				var stationNameChangePoint = new BMap.Point(BJwpointsArray[0], BJwpointsArray[1]);
-            		  		var marker_stargt2 = new BMap.Marker(stationNameChangePoint); 
-            		  		var PanOptions ={noAnimation :true};
-            		  		mapValue.panTo(stationNameChangePoint,PanOptions);
-            		  		mapValue.panBy(0,-200);
-            		  		// 将标注添加到地图中
-            		  		mapValue.addOverlay(marker_stargt2);  
-            		  		//跳动的动画
-            		  		marker_stargt2.setAnimation(BMAP_ANIMATION_BOUNCE); 
-						} 
-					} 
-				});
-				// 根据检索词发起检索。
-				localSearch.search(Address);
-			},
-			/**  画圆 @param：<r：停车场信息；point：中心点；htm：信息窗口html文本；pots：信息窗口参数属性> */
-			pointsCircle : function(r,point,htm,opts) {
-				//创建圆
-		  		circle = new BMap.Circle(point,r[0].carParkRadius,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5});
-		  		// 允许覆盖物在map.clearOverlays方法中被清除
-		  		circle.enableMassClear();
-		  		// 百度地图添加覆盖物圆
-		  		mapValue.addOverlay(circle);
-		  		// 创建信息窗口
-		  		infoWindow = new BMap.InfoWindow(htm, opts);
-			  	// 自定义标注物图片
-		  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
-		  	  	// 创建点
-				marker = new BMap.Marker(point,{icon : icon_target}); 
-				// 把标注添物加到地图上
-				mapValue.addOverlay(marker);
-			  	setTimeout(function(){
-			  		//开启信息窗口
-			  	  	marker.openInfoWindow(infoWindow,point);
-			  	},100);
-		  		// 是否在平移过程中禁止动画。（自1.2新增）
-		  		var PanOptions_ ={noAnimation :true};
-		  		// 将地图的中心点更改为给定的点。
-		  		mapValue.panTo(point,PanOptions_);
-		  		// 添加标志物监听事件
-		  		marker.addEventListener("click",function() {
-		  			//开启信息窗口
-		  			marker.openInfoWindow(infoWindow,point);
-			  	});
-			},
-			
-			/** 画多边形 @param：<r：停车场信息；point：中心点；htm：信息窗口html文本；pots：信息窗口参数属性> */
-			pointsPolygon : function(r,pointPolygon,htm,opts_polygon) {
-				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
-				mapValue.setZoom(17);
-				// 获取多边形坐标字符串
-				var stationBPolygonGrid = r[0].carParkBparkPoint;
-				// 截取多边形坐标字符串
-				var stationBPolygonGridStr = stationBPolygonGrid.substring(9,stationBPolygonGrid.length-2);
-				// 按逗号切割
-				var pointPolygonArray = stationBPolygonGridStr.split(',');
-				// 多边形坐标集合
-				var polygonP = [];
-				for(var v = 0;v<pointPolygonArray.length;v++) {
-					polygonP.push(new BMap.Point(pointPolygonArray[v].split(" ")[0],pointPolygonArray[v].split(" ")[1]));
-				}
-				// 画多边形
-				polygon = new BMap.Polygon(polygonP, {
-					// 线条显色
-		  			strokeColor : "blue",
-		  			// 边线的宽度，以像素为单位。
-		  			strokeWeight : 2,
-		  			// 边线透明度，取值范围0 - 1。
-		  			strokeOpacity : 0.5
-		  		});
-				// 增加地图覆盖物多边形
-				mapValue.addOverlay(polygon);  
-				// 创建信息窗口
-				infoWindow = new BMap.InfoWindow(htm, opts_polygon);
-			  	// 自定义标注物图片
-		  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
-		  	  	// 创建点
-				marker = new BMap.Marker(pointPolygon,{icon : icon_target}); 
-				// 把标注添物加到地图上
-				mapValue.addOverlay(marker);
-		  		// 是否在平移过程中禁止动画。（自1.2新增）
-		  		var PanOptions_ ={noAnimation :true};
-		  		// 将地图的中心点更改为给定的点。
-		  		mapValue.panTo(pointPolygon,PanOptions_);
-		  		// 将地图在水平位置上移动x像素，垂直位置上移动y像素。
-		  		mapValue.panBy(10,-250,PanOptions_);
-		  		//开启信息窗口
-		  		marker.openInfoWindow(infoWindow,pointPolygon);
-			},
-			
-			// 编辑图形
-			editShapes : function(stationShapesTypeV,mindex) {
-				// 关闭信息窗口
-				marker.closeInfoWindow();
-				// 清除marker
-				mapValue.removeOverlay(marker);
-				// 编辑圆
-				if(stationShapesTypeV =='r') {
-					// 开启编辑功能
-					circle.enableEditing();
-					// 编辑圆监听事件
-					circle.addEventListener('dblclick',function() {
-						// 关闭提示弹出层
-						layer.close(mindex);
-						// 返回圆形的半径，单位为米。
-						var newRadius = circle.getRadius();
-						// 返回圆形的中心点坐标。
-						var newCenter = circle.getCenter().lng + ' ' + circle.getCenter().lat;
-						var centre_New = [{potion:{lng:circle.getCenter().lng,lat:circle.getCenter().lat}}];
-						 /** 设置修改停车场集合对象图形质心点属性 @param：<addSttationPoints_：多边形质心点> */
-						 EditCarParkObj.setCarParkBcenterPoint(newCenter);
-						 /** 设置修改停车场集合对象图形类型属性 @param：<shapeType：图形类型> */
-						 EditCarParkObj.setCarParkShapesType('r');
-						 /** 设置修改停车场集合对象圆形半径属性 @param：<radius：圆形半径> */
-						 EditCarParkObj.setCarParkRadius(Math.round(newRadius));
-						 /** 设置修改停车场集合对象名称 @param：<bParkPoint：多边形图形坐标集合> */
-						 EditCarParkObj.setCarParkBparkPoint('');
-						// 加载编辑页面
-						$.get('edit.html', function(m){
-							$(pjaxContainer).append(m);
-							$('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
-						}); 
-					});
-				// 编辑多变行
-				}else if(stationShapesTypeV =='d') {
-					// 开启编辑功能(自 1.1 新增)
-					polygon.enableEditing();
-					// 添加多变行编辑事件
-					polygon.addEventListener('dblclick',function(e) {
-						 // 获取编辑的多边形对象
-						 var edit_pointE = polygon;
-						 var edit_bPloygonGrid = "";
-						 var editPolyGonLen_ = edit_pointE.getPath().length;
-						 for(var k =0;k<editPolyGonLen_;k++) {
-							 if(k==0) {
-								 edit_bPloygonGrid = edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
-							 }else {
-								 edit_bPloygonGrid = edit_bPloygonGrid + ',' + edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
-							 }
-						 }
-						 edit_bPloygonGrid  = edit_bPloygonGrid + ',' + edit_pointE.getPath()[0].lng + ' ' + edit_pointE.getPath()[0].lat;
-						 // 多边形中心点
-						 var centre_points = edit_pointE.getBounds().getCenter().lng + ' ' + edit_pointE.getBounds().getCenter().lat;
-						 /** 设置修改停车场集合对象图形质心点属性 @param：<addSttationPoints_：多边形质心点> */
-						 EditCarParkObj.setCarParkBcenterPoint(centre_points);
-						 /** 设置修改停车场集合对象图形类型属性 @param：<shapeType：图形类型> */
-						 EditCarParkObj.setCarParkShapesType('d');
-						 /** 设置修改停车场集合对象圆形半径属性 @param：<radius：圆形半径> */
-						 EditCarParkObj.setCarParkRadius('');
-						 /** 设置修改停车场集合对象名称 @param：<bParkPoint：多边形图形坐标集合> */
-						 EditCarParkObj.setCarParkBparkPoint(edit_bPloygonGrid);
-						 $.get('edit.html', function(m){
-							 $(pjaxContainer).append(m);
-							 $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
-						 });
-					});
-				}
-			},
-			clearMarkAndOverlays : function() {
-				// 清楚地图覆盖物
-				mapValue.clearOverlays();
-			}
-	}
-	return Bmap;
+/**
+ * 百度地图
+ * 
+ */
+
+var CarParkPWorldsBMap = function () {
+	
+	var mapValue='',drawingManager='',marker='',circle='',polygon='';
+	
+	var Bmap = {
+			init : function() {
+				// 设置中心点,
+				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
+				// 百度API Key
+				var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
+				// 初始化百度地图
+				mapValue = new BMap.Map("carParkbmap_basic");
+				//中心点和缩放级别
+				mapValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
+				//启用地图拖拽事件，默认启用(可不写)
+				mapValue.enableDragging(); 
+				//启用地图滚轮放大缩小
+				mapValue.enableScrollWheelZoom(); 
+				//禁用鼠标双击放大
+				mapValue.disableDoubleClickZoom();
+				//启用键盘上下左右键移动地图
+				mapValue.enableKeyboard();
+				var styleOptions = {
+						//边线颜色。
+						strokeColor : "blue",
+						//填充颜色。当参数为空时，圆形将没有填充效果。
+						fillColor : "blue",
+						//边线的宽度，以像素为单位。
+						strokeWeight : 3,
+						//边线透明度，取值范围0 - 1。
+						strokeOpacity : 0.8,
+						//填充的透明度，取值范围0 - 1。
+						fillOpacity : 0.6,
+						//边线的样式，solid或dashed。
+						strokeStyle : 'solid' 
+				};
+				// 创建鼠标绘制管理类
+				drawingManager = new BMapLib.DrawingManager(mapValue, {
+					//是否开启绘制模式
+					isOpen : false,
+					//是否显示工具栏
+					enableDrawingTool : false,
+					drawingToolOptions : {
+						//位置
+						anchor : BMAP_ANCHOR_TOP_RIGHT,
+						//偏离值
+						offset : new BMap.Size(5, 5),
+						//工具栏缩放比例
+						scale : 0.8
+					},
+					//线的样式
+					polygonOptions : styleOptions
+				});
+				// 添加绘画完成事件
+				drawingManager.addEventListener('polygoncomplete', function(e) {
+					 drawingManager.close();
+					 if (e.getPath().length <= 2) {
+						// 弹出提示消息
+						layer.msg('坐标点不能小于等于两个...');
+						 // 清除地图覆盖物
+						Bmap.clearMarkAndOverlays();
+						// 加载该线路下所有站点位置添加到地图上
+						return false;
+					 }else {
+						 var pointE = e;
+						 // 多变行质心点
+						 var addSttationPoints_ = pointE.getBounds().getCenter().lng+ ' ' + pointE.getBounds().getCenter().lat;
+						 var addPolyGonLen_ = pointE.getPath().length;
+						 for(var k =0;k<addPolyGonLen_;k++) {
+							 if(k==0) {
+								 bPloygonGrid = pointE.getPath()[k].lng + ' ' + pointE.getPath()[k].lat;
+							 }else {
+								 bPloygonGrid = bPloygonGrid + ',' + pointE.getPath()[k].lng + ' ' + pointE.getPath()[k].lat;
+							 }
+								
+						 }
+						 bPloygonGrid  = bPloygonGrid + ',' + pointE.getPath()[0].lng + ' ' + pointE.getPath()[0].lat;
+						 /** 设置修改停车场集合对象图形质心点属性 @param：<addSttationPoints_：多边形质心点> */
+						 EditCarParkObj.setCarParkBcenterPoint(addSttationPoints_);
+						 /** 设置修改停车场集合对象图形类型属性 @param：<shapeType：图形类型> */
+						 EditCarParkObj.setCarParkShapesType('d');
+						 /** 设置修改停车场集合对象圆形半径属性 @param：<radius：圆形半径> */
+						 EditCarParkObj.setCarParkRadius('');
+						 /** 设置修改停车场集合对象名称 @param：<bParkPoint：多边形图形坐标集合> */
+						 EditCarParkObj.setCarParkBparkPoint(bPloygonGrid);
+						 $.get('edit.html', function(m){
+							 $(pjaxContainer).append(m);
+							 $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
+						 });
+					 }
+				});
+				return mapValue;
+			},
+			openDrawingManager : function() {
+				// 清楚地图覆盖物
+				// mapValue.clearOverlays();
+				// 打开鼠标绘画工具
+				drawingManager.open();
+				// 设置属性
+				drawingManager.setDrawingMode(BMAP_DRAWING_POLYGON);
+			},
+			drawingManagerClose : function() {
+				drawingManager.close();
+			},
+			localSearchFromAdreesToPoint: function(Address) {
+				// 创建一个搜索类实例
+				var localSearch = new BMap.LocalSearch(mapValue);
+				// 检索完成后的回调函数。
+				localSearch.setSearchCompleteCallback(function (searchResult) {
+					var resultPoints = '';
+					if(searchResult) {
+						// 返回索引指定的结果。索引0表示第1条结果
+						var poi = searchResult.getPoi(0);
+						if(poi) {
+							//获取经度和纬度
+							var Points = poi.point.lng + ' ' + poi.point.lat;
+							var BJwpointsArray = Points.split(' ');
+            				var stationNameChangePoint = new BMap.Point(BJwpointsArray[0], BJwpointsArray[1]);
+            		  		var marker_stargt2 = new BMap.Marker(stationNameChangePoint); 
+            		  		var PanOptions ={noAnimation :true};
+            		  		mapValue.panTo(stationNameChangePoint,PanOptions);
+            		  		mapValue.panBy(0,-200);
+            		  		// 将标注添加到地图中
+            		  		mapValue.addOverlay(marker_stargt2);  
+            		  		//跳动的动画
+            		  		marker_stargt2.setAnimation(BMAP_ANIMATION_BOUNCE); 
+						} 
+					} 
+				});
+				// 根据检索词发起检索。
+				localSearch.search(Address);
+			},
+			/**  画圆 @param：<r：场站信息；point：中心点；htm：信息窗口html文本；pots：信息窗口参数属性> */
+			pointsCircle : function(r,point,htm,opts) {
+				//创建圆
+		  		circle = new BMap.Circle(point,r[0].carParkRadius,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5});
+		  		// 允许覆盖物在map.clearOverlays方法中被清除
+		  		circle.enableMassClear();
+		  		// 百度地图添加覆盖物圆
+		  		mapValue.addOverlay(circle);
+		  		// 创建信息窗口
+		  		infoWindow = new BMap.InfoWindow(htm, opts);
+			  	// 自定义标注物图片
+		  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
+		  	  	// 创建点
+				marker = new BMap.Marker(point,{icon : icon_target}); 
+				// 把标注添物加到地图上
+				mapValue.addOverlay(marker);
+			  	setTimeout(function(){
+			  		//开启信息窗口
+			  	  	marker.openInfoWindow(infoWindow,point);
+			  	},100);
+		  		// 是否在平移过程中禁止动画。（自1.2新增）
+		  		var PanOptions_ ={noAnimation :true};
+		  		// 将地图的中心点更改为给定的点。
+		  		mapValue.panTo(point,PanOptions_);
+		  		// 添加标志物监听事件
+		  		marker.addEventListener("click",function() {
+		  			//开启信息窗口
+		  			marker.openInfoWindow(infoWindow,point);
+			  	});
+			},
+			
+			/** 画多边形 @param：<r：场站信息；point：中心点；htm：信息窗口html文本；pots：信息窗口参数属性> */
+			pointsPolygon : function(r,pointPolygon,htm,opts_polygon) {
+				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
+				mapValue.setZoom(17);
+				// 获取多边形坐标字符串
+				var stationBPolygonGrid = r[0].carParkBparkPoint;
+				// 截取多边形坐标字符串
+				var stationBPolygonGridStr = stationBPolygonGrid.substring(9,stationBPolygonGrid.length-2);
+				// 按逗号切割
+				var pointPolygonArray = stationBPolygonGridStr.split(',');
+				// 多边形坐标集合
+				var polygonP = [];
+				for(var v = 0;v<pointPolygonArray.length;v++) {
+					polygonP.push(new BMap.Point(pointPolygonArray[v].split(" ")[0],pointPolygonArray[v].split(" ")[1]));
+				}
+				// 画多边形
+				polygon = new BMap.Polygon(polygonP, {
+					// 线条显色
+		  			strokeColor : "blue",
+		  			// 边线的宽度，以像素为单位。
+		  			strokeWeight : 2,
+		  			// 边线透明度，取值范围0 - 1。
+		  			strokeOpacity : 0.5
+		  		});
+				// 增加地图覆盖物多边形
+				mapValue.addOverlay(polygon);  
+				// 创建信息窗口
+				infoWindow = new BMap.InfoWindow(htm, opts_polygon);
+			  	// 自定义标注物图片
+		  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
+		  	  	// 创建点
+				marker = new BMap.Marker(pointPolygon,{icon : icon_target}); 
+				// 把标注添物加到地图上
+				mapValue.addOverlay(marker);
+		  		// 是否在平移过程中禁止动画。（自1.2新增）
+		  		var PanOptions_ ={noAnimation :true};
+		  		// 将地图的中心点更改为给定的点。
+		  		mapValue.panTo(pointPolygon,PanOptions_);
+		  		// 将地图在水平位置上移动x像素，垂直位置上移动y像素。
+		  		mapValue.panBy(10,-250,PanOptions_);
+		  		//开启信息窗口
+		  		marker.openInfoWindow(infoWindow,pointPolygon);
+			},
+			
+			// 编辑图形
+			editShapes : function(stationShapesTypeV,mindex) {
+				// 关闭信息窗口
+				marker.closeInfoWindow();
+				// 清除marker
+				mapValue.removeOverlay(marker);
+				// 编辑圆
+				if(stationShapesTypeV =='r') {
+					// 开启编辑功能
+					circle.enableEditing();
+					// 编辑圆监听事件
+					circle.addEventListener('dblclick',function() {
+						// 关闭提示弹出层
+						layer.close(mindex);
+						// 返回圆形的半径，单位为米。
+						var newRadius = circle.getRadius();
+						// 返回圆形的中心点坐标。
+						var newCenter = circle.getCenter().lng + ' ' + circle.getCenter().lat;
+						var centre_New = [{potion:{lng:circle.getCenter().lng,lat:circle.getCenter().lat}}];
+						 /** 设置修改停车场集合对象图形质心点属性 @param：<addSttationPoints_：多边形质心点> */
+						 EditCarParkObj.setCarParkBcenterPoint(newCenter);
+						 /** 设置修改停车场集合对象图形类型属性 @param：<shapeType：图形类型> */
+						 EditCarParkObj.setCarParkShapesType('r');
+						 /** 设置修改停车场集合对象圆形半径属性 @param：<radius：圆形半径> */
+						 EditCarParkObj.setCarParkRadius(Math.round(newRadius));
+						 /** 设置修改停车场集合对象名称 @param：<bParkPoint：多边形图形坐标集合> */
+						 EditCarParkObj.setCarParkBparkPoint('');
+						// 加载编辑页面
+						$.get('edit.html', function(m){
+							$(pjaxContainer).append(m);
+							$('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
+						}); 
+					});
+				// 编辑多变行
+				}else if(stationShapesTypeV =='d') {
+					// 开启编辑功能(自 1.1 新增)
+					polygon.enableEditing();
+					// 添加多变行编辑事件
+					polygon.addEventListener('dblclick',function(e) {
+						 // 获取编辑的多边形对象
+						 var edit_pointE = polygon;
+						 var edit_bPloygonGrid = "";
+						 var editPolyGonLen_ = edit_pointE.getPath().length;
+						 for(var k =0;k<editPolyGonLen_;k++) {
+							 if(k==0) {
+								 edit_bPloygonGrid = edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
+							 }else {
+								 edit_bPloygonGrid = edit_bPloygonGrid + ',' + edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
+							 }
+						 }
+						 edit_bPloygonGrid  = edit_bPloygonGrid + ',' + edit_pointE.getPath()[0].lng + ' ' + edit_pointE.getPath()[0].lat;
+						 // 多边形中心点
+						 var centre_points = edit_pointE.getBounds().getCenter().lng + ' ' + edit_pointE.getBounds().getCenter().lat;
+						 /** 设置修改停车场集合对象图形质心点属性 @param：<addSttationPoints_：多边形质心点> */
+						 EditCarParkObj.setCarParkBcenterPoint(centre_points);
+						 /** 设置修改停车场集合对象图形类型属性 @param：<shapeType：图形类型> */
+						 EditCarParkObj.setCarParkShapesType('d');
+						 /** 设置修改停车场集合对象圆形半径属性 @param：<radius：圆形半径> */
+						 EditCarParkObj.setCarParkRadius('');
+						 /** 设置修改停车场集合对象名称 @param：<bParkPoint：多边形图形坐标集合> */
+						 EditCarParkObj.setCarParkBparkPoint(edit_bPloygonGrid);
+						 $.get('edit.html', function(m){
+							 $(pjaxContainer).append(m);
+							 $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
+						 });
+					});
+				}
+			},
+			clearMarkAndOverlays : function() {
+				// 清楚地图覆盖物
+				mapValue.clearOverlays();
+			}
+	}
+	return Bmap;
 }();
 \ No newline at end of file
-/**
- * 
- * @JSName : list.js(停车场定位positions.html页面js)
- * 
- * @Author : bsth@lq
- * 
- * @Description : TODO(停车场定位positions.html页面js)
- * 
- * @Data : 2016年4月28日 上午9:21:17
- *
- * @Version 公交调度系统BS版 0.1
- * 
- */
-
-(function(){
-	// 获取参数停车场ID
-	var id = $.url().param('no');
-	// 关闭左侧栏
-	if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
-	// 等候300毫秒执行
-	setTimeout(function(){
-		// 地图初始化
-		mapB = CarParkPWorldsBMap.init();
-		/** 停车场信息初始化 @param：<id：停车场ID> */
-		PublicFunctions.initCarPark(id);
-	},300);
+/**
+ * 
+ * @JSName : list.js(停车场定位positions.html页面js)
+ * 
+ * @Author : bsth@lq
+ * 
+ * @Description : TODO(停车场定位positions.html页面js)
+ * 
+ * @Data : 2016年4月28日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+(function(){
+	// 获取参数停车场ID
+	var id = $.url().param('no');
+	// 关闭左侧栏
+	if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
+	// 等候300毫秒执行
+	setTimeout(function(){
+		// 地图初始化
+		mapB = CarParkPWorldsBMap.init();
+		/** 场站信息初始化 @param：<id：停车场ID> */
+		PublicFunctions.initCarPark(id);
+	},300);
 })();
 \ No newline at end of file
-<div class="page-head">
-	<div class="page-title">
-		<h1>停车场信息</h1>
-	</div>
-</div>
-
-<ul class="page-breadcrumb breadcrumb">
-	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
-	<li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
-	<li><span class="active">停车场信息</span></li>
-</ul>
-
-<div class="row">
-	<div class="col-md-12">
-		<div class="portlet light porttlet-fit bordered">
-			<div class="portlet-title">
-				<div class="caption">
-					 <i class="fa fa-info-circle font-dark"></i> 
-					 <span class="caption-subject font-dark sbold uppercase">停车场信息</span>
-				</div>
-				<div class="actions">
-					<div class="btn-group btn-group-devided" data-toggle="buttons">
-						<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加停车场</a>
-					</div>
-				</div>
-			</div>
-			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px">
-					<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_carpark">
-						<thead>
-							<tr role="row" class="heading">
-								<th width="3%">序号</th>
-								<th width="12%">停车场名称</th>
-								<th width="8%">停车场编码</th>
-								<th width="8%">地理位置</th>
-								<th width="6%">面积(㎡)</th>
-								<th width="8%">所属公司</th>
-								<th width="8%">所属分公司</th>
-								<th width="6%">版本号</th>
-								<th width="6%">是否撤销</th>
-								<th width="10%">操作</th>
-							</tr>
-							<tr role="row" class="filter">
-								<td>#</td>
-								<td>
-									 <!-- <input type="text" class="form-control form-filter input-sm" name="parkName_like" > -->
-									 <select name="parkName_like" class="form-control" style="width:100%" id="parkNameSelect"></select>
-								</td>
-								<td>
-									 <input type="text" class="form-control form-filter input-sm" name="parkCode_like" id="parkCodeInput">
-
-								</td>
-								<td>
-									<input type="text" class="form-control form-filter input-sm"  name="gCenterPoint_like">
-								</td>
-								<td>
-									 <input type="text" class="form-control form-filter input-sm" name="area_eq">
-								</td>
-								<td>
-									<select name="company_eq" class="form-control" id="companySelect"></select>
-								</td>
-								<td>
-									<select name="brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select>
-									 <!-- <input type="text" class="form-control form-filter input-sm" name="brancheCompany_eq" id="brancheCompanySelect"> -->
-								</td>
-								<td>
-									<input type="text" class="form-control form-filter input-sm"  name="versions_eq">
-								</td>
-								<td>
-									<select class="form-control form-filter " name="destroy_eq">
-                                         <option value="">请选择...</option>
-                                         <option value="0">运营</option>
-                                         <option value="1">撤销</option>
-                                     </select>
-								</td>
-								<td>
-									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
-										<i class="fa fa-search"></i> 搜索
-									</button>
-                                                                
-									<button class="btn btn-sm red btn-outline filter-cancel">
-										<i class="fa fa-times"></i> 重置
-									</button>
-								</td>
-							</tr>
-						</thead>
-						<tbody></tbody>
-					</table>
-					<div style="text-align: right;">
-						<ul id="pagination" class="pagination"></ul>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script type="text/html" id="carpark_list_table_temp">
-	{{each list as obj i }}
-		<tr>
-			<td style="vertical-align: middle;">
-				 {{(list.page*10)+(i+1)}}
-			</td>
-			<td>
-				{{obj.parkName}}
-			</td>
-			<td>
-				{{obj.parkCode}}
-			</td>
-			<td>
-				{{obj.bCenterPoint}}
-			</td>
-			<td>
-				{{obj.area}}
-			</td>
-			<td>
-				{{obj.gsmc}}
-			</td>
-			<td>
-				{{obj.fgsmc}}
-			</td>
-			<td>
-				{{obj.versions}}
-			</td>
-			<td>
-				{{if obj.destroy == 1}}
-					<span style="font-weight: bold; color: red; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">撤销</span>
-				{{else if obj.destroy == 0}}
-					<span style="font-weight: bold; color: #07824e; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">运营</span>
-				{{/if}}
-			</td>
-			<td>
-				<a href="positions.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 定位 </a>
-			</td>
-		</tr>
-	{{/each}}
-	{{if list.length == 0}}
-		<tr>
-			<td colspan=10><h6 class="muted">没有找到相关数据</h6></td>
-		</tr>
-	{{/if}}
-</script>
+<div class="page-head">
+	<div class="page-title">
+		<h1>场站信息</h1>
+	</div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
+	<li><span class="active">场站信息</span></li>
+</ul>
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<div class="caption">
+					 <i class="fa fa-info-circle font-dark"></i> 
+					 <span class="caption-subject font-dark sbold uppercase">场站信息</span>
+				</div>
+				<div class="actions">
+					<div class="btn-group btn-group-devided" data-toggle="buttons">
+						<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加停车场</a>
+					</div>
+				</div>
+			</div>
+			<div class="portlet-body">
+				<div class="table-container" style="margin-top: 10px">
+					<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_carpark">
+						<thead>
+							<tr role="row" class="heading">
+								<th width="3%">序号</th>
+								<th width="12%">停车场名称</th>
+								<th width="8%">停车场编码</th>
+								<th width="8%">地理位置</th>
+								<th width="6%">面积(㎡)</th>
+								<th width="8%">所属公司</th>
+								<th width="8%">所属分公司</th>
+								<th width="6%">版本号</th>
+								<th width="6%">是否撤销</th>
+								<th width="10%">操作</th>
+							</tr>
+							<tr role="row" class="filter">
+								<td>#</td>
+								<td>
+									 <!-- <input type="text" class="form-control form-filter input-sm" name="parkName_like" > -->
+									 <select name="parkName_like" class="form-control" style="width:100%" id="parkNameSelect"></select>
+								</td>
+								<td>
+									 <input type="text" class="form-control form-filter input-sm" name="parkCode_like" id="parkCodeInput">
+
+								</td>
+								<td>
+									<input type="text" class="form-control form-filter input-sm"  name="gCenterPoint_like">
+								</td>
+								<td>
+									 <input type="text" class="form-control form-filter input-sm" name="area_eq">
+								</td>
+								<td>
+									<select name="company_eq" class="form-control" id="companySelect"></select>
+								</td>
+								<td>
+									<select name="brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select>
+									 <!-- <input type="text" class="form-control form-filter input-sm" name="brancheCompany_eq" id="brancheCompanySelect"> -->
+								</td>
+								<td>
+									<input type="text" class="form-control form-filter input-sm"  name="versions_eq">
+								</td>
+								<td>
+									<select class="form-control form-filter " name="destroy_eq">
+                                         <option value="">请选择...</option>
+                                         <option value="0">运营</option>
+                                         <option value="1">撤销</option>
+                                     </select>
+								</td>
+								<td>
+									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
+										<i class="fa fa-search"></i> 搜索
+									</button>
+                                                                
+									<button class="btn btn-sm red btn-outline filter-cancel">
+										<i class="fa fa-times"></i> 重置
+									</button>
+								</td>
+							</tr>
+						</thead>
+						<tbody></tbody>
+					</table>
+					<div style="text-align: right;">
+						<ul id="pagination" class="pagination"></ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script type="text/html" id="carpark_list_table_temp">
+	{{each list as obj i }}
+		<tr>
+			<td style="vertical-align: middle;">
+				 {{(list.page*10)+(i+1)}}
+			</td>
+			<td>
+				{{obj.parkName}}
+			</td>
+			<td>
+				{{obj.parkCode}}
+			</td>
+			<td>
+				{{obj.bCenterPoint}}
+			</td>
+			<td>
+				{{obj.area}}
+			</td>
+			<td>
+				{{obj.gsmc}}
+			</td>
+			<td>
+				{{obj.fgsmc}}
+			</td>
+			<td>
+				{{obj.versions}}
+			</td>
+			<td>
+				{{if obj.destroy == 1}}
+					<span style="font-weight: bold; color: red; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">撤销</span>
+				{{else if obj.destroy == 0}}
+					<span style="font-weight: bold; color: #07824e; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">运营</span>
+				{{/if}}
+			</td>
+			<td>
+				<a href="positions.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 定位 </a>
+			</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan=10><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
 <script src="/pages/base/carpark/js/carpark-list-table.js"></script>
 \ No newline at end of file
@@ -3,7 +3,7 @@ var SectionVmapWorlds = function() {
 	var Bmap = {
 		init : function() {
 			var CENTER_POINT = {lng : 121.528733,lat : 31.237425};// 设置中心点.
-			var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';// 百度API Key
+			var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';// 百度API Key
 			mapB = new BMap.Map("sectionBmap_basic");// 初始化百度地图
 			mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);//中心点和缩放级别
 			mapB.enableDragging(); //启用地图拖拽事件，默认启用(可不写)
@@ -24,7 +24,7 @@ var BasicMap = function () {
 				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
  
 				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
  
 				// 初始化百度地图
 				mapBValue = new BMap.Map("BasicMap");
@@ -35,7 +35,7 @@ var WorldsBMap = function () {
 				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
  
 				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
  
 				// 初始化百度地图
 				mapBValue = new BMap.Map("bmap_basic");
@@ -24,7 +24,7 @@ var SpeedingMap = function () {
 				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
  
 				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
  
 				// 初始化百度地图
 				mapBValue = new BMap.Map("speedingMap");
@@ -37,7 +37,7 @@ var realMap = (function() {
 	var city = "上海";
  
 	//百度API Key
-	var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+	var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
  
 	var bd_gps_info_win_opts = {
 	  		width : 190,
@@ -72,7 +72,7 @@
  
  
 <!-- 地图相关 -->
-<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"></script>
 <script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
 <script src="/assets/js/CoordinateConverter.js" merge="plugins"></script>
@@ -60,7 +60,7 @@
     <span style="position: absolute;left: calc(50% - 35px);top: calc(45% - 35px);">加载中...</span>
 </div>
 <!-- 地图相关 -->
-<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"></script>
 <script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
 <script src="/assets/js/CoordinateConverter.js" merge="plugins"></script>
@@ -25,7 +25,7 @@
     <script>
         (function () {
             var modal = '#schedule-addsch-modal-v2',
-                    sch, stationRoutes, parks, information, carsArray, st_park_data, lineRegion = {};
+                    sch, stationRoutes, parks, information, carsArray, st_park_data, lineRegions = {};
  
             $(modal).on('init', function (e, data) {
                 e.stopPropagation();
@@ -63,7 +63,7 @@
                     opts.push('<option value="">选择预设区间</option>');
                     for (var idx in regions) {
                         var item = regions[idx], title = new Array();
-                        lineRegion[item.id + '_' + item.seq] = item;
+                        lineRegions[item.id + '_' + item.seq] = item;
                         if (item.stationRoutes.length > 1) {
                             for (var idx1 in item.stationRoutes) {
                                 title.push(item.stationRoutes[idx1].stationName);
@@ -113,7 +113,7 @@
                     opts.push('<option value="">选择预设区间</option>');
                     for (var idx in regions) {
                         var item = regions[idx], title = new Array();
-                        lineRegion[item.id + '_' + item.seq] = item;
+                        lineRegions[item.id + '_' + item.seq] = item;
                         if (item.stationRoutes.length > 1) {
                             for (var idx1 in item.stationRoutes) {
                                 title.push(item.stationRoutes[idx1].stationName);
@@ -282,7 +282,7 @@
                     zdzCode = $('[name=zdzCode]', f),
                     lineRegion = $(this).val();
                 if (!lineRegion) return;
-                var stationRoutes = lineRegion[lineRegion].stationRoutes;
+                var stationRoutes = lineRegions[lineRegion].stationRoutes;
                 if (stationRoutes && stationRoutes.length > 1) {
                     qdzCode.val(stationRoutes[0].stationCode);
                     zdzCode.val(stationRoutes[stationRoutes.length - 1].stationCode);