1.解决报站语音生成在centos7下异常问题

2.百度地图商用key替换 3.js压缩兼容es6

1.解决报站语音生成在centos7下异常问题
2.百度地图商用key替换 3.js压缩兼容es6
王通
1 parent 52eb029a
Showing 11 changed files with 2181 additions and 2003 deletions
pom.xml
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/util/FTPClientUtils.java
src/main/java/com/bsth/util/IFlyUtils.java
src/main/resources/application-dev.properties
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/index.html
src/main/resources/static/pages/base/carpark/js/add-vmap-world.js
@@ -419,10 +419,23 @@
 			<version>1.5.3</version>
 		</dependency>
+		<!-- 核心依赖 -->
 		<dependency>
 			<groupId>org.bytedeco</groupId>
-			<artifactId>javacv-platform</artifactId>
-			<version>1.5.11</version>
+			<artifactId>javacv</artifactId>
+			<version>1.5.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.bytedeco</groupId>
+			<artifactId>javacpp</artifactId>
+			<version>1.5.5</version>
+		</dependency>
+		<!-- Linux x86_64平台特定的FFmpeg依赖 -->
+		<dependency>
+			<groupId>org.bytedeco</groupId>
+			<artifactId>ffmpeg</artifactId>
+			<version>4.3.2-1.5.5</version>
+			<classifier>${javacpp.platform}</classifier>
 		</dependency>
     </dependencies>
@@ -496,6 +509,7 @@
 	<properties>
 		<start-class>com.bsth.Application</start-class>
+		<!-- 平台配置，只打包Linux x86_64平台的jar包 -->
 		<javacpp.platform>linux-x86_64</javacpp.platform>
 	</properties>
 </project>
@@ -8,7 +8,6 @@ import com.bsth.service.StationRouteService;
 import com.bsth.util.*;
 import com.bsth.util.Geo.GeoUtils;
 import com.bsth.util.Geo.Point;
-import com.bsth.util.PackTarGZUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
 import org.apache.commons.lang3.StringUtils;
@@ -27,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
@@ -50,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;
@@ -72,6 +71,11 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
     @Autowired
     private LsSectionRouteRepository lsSectionRouteRepository;
+	@Autowired
+	private LineRegionRepository lineRegionRepository;
+    @Autowired
+    private LineVersionsRepository lineVersionsRepository;
+
 	@Override
 	public Iterable<StationRoute> list(Map<String, Object> map) {
 		List<Sort.Order> orders = new ArrayList<>();
@@ -80,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>();
@@ -132,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
@@ -151,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){
@@ -179,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) {
@@ -300,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;
 	}
@@ -351,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();
@@ -362,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
@@ -409,10 +413,13 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		try {
 			// 获取线路ID
 			Integer lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
+			Integer version = lineVersionsRepository.findCurrentVersion(lineId);
+			Map<String, Object> param = new HashMap<>();
+			param.put("line_eq", lineId);
+			param.put("version_eq", version);
 			/** 查询线路信息 @param：<lineId：线路ID> */
 			Line line = lineRepository.findById(lineId).get();
-
 			Business company = businessRepository.findByBusinessCode(line.getCompany()).get(0);
 			Integer fileVersions = lineRepository.findfileVersions(lineId);
@@ -426,13 +433,15 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 //			Integer fileVersions = map.get("fileVersions").equals("") ? 1 : Integer.parseInt(map.get("fileVersions").toString());// 没有输入就默认1
 			/** 查询线路信息下的站点路由信息 @param：<lineId：线路ID> */
 			List<Object[]> objects = stationRouteRepository.usingSingle(lineId);
+			List<LineRegion> lineRegions = lineRegionRepository.findAll(new CustomerSpecs<>(param));
 			if (objects.size()>0) {
-//				// 报站音频
-//				Set<String> languages = new HashSet<>();
-//				languages.add("cn");
-//				languages.add("sh");
-//				languages.add("en");
-//				InputStream tts = ttsAndZip(objects, line, languages);
+				// 报站音频
+				Set<String> languages = new HashSet<>();
+				languages.add("cn");
+				languages.add("sh");
+				languages.add("en");
+				ttsAndZip(objects, line, languages, lineRegions);
+
 				/** 获取配置文件里的ftp登录参数 */
 				Map<String, Object> FTPParamMap = readPropertiesGetFTPParam();
 				// 压缩文件名
@@ -497,12 +506,25 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				input = new ByteArrayInputStream(textStr.getBytes("gbk"));
+				// 线路文件上传(全程)
 				clientUtils.uploadFile(url, port, username, password, remotePath + "/voice/", textFileName, input);
-
-//				textFile.delete();
-
-//				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);
+				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/");
+
+				// 线路区间
+				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/");
+					}
+				}
 				resultMap.put("status", ResponseCode.SUCCESS);
 			}else {
@@ -515,22 +537,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
@@ -545,34 +567,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;
@@ -584,24 +606,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 = "";
 				// 方向
@@ -631,16 +653,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
@@ -655,34 +677,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;
@@ -694,31 +716,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 = "";
 				// 方向
@@ -751,16 +773,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下的文本文件换行符
@@ -773,10 +795,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;
 					// 站点类型
@@ -787,7 +809,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;
 					// 站点编码
@@ -843,7 +865,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;
@@ -853,70 +875,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 ;
 	}
@@ -943,7 +965,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"))
@@ -951,14 +973,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;
 	}
@@ -1047,7 +1069,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;
@@ -1082,47 +1104,90 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		// 文本转语音并进行分割
 		// 音频存放及压缩文件路径
 		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));
+			}
+			merge(lineId, "0", seq, seqs, languages);
+		}
+		zipAudio(String.format("%s%s/", linePath, "0"), voicePath);
+
+		// 线路区间
+		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));
+		}
+	}
-		// 合并每站起步、到达语音
-		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) 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")) {
@@ -1138,8 +1203,6 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}
 		zos.flush();
 		zos.close();
-
-		return new FileInputStream(voicePath);
 	}
 	private static void addFileToZip(ZipOutputStream zos, File file) throws IOException {
@@ -1157,21 +1220,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, current.getDirection(), terminal, languages);
+					mergeNormalArrive(lineId, subLineId, seq, current, current.getDirection(), 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, current.getDirection(), terminal, languages);
+					mergeTerminalArrive(lineId, subLineId, seq, current, current.getDirection(), terminal, languages);
 				} else {
 					// 生成中途站
-					mergeNormalStart(lineId, seq, i, direction, terminal, languages);
-					mergeNormalArrive(lineId, seq, i, direction, terminal, languages);
+					mergeNormalStart(lineId, subLineId, seq, current, current.getDirection(), terminal, languages);
+					mergeNormalArrive(lineId, subLineId, seq, current, current.getDirection(), terminal, languages);
 				}
 				seq++;
 			}
@@ -1180,9 +1254,11 @@ 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, int direction, 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);
+		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) {
@@ -1192,12 +1268,13 @@ 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, int direction, 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);
+		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) {
@@ -1207,26 +1284,27 @@ 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, int direction, 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);
+		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) {
@@ -1236,12 +1314,13 @@ 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, int direction, 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);
+		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) {
@@ -1251,7 +1330,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() {
@@ -1276,4 +1355,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;
+		}
+	}
 }
-package com.bsth.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.commons.net.ftp.FTPClient;
-import org.apache.commons.net.ftp.FTPFile;
-import org.apache.commons.net.ftp.FTPReply;
-/**
- * @Description: 向FTP服务器上传文件
- * 
- * @Version 1.0 2016-06-21 4:31:09 by 李强 
- * 
- */
-public class FTPClientUtils {
-	
-	/** 
-	 * @param  url FTP服务器hostname； 
-	 * 
-	 * - - - - port FTP服务器端口；
-	 * 
-	 * - - - - username FTP登录账号；
-	 * 
-	 * - - - - password FTP登录密码 ；
-	 * 
-	 * - - - - path FTP服务器保存目录；
-	 * 
-	 * - - - - filename 上传到FTP服务器上的文件名
-	 * 
-	 * - - - - input 输入流；
-	 * 
-	 * @return 成功返回true，否则返回false
-	 * 
-	 */
-	public boolean uploadFile(String url,int port,String username, String password, String path, String filename, InputStream input) {
-		
-		boolean success = false;
-		
-		FTPClient ftp = new FTPClient();
-		
-		try {
-			
-			int reply;
-			
-			//连接FTP服务器,如果采用默认端口，可以使用ftp.connect(url)的方式直接连接FTP服务器
-			ftp.connect(url, port);
-			
-			//登录
-			ftp.login(username, password);
-			
-			reply = ftp.getReplyCode();
-			
-			if (!FTPReply.isPositiveCompletion(reply)) {
-				
-				ftp.disconnect();
-				
-				return success;
-				
-			}
-			
-			ftp.changeWorkingDirectory(path);
-			ftp.setFileType(FTPClient.BINARY_FILE_TYPE);
-			ftp.enterLocalPassiveMode();
-			success = ftp.storeFile(new String(filename.getBytes("gbk"),"gbk"), input);
-			/*success = ftp.storeFile(filename, input);	*/
-			input.close();
-			
-			ftp.logout();
-			
-			// success = true;
-			
-		} catch (IOException e) {
-			
-			e.printStackTrace();
-			
-		} finally {
-			
-			if (ftp.isConnected()) {
-				
-				try {
-					
-					ftp.disconnect();
-					
-				} catch (IOException ioe) {
-					
-				}
-				
-			}
-			
-		}
-		
-		return success;
-	}
-	
-	/**
-	 * @Description : TOOD(将本地文件上传到FTP服务器上)
-	 * 
-	 * @param file
-	 * 
-	 * @param name
-	 * 
-	 * @param url
-	 * 
-	 * @param port
-	 * 
-	 * @param username
-	 * 
-	 * @param password
-	 * 
-	 * @param remotePath
-	 * 
-	 */
-	public void FTPUpLoadFromDisk(File file,String name,String url, int port, String username, String password, String remotePath){
-		
-		 try { 
-		        FileInputStream in=new FileInputStream(file); 
-		        
-		        boolean flag = uploadFile(url, port,username, password, remotePath, name, in);
-		        
-		      /* boolean flag = uploadFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", name, in);*/
-		        
-		       /* boolean flag = uploadFile("222.66.0.205", 21, "transport", "transport123", "ftptest/", name, in);*/
-		        
-		    } catch (FileNotFoundException e) { 
-		    	
-		        e.printStackTrace(); 
-		        
-		    } 
-		
-	}
-	
-	// 在FTP服务器上生成一个文件，并将一个字符串写入到该文件中
-	public void testUpLoadFromString(){
-		
-		try {
-			
-			String str = "test ftp "+ "\r\n"+ "ccccc dddd";
-			
-			InputStream input = new ByteArrayInputStream(str.getBytes("utf-8"));
-			
-			uploadFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", "test.txt", input); 
-			
-		} catch (UnsupportedEncodingException e) {
-			
-			e.printStackTrace();
-			
-		}
-		
-	}
-	
-	/** 
-     * @Description (删除FTP上的文件)
-     * 
-     * @param url FTP服务器IP地址 
-     * 
-     * @param port FTP服务器端口 
-     * 
-     * @param username FTP服务器登录名 
-     * 
-     * @param password FTP服务器密码 
-     * 
-     * @param remotePath 远程文件路径 
-     * 
-     * @param fileName 待删除的文件名 
-     * 
-     * @return boolean
-     */  
-    public static boolean deleteFtpFile(String url, int port, String username, String password, String remotePath, String fileName){  
-    	
-    	boolean success = false; 
-    	
-        FTPClient ftp = new FTPClient(); 
-        
-        try { 
-        	
-        	int reply;  
-              
-            // 连接FTP服务器  
-            if (port > -1)
-            	
-            	ftp.connect(url, port);
-                
-            else  
-            	
-                ftp.connect(url);  
-              
-            // 登录  
-            ftp.login(username, password);  
-            
-            reply = ftp.getReplyCode(); 
-            
-            if (!FTPReply.isPositiveCompletion(reply)) {
-            	
-            	ftp.disconnect(); 
-            	
-                return success;  
-            }  
-              
-            // 转移到FTP服务器目录  
-            
-            ftp.changeWorkingDirectory(remotePath);
-            
-            /*success = ftp.deleteFile(fileName);*/
-            
-            success = ftp.deleteFile(new String(fileName.getBytes("gbk"),"gbk"));
-            
-            ftp.logout(); 
-            
-        } catch (IOException e){  
-        	
-        	e.printStackTrace();
-        	
-            success = false;
-            
-        } finally {
-        	
-        	if (ftp.isConnected()) {
-        		
-        		try { 
-        			
-                    ftp.disconnect();
-                    
-                } catch (IOException e) {  
-                	
-                	e.printStackTrace();
-                	
-                }  
-            }  
-        }  
-        
-        return success;  
-    }  
-	
-    public static File GetFtpFile(String url, int port, String username, String password, String remotePath, String fileName){  
-    	
-        FTPClient ftp = new FTPClient(); 
-       
-        /*File destFile = new File(fileName); */
-        
-        File destFile = new File(fileName); 
-        
-        InputStream in = null; 
-        
-        OutputStream out = null; 
-        
-        try { 
-        	
-        	int reply;  
-              
-            // 连接FTP服务器  
-            if (port > -1)
-            	
-            	ftp.connect(url, port);
-                
-            else  
-            	
-                ftp.connect(url);  
-              
-            // 登录  
-            ftp.login(username, password);  
-            
-            reply = ftp.getReplyCode(); 
-            
-            if (!FTPReply.isPositiveCompletion(reply)) {
-            	
-            	ftp.disconnect(); 
-            	
-            }  
-             
-            // 转移到FTP服务器目录  
-           
-            ftp.changeWorkingDirectory(remotePath);
-            
-            ftp.enterLocalPassiveMode();
-            
-            FTPFile[] fs = ftp.listFiles();  
-            
-            System.out.println(fs.length);
-            
-          /*  for (FTPFile ff : fs) {  
-                //解决中文乱码问题，两次解码  
-                byte[] bytes=ff.getName().getBytes("gbk");  
-                String fn=new String(bytes,"gbk");  
-                if (fn.equals(fileName)) {  
-                    //6.写操作，将其写入到本地文件中  
-                    File localFile = new File(ff.getName());  
-                    
-                    
-                    OutputStream is = new FileOutputStream(localFile);  
-                    ftp.retrieveFile(ff.getName(), is);  
-                    is.close();  
-                }  
-            } */
-            
-           /* File srcFile = new File(fileName);  */
-            
-           /* File srcFile = new File(new String(fileName.getBytes("gbk"),"gbk"));*/
-            
-            int byteread = 0; // 读取的字节数
-           
-           /* in =  ftp.retrieveFileStream(remotePath + fileName);*/
-            
-            in =  ftp.retrieveFileStream(new String(fileName.getBytes("gbk"),"gbk"));
-         
-            
-            out = new FileOutputStream(destFile);
-            
-            byte[] buffer = new byte[1024];  
-  
-            while ((byteread = in.read(buffer)) != -1) { 
-            	
-                out.write(buffer, 0, byteread);  
-                
-            }  
-            
-            out.flush();
-            ftp.logout(); 
-            
-        } catch (IOException e){  
-        	
-        	e.printStackTrace();
-        	
-        } finally {
-        	
-        	try { 
-        		
-                if (out != null) 
-                	
-                    out.close();
-                
-                if (in != null) 
-                	
-                    in.close();
-                
-            } catch (IOException e) { 
-            	
-                e.printStackTrace(); 
-                
-            }
-        	
-        	if (ftp.isConnected()) {
-        		
-        		try { 
-        			
-                    ftp.disconnect();
-                    
-                } catch (IOException e) {  
-                	
-                	e.printStackTrace();
-                	
-                }  
-            }  
-        }  
-        
-        return destFile;  
-    }  
-	
-    
-	public static void main(String[] args) {
-		
-		FTPClientUtils clientUtils = new FTPClientUtils();
-		
-		Test test= new Test();
-		
-		File[] sources = new File[] {new File("E:/20079.txt")};
-		  
-		File target = new File("release_package.tar.gz");
-		  
-		File targetFile = test.pack(sources, target);
-		  
-	/*	clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());*/
-		
-		
-		/** 删除文件 */
-		/*boolean a =clientUtils.deleteFtpFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", "release_package.tar.gz");*/
-		
-	}
-}
+package com.bsth.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
+import org.apache.commons.net.ftp.FTPReply;
+/**
+ * @Description: 向FTP服务器上传文件
+ * 
+ * @Version 1.0 2016-06-21 4:31:09 by 李强 
+ * 
+ */
+public class FTPClientUtils {
+	
+	/** 
+	 * @param  url FTP服务器hostname； 
+	 * 
+	 * - - - - port FTP服务器端口；
+	 * 
+	 * - - - - username FTP登录账号；
+	 * 
+	 * - - - - password FTP登录密码 ；
+	 * 
+	 * - - - - path FTP服务器保存目录；
+	 * 
+	 * - - - - filename 上传到FTP服务器上的文件名
+	 * 
+	 * - - - - input 输入流；
+	 * 
+	 * @return 成功返回true，否则返回false
+	 * 
+	 */
+	public boolean uploadFile(String url,int port,String username, String password, String path, String filename, InputStream input) {
+		
+		boolean success = false;
+		
+		FTPClient ftp = new FTPClient();
+		
+		try {
+			
+			int reply;
+			
+			//连接FTP服务器,如果采用默认端口，可以使用ftp.connect(url)的方式直接连接FTP服务器
+			ftp.connect(url, port);
+			
+			//登录
+			ftp.login(username, password);
+			
+			reply = ftp.getReplyCode();
+			
+			if (!FTPReply.isPositiveCompletion(reply)) {
+				
+				ftp.disconnect();
+				
+				return success;
+				
+			}
+			
+			ftp.changeWorkingDirectory(path);
+			ftp.setFileType(FTPClient.BINARY_FILE_TYPE);
+			ftp.enterLocalPassiveMode();
+			success = ftp.storeFile(new String(filename.getBytes("gbk"),"gbk"), input);
+			/*success = ftp.storeFile(filename, input);	*/
+			input.close();
+			
+			ftp.logout();
+			
+			// success = true;
+			
+		} catch (IOException e) {
+			
+			e.printStackTrace();
+			
+		} finally {
+			
+			if (ftp.isConnected()) {
+				
+				try {
+					
+					ftp.disconnect();
+					
+				} catch (IOException ioe) {
+					
+				}
+				
+			}
+			
+		}
+		
+		return success;
+	}
+	
+	/**
+	 * @Description : TOOD(将本地文件上传到FTP服务器上)
+	 * 
+	 * @param file
+	 * 
+	 * @param name
+	 * 
+	 * @param url
+	 * 
+	 * @param port
+	 * 
+	 * @param username
+	 * 
+	 * @param password
+	 * 
+	 * @param remotePath
+	 * 
+	 */
+	public void FTPUpLoadFromDisk(File file,String name,String url, int port, String username, String password, String remotePath){
+		
+		 try { 
+		        FileInputStream in=new FileInputStream(file); 
+		        
+		        boolean flag = uploadFile(url, port,username, password, remotePath, name, in);
+		        
+		      /* boolean flag = uploadFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", name, in);*/
+		        
+		       /* boolean flag = uploadFile("222.66.0.205", 21, "transport", "transport123", "ftptest/", name, in);*/
+		        
+		    } catch (FileNotFoundException e) { 
+		    	
+		        e.printStackTrace(); 
+		        
+		    } 
+		
+	}
+	
+	// 在FTP服务器上生成一个文件，并将一个字符串写入到该文件中
+	public void testUpLoadFromString(){
+		
+		try {
+			
+			String str = "test ftp "+ "\r\n"+ "ccccc dddd";
+			
+			InputStream input = new ByteArrayInputStream(str.getBytes("utf-8"));
+			
+			uploadFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", "test.txt", input); 
+			
+		} catch (UnsupportedEncodingException e) {
+			
+			e.printStackTrace();
+			
+		}
+		
+	}
+	
+	/** 
+     * @Description (删除FTP上的文件)
+     * 
+     * @param url FTP服务器IP地址 
+     * 
+     * @param port FTP服务器端口 
+     * 
+     * @param username FTP服务器登录名 
+     * 
+     * @param password FTP服务器密码 
+     * 
+     * @param remotePath 远程文件路径 
+     * 
+     * @param fileName 待删除的文件名 
+     * 
+     * @return boolean
+     */  
+    public static boolean deleteFtpFile(String url, int port, String username, String password, String remotePath, String fileName){  
+    	
+    	boolean success = false; 
+    	
+        FTPClient ftp = new FTPClient(); 
+        
+        try { 
+        	
+        	int reply;  
+              
+            // 连接FTP服务器  
+            if (port > -1)
+            	
+            	ftp.connect(url, port);
+                
+            else  
+            	
+                ftp.connect(url);  
+              
+            // 登录  
+            ftp.login(username, password);  
+            
+            reply = ftp.getReplyCode(); 
+            
+            if (!FTPReply.isPositiveCompletion(reply)) {
+            	
+            	ftp.disconnect(); 
+            	
+                return success;  
+            }  
+              
+            // 转移到FTP服务器目录  
+            
+            ftp.changeWorkingDirectory(remotePath);
+            
+            /*success = ftp.deleteFile(fileName);*/
+            
+            success = ftp.deleteFile(new String(fileName.getBytes("gbk"),"gbk"));
+            
+            ftp.logout(); 
+            
+        } catch (IOException e){  
+        	
+        	e.printStackTrace();
+        	
+            success = false;
+            
+        } finally {
+        	
+        	if (ftp.isConnected()) {
+        		
+        		try { 
+        			
+                    ftp.disconnect();
+                    
+                } catch (IOException e) {  
+                	
+                	e.printStackTrace();
+                	
+                }  
+            }  
+        }  
+        
+        return success;  
+    }  
+	
+    public static File GetFtpFile(String url, int port, String username, String password, String remotePath, String fileName){  
+    	
+        FTPClient ftp = new FTPClient(); 
+       
+        /*File destFile = new File(fileName); */
+        
+        File destFile = new File(fileName); 
+        
+        InputStream in = null; 
+        
+        OutputStream out = null; 
+        
+        try { 
+        	
+        	int reply;  
+              
+            // 连接FTP服务器  
+            if (port > -1)
+            	
+            	ftp.connect(url, port);
+                
+            else  
+            	
+                ftp.connect(url);  
+              
+            // 登录  
+            ftp.login(username, password);  
+            
+            reply = ftp.getReplyCode(); 
+            
+            if (!FTPReply.isPositiveCompletion(reply)) {
+            	
+            	ftp.disconnect(); 
+            	
+            }  
+             
+            // 转移到FTP服务器目录  
+           
+            ftp.changeWorkingDirectory(remotePath);
+            
+            ftp.enterLocalPassiveMode();
+            
+            FTPFile[] fs = ftp.listFiles();  
+            
+            System.out.println(fs.length);
+            
+          /*  for (FTPFile ff : fs) {  
+                //解决中文乱码问题，两次解码  
+                byte[] bytes=ff.getName().getBytes("gbk");  
+                String fn=new String(bytes,"gbk");  
+                if (fn.equals(fileName)) {  
+                    //6.写操作，将其写入到本地文件中  
+                    File localFile = new File(ff.getName());  
+                    
+                    
+                    OutputStream is = new FileOutputStream(localFile);  
+                    ftp.retrieveFile(ff.getName(), is);  
+                    is.close();  
+                }  
+            } */
+            
+           /* File srcFile = new File(fileName);  */
+            
+           /* File srcFile = new File(new String(fileName.getBytes("gbk"),"gbk"));*/
+            
+            int byteread = 0; // 读取的字节数
+           
+           /* in =  ftp.retrieveFileStream(remotePath + fileName);*/
+            
+            in =  ftp.retrieveFileStream(new String(fileName.getBytes("gbk"),"gbk"));
+         
+            
+            out = new FileOutputStream(destFile);
+            
+            byte[] buffer = new byte[1024];  
+  
+            while ((byteread = in.read(buffer)) != -1) { 
+            	
+                out.write(buffer, 0, byteread);  
+                
+            }  
+            
+            out.flush();
+            ftp.logout(); 
+            
+        } catch (IOException e){  
+        	
+        	e.printStackTrace();
+        	
+        } finally {
+        	
+        	try { 
+        		
+                if (out != null) 
+                	
+                    out.close();
+                
+                if (in != null) 
+                	
+                    in.close();
+                
+            } catch (IOException e) { 
+            	
+                e.printStackTrace(); 
+                
+            }
+        	
+        	if (ftp.isConnected()) {
+        		
+        		try { 
+        			
+                    ftp.disconnect();
+                    
+                } catch (IOException e) {  
+                	
+                	e.printStackTrace();
+                	
+                }  
+            }  
+        }  
+        
+        return destFile;  
+    }
+
+	public static boolean deleteFileByPrefix(String prefix, String url, int port, String username, String password, String remotePath) {
+		boolean flag = false;
+		FTPClient ftp = new FTPClient();
+		try {
+			int reply;
+			if (port > -1) {
+				ftp.connect(url, port);
+			} else {
+				ftp.connect(url);
+			}
+			ftp.login(username, password);
+			reply = ftp.getReplyCode();
+			if (!FTPReply.isPositiveCompletion(reply)) {
+				ftp.disconnect();
+				return flag;
+			}
+			ftp.enterLocalPassiveMode();
+			ftp.changeWorkingDirectory(remotePath);
+			for (FTPFile file : ftp.listFiles()) {
+				if (file.getName().startsWith(prefix)) {
+					ftp.deleteFile(file.getName());
+				}
+			}
+			ftp.logout();
+		} catch (IOException e){
+			e.printStackTrace();
+		} finally {
+			if (ftp.isConnected()) {
+				try {
+					ftp.disconnect();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+
+		return flag;
+	}
+	
+    
+	public static void main(String[] args) {
+		
+		FTPClientUtils clientUtils = new FTPClientUtils();
+		
+		Test test= new Test();
+		
+		File[] sources = new File[] {new File("E:/20079.txt")};
+		  
+		File target = new File("release_package.tar.gz");
+		  
+		File targetFile = test.pack(sources, target);
+		  
+	/*	clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());*/
+		
+		
+		/** 删除文件 */
+		/*boolean a =clientUtils.deleteFtpFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", "release_package.tar.gz");*/
+		
+	}
+}
@@ -31,65 +31,36 @@ public class IFlyUtils {
     private final static String appId = "b4b21ad4";
-    /**
-     * 生成普通话语音
-     * text以","进行分割
-     * @param text
-     */
-    public static void textToSpeechCn(String text, String outputPath) throws Exception {
+    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");
+    }
+
+    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 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);
+        String vcn = language2vcn.get(language);
+        if (vcn == null) {
+            throw new IllegalArgumentException("Language is not supported: " + language);
         }
-    }
-
-    /**
-     * 生成上海话语音
-     * text以","进行分割
-     * @param text
-     */
-    public static void textToSpeechSh(String text, String outputPath) throws Exception {
         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(outputPath));
-        while (!request.isCompleted()) {
-            Thread.sleep(500);
+        request.getBusiness().put("vcn", vcn);
+        String charset = "GBK";
+        if (language.equals("en")) {
+            charset = "UTF-8";
         }
-    }
-
-    /**
-     * 生成英语语音
-     * text以","进行分割
-     * @param text
-     */
-    public static void textToSpeechEn(String text, String outputPath) throws Exception {
-        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(outputPath));
+        websocketWork(wsUrl, request, new FileOutputStream(file));
         while (!request.isCompleted()) {
             Thread.sleep(500);
         }
 server.port=9088
-# dubbo服务化使用开关flag
+# dubbo����ʹ�ÿ���flag
 dubbo.use=false
 #JPA
@@ -9,21 +9,14 @@ spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.Im
 spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.jpa.show-sql= true
+spring.jpa.show-sql= false
 spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MySQL56InnoDBSpatialDialect
 #DATABASE
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-#spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-##spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-#spring.datasource.username= root
-#spring.datasource.password=
-spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://192.168.168.152/control_lg?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root
-#spring.datasource.url= jdbc:mysql://192.168.168.241/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-#spring.datasource.username= root
-#spring.datasource.password= root2jsp
+spring.datasource.password= root2jsp
 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
 #DATASOURCE SETTING
@@ -39,17 +32,17 @@ spring.datasource.hikari.validation-timeout= 3000
 spring.datasource.hikari.register-mbeans=true
 kafka.use= false
-spring.kafka.consumer.bootstrap-servers= localhost:9092
-spring.kafka.consumer.group-id= schedule-system
+spring.kafka.consumer.bootstrap-servers= 192.170.100.114:9092,192.170.100.114:9093,192.170.100.114:9094
+spring.kafka.consumer.group-id= schedule-system-test
 spring.kafka.consumer.auto-offset-reset= latest
 spring.kafka.consumer.key-deserializer= org.apache.kafka.common.serialization.StringDeserializer
 spring.kafka.consumer.value-deserializer= org.apache.kafka.common.serialization.StringDeserializer
 sso.enabled= false
-sso.systemcode = SYS0019
-sso.http.url.login= http://180.169.154.251:28090/portal/index.html#/login
-sso.http.url.logout= http://180.169.154.251:18080/information/api/v1/logout
-sso.http.url.auth= http://180.169.154.251:18080/information/authenticate/authorityAuthentication
+sso.systemcode = SYS0023
+sso.http.url.login= https://112.64.45.51/portal/index.html#/login
+sso.http.url.logout= https://112.64.45.51/information/api/v1/logout
+sso.http.url.auth= https://112.64.45.51/information/authenticate/authorityAuthentication
-path.speech.common = /data/control/speech/common/
-path.speech.line = /data/control/speech/%s/
 \ No newline at end of file
+path.speech.common = D:/speech/common/
+path.speech.line = D:/speech/%s/
 \ 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.4",
-    "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"
+  }
+}
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title>GPS点测试</title>
-<meta name=”renderer” content=”webkit”>
-<meta http-equiv=”X-UA-Compatible” content=”IE=Edge,chrome=1″>
-
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="Cache-control" content="no-cache">
-<meta http-equiv="Cache" content="no-cache">
-<head>
-<!-- select2 下拉框插件 -->
-<link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css"
-	rel="stylesheet" type="text/css" />
-<style type="text/css">
-html,body {
-	height: 100%;
-	overflow: hidden;
-}
-
-#mapContainer {
-	width: 100%;
-	height: calc(100% -   93px);
-}
-
-form {
-	padding: 25px;
-}
-
-form .item {
-	display: inline-block;
-}
-
-form .item input {
-	height: 26px;
-	width: 110px;
-}
-
-form .item select {
-	height: 32px;
-}
-</style>
-</head>
-<body>
-	<form action="">
-		<div class="item">
-			线路： <select name="xl" style="width: 150px;">
-			</select>
-		</div>
-		<div class="item">
-			方向： <select name="directions" style="width: 70px;">
-				<option value="0">上行</option>
-				<option value="1">下行</option>
-			</select>
-		</div>
-		<div class="item">
-			设备号： <input name="device" value="059L0903" />
-		</div>
-		<div class="item">
-			开始时间戳： <input type="number" name="startTime" value="1461380940000" />
-		</div>
-		<div class="item">
-			结束时间戳： <input type="number" name="endTime" value="1461381960000" />
-		</div>
-		<div class="item">
-			<input type="button" value="查询GPS轨迹" onclick="searchGps()">
-		</div>
-		<div class="item">
-			<input type="button" value="开启测距" onclick="myDis.open();"
-				style="width: 75px" /> <input type="button" value="关闭测距"
-				onclick="myDis.close()" style="width: 75px" />
-
-		</div>
-
-		<div class="item">
-			<a target="_blank" href="http://tool.chinaz.com/Tools/unixtime.aspx"
-				style="font-size: 12px; color: red;">毫秒时间戳转换</a>
-		</div>
-	</form>
-
-	<div id="mapContainer"></div>
-	<script src="/assets/plugins/pinyin.js"></script>
-	<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>
-	<script type="text/javascript"
-		src="//api.map.baidu.com/library/DistanceTool/1.2/src/DistanceTool_min.js"></script>
-	<!-- moment.js 日期处理类库 -->
-	<script src="/assets/plugins/moment-with-locales.js"></script>
-	<!-- select2 下拉框 -->
-	<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>
-	<script>
-
-	var inMark = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAA1CAYAAABSrotqAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAGW0lEQVRYw62XX2wc1RWHv3vv7NhrQkKCIa0poaKRmjdUFUGr+IH+ITy0Kg/0qVRV1ZamVV95al94oPSBVmoRUZTIKRFBLW1aapBK6gIChYTgFJRQHoITqCCO7eC1vY7t2Z1/954+zK69Xs9mx4mPdLWjmTvnO79z7zl3VlHAvv3XmXuM8R4EBpVSu1DqpiQRBJlH5APn5KQ4NzzycP/pbr7U1R5+6y+Vr2njP6EVX1FKoRTZAOJUQMBlP4gIIrwtNvnlyMO3vL4u4AND49vMjZsOaqMfUgpMA+ZEiBJIrJAkQslT+B4YrXACzknj1x4N6rWfnfrJ7XNdgd888NEOs+XmEaPVLq0zRVEiRGnmsGlJsnKtFfT4ih5PIQJWwDr3QRJUHzix9wsXOwLvOzDW72269ZQxeqcxIAL1WLAtoDzgMlgr+vwsG6kTrOXDoDL91Xcf/eLM8pxWuJT7j4hSO5UC66AW5cM6mXNCEDmsA60UAjv9rf1HWoU1L9Tg0OT3dU/5Wd9TeFpRiwWRFZhNhSvTMbX5hDh0uNhR6jWUb/LYvL0H460kSyko+xrrhCgVJAp/MPrzgecAMVkuH/PuuHv335VSW3s8TZgIrgUWzKdMXagRLqU4KygF4gRnhSiwLFZivF6N32tWAhTwPUWSCmhz18RC3z4+fsNpgN3f+/H9oO4ESO3qNNaupFQ+qWeRa5U7AGY/rlO7kq5Kb+qkUUrqzru/+8M9zTXUeKUHs92miG3LmlhhbjJCGVVoVCdCnG3ZyamgVRaQLvV+B9AeoJUu3QtgdLZWy6mspgigzdpyFS+/ZwTVhBv7/WyOgDbZBtTa3NMEKqX0Dsg6RqvFoUN3cOyczr2f1F3+FtbmDkB5gEKzFQFr215OBe3lO9Yu33GSrg47XUnxtiYQRKUgpdadCaAbnSMfmK+8Pf3L74ssATSAtorSt7a/vKnPUA87pMhTa9cAKJfzMwKysAwU56aUWQvcssUQJ/lA6aBw8xaPJHe+m4asLERcOpb3cvkGg1/SeEatGSZn+CVFeZPJDQRnxwDJgDY5nzcniIXbBkq5zo3Jyqg5PAMDAz5BlL/oLo0uLAOT4MqZvEnWCbEoPjfgU/LUKoDRK/BSSXHbgE8kqmOzt+HiGUA8QBY+Ov127823u0YAq1VGDno0n9/hs7BoWQocSSKIQKmk6OvTbN5sqAZCLeqw3uBmz791ChBFdmL4g4dnziptdnXYYhit2FxWlH2N72WHcmqhFjkW61c/xsTZc6OP3PIlIPayAHA2Dt/wem/oCLROqAZCNchU5B3AnczF9dcBR0sKxQZzI4U9rNOS+vwrDWHLJ76bOH7gTZBwo2GCBDOv/OF4Q+EyUCb+sW/JJeGxDQfG4b8vjRwK2hUKYNPF6gsbDUyC6lHAtgMB3NTfnv5ns+dtkL6F2eF9/6KRznagXDyxvyZx9PJG4WxUf+niif01Wtr8KiBgo8VPj24UMA5mXqAlne1AAPfhc79+DZHZ66aJq0wM/eJVWtKZB5Tqu0frNlr80/Xy0jB4fmbsZNQVCNj6+LlDoFxh7+2mkHjy3OFGOtse5U2H3sE/Xn5ZeT33dfJ5tdYmNjk5+tPt9wMhbd8Fed8DAqTJwuyhaxWYLM4MASk5HyGdPkDshT8/+hLiLq8XJuIu/+/Ir4bz0nk1oMyNHgttuPTseoGuvnh4/uzwqtorBATszNnXDqyvoUu48N6rB2mrvSJAAHd+/48mbVgr3AhsGDw/NvTIFG2lUBQoQFr/5L2nipSIgAvH//s0HTZL01QXPwro3X3o8rAu9expfdBeFpJGx0b3fvYhckqhqMJllVFl/PfdFNanx5/qpq6IwmZQvYPPTB9XpvTlPIWSxqOjez/z9YY6181ZN3NAEs5d+k2nCfHc5JNA0g1WVGGLyspbynh3tSp0aXLm9N7tg0XUFVXYVJlG81NPrlE3P/k7srUr1OyLAgHS/zzxjRex9v3mDbHp+2d/u+fFBrBwqoqaUKnEYfXS480b4dzk41QqMV125vWYBvoGn5l+596Dn74D9K0z6MY/4M7WvqkESOPK+GNRlsRm3eXNK+SwVYkPlBpBacA05uvGfVgpBSFr2K4RRALE5GykTif+toZT1WFu87pVSft1Asy1q70WhYrVwOa4ZoXred7JOq7h/wF6az0ukZgX/AAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yNVQyMTo1MDo0MyswODowMOgS43cAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTMtMTEtMjBUMjI6NDc6MTErMDg6MDAou1syAAAATnRFWHRzb2Z0d2FyZQBJbWFnZU1hZ2ljayA2LjguOC0xMCBRMTYgeDg2XzY0IDIwMTUtMDctMTkgaHR0cDovL3d3dy5pbWFnZW1hZ2ljay5vcmcFDJw1AAAAGHRFWHRUaHVtYjo6RG9jdW1lbnQ6OlBhZ2VzADGn/7svAAAAF3RFWHRUaHVtYjo6SW1hZ2U6OkhlaWdodAA1Mwmpb+QAAAAWdEVYdFRodW1iOjpJbWFnZTo6V2lkdGgAMjgpleAmAAAAGXRFWHRUaHVtYjo6TWltZXR5cGUAaW1hZ2UvcG5nP7JWTgAAABd0RVh0VGh1bWI6Ok1UaW1lADEzODQ5NTg4MzEXUMEwAAAAE3RFWHRUaHVtYjo6U2l6ZQA0LjUzS0JC/AyPiAAAAFp0RVh0VGh1bWI6OlVSSQBmaWxlOi8vL2hvbWUvd3d3cm9vdC93d3cuZWFzeWljb24ubmV0L2Nkbi1pbWcuZWFzeWljb24uY24vc3JjLzExMjk3LzExMjk3NzIucG5nqXNeUQAAAABJRU5ErkJggg==';
-	var outMark = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAvCAMAAAC18jgTAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABO1BMVEUAAAAiu4ggv40gvowgvowgvosgvowfvo0jv44hv40gvosgvowcxo4fvowgvowdvYogv4whvo0gvowhvYwrqoAhv4wnxIkgv4wA//8gvIshvosgvowhvIshvowgvowrv5Ugv4ohvosgvowhv4wgv4whvYwXuYsgvowgvowiu4gfvo0zzJkhvowktpIgvowgv40hvo0gv4wgvowAqqogvosgvowjv4sgvowivIskv4khvowgvYsiu44hvosfvI0hv4sgvYofvowgvowgv40gv4wjuYsgvowhvowfvIsgvYsgvo0hvoxAv4Agv4wgvowgvoshvo0mv4whvowgvowfwo8gv4wgv40duokAAAAfvYsgvYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAYjGUYj2kAAAAAAAAAAAAgvoz///9v2GMAAAAAZ3RSTlMAD1eZyOr4miSc950Jivoj0i/pfAarDaoBWH3JLuv5DDDL0ZunbQvu/h6CBbQO5jhOkNwDtfAsz0Qc42EtdUGLYKKOwsYW7/s5f7nMBCj9N40U8/YZh48aAaOmAggNERMWF0lLGBkanzLKGQAAAAFiS0dEaMts9CIAAAGZSURBVDjLfZRnW8IwFIUvyN6FUlCx4AZxKw7cA/eeKKNUwfz/f2ChZNAmnC+U+54m9548KQCRwznicns8bpfX6QC7fP4AIgoEfRYcCkfQgCLhEMujMWRTLEq55EYcuSXyPpcbjv4aoRgSKGb2EUZChXvzRcSGSHfaIP0fT0iyLCXitOI38qP5JBWzKSVFE3OAk/I0HiudJMVR8JL1FRqMQgb3ggs/Jthox3B1HIg3wxoyuDoBKn6UWYOMqyp4uIYsNfC3yNEtJoc3OQXT3DFJmDNMUCkaFI1yFubmqcMedb4AsMAeVqaYzbGHtWj4l5bFx51f6a64mhca/OaeayK+3m9qY5PPS1tk7G0eV3doMLtlToN7bLT7JZvhYPByHqoWfmS93ceD/CRtNcApy89kG4fiOeXlCucLAoULzC+vgCvSxjUIdGPy2zuR4b53jx8eQagn5gi5en5B6PVtiAHeEfoYxqHiUT9FrNrT17f5a8O1eqOptXT951fXW1qzUa9ZXtfanU7nry/jsa1VuSsYtjZ3BdIDFin/A1AVNdoKDyAYAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTI1VDIxOjUwOjQzKzA4OjAw6BLjdwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMy0xMS0yMFQyMjo0NzoxMyswODowML8kShsAAABOdEVYdHNvZnR3YXJlAEltYWdlTWFnaWNrIDYuOC44LTEwIFExNiB4ODZfNjQgMjAxNS0wNy0xOSBodHRwOi8vd3d3LmltYWdlbWFnaWNrLm9yZwUMnDUAAAAYdEVYdFRodW1iOjpEb2N1bWVudDo6UGFnZXMAMaf/uy8AAAAXdEVYdFRodW1iOjpJbWFnZTo6SGVpZ2h0ADQ3F9+avAAAABZ0RVh0VGh1bWI6OkltYWdlOjpXaWR0aAAzMtBbOHkAAAAZdEVYdFRodW1iOjpNaW1ldHlwZQBpbWFnZS9wbmc/slZOAAAAF3RFWHRUaHVtYjo6TVRpbWUAMTM4NDk1ODgzM/leoBwAAAATdEVYdFRodW1iOjpTaXplADQuMDFLQkKe5chzAAAAWnRFWHRUaHVtYjo6VVJJAGZpbGU6Ly8vaG9tZS93d3dyb290L3d3dy5lYXN5aWNvbi5uZXQvY2RuLWltZy5lYXN5aWNvbi5jbi9zcmMvMTEyOTcvMTEyOTc4Ni5wbmetpUpEAAAAAElFTkSuQmCC';
-
-	var inOuts = [outMark, inMark];
-	
-	var stationCodeMap = {};
-	
-	var map = new BMap.Map("mapContainer");
-	map.centerAndZoom(new BMap.Point(121.544336, 31.221315), 15);
-	map.enableScrollWheelZoom();
-	//中心点和缩放级别
-	map.setCurrentCity("上海");  
-	var myDis = new BMapLib.DistanceTool(map);
-
-	
-	$.get('/line/all', function(rs){
-		var data = [];
-		$.each(rs, function(){
-			data.push({id: this.id, text: this.name});
-		});
-		
-		initPinYinSelect2('select[name=xl]', data);
-	});
-	
-	function searchGps(){
-		var params = $('form').serializeJSON();
-		//查询线路路由站点
-		$.get('/test/gps/route', params, function(rs){
-			var array = rs[0].children[0].children
-				,coords,circle, cdsArray, points, polygon;
-			//画出站点
-			console.log(array);
-			$.each(array, function(){
-				stationCodeMap[this.stationStationCod] = this.name;
-				if(this.stationShapesType === 'r'){
-					//画圆
-					coords = this.stationBJwpoints.split(' ');
-					circle = new BMap.Circle(new BMap.Point(coords[0], coords[1]),this.stationRadius);
-					circle.setStrokeColor('red');
-					circle.setStrokeWeight(2)
-					map.addOverlay(circle);
-				}
-				else if(this.stationShapesType === 'd'){
-					//画多边形
-					coords = this.stationBPolygonGrid.substring(9, this.stationBPolygonGrid.length - 2);
-					cdsArray = coords.split(',');
-					points = [];
-					$.each(cdsArray, function(){
-						coords = this.split(' ');
-						points.push(new BMap.Point(coords[0], coords[1]));
-					});
-					
-					polygon = new BMap.Polygon(points, {strokeColor:"red", strokeWeight:2, strokeOpacity:0.5});
-					map.addOverlay(polygon);
-				}
-			});
-			coords = array[array.length / 2].stationBJwpoints.split(' ');
-			map.setCenter(new BMap.Point(coords[0], coords[1]))
-		});
-		
-		//查询gps点
-		$.get('/gps/history/' + params.device, params, function(gpsArray){
-			console.log(stationCodeMap);
-			var marker, label, point, state, text;
-			$.each(gpsArray, function(){
-				point = new BMap.Point(this.lon, this.lat);
-				marker = new BMap.Marker(point);
-				state = this.inout_stop;
-				
-				if(state == 0 || state == 1){
-					text = state == 0?'出':'进';
-					
-					console.log(stationCodeMap[this.stopNo], this);
-					marker.setIcon(new BMap.Icon(inOuts[this.inout_stop], new BMap.Size(25,25)));
-					label = new BMap.Label(
-							stationCodeMap[this.stopNo] + '/' +moment(this.ts).format('HH:mm.ss') + ' -'+text
-							, {position: point, offset: new BMap.Size(-25,-18)});
-					marker.setLabel(label);
-				}
-				else{
-					label = new BMap.Label(moment(this.ts).format('HH:mm.ss')
-							, {position: point, offset: new BMap.Size(-25,-18)});
-					marker.setLabel(label);
-				}
-				
-				map.addOverlay(marker);
-			});
-		});
-	}
-	
-	
-	/**
-	 * 支持拼音搜索的select2
-	 * @param selector
-	 * @param data
-	 */
-	function initPinYinSelect2(selector, data, cb){
-		
-		$.each(data, function(){
-			this.fullChars = pinyin.getFullChars(this.text).toUpperCase();
-			this.camelChars = pinyin.getCamelChars(this.text);
-		});
-		
-		$.fn.select2.amd.require(['select2/compat/matcher'], function (oldMatcher) {
-			$(selector).select2({
-				data: data,
-			    matcher: oldMatcher(function(term, text, item){
-			    	var upTerm = term.toUpperCase();
-					if(item.fullChars.indexOf(upTerm) != -1
-							|| item.camelChars.indexOf(upTerm) != -1)
-						return true;
-					
-					return text.indexOf(term) != -1;
-			    })
-			});
-			
-			cb && cb();
-		});
-		
-		return $(selector);
-	}
-</script>
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>GPS点测试</title>
+<meta name=”renderer” content=”webkit”>
+<meta http-equiv=”X-UA-Compatible” content=”IE=Edge,chrome=1″>
+
+<meta http-equiv="Pragma" content="no-cache">
+<meta http-equiv="Cache-control" content="no-cache">
+<meta http-equiv="Cache" content="no-cache">
+<head>
+<!-- select2 下拉框插件 -->
+<link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css"
+	rel="stylesheet" type="text/css" />
+<style type="text/css">
+html,body {
+	height: 100%;
+	overflow: hidden;
+}
+
+#mapContainer {
+	width: 100%;
+	height: calc(100% -   93px);
+}
+
+form {
+	padding: 25px;
+}
+
+form .item {
+	display: inline-block;
+}
+
+form .item input {
+	height: 26px;
+	width: 110px;
+}
+
+form .item select {
+	height: 32px;
+}
+</style>
+</head>
+<body>
+	<form action="">
+		<div class="item">
+			线路： <select name="xl" style="width: 150px;">
+			</select>
+		</div>
+		<div class="item">
+			方向： <select name="directions" style="width: 70px;">
+				<option value="0">上行</option>
+				<option value="1">下行</option>
+			</select>
+		</div>
+		<div class="item">
+			设备号： <input name="device" value="059L0903" />
+		</div>
+		<div class="item">
+			开始时间戳： <input type="number" name="startTime" value="1461380940000" />
+		</div>
+		<div class="item">
+			结束时间戳： <input type="number" name="endTime" value="1461381960000" />
+		</div>
+		<div class="item">
+			<input type="button" value="查询GPS轨迹" onclick="searchGps()">
+		</div>
+		<div class="item">
+			<input type="button" value="开启测距" onclick="myDis.open();"
+				style="width: 75px" /> <input type="button" value="关闭测距"
+				onclick="myDis.close()" style="width: 75px" />
+
+		</div>
+
+		<div class="item">
+			<a target="_blank" href="http://tool.chinaz.com/Tools/unixtime.aspx"
+				style="font-size: 12px; color: red;">毫秒时间戳转换</a>
+		</div>
+	</form>
+
+	<div id="mapContainer"></div>
+	<script src="/assets/plugins/pinyin.js"></script>
+	<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=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"></script>
+	<script type="text/javascript"
+		src="//api.map.baidu.com/library/DistanceTool/1.2/src/DistanceTool_min.js"></script>
+	<!-- moment.js 日期处理类库 -->
+	<script src="/assets/plugins/moment-with-locales.js"></script>
+	<!-- select2 下拉框 -->
+	<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>
+	<script>
+
+	var inMark = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAA1CAYAAABSrotqAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAGW0lEQVRYw62XX2wc1RWHv3vv7NhrQkKCIa0poaKRmjdUFUGr+IH+ITy0Kg/0qVRV1ZamVV95al94oPSBVmoRUZTIKRFBLW1aapBK6gIChYTgFJRQHoITqCCO7eC1vY7t2Z1/954+zK69Xs9mx4mPdLWjmTvnO79z7zl3VlHAvv3XmXuM8R4EBpVSu1DqpiQRBJlH5APn5KQ4NzzycP/pbr7U1R5+6y+Vr2njP6EVX1FKoRTZAOJUQMBlP4gIIrwtNvnlyMO3vL4u4AND49vMjZsOaqMfUgpMA+ZEiBJIrJAkQslT+B4YrXACzknj1x4N6rWfnfrJ7XNdgd888NEOs+XmEaPVLq0zRVEiRGnmsGlJsnKtFfT4ih5PIQJWwDr3QRJUHzix9wsXOwLvOzDW72269ZQxeqcxIAL1WLAtoDzgMlgr+vwsG6kTrOXDoDL91Xcf/eLM8pxWuJT7j4hSO5UC66AW5cM6mXNCEDmsA60UAjv9rf1HWoU1L9Tg0OT3dU/5Wd9TeFpRiwWRFZhNhSvTMbX5hDh0uNhR6jWUb/LYvL0H460kSyko+xrrhCgVJAp/MPrzgecAMVkuH/PuuHv335VSW3s8TZgIrgUWzKdMXagRLqU4KygF4gRnhSiwLFZivF6N32tWAhTwPUWSCmhz18RC3z4+fsNpgN3f+/H9oO4ESO3qNNaupFQ+qWeRa5U7AGY/rlO7kq5Kb+qkUUrqzru/+8M9zTXUeKUHs92miG3LmlhhbjJCGVVoVCdCnG3ZyamgVRaQLvV+B9AeoJUu3QtgdLZWy6mspgigzdpyFS+/ZwTVhBv7/WyOgDbZBtTa3NMEKqX0Dsg6RqvFoUN3cOyczr2f1F3+FtbmDkB5gEKzFQFr215OBe3lO9Yu33GSrg47XUnxtiYQRKUgpdadCaAbnSMfmK+8Pf3L74ssATSAtorSt7a/vKnPUA87pMhTa9cAKJfzMwKysAwU56aUWQvcssUQJ/lA6aBw8xaPJHe+m4asLERcOpb3cvkGg1/SeEatGSZn+CVFeZPJDQRnxwDJgDY5nzcniIXbBkq5zo3Jyqg5PAMDAz5BlL/oLo0uLAOT4MqZvEnWCbEoPjfgU/LUKoDRK/BSSXHbgE8kqmOzt+HiGUA8QBY+Ov127823u0YAq1VGDno0n9/hs7BoWQocSSKIQKmk6OvTbN5sqAZCLeqw3uBmz791ChBFdmL4g4dnziptdnXYYhit2FxWlH2N72WHcmqhFjkW61c/xsTZc6OP3PIlIPayAHA2Dt/wem/oCLROqAZCNchU5B3AnczF9dcBR0sKxQZzI4U9rNOS+vwrDWHLJ76bOH7gTZBwo2GCBDOv/OF4Q+EyUCb+sW/JJeGxDQfG4b8vjRwK2hUKYNPF6gsbDUyC6lHAtgMB3NTfnv5ns+dtkL6F2eF9/6KRznagXDyxvyZx9PJG4WxUf+niif01Wtr8KiBgo8VPj24UMA5mXqAlne1AAPfhc79+DZHZ66aJq0wM/eJVWtKZB5Tqu0frNlr80/Xy0jB4fmbsZNQVCNj6+LlDoFxh7+2mkHjy3OFGOtse5U2H3sE/Xn5ZeT33dfJ5tdYmNjk5+tPt9wMhbd8Fed8DAqTJwuyhaxWYLM4MASk5HyGdPkDshT8/+hLiLq8XJuIu/+/Ir4bz0nk1oMyNHgttuPTseoGuvnh4/uzwqtorBATszNnXDqyvoUu48N6rB2mrvSJAAHd+/48mbVgr3AhsGDw/NvTIFG2lUBQoQFr/5L2nipSIgAvH//s0HTZL01QXPwro3X3o8rAu9expfdBeFpJGx0b3fvYhckqhqMJllVFl/PfdFNanx5/qpq6IwmZQvYPPTB9XpvTlPIWSxqOjez/z9YY6181ZN3NAEs5d+k2nCfHc5JNA0g1WVGGLyspbynh3tSp0aXLm9N7tg0XUFVXYVJlG81NPrlE3P/k7srUr1OyLAgHS/zzxjRex9v3mDbHp+2d/u+fFBrBwqoqaUKnEYfXS480b4dzk41QqMV125vWYBvoGn5l+596Dn74D9K0z6MY/4M7WvqkESOPK+GNRlsRm3eXNK+SwVYkPlBpBacA05uvGfVgpBSFr2K4RRALE5GykTif+toZT1WFu87pVSft1Asy1q70WhYrVwOa4ZoXred7JOq7h/wF6az0ukZgX/AAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yNVQyMTo1MDo0MyswODowMOgS43cAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTMtMTEtMjBUMjI6NDc6MTErMDg6MDAou1syAAAATnRFWHRzb2Z0d2FyZQBJbWFnZU1hZ2ljayA2LjguOC0xMCBRMTYgeDg2XzY0IDIwMTUtMDctMTkgaHR0cDovL3d3dy5pbWFnZW1hZ2ljay5vcmcFDJw1AAAAGHRFWHRUaHVtYjo6RG9jdW1lbnQ6OlBhZ2VzADGn/7svAAAAF3RFWHRUaHVtYjo6SW1hZ2U6OkhlaWdodAA1Mwmpb+QAAAAWdEVYdFRodW1iOjpJbWFnZTo6V2lkdGgAMjgpleAmAAAAGXRFWHRUaHVtYjo6TWltZXR5cGUAaW1hZ2UvcG5nP7JWTgAAABd0RVh0VGh1bWI6Ok1UaW1lADEzODQ5NTg4MzEXUMEwAAAAE3RFWHRUaHVtYjo6U2l6ZQA0LjUzS0JC/AyPiAAAAFp0RVh0VGh1bWI6OlVSSQBmaWxlOi8vL2hvbWUvd3d3cm9vdC93d3cuZWFzeWljb24ubmV0L2Nkbi1pbWcuZWFzeWljb24uY24vc3JjLzExMjk3LzExMjk3NzIucG5nqXNeUQAAAABJRU5ErkJggg==';
+	var outMark = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAvCAMAAAC18jgTAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABO1BMVEUAAAAiu4ggv40gvowgvowgvosgvowfvo0jv44hv40gvosgvowcxo4fvowgvowdvYogv4whvo0gvowhvYwrqoAhv4wnxIkgv4wA//8gvIshvosgvowhvIshvowgvowrv5Ugv4ohvosgvowhv4wgv4whvYwXuYsgvowgvowiu4gfvo0zzJkhvowktpIgvowgv40hvo0gv4wgvowAqqogvosgvowjv4sgvowivIskv4khvowgvYsiu44hvosfvI0hv4sgvYofvowgvowgv40gv4wjuYsgvowhvowfvIsgvYsgvo0hvoxAv4Agv4wgvowgvoshvo0mv4whvowgvowfwo8gv4wgv40duokAAAAfvYsgvYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAYjGUYj2kAAAAAAAAAAAAgvoz///9v2GMAAAAAZ3RSTlMAD1eZyOr4miSc950Jivoj0i/pfAarDaoBWH3JLuv5DDDL0ZunbQvu/h6CBbQO5jhOkNwDtfAsz0Qc42EtdUGLYKKOwsYW7/s5f7nMBCj9N40U8/YZh48aAaOmAggNERMWF0lLGBkanzLKGQAAAAFiS0dEaMts9CIAAAGZSURBVDjLfZRnW8IwFIUvyN6FUlCx4AZxKw7cA/eeKKNUwfz/f2ChZNAmnC+U+54m9548KQCRwznicns8bpfX6QC7fP4AIgoEfRYcCkfQgCLhEMujMWRTLEq55EYcuSXyPpcbjv4aoRgSKGb2EUZChXvzRcSGSHfaIP0fT0iyLCXitOI38qP5JBWzKSVFE3OAk/I0HiudJMVR8JL1FRqMQgb3ggs/Jthox3B1HIg3wxoyuDoBKn6UWYOMqyp4uIYsNfC3yNEtJoc3OQXT3DFJmDNMUCkaFI1yFubmqcMedb4AsMAeVqaYzbGHtWj4l5bFx51f6a64mhca/OaeayK+3m9qY5PPS1tk7G0eV3doMLtlToN7bLT7JZvhYPByHqoWfmS93ceD/CRtNcApy89kG4fiOeXlCucLAoULzC+vgCvSxjUIdGPy2zuR4b53jx8eQagn5gi5en5B6PVtiAHeEfoYxqHiUT9FrNrT17f5a8O1eqOptXT951fXW1qzUa9ZXtfanU7nry/jsa1VuSsYtjZ3BdIDFin/A1AVNdoKDyAYAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTI1VDIxOjUwOjQzKzA4OjAw6BLjdwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMy0xMS0yMFQyMjo0NzoxMyswODowML8kShsAAABOdEVYdHNvZnR3YXJlAEltYWdlTWFnaWNrIDYuOC44LTEwIFExNiB4ODZfNjQgMjAxNS0wNy0xOSBodHRwOi8vd3d3LmltYWdlbWFnaWNrLm9yZwUMnDUAAAAYdEVYdFRodW1iOjpEb2N1bWVudDo6UGFnZXMAMaf/uy8AAAAXdEVYdFRodW1iOjpJbWFnZTo6SGVpZ2h0ADQ3F9+avAAAABZ0RVh0VGh1bWI6OkltYWdlOjpXaWR0aAAzMtBbOHkAAAAZdEVYdFRodW1iOjpNaW1ldHlwZQBpbWFnZS9wbmc/slZOAAAAF3RFWHRUaHVtYjo6TVRpbWUAMTM4NDk1ODgzM/leoBwAAAATdEVYdFRodW1iOjpTaXplADQuMDFLQkKe5chzAAAAWnRFWHRUaHVtYjo6VVJJAGZpbGU6Ly8vaG9tZS93d3dyb290L3d3dy5lYXN5aWNvbi5uZXQvY2RuLWltZy5lYXN5aWNvbi5jbi9zcmMvMTEyOTcvMTEyOTc4Ni5wbmetpUpEAAAAAElFTkSuQmCC';
+
+	var inOuts = [outMark, inMark];
+	
+	var stationCodeMap = {};
+	
+	var map = new BMap.Map("mapContainer");
+	map.centerAndZoom(new BMap.Point(121.544336, 31.221315), 15);
+	map.enableScrollWheelZoom();
+	//中心点和缩放级别
+	map.setCurrentCity("上海");  
+	var myDis = new BMapLib.DistanceTool(map);
+
+	
+	$.get('/line/all', function(rs){
+		var data = [];
+		$.each(rs, function(){
+			data.push({id: this.id, text: this.name});
+		});
+		
+		initPinYinSelect2('select[name=xl]', data);
+	});
+	
+	function searchGps(){
+		var params = $('form').serializeJSON();
+		//查询线路路由站点
+		$.get('/test/gps/route', params, function(rs){
+			var array = rs[0].children[0].children
+				,coords,circle, cdsArray, points, polygon;
+			//画出站点
+			console.log(array);
+			$.each(array, function(){
+				stationCodeMap[this.stationStationCod] = this.name;
+				if(this.stationShapesType === 'r'){
+					//画圆
+					coords = this.stationBJwpoints.split(' ');
+					circle = new BMap.Circle(new BMap.Point(coords[0], coords[1]),this.stationRadius);
+					circle.setStrokeColor('red');
+					circle.setStrokeWeight(2)
+					map.addOverlay(circle);
+				}
+				else if(this.stationShapesType === 'd'){
+					//画多边形
+					coords = this.stationBPolygonGrid.substring(9, this.stationBPolygonGrid.length - 2);
+					cdsArray = coords.split(',');
+					points = [];
+					$.each(cdsArray, function(){
+						coords = this.split(' ');
+						points.push(new BMap.Point(coords[0], coords[1]));
+					});
+					
+					polygon = new BMap.Polygon(points, {strokeColor:"red", strokeWeight:2, strokeOpacity:0.5});
+					map.addOverlay(polygon);
+				}
+			});
+			coords = array[array.length / 2].stationBJwpoints.split(' ');
+			map.setCenter(new BMap.Point(coords[0], coords[1]))
+		});
+		
+		//查询gps点
+		$.get('/gps/history/' + params.device, params, function(gpsArray){
+			console.log(stationCodeMap);
+			var marker, label, point, state, text;
+			$.each(gpsArray, function(){
+				point = new BMap.Point(this.lon, this.lat);
+				marker = new BMap.Marker(point);
+				state = this.inout_stop;
+				
+				if(state == 0 || state == 1){
+					text = state == 0?'出':'进';
+					
+					console.log(stationCodeMap[this.stopNo], this);
+					marker.setIcon(new BMap.Icon(inOuts[this.inout_stop], new BMap.Size(25,25)));
+					label = new BMap.Label(
+							stationCodeMap[this.stopNo] + '/' +moment(this.ts).format('HH:mm.ss') + ' -'+text
+							, {position: point, offset: new BMap.Size(-25,-18)});
+					marker.setLabel(label);
+				}
+				else{
+					label = new BMap.Label(moment(this.ts).format('HH:mm.ss')
+							, {position: point, offset: new BMap.Size(-25,-18)});
+					marker.setLabel(label);
+				}
+				
+				map.addOverlay(marker);
+			});
+		});
+	}
+	
+	
+	/**
+	 * 支持拼音搜索的select2
+	 * @param selector
+	 * @param data
+	 */
+	function initPinYinSelect2(selector, data, cb){
+		
+		$.each(data, function(){
+			this.fullChars = pinyin.getFullChars(this.text).toUpperCase();
+			this.camelChars = pinyin.getCamelChars(this.text);
+		});
+		
+		$.fn.select2.amd.require(['select2/compat/matcher'], function (oldMatcher) {
+			$(selector).select2({
+				data: data,
+			    matcher: oldMatcher(function(term, text, item){
+			    	var upTerm = term.toUpperCase();
+					if(item.fullChars.indexOf(upTerm) != -1
+							|| item.camelChars.indexOf(upTerm) != -1)
+						return true;
+					
+					return text.indexOf(term) != -1;
+			    })
+			});
+			
+			cb && cb();
+		});
+		
+		return $(selector);
+	}
+</script>
+</body>
+</html>
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<meta name="renderer" content="webkit" />
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-	<meta charset="UTF-8">
-	<title>调度系统</title>
-
-	<meta http-equiv="Pragma" content="no-cache">
-	<meta http-equiv="Cache-control" content="no-cache">
-	<meta http-equiv="Cache" content="no-cache">
-
-	<!-- Font Awesome 图标字体 -->
-	<link
-			href="/metronic_v4.5.4/plugins/font-awesome/css/font-awesome.min.css"
-			rel="stylesheet" type="text/css" />
-	<!-- Bootstrap style -->
-	<link href="/metronic_v4.5.4/plugins/bootstrap/css/bootstrap.min.css"
-		  rel="stylesheet" type="text/css" />
-	<!-- jsTree 数插件 -->
-	<link
-			href="/metronic_v4.5.4/plugins/jstree/dist/themes/default/style.min.css"
-			rel="stylesheet" type="text/css" />
-	<!-- MULTI-select 多选下拉框美化 -->
-	<link
-			href="/metronic_v4.5.4/plugins/jquery-multi-select/css/multi-select.css"
-			rel="stylesheet" type="text/css" />
-
-	<!-- editable -->
-	<link
-			href="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css"
-			rel="stylesheet" type="text/css" />
-	<!-- METRONIC style -->
-	<link href="/metronic_v4.5.4/layout4/css/themes/light.min.css"
-		  rel="stylesheet" type="text/css" id="style_color" />
-	<link href="/metronic_v4.5.4/css/components.css" rel="stylesheet"
-		  type="text/css" />
-	<link href="/metronic_v4.5.4/css/plugins.css" rel="stylesheet"
-		  type="text/css" />
-	<link href="/metronic_v4.5.4/layout4/css/layout.min.css"
-		  rel="stylesheet" type="text/css" />
-	<link href="/metronic_v4.5.4/layout4/css/custom.min.css"
-		  rel="stylesheet" type="text/css" />
-	<!-- select2 下拉框插件 -->
-	<link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css"
-		  rel="stylesheet" type="text/css" />
-	<link
-			href="/metronic_v4.5.4/plugins/select2/css/select2-bootstrap.min.css"
-			rel="stylesheet" type="text/css" />
-	<!-- layer 弹层 插件 -->
-	<link href="/assets/plugins/layer-v2.4/layer/skin/layer.css"
-		  rel="stylesheet" type="text/css" />
-	<!-- fileinput 上传 插件 -->
-	<link href="/assets/plugins/fileinput/css/fileinput.min.css"
-		  rel="stylesheet" type="text/css" />
-	<!-- iCheck 单选框和复选框 -->
-	<link href="/metronic_v4.5.4/plugins/icheck/skins/all.css"
-		  rel="stylesheet" type="text/css" />
-	<!-- 日期控件 -->
-	<link
-			href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css"
-			rel="stylesheet" type="text/css" />
-	<!-- table 表格控件 -->
-	<!--<link rel="stylesheet"-->
-		  <!--href="//api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"-->
-		  <!--type="text/css" />-->
-	<link href="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css" rel="stylesheet" type="text/css"/>
-	<!-- handsontable样式 -->
-	<link rel="stylesheet"
-		  href="/assets/bower_components/handsontable/dist/handsontable.full.css" />
-	<!-- sweetalert样式 -->
-	<link rel="stylesheet"
-		  href="/assets/bower_components/sweetalert/dist/sweetalert.css" />
-	<!-- schedule计划调度AngularJS模块主css -->
-	<link rel="stylesheet" href="/pages/scheduleApp/module/common/main.css"
-		  type="text/css" />
-	<link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" merge="plugins"/>
-
-	<!-- CSS动画 -->
-	<link
-			href="/metronic_v4.5.4/plugins/tipso/css/animate.css"
-			rel="stylesheet" type="text/css" />
-
-	<!-- 提示工具样式 -->
-	<link
-			href="/metronic_v4.5.4/plugins/tipso/css/tipso.css"
-			rel="stylesheet" type="text/css" />
-
-	<style type="text/css">
-		.searchForm {
-
-		}
-
-		.searchForm .form-group .control-label {
-			padding-right: 0px;
-			text-align: right;
-			margin-top: 7px;
-		}
-
-		.searchForm .form-group>div {
-			padding-left: 10px;
-			padding-right: 0px;
-		}
-
-		.searchForm .row>div {
-			padding-left: 0px;
-			padding-right: 0px;
-			padding: 5px 0 5px 0;
-			width: 270px;
-			display: inline-block;
-		}
-
-		.searchForm .form-actions {
-
-		}
-
-		tr.row-active td {
-			border-bottom: 1px solid blue !important;
-			color: blue;
-		}
-
-		.ms-container .ms-selectable li.ms-elem-selectable,.ms-container .ms-selection li.ms-elem-selection
-		{
-			font-size: 14px;
-		}
-
-		.ms-container .ms-selectable li.ms-elem-selectable,.ms-container .ms-selection li.ms-elem-selection
-		{
-			padding: 6px 26px;
-		}
-
-		.ms-container .ms-list {
-			height: 306px;
-		}
-
-		.ms-container .ms-selectable,.ms-container .ms-selection {
-			width: 47%;
-		}
-
-		.ms-container {
-			width: 470px;
-			margin: auto;
-		}
-
-		.multi-custom-header-left {
-			text-align: center;
-			padding: 7px;
-			color: #3B3F51;
-		}
-
-		.multi-custom-header-right {
-			text-align: center;
-			padding: 7px;
-			font-weight: bold;
-			color: #36C6D3;
-		}
-
-		.mt-element-list .list-simple.mt-list-container ul>.mt-list-item>.list-item-content
-		{
-			padding: 0 55px 0 0px;
-		}
-
-		.mt-element-list .list-simple.mt-list-container ul>.mt-list-item {
-			padding: 3.3px 0;
-		}
-
-		#route-container {
-			display: none;
-		}
-
-		.page-content.active {
-			display: block !important;
-		}
-
-		.page-header.navbar .page-logo .logo-default {
-			margin: 0;
-		}
-
-		.page-header.navbar .top-menu .navbar-nav>li.dropdown.open .dropdown-toggle
-		{
-			background-color: #284a99;
-		}
-
-		.page-header.navbar .page-logo {
-			padding-right: 10px;
-		}
-
-		.page-logo .logo-default.logo-default-text {
-			font-weight: 600;
-			color: white !important;
-			margin-top: 19px !important;
-			font-size: 24px;
-			text-decoration: none;
-		}
-
-		.page-logo .logo-default.logo-default-text:HOVER {
-			color: #dedede !important;
-		}
-
-		body,.page-content-wrapper,#pjax-container{
-			height: 100%;
-		}
-		html{
-			height: 90%;
-		}
-		.page-container{
-			height: 100%;
-		}
-	</style>
-
-	<!-- ocLazyLoading载入文件的位置 -->
-	<link id="ng_load_plugins_before" />
-
-</head>
-<body
-		class="page-container-bg-solid page-header-fixed page-sidebar-closed-hide-logo page-sidebar-fixed">
-<div class="page-header navbar navbar-fixed-top"
-	 style="background: linear-gradient(to bottom, #124e78, #125688);">
-	<div class="page-header-inner ">
-		<!-- LOGO -->
-		<div class="page-logo">
-			<a href="index.html" class="logo-default logo-default-text">
-				浦东公交调度系统 </a>
-			<div class="menu-toggler sidebar-toggler"></div>
-		</div>
-		<!-- END LOGO -->
-		<a href="javascript:;" class="menu-toggler responsive-toggler"
-		   data-toggle="collapse" data-target=".navbar-collapse"> </a>
-		<div class="page-top">
-			<div class="top-menu">
-				<ul class="nav navbar-nav pull-right">
-					<!-- 信息通知区 -->
-					<li
-							class="dropdown dropdown-extended dropdown-notification dropdown-dark"
-							id="header_notification_bar"><a href="javascript:;"
-															class="dropdown-toggle" data-toggle="dropdown"
-															data-hover="dropdown" data-close-others="true"> <i
-							class="fa fa-bell"></i> <span class="badge badge-success">
-									0 </span>
-					</a>
-						<ul class="dropdown-menu" style="max-width: 345px; width: 345px;">
-							<li class="external">
-								<h3>
-									今日 <span class="bold">0 条</span> 通知
-								</h3> <a href="javascript:;">查看全部</a>
-							</li>
-							<li>
-								<ul class="dropdown-menu-list scroller" style="height: 250px;"
-									data-handle-color="#637283">
-								</ul>
-							</li>
-						</ul></li>
-					<li class="dropdown dropdown-user dropdown-dark"><a
-							href="javascript:;" class="dropdown-toggle"
-							data-toggle="dropdown" data-hover="dropdown"
-							data-close-others="true"> <span id="indexTopUName"
-															class="username username-hide-on-mobile"
-															style="vertical-align: middle;"> <i class="fa fa-user"></i></span>
-					</a>
-						<ul class="dropdown-menu dropdown-menu-default">
-							<li><a href="javascript:;"> <i class="fa fa-user"></i>
-								我的信息
-							</a></li>
-							<li><a href="javascript:;" id="changePWD"> <i
-									class="fa fa-unlock-alt"></i> 修改密码
-							</a></li>
-							<li class="divider"></li>
-							<li><a href="javascript:;"> <i class="fa fa-lock"></i>
-								锁屏
-							</a></li>
-							<li><a href="/logout"> <i class="fa fa-key"></i> 注销登陆
-							</a></li>
-						</ul></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</div>
-<div class="page-container">
-	<div class="page-sidebar-wrapper">
-		<div class="page-sidebar navbar-collapse collapse">
-			<ul class="page-sidebar-menu page-sidebar-menu-fixed"
-				data-keep-expanded="false" data-auto-scroll="true"
-				data-slide-speed="200" id="leftMenuSidebar">
-			</ul>
-		</div>
-	</div>
-	<div class="page-content-wrapper">
-		<div id="pjax-container" class="page-content"></div>
-
-		<div id="route-container">
-			<div ng-app="ScheduleApp">
-				<div ng-controller="ScheduleAppController">
-
-					<!-- loading widget -->
-					<div id="loadingWidget" class="flyover mask" loading-widget>
-						<div class="alert alert-info">
-							<strong>载入中......</strong>
-						</div>
-					</div>
-
-					<div ui-view class="uv"></div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script id="menu_list_temp" type="text/html">
-	{{each list as group i}}
-	<li class="heading">
-		<h3 class="uppercase">{{group.name}}</h3>
-	</li>
-	{{each group.children as dir j}}
-	<li class="nav-item">
-		<a href="javascript:;" class="nav-link nav-toggle ">
-			<i class="{{dir.icon}}"></i>
-			<span class="title">{{dir.name}}</span>
-			<span class="arrow"></span>
-		</a>
-		<ul class="sub-menu">
-			{{each dir.children as module s}}
-			<li class="nav-item  ">
-				{{if module.container=="pjax-container"}}
-				<a href="/pages/{{module.path}}" class="nav-link " data-pjax>
-					<span class="title">{{module.name}}</span>
-				</a>
-				{{else}}
-				<a href="{{module.path}}" class="nav-link " data-angularjs>
-					<span class="title">{{module.name}}</span>
-				</a>
-				{{/if}}
-			</li>
-			{{/each}}
-		</ul>
-	</li>
-	{{/each}}
-	{{/each}}
-
-</script>
-<script>
-	delete window.require;
-	delete window.exports;
-	delete window.module;
-</script>
-<!-- jQuery -->
-<script src="/metronic_v4.5.4/plugins/jquery.min.js" data-exclude=1></script>
-<!-- bootstrap -->
-<script src="/metronic_v4.5.4/plugins/bootstrap/js/bootstrap.min.js"
-		data-exclude=1></script>
-<script src="/pages/forms/statement/js/jquery.autocompleter.js"></script>
-<script src="/pages/forms/statement/js/jquery.PrintArea.js"></script>
-<!-- MTRONIC JS -->
-<script src="/metronic_v4.5.4/scripts/app.min.js" data-exclude=1></script>
-<script src="/metronic_v4.5.4/layout4/scripts/layout.min.js"
-		data-exclude=1></script>
-<!-- 虚拟滚动条 -->
-<script
-		src="/metronic_v4.5.4/plugins/jquery-slimscroll/jquery.slimscroll.min.js"></script>
-<!-- jsTree 树插件 -->
-<script src="/metronic_v4.5.4/plugins/jstree/dist/jstree.min.js"></script>
-<!-- bootstrap-hover-dropDown -->
-<script
-		src="/metronic_v4.5.4/plugins/bootstrap-hover-dropdown/bootstrap-hover-dropdown.min.js"></script>
-<!-- jquery.validate 表单验证 -->
-<script
-		src="/metronic_v4.5.4/plugins/jquery-validation/js/jquery.validate.min.js"></script>
-<script
-		src="/metronic_v4.5.4/plugins/jquery-validation/js/localization/messages_zh.js"></script>
-<!-- 向导式插件 -->
-<script
-		src="/metronic_v4.5.4//plugins/bootstrap-wizard/jquery.bootstrap.wizard.min.js"></script>
-<!-- iCheck 单选框和复选框  -->
-<script src="/metronic_v4.5.4/plugins/icheck/icheck.min.js"></script>
-<!-- select2 下拉框 -->
-<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>
-<!-- MULTI SELECT 多选下拉框 -->
-<script
-		src="/metronic_v4.5.4/plugins/jquery-multi-select/js/jquery.multi-select.js"></script>
-<!-- editable.js -->
-<script
-		src="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/js/bootstrap-editable.min.js"></script>
-<!-- PJAX -->
-<script src="/assets/plugins/jquery.pjax.js"></script>
-<!-- layer 弹层 -->
-<script src="/assets/plugins/layer-v2.4/layer/layer.js" data-exclude=1></script>
-<!-- fileinput 上传 -->
-<script src="/assets/plugins/fileinput/canvas-to-blob.min.js"></script>
-<script src="/assets/plugins/fileinput/purify.min.js"></script>
-<script src="/assets/plugins/fileinput/sortable.min.js"></script>
-<script src="/assets/plugins/fileinput/fileinput.min.js"></script>
-<script src="/assets/plugins/fileinput/fileinput_locale_zh.js"></script>
-<!-- jquery.purl URL解析 -->
-<script src="/assets/plugins/purl.js"></script>
-<!-- jquery.serializejson JSON序列化插件 -->
-<script src="/assets/plugins/jquery.serializejson.js"></script>
-<!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js"></script>
-<!-- jquery.pageinator 分页 -->
-<script src="/assets/plugins/jqPaginator.min.js"></script>
-<!-- moment.js 日期处理类库 -->
-<script src="/assets/plugins/moment-with-locales.js"></script>
-
-<script src="/assets/plugins/pinyin.js"></script>
-<!-- 日期控件 -->
-<script
-		src="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/js/bootstrap-datetimepicker.min.js"></script>
-<!-- 表格控件 -->
-<script src="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js"></script>
-<!-- 统计图控件 -->
-<!--<script src="/assets/global/getEchart.js"></script>
-<script src="/assets/global/echarts.js"></script> -->
-<script src="/assets/js/common.js"></script>
-<script src="/assets/js/dictionary.js"></script>
-<!-- tipso JS -->
-<script src="/metronic_v4.5.4/plugins/tipso/js/tipso.js"></script>
-<script data-exclude=1>
-	//初始打开的片段地址
-	var initFragment = "^_^initFragment^_^";
-	//静态文件目录
-	var dir = '/pages/';
-	//片段容器
-	var pjaxContainer = '#pjax-container'
-			, angJsContainer = '#route-container';
-
-	$(document).ajaxError(function (event, jqxhr, settings, thrownError) {
-		if(jqxhr.status == 403){
-			layer.closeAll();
-			layer.alert(jqxhr.message?jqxhr.message:'访问被拒绝', {icon: 2, title: '操作失败'});
-		}
-	});
-
-	$(function () {
-		$.ajax({
-			url: '/user/isWeakCipher',
-			type: 'POST',
-			async: false,
-			success: function (result,status,xhr) {
-				if (result.data == 1) {
-					$.get('/pages/permission/user/forceChangePWD.html', function (content) {
-						layer.open({
-							type: 1,
-							area: ['600px', '360px'],
-							content: content,
-							title: '修改密码',
-							shift: 5,
-							scrollbar: false,
-							closeBtn: 0,
-							success: function () {
-							}
-						});
-					});
-				}
-			}
-		});
-
-		$.ajax({
-			url: '/user/isRealName',
-			type: 'POST',
-			async: false,
-			success: function (result,status,xhr) {
-				if (result.data == 0) {
-					$.get('/pages/permission/user/jobCode.html', function (content) {
-						layer.open({
-							type: 1,
-							area: ['600px', '360px'],
-							content: content,
-							title: '设置工号(后期统一登录平台接入)',
-							shift: 5,
-							scrollbar: false,
-							success: function () {
-							}
-						});
-					});
-				}
-			}
-		});
-
-		$.get('/user/currentUser', function (user) {
-			$('#indexTopUName').text(user.userName);
-		});
-
-		//带 data-pjax 的链接由pjax加载
-		$(document).pjax('a[data-pjax]', pjaxContainer);
-
-		//pjax左菜单点击事件
-		$(document).on('click', '#leftMenuSidebar a[data-pjax]', function () {
-			setTitle(this);
-
-			$('#leftMenuSidebar li.nav-item.active').removeClass('active');
-			$(this).parent().addClass('active');
-			showPjax();
-		});
-
-		//angularjs左菜单点击事件
-		$(document).on('click', '#leftMenuSidebar a[data-angularjs]', function () {
-			setTitle(this);
-
-			$('#leftMenuSidebar li.nav-item.active').removeClass('active');
-			$(this).parent().addClass('active');
-			showAngJs();
-		});
-
-		//加载左菜单栏
-		$get('/module/findByCurrentUser', null,
-				function (ms) {
-					var treeArray = createTreeData(ms);
-					treeArray.sort(function (a, b) {
-						return a.createDate - b.createDate;
-					});
-					var menuHtml = template('menu_list_temp', {list: treeArray});
-					$('#leftMenuSidebar').html(menuHtml);
-
-					//----------- 检查URL ----------------
-					var h = location.hash;
-					if (initFragment && initFragment != '') {
-						showPjax();
-						//普通片段
-						loadPage(initFragment);
-						//选中菜单
-						$.each($('#leftMenuSidebar a'), function (i, item) {
-							if (urlPattern($(item).attr('href'), initFragment)) {
-								activeLeftMenu(item);
-							}
-						});
-					} else if (h) {
-						//angularjs片段
-						showAngJs();
-						//选中菜单
-						$.each($('#leftMenuSidebar a'), function (i, item) {
-							if ($(item).attr('href') == h) {
-								activeLeftMenu(item);
-							}
-						});
-					}
-					else {
-						//加载主页
-						loadPage('/pages/home.html');
-					}
-				});
-
-		//修改密码
-		$('#changePWD').on('click', function () {
-			$.get('/pages/permission/user/changePWD.html', function (content) {
-				layer.open({
-					type: 1,
-					area: ['600px', '360px'],
-					content: content,
-					title: '修改密码',
-					shift: 5,
-					scrollbar: false,
-					success: function () {
-					}
-				});
-			});
-		});
-	});
-
-	//modal关闭时销毁dom
-	$(document).on('hidden.bs.modal', '.modal', function () {
-		$(this).remove();
-	});
-
-	//pjax加载完成事件
-	$(document).on('pjax:success', function () {
-		var dicts = $(pjaxContainer).find('.nt-dictionary');
-		dictionaryUtils.transformDom(dicts);
-	});
-
-	function loadPage(url) {
-		$.pjax({url: url, container: pjaxContainer})
-	}
-
-	function urlPattern(a, b) {
-		var r;
-		try {
-			r = a.substring(0, a.lastIndexOf('/')) == b.substring(0, b.lastIndexOf('/'));
-		} catch (e) {
-			r = false;
-		}
-		return r;
-	}
-
-	function showPjax() {
-		$(angJsContainer).removeClass('page-content active').hide();
-		$(pjaxContainer).addClass('page-content active');
-	}
-
-	function showAngJs() {
-		$(pjaxContainer).html('').removeClass('page-content active').hide();
-		$(angJsContainer).addClass('page-content active');
-	}
-
-	function activeLeftMenu(item) {
-		$(item).parent('.nav-item').addClass('active').parent('.sub-menu').show().parent().addClass('open');
-		setTitle(item);
-	}
-
-	function setTitle(menuItem){
-		document.title = $('span.title', menuItem).text();
-	}
-
-</script>
-<!-- d3 -->
-<script src="/assets/js/d3.min.js" data-exclude=1></script>
-<!-- webSocket JS -->
-<script src="/assets/js/sockjs.min.js"></script>
-
-<!-- TODO：angularJS相关库 -->
-
-<!-- angularJS相关库 -->
-<!-- 这个是基于angularjs 1.4.10修改的版本，主要是修改了history控制部分，用于兼容route和pjax的同时操作history的冲突 -->
-<script src="/assets/js/angular.js" data-autocephaly=1></script>
-<script src="/assets/bower_components/angular-i18n/angular-locale_zh-cn.js" data-autocephaly=1></script>
-<script
-		src="/assets/bower_components/angular-resource/angular-resource.min.js"
-		data-exclude=1></script>
-<script
-		src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js"
-		data-exclude=1></script>
-<script
-		src="/assets/bower_components/angular-animate/angular-animate.min.js"
-		data-exclude=1></script>
-<script
-		src="/assets/bower_components/angular-touch/angular-touch.min.js"
-		data-exclude=1></script>
-<script
-		src="/assets/bower_components/angular-ui-router/release/angular-ui-router.min.js"
-		data-exclude=1></script>
-<script
-		src="/assets/bower_components/oclazyload/dist/ocLazyLoad.min.js"
-		data-exclude=1></script>
-<script
-		src="/assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"
-		data-exclude=1></script>
-<!-- handsontable相关js -->
-<script
-		src="/assets/bower_components/handsontable/dist/handsontable.full.js"></script>
-<script
-		src="/assets/bower_components/ngHandsontable/dist/ngHandsontable.js"></script>
-<!-- sweetalert相关js -->
-<script src="/assets/bower_components/sweetalert/dist/sweetalert.min.js"></script>
-<script src="/assets/bower_components/ng-sweet-alert/ng-sweet-alert.js"></script>
-
-<!-- schedule计划调度AngularJS模块主JS -->
-<script src="/pages/scheduleApp/module/common/main.js" data-exclude=1></script>
-<script
-		src="/pages/scheduleApp/module/common/prj-common-globalservice.js"
-		data-exclude=1></script>
-<script src="/pages/scheduleApp/module/common/prj-common-filter.js"
-		data-exclude=1></script>
-<script src="/pages/scheduleApp/module/common/prj-common-directive.js"
-		data-exclude=1></script>
-<script
-		src="/pages/scheduleApp/module/common/prj-common-ui-route-state.js"
-		data-exclude=1></script>
-
-<!-- 地图相关 -->
-<!-- 百度 -->
-<script
-		src="//api.map.baidu.com/api?v=3.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
-		data-exclude=1></script>
-<script
-		src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
-		data-exclude=1></script>
-<script type="text/javascript"
-		src="//api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
-		data-exclude=1></script>
-<script type="text/javascript"
-		src="//api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
-		data-exclude=1></script>
-<script src="/assets/js/baidu/TextIconOverlay.js" data-exclude=1></script>
-<script src="/assets/js/baidu//MarkerClusterer.js" data-exclude=1></script>
-<!-- 高德  -->
-<script
-		src="//webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
-		data-exclude=1></script>
-<!-- echarts4 -->
-<script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
-<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
-<!-- RSA加密 -->
-<script src="/assets/plugins/jsencrypt.min.js"></script>
-<script src="/assets/js/eventproxy.js"></script>
-<!-- 线路路由信息操作 -->
-<script src="/pages/base/stationroute/js/routes-operation.js"></script>
-<script src="/pages/base/stationroute/js/routes-service.js"></script>
-<script src="/assets/js/CoordinateConverter.js"></script>
-</body>
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+	<meta name="renderer" content="webkit" />
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+	<meta charset="UTF-8">
+	<title>调度系统</title>
+
+	<meta http-equiv="Pragma" content="no-cache">
+	<meta http-equiv="Cache-control" content="no-cache">
+	<meta http-equiv="Cache" content="no-cache">
+
+	<!-- Font Awesome 图标字体 -->
+	<link
+			href="/metronic_v4.5.4/plugins/font-awesome/css/font-awesome.min.css"
+			rel="stylesheet" type="text/css" />
+	<!-- Bootstrap style -->
+	<link href="/metronic_v4.5.4/plugins/bootstrap/css/bootstrap.min.css"
+		  rel="stylesheet" type="text/css" />
+	<!-- jsTree 数插件 -->
+	<link
+			href="/metronic_v4.5.4/plugins/jstree/dist/themes/default/style.min.css"
+			rel="stylesheet" type="text/css" />
+	<!-- MULTI-select 多选下拉框美化 -->
+	<link
+			href="/metronic_v4.5.4/plugins/jquery-multi-select/css/multi-select.css"
+			rel="stylesheet" type="text/css" />
+
+	<!-- editable -->
+	<link
+			href="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css"
+			rel="stylesheet" type="text/css" />
+	<!-- METRONIC style -->
+	<link href="/metronic_v4.5.4/layout4/css/themes/light.min.css"
+		  rel="stylesheet" type="text/css" id="style_color" />
+	<link href="/metronic_v4.5.4/css/components.css" rel="stylesheet"
+		  type="text/css" />
+	<link href="/metronic_v4.5.4/css/plugins.css" rel="stylesheet"
+		  type="text/css" />
+	<link href="/metronic_v4.5.4/layout4/css/layout.min.css"
+		  rel="stylesheet" type="text/css" />
+	<link href="/metronic_v4.5.4/layout4/css/custom.min.css"
+		  rel="stylesheet" type="text/css" />
+	<!-- select2 下拉框插件 -->
+	<link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css"
+		  rel="stylesheet" type="text/css" />
+	<link
+			href="/metronic_v4.5.4/plugins/select2/css/select2-bootstrap.min.css"
+			rel="stylesheet" type="text/css" />
+	<!-- layer 弹层 插件 -->
+	<link href="/assets/plugins/layer-v2.4/layer/skin/layer.css"
+		  rel="stylesheet" type="text/css" />
+	<!-- fileinput 上传 插件 -->
+	<link href="/assets/plugins/fileinput/css/fileinput.min.css"
+		  rel="stylesheet" type="text/css" />
+	<!-- iCheck 单选框和复选框 -->
+	<link href="/metronic_v4.5.4/plugins/icheck/skins/all.css"
+		  rel="stylesheet" type="text/css" />
+	<!-- 日期控件 -->
+	<link
+			href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css"
+			rel="stylesheet" type="text/css" />
+	<!-- table 表格控件 -->
+	<!--<link rel="stylesheet"-->
+		  <!--href="//api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"-->
+		  <!--type="text/css" />-->
+	<link href="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css" rel="stylesheet" type="text/css"/>
+	<!-- handsontable样式 -->
+	<link rel="stylesheet"
+		  href="/assets/bower_components/handsontable/dist/handsontable.full.css" />
+	<!-- sweetalert样式 -->
+	<link rel="stylesheet"
+		  href="/assets/bower_components/sweetalert/dist/sweetalert.css" />
+	<!-- schedule计划调度AngularJS模块主css -->
+	<link rel="stylesheet" href="/pages/scheduleApp/module/common/main.css"
+		  type="text/css" />
+	<link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" merge="plugins"/>
+
+	<!-- CSS动画 -->
+	<link
+			href="/metronic_v4.5.4/plugins/tipso/css/animate.css"
+			rel="stylesheet" type="text/css" />
+
+	<!-- 提示工具样式 -->
+	<link
+			href="/metronic_v4.5.4/plugins/tipso/css/tipso.css"
+			rel="stylesheet" type="text/css" />
+
+	<style type="text/css">
+		.searchForm {
+
+		}
+
+		.searchForm .form-group .control-label {
+			padding-right: 0px;
+			text-align: right;
+			margin-top: 7px;
+		}
+
+		.searchForm .form-group>div {
+			padding-left: 10px;
+			padding-right: 0px;
+		}
+
+		.searchForm .row>div {
+			padding-left: 0px;
+			padding-right: 0px;
+			padding: 5px 0 5px 0;
+			width: 270px;
+			display: inline-block;
+		}
+
+		.searchForm .form-actions {
+
+		}
+
+		tr.row-active td {
+			border-bottom: 1px solid blue !important;
+			color: blue;
+		}
+
+		.ms-container .ms-selectable li.ms-elem-selectable,.ms-container .ms-selection li.ms-elem-selection
+		{
+			font-size: 14px;
+		}
+
+		.ms-container .ms-selectable li.ms-elem-selectable,.ms-container .ms-selection li.ms-elem-selection
+		{
+			padding: 6px 26px;
+		}
+
+		.ms-container .ms-list {
+			height: 306px;
+		}
+
+		.ms-container .ms-selectable,.ms-container .ms-selection {
+			width: 47%;
+		}
+
+		.ms-container {
+			width: 470px;
+			margin: auto;
+		}
+
+		.multi-custom-header-left {
+			text-align: center;
+			padding: 7px;
+			color: #3B3F51;
+		}
+
+		.multi-custom-header-right {
+			text-align: center;
+			padding: 7px;
+			font-weight: bold;
+			color: #36C6D3;
+		}
+
+		.mt-element-list .list-simple.mt-list-container ul>.mt-list-item>.list-item-content
+		{
+			padding: 0 55px 0 0px;
+		}
+
+		.mt-element-list .list-simple.mt-list-container ul>.mt-list-item {
+			padding: 3.3px 0;
+		}
+
+		#route-container {
+			display: none;
+		}
+
+		.page-content.active {
+			display: block !important;
+		}
+
+		.page-header.navbar .page-logo .logo-default {
+			margin: 0;
+		}
+
+		.page-header.navbar .top-menu .navbar-nav>li.dropdown.open .dropdown-toggle
+		{
+			background-color: #284a99;
+		}
+
+		.page-header.navbar .page-logo {
+			padding-right: 10px;
+		}
+
+		.page-logo .logo-default.logo-default-text {
+			font-weight: 600;
+			color: white !important;
+			margin-top: 19px !important;
+			font-size: 24px;
+			text-decoration: none;
+		}
+
+		.page-logo .logo-default.logo-default-text:HOVER {
+			color: #dedede !important;
+		}
+
+		body,.page-content-wrapper,#pjax-container{
+			height: 100%;
+		}
+		html{
+			height: 90%;
+		}
+		.page-container{
+			height: 100%;
+		}
+	</style>
+
+	<!-- ocLazyLoading载入文件的位置 -->
+	<link id="ng_load_plugins_before" />
+
+</head>
+<body
+		class="page-container-bg-solid page-header-fixed page-sidebar-closed-hide-logo page-sidebar-fixed">
+<div class="page-header navbar navbar-fixed-top"
+	 style="background: linear-gradient(to bottom, #124e78, #125688);">
+	<div class="page-header-inner ">
+		<!-- LOGO -->
+		<div class="page-logo">
+			<a href="index.html" class="logo-default logo-default-text">
+				浦东公交调度系统 </a>
+			<div class="menu-toggler sidebar-toggler"></div>
+		</div>
+		<!-- END LOGO -->
+		<a href="javascript:;" class="menu-toggler responsive-toggler"
+		   data-toggle="collapse" data-target=".navbar-collapse"> </a>
+		<div class="page-top">
+			<div class="top-menu">
+				<ul class="nav navbar-nav pull-right">
+					<!-- 信息通知区 -->
+					<li
+							class="dropdown dropdown-extended dropdown-notification dropdown-dark"
+							id="header_notification_bar"><a href="javascript:;"
+															class="dropdown-toggle" data-toggle="dropdown"
+															data-hover="dropdown" data-close-others="true"> <i
+							class="fa fa-bell"></i> <span class="badge badge-success">
+									0 </span>
+					</a>
+						<ul class="dropdown-menu" style="max-width: 345px; width: 345px;">
+							<li class="external">
+								<h3>
+									今日 <span class="bold">0 条</span> 通知
+								</h3> <a href="javascript:;">查看全部</a>
+							</li>
+							<li>
+								<ul class="dropdown-menu-list scroller" style="height: 250px;"
+									data-handle-color="#637283">
+								</ul>
+							</li>
+						</ul></li>
+					<li class="dropdown dropdown-user dropdown-dark"><a
+							href="javascript:;" class="dropdown-toggle"
+							data-toggle="dropdown" data-hover="dropdown"
+							data-close-others="true"> <span id="indexTopUName"
+															class="username username-hide-on-mobile"
+															style="vertical-align: middle;"> <i class="fa fa-user"></i></span>
+					</a>
+						<ul class="dropdown-menu dropdown-menu-default">
+							<li><a href="javascript:;"> <i class="fa fa-user"></i>
+								我的信息
+							</a></li>
+							<li><a href="javascript:;" id="changePWD"> <i
+									class="fa fa-unlock-alt"></i> 修改密码
+							</a></li>
+							<li class="divider"></li>
+							<li><a href="javascript:;"> <i class="fa fa-lock"></i>
+								锁屏
+							</a></li>
+							<li><a href="/logout"> <i class="fa fa-key"></i> 注销登陆
+							</a></li>
+						</ul></li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="page-container">
+	<div class="page-sidebar-wrapper">
+		<div class="page-sidebar navbar-collapse collapse">
+			<ul class="page-sidebar-menu page-sidebar-menu-fixed"
+				data-keep-expanded="false" data-auto-scroll="true"
+				data-slide-speed="200" id="leftMenuSidebar">
+			</ul>
+		</div>
+	</div>
+	<div class="page-content-wrapper">
+		<div id="pjax-container" class="page-content"></div>
+
+		<div id="route-container">
+			<div ng-app="ScheduleApp">
+				<div ng-controller="ScheduleAppController">
+
+					<!-- loading widget -->
+					<div id="loadingWidget" class="flyover mask" loading-widget>
+						<div class="alert alert-info">
+							<strong>载入中......</strong>
+						</div>
+					</div>
+
+					<div ui-view class="uv"></div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script id="menu_list_temp" type="text/html">
+	{{each list as group i}}
+	<li class="heading">
+		<h3 class="uppercase">{{group.name}}</h3>
+	</li>
+	{{each group.children as dir j}}
+	<li class="nav-item">
+		<a href="javascript:;" class="nav-link nav-toggle ">
+			<i class="{{dir.icon}}"></i>
+			<span class="title">{{dir.name}}</span>
+			<span class="arrow"></span>
+		</a>
+		<ul class="sub-menu">
+			{{each dir.children as module s}}
+			<li class="nav-item  ">
+				{{if module.container=="pjax-container"}}
+				<a href="/pages/{{module.path}}" class="nav-link " data-pjax>
+					<span class="title">{{module.name}}</span>
+				</a>
+				{{else}}
+				<a href="{{module.path}}" class="nav-link " data-angularjs>
+					<span class="title">{{module.name}}</span>
+				</a>
+				{{/if}}
+			</li>
+			{{/each}}
+		</ul>
+	</li>
+	{{/each}}
+	{{/each}}
+
+</script>
+<script>
+	delete window.require;
+	delete window.exports;
+	delete window.module;
+</script>
+<!-- jQuery -->
+<script src="/metronic_v4.5.4/plugins/jquery.min.js" data-exclude=1></script>
+<!-- bootstrap -->
+<script src="/metronic_v4.5.4/plugins/bootstrap/js/bootstrap.min.js"
+		data-exclude=1></script>
+<script src="/pages/forms/statement/js/jquery.autocompleter.js"></script>
+<script src="/pages/forms/statement/js/jquery.PrintArea.js"></script>
+<!-- MTRONIC JS -->
+<script src="/metronic_v4.5.4/scripts/app.min.js" data-exclude=1></script>
+<script src="/metronic_v4.5.4/layout4/scripts/layout.min.js"
+		data-exclude=1></script>
+<!-- 虚拟滚动条 -->
+<script
+		src="/metronic_v4.5.4/plugins/jquery-slimscroll/jquery.slimscroll.min.js"></script>
+<!-- jsTree 树插件 -->
+<script src="/metronic_v4.5.4/plugins/jstree/dist/jstree.min.js"></script>
+<!-- bootstrap-hover-dropDown -->
+<script
+		src="/metronic_v4.5.4/plugins/bootstrap-hover-dropdown/bootstrap-hover-dropdown.min.js"></script>
+<!-- jquery.validate 表单验证 -->
+<script
+		src="/metronic_v4.5.4/plugins/jquery-validation/js/jquery.validate.min.js"></script>
+<script
+		src="/metronic_v4.5.4/plugins/jquery-validation/js/localization/messages_zh.js"></script>
+<!-- 向导式插件 -->
+<script
+		src="/metronic_v4.5.4//plugins/bootstrap-wizard/jquery.bootstrap.wizard.min.js"></script>
+<!-- iCheck 单选框和复选框  -->
+<script src="/metronic_v4.5.4/plugins/icheck/icheck.min.js"></script>
+<!-- select2 下拉框 -->
+<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>
+<!-- MULTI SELECT 多选下拉框 -->
+<script
+		src="/metronic_v4.5.4/plugins/jquery-multi-select/js/jquery.multi-select.js"></script>
+<!-- editable.js -->
+<script
+		src="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/js/bootstrap-editable.min.js"></script>
+<!-- PJAX -->
+<script src="/assets/plugins/jquery.pjax.js"></script>
+<!-- layer 弹层 -->
+<script src="/assets/plugins/layer-v2.4/layer/layer.js" data-exclude=1></script>
+<!-- fileinput 上传 -->
+<script src="/assets/plugins/fileinput/canvas-to-blob.min.js"></script>
+<script src="/assets/plugins/fileinput/purify.min.js"></script>
+<script src="/assets/plugins/fileinput/sortable.min.js"></script>
+<script src="/assets/plugins/fileinput/fileinput.min.js"></script>
+<script src="/assets/plugins/fileinput/fileinput_locale_zh.js"></script>
+<!-- jquery.purl URL解析 -->
+<script src="/assets/plugins/purl.js"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js"></script>
+<!-- jquery.pageinator 分页 -->
+<script src="/assets/plugins/jqPaginator.min.js"></script>
+<!-- moment.js 日期处理类库 -->
+<script src="/assets/plugins/moment-with-locales.js"></script>
+
+<script src="/assets/plugins/pinyin.js"></script>
+<!-- 日期控件 -->
+<script
+		src="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/js/bootstrap-datetimepicker.min.js"></script>
+<!-- 表格控件 -->
+<script src="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js"></script>
+<!-- 统计图控件 -->
+<!--<script src="/assets/global/getEchart.js"></script>
+<script src="/assets/global/echarts.js"></script> -->
+<script src="/assets/js/common.js"></script>
+<script src="/assets/js/dictionary.js"></script>
+<!-- tipso JS -->
+<script src="/metronic_v4.5.4/plugins/tipso/js/tipso.js"></script>
+<script data-exclude=1>
+	//初始打开的片段地址
+	var initFragment = "^_^initFragment^_^";
+	//静态文件目录
+	var dir = '/pages/';
+	//片段容器
+	var pjaxContainer = '#pjax-container'
+			, angJsContainer = '#route-container';
+
+	$(document).ajaxError(function (event, jqxhr, settings, thrownError) {
+		if(jqxhr.status == 403){
+			layer.closeAll();
+			layer.alert(jqxhr.message?jqxhr.message:'访问被拒绝', {icon: 2, title: '操作失败'});
+		}
+	});
+
+	$(function () {
+		$.ajax({
+			url: '/user/isWeakCipher',
+			type: 'POST',
+			async: false,
+			success: function (result,status,xhr) {
+				if (result.data == 1) {
+					$.get('/pages/permission/user/forceChangePWD.html', function (content) {
+						layer.open({
+							type: 1,
+							area: ['600px', '360px'],
+							content: content,
+							title: '修改密码',
+							shift: 5,
+							scrollbar: false,
+							closeBtn: 0,
+							success: function () {
+							}
+						});
+					});
+				}
+			}
+		});
+
+		$.ajax({
+			url: '/user/isRealName',
+			type: 'POST',
+			async: false,
+			success: function (result,status,xhr) {
+				if (result.data == 0) {
+					$.get('/pages/permission/user/jobCode.html', function (content) {
+						layer.open({
+							type: 1,
+							area: ['600px', '360px'],
+							content: content,
+							title: '设置工号(后期统一登录平台接入)',
+							shift: 5,
+							scrollbar: false,
+							success: function () {
+							}
+						});
+					});
+				}
+			}
+		});
+
+		$.get('/user/currentUser', function (user) {
+			$('#indexTopUName').text(user.userName);
+		});
+
+		//带 data-pjax 的链接由pjax加载
+		$(document).pjax('a[data-pjax]', pjaxContainer);
+
+		//pjax左菜单点击事件
+		$(document).on('click', '#leftMenuSidebar a[data-pjax]', function () {
+			setTitle(this);
+
+			$('#leftMenuSidebar li.nav-item.active').removeClass('active');
+			$(this).parent().addClass('active');
+			showPjax();
+		});
+
+		//angularjs左菜单点击事件
+		$(document).on('click', '#leftMenuSidebar a[data-angularjs]', function () {
+			setTitle(this);
+
+			$('#leftMenuSidebar li.nav-item.active').removeClass('active');
+			$(this).parent().addClass('active');
+			showAngJs();
+		});
+
+		//加载左菜单栏
+		$get('/module/findByCurrentUser', null,
+				function (ms) {
+					var treeArray = createTreeData(ms);
+					treeArray.sort(function (a, b) {
+						return a.createDate - b.createDate;
+					});
+					var menuHtml = template('menu_list_temp', {list: treeArray});
+					$('#leftMenuSidebar').html(menuHtml);
+
+					//----------- 检查URL ----------------
+					var h = location.hash;
+					if (initFragment && initFragment != '') {
+						showPjax();
+						//普通片段
+						loadPage(initFragment);
+						//选中菜单
+						$.each($('#leftMenuSidebar a'), function (i, item) {
+							if (urlPattern($(item).attr('href'), initFragment)) {
+								activeLeftMenu(item);
+							}
+						});
+					} else if (h) {
+						//angularjs片段
+						showAngJs();
+						//选中菜单
+						$.each($('#leftMenuSidebar a'), function (i, item) {
+							if ($(item).attr('href') == h) {
+								activeLeftMenu(item);
+							}
+						});
+					}
+					else {
+						//加载主页
+						loadPage('/pages/home.html');
+					}
+				});
+
+		//修改密码
+		$('#changePWD').on('click', function () {
+			$.get('/pages/permission/user/changePWD.html', function (content) {
+				layer.open({
+					type: 1,
+					area: ['600px', '360px'],
+					content: content,
+					title: '修改密码',
+					shift: 5,
+					scrollbar: false,
+					success: function () {
+					}
+				});
+			});
+		});
+	});
+
+	//modal关闭时销毁dom
+	$(document).on('hidden.bs.modal', '.modal', function () {
+		$(this).remove();
+	});
+
+	//pjax加载完成事件
+	$(document).on('pjax:success', function () {
+		var dicts = $(pjaxContainer).find('.nt-dictionary');
+		dictionaryUtils.transformDom(dicts);
+	});
+
+	function loadPage(url) {
+		$.pjax({url: url, container: pjaxContainer})
+	}
+
+	function urlPattern(a, b) {
+		var r;
+		try {
+			r = a.substring(0, a.lastIndexOf('/')) == b.substring(0, b.lastIndexOf('/'));
+		} catch (e) {
+			r = false;
+		}
+		return r;
+	}
+
+	function showPjax() {
+		$(angJsContainer).removeClass('page-content active').hide();
+		$(pjaxContainer).addClass('page-content active');
+	}
+
+	function showAngJs() {
+		$(pjaxContainer).html('').removeClass('page-content active').hide();
+		$(angJsContainer).addClass('page-content active');
+	}
+
+	function activeLeftMenu(item) {
+		$(item).parent('.nav-item').addClass('active').parent('.sub-menu').show().parent().addClass('open');
+		setTitle(item);
+	}
+
+	function setTitle(menuItem){
+		document.title = $('span.title', menuItem).text();
+	}
+
+</script>
+<!-- d3 -->
+<script src="/assets/js/d3.min.js" data-exclude=1></script>
+<!-- webSocket JS -->
+<script src="/assets/js/sockjs.min.js"></script>
+
+<!-- TODO：angularJS相关库 -->
+
+<!-- angularJS相关库 -->
+<!-- 这个是基于angularjs 1.4.10修改的版本，主要是修改了history控制部分，用于兼容route和pjax的同时操作history的冲突 -->
+<script src="/assets/js/angular.js" data-autocephaly=1></script>
+<script src="/assets/bower_components/angular-i18n/angular-locale_zh-cn.js" data-autocephaly=1></script>
+<script
+		src="/assets/bower_components/angular-resource/angular-resource.min.js"
+		data-exclude=1></script>
+<script
+		src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js"
+		data-exclude=1></script>
+<script
+		src="/assets/bower_components/angular-animate/angular-animate.min.js"
+		data-exclude=1></script>
+<script
+		src="/assets/bower_components/angular-touch/angular-touch.min.js"
+		data-exclude=1></script>
+<script
+		src="/assets/bower_components/angular-ui-router/release/angular-ui-router.min.js"
+		data-exclude=1></script>
+<script
+		src="/assets/bower_components/oclazyload/dist/ocLazyLoad.min.js"
+		data-exclude=1></script>
+<script
+		src="/assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"
+		data-exclude=1></script>
+<!-- handsontable相关js -->
+<script
+		src="/assets/bower_components/handsontable/dist/handsontable.full.js"></script>
+<script
+		src="/assets/bower_components/ngHandsontable/dist/ngHandsontable.js"></script>
+<!-- sweetalert相关js -->
+<script src="/assets/bower_components/sweetalert/dist/sweetalert.min.js"></script>
+<script src="/assets/bower_components/ng-sweet-alert/ng-sweet-alert.js"></script>
+
+<!-- schedule计划调度AngularJS模块主JS -->
+<script src="/pages/scheduleApp/module/common/main.js" data-exclude=1></script>
+<script
+		src="/pages/scheduleApp/module/common/prj-common-globalservice.js"
+		data-exclude=1></script>
+<script src="/pages/scheduleApp/module/common/prj-common-filter.js"
+		data-exclude=1></script>
+<script src="/pages/scheduleApp/module/common/prj-common-directive.js"
+		data-exclude=1></script>
+<script
+		src="/pages/scheduleApp/module/common/prj-common-ui-route-state.js"
+		data-exclude=1></script>
+
+<!-- 地图相关 -->
+<!-- 百度 -->
+<script
+		src="//api.map.baidu.com/api?v=3.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"
+		data-exclude=1></script>
+<script
+		src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
+		data-exclude=1></script>
+<script type="text/javascript"
+		src="//api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
+		data-exclude=1></script>
+<script type="text/javascript"
+		src="//api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
+		data-exclude=1></script>
+<script src="/assets/js/baidu/TextIconOverlay.js" data-exclude=1></script>
+<script src="/assets/js/baidu//MarkerClusterer.js" data-exclude=1></script>
+<!-- 高德  -->
+<script
+		src="//webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
+		data-exclude=1></script>
+<!-- echarts4 -->
+<script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
+<!-- RSA加密 -->
+<script src="/assets/plugins/jsencrypt.min.js"></script>
+<script src="/assets/js/eventproxy.js"></script>
+<!-- 线路路由信息操作 -->
+<script src="/pages/base/stationroute/js/routes-operation.js"></script>
+<script src="/pages/base/stationroute/js/routes-service.js"></script>
+<script src="/assets/js/CoordinateConverter.js"></script>
+</body>
 </html>
 \ No newline at end of file
-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