Browse Source

增加供应链测试-顺丰

koul 4 years ago
parent
commit
1cf07a420c

+ 3 - 3
src/main/java/com/uas/service/Impl/DownloadFilePathServiceImpl.java

@@ -53,7 +53,7 @@ public class DownloadFilePathServiceImpl implements DownloadFilePathService {
     		Map<String,Object> servMap = JdbcUtil.getFtpConfigs();
 			Map<String,Object> ftpMap = (Map<String,Object>)servMap.get(depot);
 			String fileName = "";
-			if ("N_YITOA_LHCT-SF".equals(depot)){
+			if ("N_YITOA_LHCT-SF".equals(depot)||"N_YITOA_LHCT_T-SF".equals(depot)){
 				sftp = new SFTPUtil(ftpMap.get("user").toString(),ftpMap.get("password").toString(),
 						ftpMap.get("ip").toString(),
 						Integer.parseInt(ftpMap.get("port").toString()));
@@ -69,13 +69,13 @@ public class DownloadFilePathServiceImpl implements DownloadFilePathService {
 									fileName += "," + file.getOriginalFilename().replaceAll(",", ",");
 									boolean bol = FileUtil.fileUp(statement, file, sob);
 									if (bol) {
-                                        if ("N_YITOA_LHCT-SF".equals(depot)) {
+                                        if ("N_YITOA_LHCT-SF".equals(depot)||"N_YITOA_LHCT_T-SF".equals(depot)) {
                                             Boolean rename =
                                                     sftp.rename("/" + ftpMap.get("file").toString() + "/" + file.getName(),
                                                             "/outbounddeliverydetails/backup/" + file.getName());
                                         }
 									}else {
-										if ("N_YITOA_LHCT-SF".equals(depot)) {
+										if ("N_YITOA_LHCT-SF".equals(depot)||"N_YITOA_LHCT_T-SF".equals(depot)) {
 											Boolean rename =
 													sftp.rename("/" + ftpMap.get("file").toString() + "/" + file.getName(), "goodsreceipt/backup/" + file.getName());
 										}

+ 4 - 4
src/main/java/com/uas/service/Impl/DownloadServiceImpl.java

@@ -68,7 +68,7 @@ public class DownloadServiceImpl implements DownloadService {
 		try {
 			Map<String,Object> servMap = JdbcUtil.getFtpConfigs();
 			Map<String,Object> ftpMap = (Map<String,Object>)servMap.get(depot);
-			if ("N_YITOA_LHCT-SF".equals(depot)){
+			if ("N_YITOA_LHCT-SF".equals(depot)||"N_YITOA_LHCT_T-SF".equals(depot)){
 				sftp = new SFTPUtil(ftpMap.get("user").toString(),ftpMap.get("password").toString(),
 						ftpMap.get("ip").toString(),
 						Integer.parseInt(ftpMap.get("port").toString()));
@@ -82,7 +82,7 @@ public class DownloadServiceImpl implements DownloadService {
 			}
 			if(client!=null||sftp!=null) {
 				List<File> files = null;
-				if ("N_YITOA_LHCT-SF".equals(depot)) {
+				if ("N_YITOA_LHCT-SF".equals(depot)||"N_YITOA_LHCT_T-SF".equals(depot)) {
 					files = sftp.download(ftpMap.get("downloadpath").toString());
 
 				}else if("N_YITOA_LHCT-SLC".equals(depot)){
@@ -113,14 +113,14 @@ public class DownloadServiceImpl implements DownloadService {
 								executeRes = JdbcUtil.executeSqls(connect, sqls);
 
 								if (executeRes) {
-									if ("N_YITOA_LHCT-SF".equals(depot)) {
+									if ("N_YITOA_LHCT-SF".equals(depot)||"N_YITOA_LHCT_T-SF".equals(depot)) {
 										Boolean rename = sftp.rename(ftpMap.get("downloadpath").toString() + "/" + s, "goodsreceipt/backup/" + s);
 									} else {
 										//移动处理完的文件到bak文件夹下
 										client.rename(file.getName(), "bak/" + file.getName());
 									}
 								}else{
-									if ("N_YITOA_LHCT-SF".equals(depot)) {
+									if ("N_YITOA_LHCT-SF".equals(depot)||"N_YITOA_LHCT_T-SF".equals(depot)) {
 										Boolean rename = sftp.rename(ftpMap.get("downloadpath").toString() + "/" + s, "goodsreceipt/backup/" + s);
 									} else {
 										//移动处理完的文件到failed文件夹下