李强

李强
1 parent 657931da
Showing 9 changed files with 122 additions and 20 deletions
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/repository/StationRouteRepository.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/stationroute/editsection.html
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
src/main/resources/static/pages/base/stationroute/list.html
@@ -51,8 +51,11 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 	@RequestMapping(method = RequestMethod.POST)
 	public Map<String, Object> save(Line t){
-		t.setId(Integer.valueOf(t.getLineCode()));
-		
+		if(t.getId()==null) {
+			
+			t.setId(Integer.valueOf(t.getLineCode()));
+			
+		}
 		return service.save(t);
 	} 
 }
@@ -7,6 +7,8 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
+import com.bsth.entity.Line;
+import com.bsth.entity.LineInformation;
 import com.bsth.entity.StationRoute;
 /**
@@ -212,4 +214,6 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.id = ?1 ) a " +
 			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
 	List<Object[]> findStationRouteInfo(Integer id);
+	
+	List<StationRoute> findByLine(Line line);
 }
@@ -563,8 +563,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				Test test= new Test();
+				
 				File textFile = clientUtils.GetFtpFile(url, port, username, password, remotePath, textFileName);
+				/*File[] sources = new File[] {textFile};*/
 				File[] sources = new File[] {textFile};
 				File target = new File(odlGzFileName);
@@ -598,10 +600,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		String stationRStr = "";
 		// windows下的文本文件换行符
-		// String enterStr = "\r\n";
+		//String enterStr = "\r\n";
 		// linux/unix下的文本文件换行符
-		String enterStr = "\r";
+		 String enterStr = "\r";
 		if(objects.size()>0) {
@@ -161,6 +161,11 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 更新里程
 			updateLineInfoUpOrDownMileage( resultLine , directions, sumUpOrDownMileage);
+			if(directions==0) {
+				
+				lineUpdateStationName(resultLine);
+				
+			}
 			resultMap.put("status", ResponseCode.SUCCESS);
 		} catch (Exception e) {
@@ -175,6 +180,53 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	}
+	public void lineUpdateStationName(Line resultLine) {
+		
+		List<StationRoute> stationRoutes = routeRepository.findByLine(resultLine);
+		
+		int sizeL = stationRoutes.size();
+		
+		if(sizeL<0) {
+			
+			return;
+			
+		}
+		
+		if(resultLine.getStartStationName()==null){
+			
+			for(int k =0;k<sizeL;k++) {
+				
+				StationRoute tempS = stationRoutes.get(k);
+				
+				if(tempS.getStationMark().equals("B") && tempS.getDirections()==0) {
+					
+					resultLine.setStartStationName(tempS.getStationName());
+					
+					lineRepository.save(resultLine);
+					
+				}
+			}
+
+		};
+		
+		if(resultLine.getEndStationName()==null) {
+			
+			for(int k =0;k<sizeL;k++) {
+				
+				StationRoute tempS = stationRoutes.get(k);
+				
+				if(tempS.getStationMark().equals("E") && tempS.getDirections()==0) {
+					
+					resultLine.setEndStationName(tempS.getStationName());
+					
+					lineRepository.save(resultLine);
+					
+				}
+			}
+			
+		}
+	}
+	
 	/**
 	 * @Description :保存站点和站点路由信息（系统规划）
 	 * 
@@ -877,7 +929,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 				String stationRouteCodeArray [] = stationRouteCodeStr.split("_");
-				stationRouteCode = Integer.parseInt(stationRouteCodeArray[0]+1);
+				stationRouteCode = Integer.parseInt(stationRouteCodeArray[0].toString())+1;
 			}else {
@@ -1436,6 +1488,12 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 更新里程
 			updateLineInfoUpOrDownMileage( resultLine , directions, sumUpOrDownMileage);
+			if(directions==0) {
+				
+				lineUpdateStationName(resultLine);
+				
+			}
+			
 			resultMap.put("status", ResponseCode.SUCCESS);
 		} catch (Exception e) {
 package com.bsth.util;
+import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -7,10 +8,12 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 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服务器上传文件
@@ -66,13 +69,16 @@ public class FTPClientUtils {
 			ftp.changeWorkingDirectory(path);
-			ftp.storeFile(filename, input);	
+			ftp.enterLocalPassiveMode();
+			
+			success = ftp.storeFile(new String(filename.getBytes("gbk"),"gbk"), input);
+			/*success = ftp.storeFile(filename, input);	*/
 			input.close();
 			ftp.logout();
-			success = true;
+			// success = true;
 		} catch (IOException e) {
@@ -170,8 +176,6 @@ public class FTPClientUtils {
             // 登录  
             ftp.login(username, password);  
-            
-            
             reply = ftp.getReplyCode(); 
             if (!FTPReply.isPositiveCompletion(reply)) {
@@ -185,7 +189,9 @@ public class FTPClientUtils {
             ftp.changeWorkingDirectory(remotePath);
-            success = ftp.deleteFile(fileName);
+            /*success = ftp.deleteFile(fileName);*/
+            
+            success = ftp.deleteFile(new String(fileName.getBytes("gbk"),"gbk"));
             ftp.logout(); 
@@ -217,6 +223,8 @@ public class FTPClientUtils {
     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); 
@@ -247,16 +255,42 @@ public class FTPClientUtils {
             	ftp.disconnect(); 
             }  
-              
+             
             // 转移到FTP服务器目录  
-            
+           
             ftp.changeWorkingDirectory(remotePath);
-            File srcFile = new File(fileName);  
+            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(fileName); 
+            in =  ftp.retrieveFileStream(new String(fileName.getBytes("gbk"),"gbk"));
+         
             out = new FileOutputStream(destFile);
@@ -2,7 +2,7 @@ ftp.url=222.66.0.205
 ftp.port=21
 ftp.username=transport
 ftp.password=transport123
-ftp.path= down/
+ftp.path=down/
 #ftp.url=192.168.168.101
 #ftp.port=21
@@ -399,9 +399,7 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 			console.log(params);
-			return;
-			
-			ajaxd.sectionUpdata(params,function(resuntDate) {
+			ajaxd.sectionUpdate(params,function(resuntDate) {
 				if(resuntDate.status=='SUCCESS') {
@@ -431,6 +431,9 @@ var PublicFunctions = function () {
 						 var Line = LineObj.getLineObj();
+						// 刷行左边树
+						 PublicFunctions.resjtreeDate(Line.id,stationRouteDirections);
+						 
 						 /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：上行路段数据 */
 						 GetAjaxData.getSectionRouteInfo(Line.id,stationRouteDirections,function(data) {
@@ -85,7 +85,7 @@
 	                            </div>
 	                            <!-- 树 -->
 	                            <div class="portlet-body">
-									<div id="station_Up_tree" style="height: 550px;overflow-y: auto;"></div>
+									<div id="station_Up_tree" style="height: auto;max-height: 500px;overflow-y: auto;"></div>
 								</div>
                              </div>
@@ -167,7 +167,7 @@
 	                            </div>
 	                            <!-- 树 -->
 	                            <div class="portlet-body">
-									<div id="station_Down_tree" style="height: 550px;overflow-y: auto;"></div>
+									<div id="station_Down_tree" style="height: auto;max-height: 500px;overflow-y: auto;"></div>
 								</div>
 	            		</div>