李强update

李强
1 parent 450417ed
Showing 27 changed files with 681 additions and 177 deletions
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/service/impl/SectionServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/java/com/bsth/util/FTPClientUtils.java
src/main/resources/ftp.properties
src/main/resources/static/pages/base/carpark/add.html
src/main/resources/static/pages/base/carpark/edit_select.html
src/main/resources/static/pages/base/carpark/js/add-form-wizard.js
src/main/resources/static/pages/base/carpark/js/carpark-positions-events.js
src/main/resources/static/pages/base/carpark/js/carpark-positions-function.js
src/main/resources/static/pages/base/carpark/js/carpark-positions-reload.js
src/main/resources/static/pages/base/carpark/list.html
src/main/resources/static/pages/base/line/js/line-list-table.js
src/main/resources/static/pages/base/line/list.html
src/main/resources/static/pages/base/section/js/add-form-wizard.js
src/main/resources/static/pages/base/section/js/section-ajax-getdata.js
src/main/resources/static/pages/base/section/js/section-positions-events.js
src/main/resources/static/pages/base/station/add.html
src/main/resources/static/pages/base/station/edit.html
@@ -141,4 +141,13 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	 */
 	@Query(value = " select  MAX(r.sectionroute_code) as sectionrouteCode   from bsth_c_sectionroute r  WHERE r.line=?1 and r.directions =?2 and r.sectionroute_code< ?3", nativeQuery=true)
 	List<Object[]> findUpSectionRouteCode(Integer lineId,Integer direction,Integer stationRouteCode);
+	
+	@Query(value =  "SELECT " +
+					"c.directions," +
+					"AsText(s.bsection_vector) as bsection_vector," +
+					"s.speed_limit," +
+					"s.section_name " +
+					" FROM bsth_c_sectionroute c " +
+					" LEFT JOIN bsth_c_section s on c.section = s.id where c.line = ?1 and c.directions = ?2", nativeQuery=true)
+List<Object[]> sectionRouteVector(Integer lineId,Integer directions);
 }
@@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.Section;
@@ -122,7 +121,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
 			// 线路ID
-			Integer sectionRouteLine =map.get("sectionRouteLine").equals("") ? null : Integer.parseInt(map.get("sectionRouteLine").toString());
+			Integer sectionRouteLine = map.get("sectionRouteLine").equals("") ? null : Integer.parseInt(map.get("sectionRouteLine").toString());
 			// 道路编码
 			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
@@ -403,16 +402,18 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			// 路段路由
 			SectionRoute sectionRoute = new SectionRoute();
-			String sectionrouteCodeArray[] = null;
-			
 			Integer routeCode = null;
 			if(!sectionrouteCode.equals("")){
-				sectionrouteCodeArray = sectionrouteCode.split("_");
+				String sectionrouteCodeArray[] =  sectionrouteCode.split("_");
 				routeCode = Integer.valueOf(sectionrouteCodeArray[0])+1;
+			}else {
+				
+				routeCode = 100;
+				
 			}	
 			sectionRoute.setSectionrouteCode(routeCode);
 package com.bsth.service.impl;
+import java.awt.Point;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
@@ -519,56 +520,66 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			/** 查询线路信息 */
 			Line line = lineRepository.findOne(lineId);
-			/** 获取配置文件里的ftp参数 */
-			Map<String, Object> FTPParamMap = readPropertiesGetFTPParam();
-			
-			// 压缩文件名
-			String odlGzFileName = line.getLineCode() + ".tar.gz";
-			
-			// text文件名
-			String textFileName  = line.getLineCode() + ".txt";
-			
-			FTPClientUtils clientUtils = new FTPClientUtils();
-			
-			String url = FTPParamMap.get("url").toString();
-			
-			int port = Integer.valueOf(FTPParamMap.get("port").toString());
-			
-			String username = FTPParamMap.get("username").toString();
-			
-			String password = FTPParamMap.get("password").toString();
-			
-			String remotePath = FTPParamMap.get("remotePath").toString();
-			
-			/** 如果行单文件已存在则删除 */
-			clientUtils.deleteFtpFile(url, port, username, password, remotePath, odlGzFileName);
-			
-			clientUtils.deleteFtpFile(url, port, username, password, remotePath, textFileName);
-			
 			List<Object[]> objects = repository.usingSingle(lineId);
-			String textStr = newTextFileToFTP(objects);
-			
-			textStr = line.getName() + " " + "2" + "\r\n" + textStr;
-			
-			InputStream input = new ByteArrayInputStream(textStr.getBytes("utf-8"));
-			
-			/** 生成text文件 */
-			clientUtils.uploadFile(url, port, username, password, remotePath, textFileName, input);
-			
-			Test test= new Test();
-			
-			File textFile = clientUtils.GetFtpFile(url, port, username, password, remotePath, textFileName);
-			
-			File[] sources = new File[] {textFile};
-			
-			File target = new File(odlGzFileName);
-			  
-			File targetFile = test.pack(sources, target);
-			  
-			clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());
+			if (objects.size()>0) {
+				
+				/** 获取配置文件里的ftp参数 */
+				Map<String, Object> FTPParamMap = readPropertiesGetFTPParam();
+				
+				// 压缩文件名
+				String odlGzFileName = line.getLineCode() + ".txt.gz";
+				
+				// text文件名
+				String textFileName  = line.getLineCode() + ".txt";
+				
+				FTPClientUtils clientUtils = new FTPClientUtils();
+				
+				String url = FTPParamMap.get("url").toString();
+				
+				int port = Integer.valueOf(FTPParamMap.get("port").toString());
+				
+				String username = FTPParamMap.get("username").toString();
+				
+				String password = FTPParamMap.get("password").toString();
+				
+				String remotePath = FTPParamMap.get("remotePath").toString();
+				
+				/** 如果行单文件已存在则删除 */
+				clientUtils.deleteFtpFile(url, port, username, password, remotePath, odlGzFileName);
+				
+				clientUtils.deleteFtpFile(url, port, username, password, remotePath, textFileName);
+				
+				String textStr = newTextFileToFTP(objects,lineId);
+				
+				textStr = line.getName() + " " + "2" + "\r\n" + textStr;
+				
+				InputStream input = new ByteArrayInputStream(textStr.getBytes("utf-8"));
+				
+				/** 生成text文件 */
+				clientUtils.uploadFile(url, port, username, password, remotePath, textFileName, input);
+				
+				Test test= new Test();
+				
+				File textFile = clientUtils.GetFtpFile(url, port, username, password, remotePath, textFileName);
+				
+				File[] sources = new File[] {textFile};
+				
+				File target = new File(odlGzFileName);
+				  
+				File targetFile = test.pack(sources, target);
+				
+				/*clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());*/
+				
+				clientUtils.testUpLoadFromDisk(targetFile, targetFile.getName(), url, port, username, password, remotePath);
+				
+				resultMap.put("status", ResponseCode.SUCCESS);
+				
+			}else {
+				
+				resultMap.put("status","NOTDATA");
+			}
-			resultMap.put("status", ResponseCode.SUCCESS);
 		} catch (Exception e) {
@@ -580,28 +591,30 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		return resultMap;
 	}
-	public String  newTextFileToFTP(List<Object[]> objects) {
+	public String  newTextFileToFTP(List<Object[]> objects,Integer lineId) {
 		String stationRStr = "";
 		// windows下的文本文件换行符
-		String enterStr = "\r\n";
+		// String enterStr = "\r\n";
 		// linux/unix下的文本文件换行符
-		// String enterStr = "\r";
+		String enterStr = "\r";
 		if(objects.size()>0) {
 			for(int i = 0; i<objects.size();i++) {
 				// 经度
-				String lng = objects.get(i)[0].toString();
+				String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
 				// 纬度
-				String lat = " " + objects.get(i)[1].toString();
+				String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
+				
+				lat = " " +  lat;
 				// 站点类型
-				String stationMake =  objects.get(i)[3].toString();
+				String stationMake =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
 				if(stationMake.equals("E")) {
@@ -614,23 +627,82 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				}
 				// 站点序号 
-				String stationNo = " " + objects.get(i)[4].toString();
+				String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
+				
+				stationNo = " " + stationNo;
 				// 站点编码
-				String stationCode = " " + objects.get(i)[5].toString();
+				String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
+				
+				stationCode =  " " +stationCode;
+				
+				double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString());
-				double tempd = Double.parseDouble(objects.get(i)[6].toString())*1000;
+				double tempd = dis*1000;
 				// 站点距离
 				String staitondistance = " " + String.valueOf((int) tempd);
+				// 站点名称
+				String stationName =  objects.get(i)[7].equals("") ? "" : objects.get(i)[7].toString();
+				
 				// 限速
-				String sleepStr = " " + "60";
+				// String sleepStr = " " + "60";
-				// 站点名称
-				String staitonName = " " + objects.get(i)[7].toString();
+				String sleepStr = "";
-				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + staitonName + enterStr;
+				int directions = objects.get(i)[8]==null ? null : Integer.valueOf(objects.get(i)[8].toString());
+				
+				List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
+				
+				if(sobje.size()==1) {
+					
+					sleepStr = sobje.get(0)[2] == null ? "" : sobje.get(0)[2].toString();
+					
+					sleepStr =  " " + sleepStr;
+					
+				}else if(sobje.size()>1){
+					
+					/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
+					for(int j =0;j<sobje.size();j++) {
+						
+						String sectionName = sobje.get(j)[3].toString();
+						
+						String sectionNameA[] = sectionName.split("至");
+						
+						if(stationName.equals(sectionNameA[0])){
+							
+							sleepStr = sobje.get(j)[2].toString();
+							
+							sleepStr =  " " + sleepStr;
+							
+						}
+						
+					}
+					
+					/*
+					String bdJWPointStr = objects.get(i)[2].toString();
+					
+					String bdJWPointA[] = bdJWPointStr.split(" ");
+					
+					Map<String, Object> pointsM = new HashMap<String,Object>();
+					
+					pointsM.put("lng", bdJWPointA[0]);
+					
+					pointsM.put("lat", bdJWPointA[1]);
+					
+					System.out.println(objects.get(i)[7].toString());
+					
+					sleepStr = sleepStr + GetFormPointOnPolylineSeleepLimit(pointsM,sobje);*/
+				}
+				
+				if(sleepStr.equals(""))
+					sleepStr = " " + "60";
+					
+				
+				stationName = " " +stationName;
+				
+				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 			}
@@ -640,6 +712,90 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	}
+	public String GetFormPointOnPolylineSeleepLimit(Map<String, Object> p,List<Object[]> listObjArra) {
+		
+		String sleeplimiV = "";
+		
+		int size = listObjArra.size();
+		
+		if(size>0) {
+			
+			for(int i =0;i<size-1;i++) {
+				
+				System.out.println(listObjArra.get(i)[3].toString());
+				
+				
+				List<Map<String, Object>> listM = new ArrayList<Map<String,Object>>();
+				
+				String bVecotr = listObjArra.get(i)[1].toString();
+				
+				bVecotr = bVecotr.substring(11,bVecotr.length()-1);
+				
+				String tempA [] = bVecotr.split(",");
+				
+				int len = tempA.length;
+				
+				for(int e = 0; e< len ;e++) {
+					
+					Map<String, Object> tempM = new HashMap<String,Object>();
+					
+					String temStr = tempA[e];
+					
+					String nextTemA[] = temStr.split(" ");
+					
+					tempM.put("lng", nextTemA[0]);
+					
+					tempM.put("lat", nextTemA[1]);
+					
+					listM.add(tempM);
+					
+				}
+				
+				if(isPointOnPolyline(p,listM)) {
+					
+					
+					sleeplimiV = listObjArra.get(i)[2].toString();
+				}
+				
+			}
+				
+		}
+		
+		
+		return sleeplimiV;
+	}
+	
+	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.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;
+	}
+	
 	public Map<String, Object> readPropertiesGetFTPParam(){
 		Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -866,25 +866,32 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Line resultLine = lineRepository.findOne(line);
 			// 站点路由序号
-			String stationRouteCode = map.get("stationRouteCode").equals("") ? "" : map.get("stationRouteCode").toString();
+			String stationRouteCodeStr = map.get("stationRouteCode").equals("") ? "" : map.get("stationRouteCode").toString();
 			// 站点类型
 			String stationMark = map.get("stationMark").equals("") ? "" : map.get("stationMark").toString();
-			String stationRouteCodeArray [] = null;
+			Integer stationRouteCode = null;
-			if(stationRouteCode!="") {
+			if(stationRouteCodeStr!="") {
+				
+				String stationRouteCodeArray [] = stationRouteCodeStr.split("_");
-				stationRouteCodeArray= stationRouteCode.split("_");
+				stationRouteCode = Integer.parseInt(stationRouteCodeArray[0]+1);
+				
+				
+			}else {
+				
+				stationRouteCode = 100;
 			}
 			// 保存站点
-			/*repository.stationSave(stationCod, stationName, roadCoding, dbType, bJwpoints, 
+			repository.stationSave(stationCod, stationName, roadCoding, dbType, bJwpoints, 
 									gLonx, gLaty, x, y, gPloygonGrid,bPloygonGrid, destroy, radius, 
-									
-									shapesType, versions, descriptions, createBy, updateBy,stationId);*/
+								
+									shapesType, versions, descriptions, createBy, updateBy,stationId);
@@ -908,7 +915,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			arg0.setStationCode(stationCod);
 			// 站点路由序号
-			arg0.setStationRouteCode(Integer.parseInt(stationRouteCodeArray[0])+1);
+			arg0.setStationRouteCode(stationRouteCode);
 			// 站点路由类型
 			arg0.setStationMark(stationMark);
@@ -931,7 +938,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 站点路由说明
 			arg0.setDescriptions(descriptions);
-			/*routeRepository.save(arg0);*/
+			routeRepository.save(arg0);
 			resultMap.put("status", ResponseCode.SUCCESS);
@@ -98,16 +98,16 @@ public class FTPClientUtils {
 	}
 	// 将本地文件上传到FTP服务器上
-	public void testUpLoadFromDisk(File file,String name){
+	public void testUpLoadFromDisk(File file,String name,String url, int port, String username, String password, String remotePath){
 		 try { 
 		        FileInputStream in=new FileInputStream(file); 
-		       boolean flag = uploadFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", name, in);
+		        boolean flag = uploadFile(url, port,username, password, remotePath, name, in);
-		       /* boolean flag = uploadFile("222.66.0.205", 21, "transport", "transport123", "ftptest/", name, in);*/
+		      /* boolean flag = uploadFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", name, in);*/
-		        System.out.println(flag); 
+		       /* boolean flag = uploadFile("222.66.0.205", 21, "transport", "transport123", "ftptest/", name, in);*/
 		    } catch (FileNotFoundException e) { 
@@ -126,9 +126,7 @@ public class FTPClientUtils {
 			InputStream input = new ByteArrayInputStream(str.getBytes("utf-8"));
-			 boolean flag = uploadFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", "test.txt", input); 
-			
-			System.out.println(flag);
+			uploadFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", "test.txt", input); 
 		} catch (UnsupportedEncodingException e) {
@@ -324,7 +322,7 @@ public class FTPClientUtils {
 		File targetFile = test.pack(sources, target);
-		clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());
+	/*	clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());*/
 		/** 删除文件 */
-ftp.url=222.66.0.205
-ftp.port=21
-ftp.username=transport
-ftp.password= transport123
-ftp.path= down/
-
-#ftp.url=192.168.168.101
+#ftp.url=222.66.0.205
 #ftp.port=21
-#ftp.username=testftpservice
-#ftp.password= 123
-#ftp.path= ftptest/
 \ No newline at end of file
+#ftp.username=transport
+#ftp.password=transport123
+#ftp.path= down/
+
+ftp.url=192.168.168.101
+ftp.port=21
+ftp.username=testftpservice
+ftp.password= 123
+ftp.path= ftptest/
 \ No newline at end of file
@@ -307,12 +307,12 @@
                                </div>
                            </div> 
-                           <div class="form-group">
+                         <!--   <div class="form-group">
                                <label class="control-label col-md-3"> 中心位置WGS坐标点： </label>
                                <div class="col-md-4">
                                    <p class="form-control-static" data-display="gCenterPoint"> </p>
                                </div>
-                           </div>  
+                           </div>  --> 
                            <h4 class="form-section"> 停车场信息 </h4>
@@ -156,7 +156,7 @@ $(&#39;#editPositions_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map,fun,
 			if(eidtselect_==0){
-				WorldsBMap.localSearchFromAdreesToPoint(editStationName);
+				map.localSearchFromAdreesToPoint(editStationName);
 				map.openDrawingManager();
@@ -167,7 +167,7 @@ var FormWizard = function() {
 						}
 						// 返回list.html页面
-						loadPage('list.html');
+						loadPage('/pages/base/carpark/list.html');
 					});
@@ -266,26 +266,21 @@ var FormWizard = function() {
                 	// 设置停车场名称
                 	$('#parkNameInput').val(stationNameV);
-                	VmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {
-		  				
-		  				if(p) {
-		  					
-		  					if(baseResValue == 0) {
-		    		  			
-		    		  			$('.leftUtils').hide();
-		    		  			
-		    		  			VmapWorlds.pointsCircle(p);
-		                		
-		                	}else if(baseResValue ==1) {
-		                		
-		                		$('.leftUtils').show();
-		                		
-		                		VmapWorlds.drawingManagerOpen();
-		                		
-		                	} 
-		  				}
-		  				
-		  			});
+                	VmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {});
+                	
+                	if(baseResValue == 0) {
+    		  			
+    		  			$('.leftUtils').hide();
+    		  			
+    		  			VmapWorlds.pointsCircle(p);
+                		
+                	}else if(baseResValue ==1) {
+                		
+                		$('.leftUtils').show();
+                		
+                		VmapWorlds.drawingManagerOpen();
+                		
+                	} 
                 }
                 /** 如果为最后一步显示提交按钮，隐藏下一步按钮,否则隐藏提交按钮，显示下一步按钮 */
@@ -327,6 +322,8 @@ var FormWizard = function() {
                 /** 当一个导航标签被点击,返回错误的移动到该选项卡，并显示它的内容. */
                 onTabClick: function (tab, navigation, index, clickedIndex) {
+                	return false;
+                	
                     success.hide();
                     error.hide();
@@ -358,6 +355,8 @@ var FormWizard = function() {
                     	VmapWorlds.clearMarkAndOverlays();
+                    	VmapWorlds.drawingManagerClose();
+                    	
                     }
                     handleTitle(tab, navigation, index);
@@ -371,6 +370,12 @@ var FormWizard = function() {
                     error.hide();
+                    if(index ==0) {
+                    	
+                    	VmapWorlds.drawingManagerClose();
+                    	
+                    }
+                    
                     VmapWorlds.clearMarkAndOverlays();
                     handleTitle(tab, navigation, index);
@@ -3,7 +3,10 @@ $(function(){
 	$('#backUp').on('click',function() {
 		// 获取返回元素并修改url地址
-		$('#backUp').attr('href','list.html?');
+		/*$('#backUp').attr('href','list.html?');*/
+		
+		// 返回list.html页面
+		loadPage('/pages/base/carpark/list.html');
 	});
 /**
  * 函数
  * 
- * initCarPark ：停车场信息初始化 @param：<id：停车场ID>
  */
 var PublicFunctions = function () {
@@ -58,16 +57,132 @@ var PublicFunctions = function () {
 						// 中心坐标点
 						var point = new BMap.Point(BJwpoints[0], BJwpoints[1]);
+						var shapesV = '';
+						
+						if(r[0].carParkShapesType='d') {
+							
+							shapesV = '多边形';
+							
+						}else if(r[0].carParkShapesType='r') {
+							
+							shapesV = '圆形'; 
+							
+						}
+						
+						var companyV = '';
+						
+						var branchecomV = '';
+						
+						if( r[0].carParkCompany=='55'){
+
+							companyV = '上南公司';
+							
+							if(r[0].carParkBrancheCompany=='1'){
+								
+								branchecomV = '上南二分公司';
+								
+							}else if(r[0].carParkBrancheCompany=='2'){
+								
+								branchecomV = '上南三分公司';
+								
+							}else if(r[0].carParkBrancheCompany=='3'){
+								
+								branchecomV = '上南六分公司';
+								
+							}else if(r[0].carParkBrancheCompany=='4'){
+								
+								branchecomV = '上南一分公司';
+								
+							}
+							
+						}else if( r[0].carParkCompany=='22'){
+							
+							companyV = '金高公司';
+							
+							if(r[0].carParkBrancheCompany=='1'){
+								
+								branchecomV = '四分公司';
+								
+							}else if(r[0].carParkBrancheCompany=='2'){
+								
+								branchecomV = '二分公司';
+								
+							}else if(r[0].carParkBrancheCompany=='3'){
+								
+								branchecomV = '三分公司';
+								
+							}else if(r[0].carParkBrancheCompany=='5'){
+								
+								branchecomV = '一分公司';
+								
+							}
+							
+						}else if( r[0].carParkCompany=='05'){
+							
+							companyV = '杨高公司';
+							
+							if(r[0].carParkBrancheCompany=='1'){
+								
+								branchecomV = '川沙分公司';
+								
+							}else if(r[0].carParkBrancheCompany=='2'){
+								
+								branchecomV = '金桥分公司';
+								
+							}else if(r[0].carParkBrancheCompany=='3'){
+								
+								branchecomV = '芦潮港分公司';
+								
+							}else if(r[0].carParkBrancheCompany=='5'){
+								
+								branchecomV = '杨高分公司';
+								
+							}else if(r[0].carParkBrancheCompany=='6'){
+								
+								branchecomV = '周浦分公司';
+								
+							}
+							
+							
+						}else if( r[0].carParkCompany=='26'){
+							
+							companyV = '南汇公司';
+							
+							if(r[0].carParkBrancheCompany=='1'){
+								
+								branchecomV = '南汇一分';
+								
+							}else if(r[0].carParkBrancheCompany=='2'){
+								
+								branchecomV = '南汇二分';
+								
+							}else if(r[0].carParkBrancheCompany=='3'){
+								
+								branchecomV = '南汇三分';
+								
+							}else if(r[0].carParkBrancheCompany=='4'){
+								
+								branchecomV = '南汇维修公司';
+								
+							}else if(r[0].carParkBrancheCompany=='5'){
+								
+								branchecomV = '南汇公司';
+								
+							}
+							
+						}
+						
+						// 信息窗口类容
 						var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
 									'<span style="color:#DDD;font-size: 15px;">停车场名称：' + r[0].carParkName + '</span>' + 
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">停车场编码：' + r[0].carParkCode + '</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">停车场面积：' + r[0].carParkArea + '</span>' +
-									'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + r[0].carParkBcenterPoint + '</span>' +
-									'<span class="help-block" style="color:#DDD;font-size: 15px;">范围类型：' + r[0].carParkShapesType + '</span>' +
-									'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + r[0].carParkRadius + '</span>' +
-									'<span class="help-block" style="color:#DDD;font-size: 15px;">所属公司：' + r[0].carParkCompany + '</span>' +
-									'<span class="help-block" style="color:#DDD;font-size: 15px;">分　公司：' + r[0].carParkBrancheCompany + '</span>' +
-									'<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + r[0].carParkVersions + '</span>' +
+									'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' +   r[0].carParkBcenterPoint + '</span>' +
+									'<span class="help-block" style="color:#DDD;font-size: 15px;">范围类型：' +   shapesV + '</span>' +
+									'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' +   r[0].carParkRadius + '</span>' +
+									'<span class="help-block" style="color:#DDD;font-size: 15px;">所属公司：' +   companyV + '</span>' +
+									'<span class="help-block" style="color:#DDD;font-size: 15px;">分　公司：' +    branchecomV+ '</span>' +
+									'<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' +   r[0].carParkVersions + '</span>' +
 									'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD; overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ r[0].carParkDescriptions +'" >说明/描述：' + r[0].carParkDescriptions + '</span>' ;
 						// 信息窗口参数属性
@@ -15,7 +15,7 @@
 (function(){
 	// 获取参数停车场ID
-	id = $.url().param('no');
+	var id = $.url().param('no');
 	// 关闭左侧栏
 	if (!$('body').hasClass('page-sidebar-closed')) {
@@ -36,9 +36,9 @@
 								<th width="8%">面积</th>
 								<th width="8%">分公司</th>
 								<th width="8%">所属公司</th>
-								<th width="8%">版本号</th>
-								<th width="8%">是否撤销</th>
-								<th width="12%">操作</th>
+								<th width="6%">版本号</th>
+								<th width="6%">是否撤销</th>
+								<th width="14%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
 								<td>#</td>
@@ -110,16 +110,80 @@
 				{{obj.area}}
 			</td>
 			<td>
-				{{obj.brancheCompany}}
+				{{if obj.company == '55'}}
+
+					{{if obj.brancheCompany == '1'}}
+						上南二分公司
+					{{else if obj.brancheCompany == '2'}}
+						上南三分公司
+					{{else if obj.brancheCompany == '3'}}
+						上南六分公司
+					{{else if obj.brancheCompany == '4'}}
+						上南一分公司
+					{{/if}}
+
+				{{else if obj.company == '22'}}
+
+					{{if obj.brancheCompany == '1'}}
+						四分公司
+					{{else if obj.brancheCompany == '2'}}
+						二分公司
+					{{else if obj.brancheCompany == '3'}}
+						三分公司
+					{{else if obj.brancheCompany == '5'}}
+						一分公司
+					{{/if}}
+		
+				{{else if obj.company == '05'}}
+					
+					{{if obj.brancheCompany == '1'}}
+						川沙分公司
+					{{else if obj.brancheCompany == '2'}}
+						金桥分公司
+					{{else if obj.brancheCompany == '3'}}
+						芦潮港分公司
+					{{else if obj.brancheCompany == '5'}}
+						杨高分公司
+					{{else if obj.brancheCompany == '6'}}
+						周浦分公司
+					{{/if}}
+
+				{{else if obj.company == '26'}}
+
+					{{if obj.brancheCompany == '1'}}
+						南汇一分
+					{{else if obj.brancheCompany == '2'}}
+						南汇二分
+					{{else if obj.brancheCompany == '3'}}
+						南汇三分
+					{{else if obj.brancheCompany == '4'}}
+						南汇维修公司
+					{{else if obj.brancheCompany == '5'}}
+						南汇公司
+					{{/if}}
+
+				{{/if}}
 			</td>
 			<td>
-				{{obj.company}}
+				{{if obj.company == '55'}}
+					上南公司
+				{{else if obj.company == '22'}}
+					金高公司
+				{{else if obj.company == '05'}}
+					杨高公司
+				{{else if obj.company == '26'}}
+					南汇公司
+				{{/if}}
 			</td>
 			<td>
 				{{obj.versions}}
 			</td>
 			<td>
-				{{obj.destroy}}
+				{{if obj.destroy == 1}}
+					<span style="font-weight: bold; color: red; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">撤销</span>
+				{{else if obj.destroy == 0}}
+					<span style="font-weight: bold; color: #07824e; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">运营</span>
+				{{/if}}
 			</td>
 			<td>
 				<a href="positions.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 定位 </a>
@@ -246,27 +246,63 @@
 	// 生成行单
 	$('#datatable_ajax_tools #createUsingSingle').on('click', function() {
-		/*alert('aaa');*/
-		
-		/*var lineIdEvents = LineObj.getLineObj();
-		
-		var params = {lineId:lineIdEvents.id};
-		
-		GetAjaxData.createUsingSingle(params,function(data) {
+		// 获取选中行
+    	var arrChk = $("input[type='checkbox']:checked");
+    	
+    	var len = arrChk.length;
+    	
+    	// 选中行ID与线路名称
+    	var id = '', lineName = '';
+    	
+    	if(len>1) {
+    		
+    		// 弹出添加成功提示消息
+			layer.msg('存在多选，请只选中一行!');
+			
+			return ;
+    		
+    	}else  if(len==0) {
+    		
+    		// 弹出添加成功提示消息
+			layer.msg('请选中一条线路！');
+			
+			return ;
+    		
+    	}else {
+    		
+    		id = arrChk.data('id');
+    		
+    		lineName = arrChk.val();
+    		
+    		var params = {lineId:id};
-			if(data.status=='SUCCESS') {
+    		// 弹出正在加载层
+    		var index = layer.load(0);
+    		
+			$post('/stationroute/usingSingle',params,function(data) {
-				// 弹出添加成功提示消息
-				layer.msg('生成成功...');
+				 // 关闭弹出框
+				 layer.close(index);
-			}else {
+				if(data.status=='SUCCESS') {
+    				
+    				// 弹出添加成功提示消息
+    				layer.msg('生成线路【'+ lineName +'】路单文件成功!');
+    				
+    			}else if(data.status=='ERROR'){
+    				
+    				// 弹出添加成功提示消息
+    				layer.msg('生成线路【'+ lineName +'】路单文件失败!');
+    				
+    			}else if(data.status=='NOTDATA') {
+
+    				// 弹出添加成功提示消息
+    				layer.msg('系统无线路【'+ lineName +'】的站点与路段信息!');
+    				
+    			}
-				// 弹出添加失败提示消息
-				layer.msg('生成失败...');
+			});
-			}
-			
-		});*/
-		
+    	}
 	});	
 })();
 \ No newline at end of file
@@ -185,9 +185,9 @@
 					{{if obj.brancheCompany == '1'}}
 						四分公司
 					{{else if obj.brancheCompany == '2'}}
-						四分公司
+						二分公司
 					{{else if obj.brancheCompany == '3'}}
-						四分公司
+						三分公司
 					{{else if obj.brancheCompany == '5'}}
 						一分公司
 					{{/if}}
@@ -194,7 +194,7 @@ var FormWizard = function() {
 					console.log(params);
-					//保存站点
+					// 保存路段
 					PublicFunctions.sectionSave(params,function(data) {
 						if(data.status=='SUCCESS') {
@@ -44,8 +44,6 @@ var GetAjaxData = function(){
 			// 编辑线路走向保存
 			sectionUpdate:function(section,callback) {
-				console.log(section);
-				
 				$post('/section/sectionUpdate',section,function(data) {
 					callback && callback(data);
@@ -10,7 +10,9 @@ $(function(){
 	// 编辑线路走向
 	$('.dropdown-menu #eidt').on('click', function(){
-		$('.dropdown-toggle').addClass('disabled');
+		$('#eidt').attr("disabled",true);
+	　	
+	  	$('#eidt').addClass('btn disabled');
 		// 弹出添加失败提示消息,2秒关闭（如果不配置，默认是3秒）
 		var yindex = layer.msg('编辑完线路走向后,请双击线路走向区域保存',{ offset: '126px',shift: 0,time: 10000});
@@ -390,12 +390,12 @@
                                </div>
                            </div> 
-                           <div class="form-group">
+                        <!--    <div class="form-group">
                                <label class="control-label col-md-3"> 中心位置WGS坐标点： </label>
                                <div class="col-md-4">
                                    <p class="form-control-static" data-display="bJwpoints"> </p>
                                </div>
-                           </div>  
+                           </div>   -->
                            <!--  
                            <div class="form-group">
@@ -452,8 +452,9 @@ $(&#39;#editPoitsions_station_mobal&#39;).on(&#39;editStationMobal_show&#39;, function(e, map,fu
 			var params = form.serializeJSON();
 			error.hide();
+			
 			console.log(params);
-			return ;
+			
 			fun.stationUpdate(params,function(resuntDate) {
 		  		if(resuntDate.status=='SUCCESS') {
@@ -174,13 +174,13 @@ $(&#39;#editPositions_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map,drm,
 			if(eidtselect_==0){
 				// 清除地图覆盖物
-				StationPositionsWorldsBMap.clearMarkAndOverlays();
+				map.clearMarkAndOverlays();
 				// 打开绘制工具
 				PositionsDrawingManagerObj.openDrawingManager();
 				// 根据站点位置在地图定位
-				StationPositionsWorldsBMap.localtionPoint(editStationName);
+				map.localtionPoint(editStationName);
 			}else if(eidtselect_==1){
@@ -190,7 +190,7 @@ $(&#39;#editPositions_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map,drm,
 					  shift: 0,time: 10000});
 				// 编辑图形
-				StationPositionsWorldsBMap.editShapes(stationShapesTypeV,mindex);
+				map.editShapes(stationShapesTypeV,mindex);
 			}else if(eidtselect_==2){
@@ -41,7 +41,7 @@ var FormWizard = function() {
 				// 需要验证的表单元素
 				rules : {
-					// 线路名称
+					// 站点名称
 					'statinoNamebooxt' : {
 						// 必填项
@@ -49,6 +49,69 @@ var FormWizard = function() {
 						// 最大长度
 						maxlength: 20
+					},
+					
+					// 线路名称
+					'line' : {
+						
+						// 必填项
+						required : true
+						
+					},
+					
+					// 线路编码
+					'lineCode' : {
+						
+						// 必填项
+						required : true
+						
+					},
+					
+					// 站点名称
+					'stationName' : {
+						
+						// 必填项
+						required : true
+						
+					},
+					
+					// 站点编码
+					'stationCod' : {
+						
+						// 必填项
+						required : true
+						
+					},
+					
+					// 上一站点
+					'stationRouteCode' : {
+						
+						isStart : true
+						
+					},
+					
+					// 站点类型
+					'stationMark' : {
+						
+						// 必填项
+						required : true
+						
+					},
+					
+					// 站点方向
+					'directions' : {
+						
+						// 必填项
+						required : true
+					
+					},
+					
+					// 经纬度坐标点
+					'bJwpoints' : {
+						
+						// 必填项
+						required : true
+						
 					}
@@ -115,6 +178,8 @@ var FormWizard = function() {
 					// 表单序列化
 					var params = form.serializeJSON();
+					console.log(params);
+					
 					//保存站点
 					PublicFunctions.stationSave(params,function(data) {
@@ -139,6 +204,37 @@ var FormWizard = function() {
 				}
 			});
+			// 当站点类型为中途站或者终点站时,上一站点为必填项！
+			$.validator.addMethod("isStart", function(value,element) {
+				
+				var tel = false;
+				
+				var stationMarkV = $('#stationMarkSelect').val();
+				
+				var stationrouteSelectV = $('#stationrouteSelect').val();
+				
+				if(stationMarkV =='B'){
+					
+					tel = true;
+					
+					return  tel;
+					
+				}else if(stationMarkV =='Z' || stationMarkV =='E'){
+					
+					
+					if(stationrouteSelectV!=''){
+						
+						tel = true;
+						
+						return  tel;
+						
+					}
+					
+				}
+				
+				return tel; 
+			}, '当站点类型为中途站或者终点站时,上一站点为必填项！');
+			
 			// 确认提交信息
 			var displayConfirm = function() {
@@ -101,8 +101,6 @@
 		// 异步请求获取表格数据
 		$.get('/stationroute',params,function(result){
-			console.log(result);
-			
 			// 添加序号
 			result.content.page =  page;
@@ -18,6 +18,25 @@ var PositionsPublicFunctions = function () {
 					if(len>0) {
+						console.log(r[0]);
+						
+						var markTypeStr = '';
+						
+						if(r[0].stationRouteStationMark=='B') {
+							
+							markTypeStr='起点站';
+							
+						}else if(r[0].stationRouteStationMark=='Z') {
+							
+							markTypeStr ='中途站';
+							
+							
+						}else if(r[0].stationRouteStationMark=='E') {
+							
+							markTypeStr='终点站';
+							
+						}
+						
 						var stationShapesType = r[0].stationShapesType;
 						// 获取中心坐标点字符串分割
@@ -30,10 +49,15 @@ var PositionsPublicFunctions = function () {
 									'<span style="color:#DDD;font-size: 15px;">站点名称：' + r[0].stationName + '</span>' + 
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + r[0].stationCode + '</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + r[0].stationRouteCode + '</span>' +
+									'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + r[0].stationJwpoints + '</span>' +
+									'<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + r[0].stationRouteToTime + '&nbsp;分钟</span>' +
+									'<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + r[0].stationRouteDistances + '&nbsp;公里</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + r[0].stationRadius + '</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + r[0].stationRouteVersions + '</span>' +
-									'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD; overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 'ddd' +'" >说明/描述：' + 'ddd' + '</span>' ;
+									'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
+									'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
+									r[0].stationRouteDescriptions +'" >说明/描述：' + r[0].stationRouteDescriptions + '</span>' ;
 						// 信息窗口参数属性
 				  		var opts = {
@@ -155,7 +155,7 @@ var StationPositionsWorldsBMap = function () {
 		  		mapBValue.panTo(pointPolygon,PanOptions_);
 		  		// 将地图在水平位置上移动x像素，垂直位置上移动y像素。
-		  		mapBValue.panBy(10,110,PanOptions_);
+		  		mapBValue.panBy(10,-510,PanOptions_);
 		  		//开启信息窗口
 		  		marker.openInfoWindow(infoWindow,pointPolygon);
@@ -188,18 +188,9 @@ var GetAjaxData = function(){
 				});
-			},
-			
-			createUsingSingle : function(params,callback) {
-				
-				$post('/stationroute/usingSingle',params,function(p) {
-					
-					 return callback && callback(p);
-					
-				});
-				
 			}
+			
 	}
 	return ajaxData;
@@ -73,9 +73,9 @@
 			                                                <li>
 			                                                    <a href="javascript:;" id="editUplineTrend"><i class="fa fa-edit"></i>  编辑走向</a>
 			                                                </li>
-			                                                 <li>
+			                                                 <!-- <li>
 			                                                    <a href="javascript:;" id="createUsingSingle"><i class="fa fa-edit"></i>  生成行单</a>
-			                                                </li>
+			                                                </li> -->
 			                                            </ul>
                                         			</div>
                                     			</div>