Merge branch 'master' of 192.168.168.201:panzhaov5/bsth_control

潘钊
2 parents 73975974 b4e40634
Showing 3 changed files with 122 additions and 21 deletions
src/main/java/com/bsth/util/FTPClientUtils.java
src/main/java/com/bsth/util/Test.java
src/main/resources/static/pages/base/station/js/add-form-wizard.js
@@ -10,7 +10,6 @@ import java.io.UnsupportedEncodingException;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPReply;
-
 /**
  * @Description: 向FTP服务器上传文件
  * 
@@ -97,12 +96,14 @@ public class FTPClientUtils {
 	}
 	// 将本地文件上传到FTP服务器上
-	public void testUpLoadFromDisk(){
+	public void testUpLoadFromDisk(File file,String name){
 		 try { 
-		        FileInputStream in=new FileInputStream(new File("D:/test.txt")); 
+		        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", "C:/ftptest", "test.txt", in); 
+		        boolean flag = uploadFile("222.66.0.205", 21, "transport", "transport123", "ftptest/", name, in);
 		        System.out.println(flag); 
@@ -123,7 +124,7 @@ public class FTPClientUtils {
 			InputStream input = new ByteArrayInputStream(str.getBytes("utf-8"));
-			 boolean flag = uploadFile("192.168.168.101", 21, "testftpservice", "123", "C:/ftptest", "test.txt", input); 
+			 boolean flag = uploadFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", "test.txt", input); 
 			System.out.println(flag);
@@ -134,4 +135,102 @@ public class FTPClientUtils {
 		}
 	}
+	
+	/** 
+     * <删除FTP上的文件> 
+     * <远程删除FTP服务器上的录音文件> 
+     * @param url FTP服务器IP地址 
+     * @param port FTP服务器端口 
+     * @param username FTP服务器登录名 
+     * @param password FTP服务器密码 
+     * @param remotePath 远程文件路径 
+     * @param fileName 待删除的文件名 
+     * @return 
+     * @see [类、类#方法、类#成员] 
+     */  
+    public static boolean deleteFtpFile(String url, int port, String username, String password, String remotePath, String fileName){  
+    	
+    	boolean success = true; 
+    	
+        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("C:/ftptest"+ "/" + "aa.txt");
+            
+            ftp.logout();  
+        } catch (IOException e){  
+        	/*logger.error("save erro.", e);*/
+        	
+        	e.printStackTrace();
+            success = false;
+            
+        } finally {
+        	
+        	if (ftp.isConnected()) {
+        		
+        		try { 
+        			
+                    ftp.disconnect();
+                    
+                } catch (IOException e) {  
+                	e.printStackTrace();
+                   /* logger.error(EXCEPTION_NAME, e);  */
+                	
+                }  
+            }  
+        }  
+        
+        return success;  
+    }  
+	
+	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());*/
+		
+		/*, 21, , "123", "C:/ftptest", "test.txt", input*/
+		
+		boolean a =clientUtils.deleteFtpFile("192.168.168.101", 21, "testftpservice", "123", "ftptest", "aa.txt");
+		
+		System.out.println(a);
+		  
+		 
+	}
 }
@@ -72,6 +72,8 @@ public class Test {
 	   out = new GZIPOutputStream(new FileOutputStream(target));
 	   byte[] array = new byte[1024];
 	   int number = -1;
+	   
+	   System.out.println( in.read(array, 0, array.length) != -1);
 	   while((number = in.read(array, 0, array.length)) != -1) {
 	    out.write(array, 0, number);
 	   }
@@ -102,10 +104,20 @@ public class Test {
 	  }
 	  return target;
 	 }
-/*	 
+ 
 	 public static void main(String[] args) {
-		  File[] sources = new File[] {new File("D:/test.txt"), new File("D:/test1.txt")};
+		/*  File[] sources = new File[] {new File("D:/test.txt")};
+		  
 		  File target = new File("release_package.tar");
+		  
+		  File targetFile = pack(sources, target);
+		  
+		  FTPClientUtils clientUtils = new FTPClientUtils();
+		  
+		  clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());
+		  
 		  File gzFile =  compress(pack(sources, target));
-	 }*/
+		  
+		  clientUtils.testUpLoadFromDisk(gzFile,gzFile.getName());*/
+	 }
 }
@@ -248,19 +248,8 @@ var FormWizard = function() {
 		  				}
 		  			});
-                	
-                	
+                }	
-              /*  if(current == 3){
-                	
-                	mapB.clearOverlays();
-                	
-                	circle = '';
-                 	
-                 	drawingManager.close();
-                	
-                }*/
-              
                 /** 如果为最后一步显示提交按钮，隐藏下一步按钮,否则隐藏提交按钮，显示下一步按钮 */
                 if (current >= total) {
@@ -384,5 +373,6 @@ var FormWizard = function() {
 			$('#submit_station_form').find('.button-previous').hide();
 		}
-	};
+	}
+
 }();