Merge branch 'master' of 192.168.168.201:panzhaov5/bsth_control

潘钊
2 parents 5422a8e2 80418565
Showing 15 changed files with 550 additions and 169 deletions
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/util/FTPClientUtils.java
src/main/java/com/bsth/util/Test.java
src/main/resources/ftp.properties
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/stationroute/add.html
src/main/resources/static/pages/base/stationroute/edit.html
src/main/resources/static/pages/base/stationroute/editsection.html
src/main/resources/static/pages/base/stationroute/js/addstationobj.js
src/main/resources/static/pages/base/stationroute/js/drawingManager.js
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-events.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-treedata.js
 package com.bsth.service.impl;
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,6 +22,8 @@ import com.bsth.repository.StationRepository;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.StationRouteService;
 import com.bsth.util.FTPClientUtils;
+import com.bsth.util.Test;
+import com.bsth.util.db.DBUtils_MS;
 /**
  * 
@@ -512,93 +516,57 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			// 获取线路ID
 			Integer lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
+			/** 查询线路信息 */
 			Line line = lineRepository.findOne(lineId);
-			List<Object[]> objects = repository.usingSingle(lineId);
+			/** 获取配置文件里的ftp参数 */
+			Map<String, Object> FTPParamMap = readPropertiesGetFTPParam();
-			String stationRStr = "";
+			// 压缩文件名
+			String odlGzFileName = line.getLineCode() + ".tar.gz";
-			// windows下的文本文件换行符
-			// String enterStr = "\r\n";
+			// text文件名
+			String textFileName  = line.getLineCode() + ".txt";
-			// linux/unix下的文本文件换行符
-			String enterStr = "\r";
+			FTPClientUtils clientUtils = new FTPClientUtils();
-			if(objects.size()>0) {
-				
-				for(int i = 0; i<objects.size();i++) {
-					
-					// 经度
-					String lng = objects.get(i)[0].toString();
-					
-					// 纬度
-					String lat = " " + objects.get(i)[1].toString();
-					
-					// 站点类型
-					String stationMake =  objects.get(i)[3].toString();
-					
-					if(stationMake.equals("E")) {
-						
-						stationMake = " " + "2";
-						
-					}else {
-						
-						stationMake =" " + "1";
-						
-					}
-					
-					// 站点序号 
-					String stationNo = " " + objects.get(i)[4].toString();
-					
-					// 站点编码
-					String stationCode = " " + objects.get(i)[5].toString();
-					
-					double tempd = Double.parseDouble(objects.get(i)[6].toString())*1000;
-					
-					// 站点距离
-					String staitondistance = " " + String.valueOf((int) tempd);
-					
-					// 限速
-					String sleepStr = " " + "60";
-					
-					// 站点名称
-					String staitonName = " " + objects.get(i)[7].toString();
-					
-					stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + staitonName + enterStr;
-					
-				}
-				
-			}
+			String url = FTPParamMap.get("url").toString();
+			
+			int port = Integer.valueOf(FTPParamMap.get("port").toString());
-			System.out.println(stationRStr);
+			String username = FTPParamMap.get("username").toString();
-			FTPClientUtils  ftpClientUtils = new FTPClientUtils();
+			String password = FTPParamMap.get("password").toString();
-			// ip
-			String url = "222.66.0.205";
+			String remotePath = FTPParamMap.get("remotePath").toString();
-			// ftp端口
-			int  port = 21;
+			/** 如果行单文件已存在则删除 */
+			clientUtils.deleteFtpFile(url, port, username, password, remotePath, odlGzFileName);
-			// 用户名
-			String username = "transport";
+			clientUtils.deleteFtpFile(url, port, username, password, remotePath, textFileName);
-			// 密码
-			String password = "transport123";
+			List<Object[]> objects = repository.usingSingle(lineId);
+			
+			String textStr = newTextFileToFTP(objects);
+			
+			textStr = line.getName() + " " + "2" + "\r\n" + textStr;
-			// 路径
-			String path = "down/";
+			InputStream input = new ByteArrayInputStream(textStr.getBytes("utf-8"));
-			// 文件名
-			String filename = line.getLineCode() + ".txt";
+			/** 生成text文件 */
+			clientUtils.uploadFile(url, port, username, password, remotePath, textFileName, input);
-			String versions = "2";
+			Test test= new Test();
-			stationRStr  =  line.getName() + " " +versions + enterStr + stationRStr;
+			File textFile = clientUtils.GetFtpFile(url, port, username, password, remotePath, textFileName);
-			InputStream input = new ByteArrayInputStream(stationRStr.getBytes("utf-8"));
+			File[] sources = new File[] {textFile};
-			boolean b = ftpClientUtils.uploadFile(url, port, username, password, path, filename, input);
+			File target = new File(odlGzFileName);
+			  
+			File targetFile = test.pack(sources, target);
+			  
+			clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());
 			resultMap.put("status", ResponseCode.SUCCESS);
@@ -611,7 +579,96 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}  
 		return resultMap;
 	}
+	
+	public String  newTextFileToFTP(List<Object[]> objects) {
+		
+		String stationRStr = "";
+		
+		// windows下的文本文件换行符
+		String enterStr = "\r\n";
+		
+		// linux/unix下的文本文件换行符
+		// String enterStr = "\r";
+		
+		if(objects.size()>0) {
+			
+			for(int i = 0; i<objects.size();i++) {
+				
+				// 经度
+				String lng = objects.get(i)[0].toString();
+				
+				// 纬度
+				String lat = " " + objects.get(i)[1].toString();
+				
+				// 站点类型
+				String stationMake =  objects.get(i)[3].toString();
+				
+				if(stationMake.equals("E")) {
+					
+					stationMake = " " + "2";
+					
+				}else {
+					
+					stationMake =" " + "1";
+					
+				}
+				
+				// 站点序号 
+				String stationNo = " " + objects.get(i)[4].toString();
+				
+				// 站点编码
+				String stationCode = " " + objects.get(i)[5].toString();
+				
+				double tempd = Double.parseDouble(objects.get(i)[6].toString())*1000;
+				
+				// 站点距离
+				String staitondistance = " " + String.valueOf((int) tempd);
+				
+				// 限速
+				String sleepStr = " " + "60";
+				
+				// 站点名称
+				String staitonName = " " + objects.get(i)[7].toString();
+				
+				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + staitonName + enterStr;
+				
+			}
+			
+		}
+		
+		return stationRStr;
+		
+	}
+	
+	public Map<String, Object> readPropertiesGetFTPParam(){
+		
+		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 ;
+	}
+	
 	@Override
 	public List<Map<String, Object>> findStationRouteInfo(Map<String, Object> map) {
@@ -4,8 +4,10 @@ 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;
@@ -101,9 +103,9 @@ public class FTPClientUtils {
 		 try { 
 		        FileInputStream in=new FileInputStream(file); 
-		       /*boolean flag = uploadFile("192.168.168.101", 21, "testftpservice", "123", "C:/ftptest", 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);
+		       /* boolean flag = uploadFile("222.66.0.205", 21, "transport", "transport123", "ftptest/", name, in);*/
 		        System.out.println(flag); 
@@ -150,11 +152,11 @@ public class FTPClientUtils {
      */  
     public static boolean deleteFtpFile(String url, int port, String username, String password, String remotePath, String fileName){  
-    	boolean success = true; 
+    	boolean success = false; 
         FTPClient ftp = new FTPClient(); 
-        try{ 
+        try { 
         	int reply;  
@@ -170,6 +172,8 @@ public class FTPClientUtils {
             // 登录  
             ftp.login(username, password);  
+            
+            
             reply = ftp.getReplyCode(); 
             if (!FTPReply.isPositiveCompletion(reply)) {
@@ -183,13 +187,14 @@ public class FTPClientUtils {
             ftp.changeWorkingDirectory(remotePath);
-           success = ftp.deleteFile("C:/ftptest"+ "/" + "aa.txt");
+            success = ftp.deleteFile(fileName);
+            
+            ftp.logout(); 
-            ftp.logout();  
         } catch (IOException e){  
-        	/*logger.error("save erro.", e);*/
         	e.printStackTrace();
+        	
             success = false;
         } finally {
@@ -201,8 +206,8 @@ public class FTPClientUtils {
                     ftp.disconnect();
                 } catch (IOException e) {  
+                	
                 	e.printStackTrace();
-                   /* logger.error(EXCEPTION_NAME, e);  */
                 }  
             }  
@@ -211,26 +216,119 @@ public class FTPClientUtils {
         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); 
+        
+        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);
+            
+            File srcFile = new File(fileName);  
+            
+            int byteread = 0; // 读取的字节数
+            
+            in =  ftp.retrieveFileStream(fileName); 
+            
+            out = new FileOutputStream(destFile);
+            
+            byte[] buffer = new byte[1024];  
+  
+            while ((byteread = in.read(buffer)) != -1) { 
+            	
+                out.write(buffer, 0, byteread);  
+                
+            }  
+            
+            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[] 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());*/
+		clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());
-		/*, 21, , "123", "C:/ftptest", "test.txt", input*/
-		boolean a =clientUtils.deleteFtpFile("192.168.168.101", 21, "testftpservice", "123", "ftptest", "aa.txt");
+		/** 删除文件 */
+		/*boolean a =clientUtils.deleteFtpFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", "release_package.tar.gz");*/
-		System.out.println(a);
-		  
-		 
 	}
 }
@@ -24,35 +24,57 @@ public class Test {
 	  * @throws
 	  */
 	 public static File pack(File[] sources, File target){
-	  FileOutputStream out = null;
-	  try {
-	   out = new FileOutputStream(target);
-	  } catch (FileNotFoundException e1) {
-	   e1.printStackTrace();
-	  }
-	  TarArchiveOutputStream os = new TarArchiveOutputStream(out);
-	  for (File file : sources) {
-	   try {
-	    os.putArchiveEntry(new TarArchiveEntry(file));
-	    IOUtils.copy(new FileInputStream(file), os);
-	    os.closeArchiveEntry();
-	     
-	   } catch (FileNotFoundException e) {
-	    e.printStackTrace();
-	   } catch (IOException e) {
-	    e.printStackTrace();
-	   } 
-	  }
-	  if(os != null) {
-	   try {
-	    os.flush();
-	    os.close();
-	   } catch (IOException e) {
-	    e.printStackTrace();
-	   }
-	  }
+		 
+		 FileOutputStream out = null;
+		 
+		 try {
+			 
+			 out = new FileOutputStream(target);
+			 
+		 } catch (FileNotFoundException e1) {
+			 
+			 e1.printStackTrace();
+			 
+		 }
+		 
+		 TarArchiveOutputStream os = new TarArchiveOutputStream(out);
+		 
+		 for (File file : sources) {
+			 
+			 try {
+				 
+				 os.putArchiveEntry(new TarArchiveEntry(file));
+				 
+				 IOUtils.copy(new FileInputStream(file), os);
+				 
+				 os.closeArchiveEntry();
+				 
+			 } catch (FileNotFoundException e) {
+				 
+				 e.printStackTrace();
+				 
+			 } catch (IOException e) { 
+				 
+				 e.printStackTrace();
+				 
+			 } 
+		 }
+		 if(os != null) {
+			 
+			 try {
+				 
+				 os.flush();
+				 
+				 os.close();
+				 
+			 } catch (IOException e) {
+				 
+				 e.printStackTrace();
+			 }
+	 	 }
 	  return target;
+	  
 	 }
 	 /**
+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.port=21
+#ftp.username=testftpservice
+#ftp.password= 123
+#ftp.path= ftptest/
 \ No newline at end of file
@@ -14,7 +14,7 @@
 (function(){
-	// 填充公司下拉框选择值
+	/** 填充公司下拉框选择值 */
 	$get('/business/all', {upCode_eq: '88'}, function(array){
 		 // 公司下拉options属性值
@@ -32,10 +32,10 @@
 	 });
-	 // 填充分公司下拉框
+	 /** 填充分公司下拉框 */ 
 	 setbrancheCompanySelectOptions();
-	 // 填充分公司下拉框选择值
+	 /** 填充分公司下拉框选择值 */ 
 	 function setbrancheCompanySelectOptions(){
 		 // 获取公司下拉框选择值
@@ -77,39 +77,45 @@
 	// 表格数据分页加载
 	loadTableDate(null,true);
-	/**
-	 * 重置按钮事件 
-	 * 
-	 */
-	$('tr.filter .filter-cancel').on('click',function(){
+	/** 重置按钮事件 */
+	$('tr.filter .filter-cancel').on('click',function() {
+		
 		 // 清空搜索框值
 		 $('tr.filter input,select').val('').change();
+		 
 		 // 重新加载表格数据
 		 loadTableDate(null,true);
 	});
-	/**
-	 * 搜索按钮事件
-	 * 
-	 */
+	/**  搜索按钮事件 */
 	$('tr.filter .filter-submit').on('click',function(){
+		
 		// cells 集合返回表格中所有（列）单元格的一个数组
 		var cells = $('tr.filter')[0].cells;
+		
 		// 搜索参数集合
 		var params = {};
+		
 		// 搜索字段名称
 		var name;
+		
 		// 遍历cells数组
 		$.each(cells, function(i, cell){
+			
 			// 获取第i列的input或者select集合
 			var items = $('input,select', cell);
+			
 			// 遍历items集合
 			for(var j = 0, item; item = items[j++];){
+				
 				// 获取字段名称
 				name = $(item).attr('name');
+				
 				if(name){
+					
 					// 赋取相对应的值
 					params[name] = $(item).val();
+					
 				}
 			}
 		});
@@ -118,25 +124,27 @@
 		loadTableDate(params,true);
 	});
-	/**
-	 * 表格数据分页加载事件
-	 * 
-	 * ------@param : 查询参数
-	 * 
-	 * ------@isPon : 是否重新分页
-	 * 
-	 */
+	/** 表格数据分页加载事件 @param:<param : 查询参数;isPon : 是否重新分页> */
 	function loadTableDate(param,isPon){
+		
 		// 搜索参数
 		var params = {};
-		if(param)
+		
+		if(param) {
+			
 			params = param;
+			
+		}
+		
 		// 排序（按更新时间）
 		params['order'] = 'id';
+		
 		// 记录当前页数
 		params['page'] = page;
+		
 		// 弹出正在加载层
 		var i = layer.load(2);
+		
 		// 异步请求获取表格数据
 		$.get('/line',params,function(result){
@@ -147,67 +155,118 @@
 			// 把数据填充到模版中
 			var tbodyHtml = template('line_list_temp',{list:result.content});
+			
 			// 把渲染好的模版html文本追加到表格中
 			$('#datatable_line tbody').html(tbodyHtml);
+			
 			// 制定复选框
 			$('#datatable_line tbody').find('.icheck').iCheck(icheckOptions);
+			
 			// 复选框改变事件
 			$('#datatable_line tbody').find('.icheck').on('ifChanged', iCheckChange);
+			
 			// 是重新分页且返回数据长度大于0
 			if(isPon && result.content.length > 0){
+				
 				// 重新分页
 				initPag = true;
+				
 				// 分页栏
 				showPagination(result);
 			}
+			
 			// 关闭弹出加载层
 			layer.close(i);
 		});
 	}
-	/**
-	 * 复选框组件
-	 * 
-	 */
+	/** 复选框组件 */
 	function iCheckChange(){
+		
 		// 获取当前的父节点tr
 		var tr = $(this).parents('tr');
 		// 判断当前是否选中
-		if(this.checked)
+		if(this.checked) {
+			
 			// 选中，则增添父节点tr的样式
 			tr.addClass('row-active');
-		else
+			
+		}else {
+			
 			// 未选中，则删除父节点tr的样式
 			tr.removeClass('row-active');
+			
+		}
+			
 	}
-	/**
-	 * 分页栏组件
-	 * 
-	 */
+	/** 分页栏组件 */
 	function showPagination(data){
+		
 		// 分页组件
 		$('#pagination').jqPaginator({
+			
 			// 总页数
 		    totalPages: data.totalPages,
+		    
 		    // 中间显示页数
 		    visiblePages: 6,
+		    
 		    // 当前页
 		    currentPage: page + 1,
+		    
 		    first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+		    
             prev:  '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+            
             next:  '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+            
             last:  '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+            
             page:  '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+            
 		    onPageChange: function (num, type) {
+		    	
 		    	if(initPag){
+		    		
 		    		initPag = false;
+		    		
 		    		return;
+		    		
 		    	}	
+		    	
 		    	page = num - 1;
+		    	
 		    	loadTableDate(null, false);
 		    }
 		});
 	}
+	
+	// 生成行单
+	$('#datatable_ajax_tools #createUsingSingle').on('click', function() {
+		
+		/*alert('aaa');*/
+		
+		/*var lineIdEvents = LineObj.getLineObj();
+		
+		var params = {lineId:lineIdEvents.id};
+		
+		GetAjaxData.createUsingSingle(params,function(data) {
+			
+			if(data.status=='SUCCESS') {
+				
+				// 弹出添加成功提示消息
+				layer.msg('生成成功...');
+				
+			}else {
+				
+				// 弹出添加失败提示消息
+				layer.msg('生成失败...');
+				
+			}
+			
+		});*/
+		
+	});	
 })();
 \ No newline at end of file
@@ -22,6 +22,25 @@
 					<div class="btn-group btn-group-devided" data-toggle="buttons">
 						<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加线路</a>
 					</div>
+					<div class="btn-group">
+					<a class="btn red btn-outline btn-circle" href="javascript:;" data-toggle="dropdown" aria-expanded="false"> <i class="fa fa-share"></i> <span class="hidden-xs"> 系统工具 </span> <i class="fa fa-angle-down"></i>
+					</a>
+					<ul class="dropdown-menu pull-right" id="datatable_ajax_tools">
+						<li>
+							<a href="javascript:;" data-action="0" id="createUsingSingle" class="tool-action"> <i class="fa fa-file-zip-o"></i> 生成路单文件</a>
+						</li>
+						<!-- <li><a href="javascript:;" data-action="0" class="tool-action"> <i class="fa fa-print"></i> 打印
+						</a></li>
+						<li><a href="javascript:;" data-action="1" class="tool-action"> <i class="fa fa-copy"></i> 复制
+						</a></li>
+						<li><a href="javascript:;" data-action="3" class="tool-action"> <i class="fa fa-file-excel-o"></i>
+								导出Excel
+						</a></li>
+						<li class="divider"></li>
+						<li><a href="javascript:;" data-action="5" class="tool-action"> <i class="fa fa-refresh"></i> 刷新数据
+						</a></li> -->
+					</ul>
+				</div>
 				</div>
 			</div>
 			<div class="portlet-body">
@@ -29,20 +48,22 @@
 					<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_line">
 						<thead>
 							<tr role="row" class="heading">
-								<th width="3%">序号</th>
+								<th width="2%">#</th>
+								<th width="4%">序号</th>
 								<th width="7%">线路编码</th>
 								<th width="8%">线路名称</th>
 								<th width="7%">所属公司</th>
 								<th width="8%">所属分公司</th>
-								<th width="8%">线路性质</th>
-								<th width="8%">线路等级</th>
+								<th width="6%">线路性质</th>
+								<th width="6%">线路等级</th>
 								<th width="7%">上海市线路编码</th>
 								<th width="7%">是否撤销</th>
-								<th width="8%">线路标准</th>
-								<th width="8%">站点详情</th>
+								<th width="6%">线路标准</th>
+								<th width="6%">站点详情</th>
 								<th width="14%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
+								<td></td>
 								<td>#</td>
 								<td>
 									<input type="text"  class="form-control form-filter input-sm" name="lineCode_eq">
@@ -124,6 +145,9 @@
 	{{each list as obj i }}
 		<tr>
 			<td style="vertical-align: middle;">
+				<input type="checkbox" class="group-checkable icheck" value="{{obj.name}}" id="{{obj.id}}" data-id="{{obj.id}}" data-lineName="{{obj.name}}">
+			</td>
+			<td style="vertical-align: middle;">
 				{{(list.page*10)+(i+1)}}
 			</td>
 			<td>
@@ -133,16 +157,102 @@
 				{{obj.name}}
 			</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.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.nature}}
+				{{if obj.nature == 'lj'}}
+						路救
+				{{else if obj.nature == 'bc'}}
+						备车
+				{{else if obj.nature == 'dbc'}}
+						定班车
+				{{else if obj.nature == 'yxl'}}
+						夜宵路
+				{{else if obj.nature == 'cgxl'}}
+						常规线路
+				{{else if obj.nature == 'gjxl'}}
+						过江线路
+				{{else if obj.nature == 'csbs'}}
+						穿梭巴士
+				{{else if obj.nature == 'tyxl'}}
+						特约线路
+				{{else if obj.nature == 'qt'}}
+						其他
+				{{else if obj.nature == 'cctxl'}}
+						村村通线路
+				{{/if}}
 			</td>
 			<td>
-				{{obj.level}}
+				{{if obj.level == '1'}}
+						一级线路
+				{{else if obj.level == '2'}}
+						 二级线路
+				{{else if obj.level == '0'}}
+						 未知等级
+				{{/if}}
 			</td>
 			<td>
 				{{obj.shanghaiLinecode}}
@@ -234,9 +234,9 @@
 </div>
 <script type="text/javascript">
-$('#add_station_mobal').on('AddStationMobal.show', function(e, addMap,ajaxd,addStationObj,lineObj,fun){
+$('#add_station_mobal').on('AddStationMobal.show', function(e, addMap,ajaxd,staobj,lineObj,fun){
-	var Station =  addStationObj.getAddStation();
+	var Station =  staobj.getAddStation();
 	var Line = lineObj.getLineObj();
@@ -494,7 +494,7 @@ $(&#39;#add_station_mobal&#39;).on(&#39;AddStationMobal.show&#39;, function(e, addMap,ajaxd,addS
 		addMap.clearMarkAndOverlays();
 		/** 设置新增站点集合对象为空 */
-		addStationObj.setAddStation({});
+		staobj.setAddStation({});
 		var add_direction_v = $('#stationdirSelect').val();
@@ -130,14 +130,14 @@
 					</div>
 					<!-- 站点WGS经纬度 -->
-					<div class="form-body">
+					<!-- <div class="form-body">
 						<div class="form-group">
 							<label class="col-md-3 control-label">站点WGS经纬度：</label>
 							<div class="col-md-6">
 								<input type="text" class="form-control" name="gJwpoints" id="gJwpointsInput" placeholder="站点WGS经纬度">
 							</div>
 						</div>
-					</div>
+					</div> -->
 					<!-- 范围图形类型 -->
 					<div class="form-body">
@@ -227,7 +227,7 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 		$('#sectionrouteCodeSelect').html(options);
-		ajaxd.findUpStationRouteCode(lineId,dir,eq_stationRouteCode,function(str) {
+		ajaxd.findUpSectionRouteCode(lineId,dir,eq_stationRouteCode,function(str) {
 			if(str.length>0){
@@ -12,9 +12,9 @@ var AddStationObj = function () {
 			},
 			/** 设置新增站点集合对象为空 */
-			setAddStation : function(station) {
+			setAddStation : function(s) {
-				station = station;
+				station = s;
 			},
 			/** 设置新增站点集合对象方向属性值 @param：<dir：方向（0：上行；1：下行）> */
@@ -130,7 +130,14 @@ var DrawingManagerObj = function () {
 							 /**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
 							 EditStationObj.setEitdBPolygonGrid(bPloygonGrid);
-							 $.get('edit.html', function(m){$(pjaxContainer).append(m);});
+							// 加载编辑页面
+							$.get('edit.html', function(m){
+								
+								$(pjaxContainer).append(m);
+								
+								$('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMap,GetAjaxData,EditStationObj,LineObj,PublicFunctions]);
+							
+							}); 
 						 }
 					 }
@@ -149,6 +156,11 @@ var DrawingManagerObj = function () {
 				// 设置属性
 				drawingManager.setDrawingMode(BMAP_DRAWING_POLYGON);
+			},
+			
+			closeDrawingManager : function() {
+				
+				drawingManager.close();
 			}
 	}
@@ -102,7 +102,7 @@ var GetAjaxData = function(){
 			},
-			findUpStationRouteCode : function(lineId,diraction,sectionRouteCode,callback) {
+			findUpSectionRouteCode : function(lineId,diraction,sectionRouteCode,callback) {
 				$get('/sectionroute/findUpStationRouteCode',{lineId:lineId,direction:diraction,sectionRouteCode:sectionRouteCode},function(result) {
@@ -147,11 +147,11 @@ $(function(){
 	// 修改下行站点mobal页面
 	$('.module_tools #editDownStation').on('click', function(){
-		var sel = PublicFunctions.getCurrSelNode(directionUpValue);
+		var sel = PublicFunctions.getCurrSelNode(directionDownValue);
 		if(sel.length==0 || sel[0].original.chaildredType !='station'){
-			layer.msg('请先选择要编辑的上行站点！');
+			layer.msg('请先选择要编辑的下行站点！');
 			return;
 		}
@@ -160,7 +160,7 @@ $(function(){
 			$(pjaxContainer).append(m);
-			$('#edit_select_mobal').trigger('editSelectMobal_show', [WorldsBMap,DrawingManagerObj,GetAjaxData,EditStationObj,LineObj,PublicFunctions,directionUpValue]);
+			$('#edit_select_mobal').trigger('editSelectMobal_show', [WorldsBMap,DrawingManagerObj,GetAjaxData,EditStationObj,LineObj,PublicFunctions,directionDownValue]);
 		});
 	});
@@ -204,17 +204,17 @@ $(function(){
 			if(data.status=='SUCCESS') {
 				// 弹出添加成功提示消息
-				layer.msg('添加成功...');
+				layer.msg('生成成功...');
 			}else {
 				// 弹出添加失败提示消息
-				layer.msg('添加失败...');
+				layer.msg('生成失败...');
 			}
 		});
-	});	
+	});
 });
 \ No newline at end of file
@@ -452,7 +452,14 @@ var PublicFunctions = function () {
 				if(sel.length==0 || sel[0].original.chaildredType !='section'){
-					layer.msg('请先选中要编辑的上行路段！');
+					if(direction_=='0') {
+						
+						layer.msg('请先选中要编辑的上行路段！');
+						
+					}else if(direction_=='1') {
+						
+						layer.msg('请先选中要编辑的下行路段！');
+					}
 					return;
 				}
@@ -41,7 +41,7 @@ var StationTreeData = function(){
 			}else if(shapesTypeT == 'd') {
 				// 百度地图画多边形
-				WorldsBMap.pointsPolygon(objStation);
+				WorldsBMap.pointsPolygon(data);
 			}
@@ -104,6 +104,8 @@ var StationTreeData = function(){
 				btn : [ '确认并退出', '返回并继续' ]
 			}, function(index) {
+				DrawingManagerObj.closeDrawingManager();
+				
 				PublicFunctions.editAChangeCssRemoveDisabled();
 				// 关闭弹出层
@@ -113,6 +115,7 @@ var StationTreeData = function(){
 					WorldsBMap.pointsCircle(edtsta);
+					
 				}else if(txType=='d') {
 					// 百度地图画多边形
@@ -150,6 +153,8 @@ var StationTreeData = function(){
 				// 百度地图画路段
 				PublicFunctions.linePanlThree(edtste.sectionrouteLine,polylineArray_,edtste.sectionrouteDirections);
+				parmasObj();
+				
 				// upIsEidtStauts(objStation,chaildredType,len);
 			},function(){