对附件上传做处理

src/main/java/com/uas/main/Download.java

@@ -40,7 +40,6 @@ public class Download{
 	 */
 	public static List<String> parseXmlFileToSqls(File file,Statement statement){
 		List<String> sqls = new ArrayList<String>();
-		Statement stm=statement;
 		String mainTableUpdateSql = null;
 		String updateDetailConditon = null;
 		List<Map<String,String>> detailXmlConfig = null;
@@ -98,7 +97,7 @@ public class Download{
 		logSql = getLogXmlDataAndInterceptorSql(mainData,detailData,xmlConfig,statement,fileName);
 		sqls.addAll(logSql);
 		try {
-			stm.close();
+			statement.close();
 		} catch (SQLException e1) {
 			e1.printStackTrace();
 		}
@@ -460,7 +459,7 @@ public class Download{
 		try {
 			Map<String,Object> servMap = JdbcUtil.getFtpConfigs();
 			Map<String,Object> ftpMap = (Map<String,Object>)servMap.get(depot);
-			if ("N_YITOA_LHCT-SF".equals(depot)||"N_YITOA_LHCT-ZX".equals(depot)){
+			if ("N_YITOA_LHCT-SF".equals(depot)){
 				sftp = new SFTPUtil(ftpMap.get("user").toString(),ftpMap.get("password").toString(),
 						ftpMap.get("ip").toString(),
 						Integer.parseInt(ftpMap.get("port").toString()));
@@ -474,7 +473,7 @@ public class Download{
 			}
 			if(client!=null||sftp!=null) {
 				List<File> files = null;
-				if ("N_YITOA_LHCT-SF".equals(depot)||"N_YITOA_LHCT-ZX".equals(depot)) {
+				if ("N_YITOA_LHCT-SF".equals(depot)) {
 					files = sftp.download(ftpMap.get("downloadpath").toString());
 
 				}else if("N_YITOA_LHCT-SLC".equals(depot)){
@@ -486,7 +485,6 @@ public class Download{
 				String fileName = "";
 				if (files != null && files.size() > 0) {
 					connect = JdbcUtil.getConnectBySob(sob);
-					Statement statement = connect.createStatement();
 					if (connect != null) {
 						for (File file : files) {
 							try {
@@ -495,6 +493,7 @@ public class Download{
 								if (!checkXmlFileToSqlToEnterprise(file, enterprise)) {
 									continue;
 								}
+								Statement statement = connect.createStatement();
 								sqls = parseXmlFileToSqls(file, statement);
 								if (sqls == null) {
 									continue;
@@ -506,9 +505,6 @@ public class Download{
 									if ("N_YITOA_LHCT-SF".equals(depot)) {
 										String s = file.getName().substring(0, file.getName().indexOf(".")) + ".xml";
 										Boolean rename = sftp.rename(ftpMap.get("downloadpath").toString() + "/" + s, "goodsreceipt/backup/" + s);
-									}else if("N_YITOA_LHCT-ZX".equals(depot)){
-										String s = file.getName().substring(0, file.getName().indexOf(".")) + ".xml";
-										Boolean rename = sftp.rename(ftpMap.get("downloadpath").toString() + "/" + s,ftpMap.get("downloadpath").toString() + "/bak/" + s);
 									} else {
 										//移动处理完的文件到bak文件夹下
 										client.rename(file.getName(), "bak/" + file.getName());

src/main/java/com/uas/main/DownloadFilePath.java

@@ -22,11 +22,9 @@ public class DownloadFilePath {
 
     public static void runDownloadFilePath(){
 		//联合创泰-富森
-        downloadFilePath("N_YITOA_LHCT-FSFILE","N_YITOA_LHCT");
+        downloadFilePath("N_YITOA_LHCT-FS","N_YITOA_LHCT");
 		//联合创泰-顺丰
-		downloadFilePath("N_YITOA_LHCT-SFFILE","N_YITOA_LHCT");
-        //联合创泰-中芯
-        //downloadFilePath("N_YITOA_LHCT-ZXFILE","N_YITOA_LHCT");
+		downloadFilePath("N_YITOA_LHCT-SF","N_YITOA_LHCT");
 
 	}
 	
@@ -40,13 +38,13 @@ public class DownloadFilePath {
     		Map<String,Object> servMap = JdbcUtil.getFtpConfigs();
 			Map<String,Object> ftpMap = (Map<String,Object>)servMap.get(depot);
 			String fileName = "";
-			if ("N_YITOA_LHCT-SFFILE".equals(depot)||"N_YITOA_LHCT-ZXFILE".equals(depot)){
+			if ("N_YITOA_LHCT-SF".equals(depot)){
 				sftp = new SFTPUtil(ftpMap.get("user").toString(),ftpMap.get("password").toString(),
 						ftpMap.get("ip").toString(),
 						Integer.parseInt(ftpMap.get("port").toString()));
 				if(sftp!=null){
 					sftp.login();
-					List<MultipartFile> files = sftp.downloadMultipartFile(ftpMap.get("downloadpath").toString());
+					List<MultipartFile> files = sftp.downloadMultipartFile(ftpMap.get("file").toString());
 					if(files!=null&&files.size()>0){
 						connect = JdbcUtil.getConnectBySob(sob);
 						if(connect!=null){
@@ -56,14 +54,10 @@ public class DownloadFilePath {
 									fileName += "," + file.getOriginalFilename().replaceAll(",", "，");
 									boolean bol = FileUtil.fileUp(statement, file, sob);
 									if (bol) {
-                                        if ("N_YITOA_LHCT-SFFILE".equals(depot)) {
+                                        if ("N_YITOA_LHCT-SF".equals(depot)) {
                                             Boolean rename =
-                                                    sftp.rename("/" + ftpMap.get("downloadpath").toString() + "/" + file.getName(),
+                                                    sftp.rename("/" + ftpMap.get("file").toString() + "/" + file.getName(),
                                                             "/outbounddeliverydetails/backup/" + file.getName());
-                                        }else if ("N_YITOA_LHCT-ZXFILE".equals(depot)){
-                                            Boolean rename =
-                                                    sftp.rename("/" + ftpMap.get("downloadpath").toString() + "/" + file.getName(),
-                                                            ftpMap.get("downloadpath").toString()+"/bak/" + file.getName());
                                         }
 									}
 								} catch (Exception e) {
@@ -106,7 +100,7 @@ public class DownloadFilePath {
 				}
 			}
 			if(!"".equals(fileName)){
-				BaseUtil.logDownload(fileName.substring(1),ftpMap.get("ip").toString(),ftpMap.get("downloadpath").toString());
+				BaseUtil.logDownload(fileName.substring(1),ftpMap.get("ip").toString(),ftpMap.get("file").toString());
 			}
     	} catch (Exception e) {
     		BaseUtil.getLogger().error(e.toString());

src/main/resources/properties/ftpconfig.properties

@@ -5,7 +5,8 @@
         "user":"yitoa",
         "password":"Slc%YiToa",
         "downloadpath":"YITOA/chuangt_postback",
-        "in":"YITOA/chuangt_normal"
+        "in":"YITOA/chuangt_normal",
+        "file":""
     },
     "N_YITOA_LHCT-ZSD":{
         "ip":"47.106.234.187",
@@ -13,7 +14,8 @@
         "user":"lhct",
         "password":"bE!8M3#5y0",
         "downloadpath":"LHCT/reply",
-        "in":"LHCT/appointment_in"
+        "in":"LHCT/appointment_in",
+        "file":""
     },
     "N_YITOA_LHCT_HK-FS":{
         "ip":"113.100.137.106",
@@ -21,7 +23,8 @@
         "user":"b2b_ftp",
         "password":"24g777sW",
         "downloadpath":"yingtang_chuangt_hk_postback",
-        "in":"yingtang_chuangt_hk_normal"
+        "in":"yingtang_chuangt_hk_normal",
+        "file":""
     },
     "N_YITOA_LHCT-FS":{
         "ip":"113.100.137.106",
@@ -29,7 +32,8 @@
         "user":"b2b_ftp",
         "password":"24g777sW",
         "downloadpath":"chuangt_postback",
-        "in":"chuangt_normal"
+        "in":"chuangt_normal",
+        "file":"chuangt_signback"
     },
     "N_YITOA_LHCT-HM":{
         "ip":"180.235.64.251",
@@ -37,7 +41,8 @@
         "user":"ufct",
         "password":"yc00lk",
         "downloadpath":"UFCT/send",
-        "in":"UFCT/recv"
+        "in":"UFCT/recv",
+        "file":""
     },
     "N_YITOA_LHCT-SF":{
         "ip":"mcs-cas-api-sftp.sf-express.com",
@@ -46,23 +51,6 @@
         "password":"g9Y0Op7K",
         "downloadpath":"goodsreceipt/data",
         "in":"stockin/data",
-        "file":""
-    },
-    "N_YITOA_LHCT-FSFILE":{
-        "ip":"113.100.137.106",
-        "port":21,
-        "user":"b2b_ftp",
-        "password":"24g777sW",
-        "downloadpath":"chuangt_signback",
-        "in":""
-    },
-    "N_YITOA_LHCT-SFFILE":{
-        "ip":"mcs-cas-api-sftp.sf-express.com",
-        "port":3022,
-        "user":"wms_ufct",
-        "password":"g9Y0Op7K",
-        "downloadpath":"outbounddeliverydetails/data",
-        "in":"",
-        "file":""
+        "file":"outbounddeliverydetails/data"
     }
 }