init

.idea/artifacts/lhct_jar.xml → .idea/artifacts/bsd_jar.xml

@@ -1,11 +1,11 @@
 <component name="ArtifactManager">
-  <artifact type="jar" name="hsl:jar">
-    <output-path>$PROJECT_DIR$/out/artifacts/lhct_jar</output-path>
-    <root id="archive" name="lhct.jar">
+  <artifact type="jar" name="bsd:jar">
+    <output-path>$PROJECT_DIR$/out/artifacts/bsd_jar</output-path>
+    <root id="archive" name="bsd.jar">
       <element id="directory" name="META-INF">
         <element id="file-copy" path="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
       </element>
-      <element id="module-output" name="lhct" />
+      <element id="module-output" name="bsd" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-csv-1.4.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-io-2.4.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-net-3.6.jar" path-in-jar="/" />

.idea/compiler.xml

@@ -7,17 +7,17 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="lhct" />
+        <module name="bsd" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel target="8">
-      <module name="lhct" target="1.8" />
+      <module name="bsd" target="1.8" />
       <module name="warehouse-edi" target="1.8" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="lhct" options="-parameters" />
+      <module name="bsd" options="-parameters" />
       <module name="warehouse-edi" options="-parameters" />
     </option>
   </component>

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/lhct.iml" filepath="$PROJECT_DIR$/.idea/lhct.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/bsd.iml" filepath="$PROJECT_DIR$/.idea/bsd.iml" />
     </modules>
   </component>
 </project>

src/main/java/com/uas/LhctApplication.java → src/main/java/com/uas/BSDApplication.java

@@ -12,8 +12,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableScheduling
-public class LhctApplication {
+public class BSDApplication {
     public static void main(String[] args) {
-        SpringApplication.run(LhctApplication.class, args);
+        SpringApplication.run(BSDApplication.class, args);
     }
 }

src/main/java/com/uas/service/Impl/DownloadFilePathServiceImpl.java

@@ -25,20 +25,9 @@ public class DownloadFilePathServiceImpl implements DownloadFilePathService {
 
 	@Override
     public void runDownloadFilePath(){
-		//联合创泰-富森
-        downloadFilePath("N_YITOA_LHCT-FS","N_YITOA_LHCT");
-		//联合创泰-顺丰
-		downloadFilePath("N_YITOA_LHCT-SF","N_YITOA_LHCT");
-		//联合创泰-上海保税仓
-		downloadFilePath("N_YITOA_LHCT-SLC","N_YITOA_LHCT");
-        //联合创泰-泓明仓
-        downloadFilePath("N_YITOA_LHCT-HM","N_YITOA_LHCT");
-        //联合创泰-准时达
-        downloadFilePath("N_YITOA_LHCT-ZSD","N_YITOA_LHCT");
-        //联合创泰电子-准时达
-		downloadFilePath("LHCT_SZ-ZSD","LHCT_SZ");
-		//联合创泰-顺丰
-		downloadFilePath("N_YITOA_LHCT_T-SF","N_YITOA_LHCT_T");
+
+        //博思达香港-准时达
+		downloadFilePath("BSD_HK-ZSD","BSD_HK");
 	}
 	
 	@SuppressWarnings("unchecked")
@@ -53,43 +42,6 @@ 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)||"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()));
-				if(sftp!=null){
-					sftp.login();
-					List<MultipartFile> files = sftp.downloadMultipartFile(ftpMap.get("file").toString());
-					if(files!=null&&files.size()>0){
-						connect = JdbcUtil.getConnectBySob(sob);
-						if(connect!=null){
-							for (MultipartFile file:files) {
-								try {
-									Statement statement = connect.createStatement();
-									fileName += "," + file.getOriginalFilename().replaceAll(",", "，");
-									boolean bol = FileUtil.fileUp(statement, file, sob);
-									if (bol) {
-                                        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)||"N_YITOA_LHCT_T-SF".equals(depot)) {
-											Boolean rename =
-													sftp.rename("/" + ftpMap.get("file").toString() + "/" + file.getName(), "goodsreceipt/backup/" + file.getName());
-										}
-									}
-								} catch (Exception e) {
-									e.printStackTrace();
-									BaseUtil.getLogger().error(e.toString());
-									continue;
-								}
-							}
-						}
-					}
-				}
-			}else {
 				client = FtpUtil.connect(ftpMap);
 				if(client!=null){
 					List<File> files = FtpUtil.downloadAllFileByDir(client,ftpMap.get("file").toString());
@@ -107,10 +59,10 @@ public class DownloadFilePathServiceImpl implements DownloadFilePathService {
 									boolean bol = FileUtil.fileUp(statement, file1, sob);
 									if (bol) {
 										//移动处理完的文件到bak文件夹下
-										client.rename(file.getName(), "bak/" + file.getName());
+										client.rename(file.getName(), "/HKHub/UPSTAR/signback_bak/" + file.getName());
 									}else {
 										//移动处理完的文件到failed文件夹下
-										client.rename(file.getName(), "failed/" + file.getName());
+										client.rename(file.getName(), "/HKHub/UPSTAR/error_signback/" + file.getName());
 									}
 								} catch (Exception e) {
 									e.printStackTrace();
@@ -121,7 +73,6 @@ public class DownloadFilePathServiceImpl implements DownloadFilePathService {
 						}
 					}
 				}
-			}
 			if(!"".equals(fileName)){
 				BaseUtil.logDownload(fileName.substring(1),ftpMap.get("ip").toString(),ftpMap.get("file").toString());
 			}

src/main/java/com/uas/service/Impl/DownloadServiceImpl.java

@@ -1,11 +1,9 @@
 package com.uas.service.Impl;
 
-import com.jcraft.jsch.JSchException;
 import com.uas.service.DownloadService;
 import com.uas.util.BaseUtil;
 import com.uas.util.FtpUtil;
 import com.uas.util.JdbcUtil;
-import com.uas.util.SFTPUtil;
 import org.apache.commons.net.ftp.FTPClient;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.dom4j.Document;
@@ -32,24 +30,8 @@ public class DownloadServiceImpl implements DownloadService {
 
 	@Override
 	public void downloadRun(){
-		//联合创泰-富森
-		downloadByDepotAndSob("N_YITOA_LHCT-FS","N_YITOA_LHCT","聯合創泰科技有限公司");
-		//联合创泰-顺丰
-		downloadByDepotAndSob("N_YITOA_LHCT-SF","N_YITOA_LHCT","聯合創泰科技有限公司");
 		//联合创泰-准时达
-		downloadByDepotAndSob("N_YITOA_LHCT-ZSD","N_YITOA_LHCT","聯合創泰科技有限公司");
-		//联合创泰-SLC上海保税仓
-		downloadByDepotAndSob("N_YITOA_LHCT-SLC","N_YITOA_LHCT","聯合創泰科技有限公司");
-		//联合创泰-中芯
-		//downloadByDepotAndSob("N_YITOA_LHCT-ZX","N_YITOA_LHCT","聯合創泰科技有限公司");
-		//联合创泰-泓明
-		downloadByDepotAndSob("N_YITOA_LHCT-HM","N_YITOA_LHCT","聯合創泰科技有限公司");
-		//英唐创泰香港-富森
-		downloadByDepotAndSob("N_YITOA_LHCT_HK-FS","N_YITOA_LHCT_HK","英唐創泰香港科技有限公司");
-        //联合创泰电子-准时达
-        downloadByDepotAndSob("LHCT_SZ-ZSD","LHCT_SZ","联合创泰（深圳）电子有限公司");
-		//供应链测试-顺丰
-		downloadByDepotAndSob("N_YITOA_LHCT_T-SF","N_YITOA_LHCT_T","聯合創泰科技有限公司");
+		downloadByDepotAndSob("BSD_HK-ZSD","BSD_HK","Upstar Technology (HK) Limited");
 
 
 	}
@@ -60,37 +42,15 @@ public class DownloadServiceImpl implements DownloadService {
 	public void downloadByDepotAndSob(String depot,String sob,String enterprise){
 		BaseUtil.getLogger().info("download xml" + " from "+depot);
 		FTPClient client = null;
-		SFTPUtil sftp = null;
 		List<String> sqls = new ArrayList<String>();
 		boolean executeRes = false;
 		Connection connect = null;
-
 		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_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()));
-				try {
-					sftp.login();
-				} catch (JSchException e) {
-					e.printStackTrace();
-				}
-			}else {
-				client = FtpUtil.connect(ftpMap);
-			}
-			if(client!=null||sftp!=null) {
-				List<File> files = null;
-				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)){
-					files = FtpUtil.downloadDirFileByType(client, "XML",
-							ftpMap.get("downloadpath").toString());
-				}else{
-					files = FtpUtil.downloadAllFileByType(client, "XML");
-				}
+			client = FtpUtil.connect(ftpMap);
+			if(client!=null) {
+				List<File> files = FtpUtil.downloadAllFileByType(client, "XML");
 				String fileName = "";
 				if (files != null && files.size() > 0) {
 					connect = JdbcUtil.getConnectBySob(sob);
@@ -104,28 +64,18 @@ public class DownloadServiceImpl implements DownloadService {
 								}
 								Statement statement = connect.createStatement();
 								sqls = parseXmlFileToSqls(file, statement);
-								String s = file.getName().substring(0, file.getName().indexOf(".")) + ".xml";
 								if (sqls == null) {
-									sftp.rename(ftpMap.get("downloadpath").toString() + "/" + s, "goodsreceipt/backup/" + s);
 									continue;
 								}
 
 								executeRes = JdbcUtil.executeSqls(connect, sqls);
 
 								if (executeRes) {
-									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());
-									}
+									//移动处理完的文件到bak文件夹下
+									client.rename(file.getName(), "/HKHub/UPSTAR/reply_bak/" + file.getName());
 								}else{
-									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文件夹下
-										client.rename(file.getName(), "failed/" + file.getName());
-									}
+									//移动处理完的文件到failed文件夹下
+									client.rename(file.getName(), "/HKHub/UPSTAR/erro_reply/" + file.getName());
 								}
 								statement.close();
 							} catch (Exception e) {
@@ -149,9 +99,6 @@ public class DownloadServiceImpl implements DownloadService {
 				FtpUtil.closeFtpClient(client);
 				client = null;
 			}
-			if (sftp!=null){
-				sftp.logout();
-			}
 			//把当前的连接关闭
 			try {
 				if(connect!=null){

src/main/java/com/uas/service/Impl/UploadServiceImpl.java

@@ -24,14 +24,8 @@ public class UploadServiceImpl implements UploadService {
 
 	@Override
 	public void uploadRun() {
-		//联合创泰
-		uploadBySob("N_YITOA_LHCT");
-		//联合创泰电子
-		uploadBySob("LHCT_SZ");
-		//供应链测试
-		uploadBySob("N_YITOA_LHCT_T");
-		//联合创泰香港
-		//uploadBySob("N_YITOA_LHCT_HK");
+		//博思达香港
+		uploadBySob("BSD_HK");
 	}
 
 	@Override

src/main/java/com/uas/task/ScheduleTask.java

@@ -25,8 +25,8 @@ public class ScheduleTask {
     @Autowired
     private DownloadService downloadService;
 
-    @Autowired
-    private DownloadFilePathService downloadFilePathService;
+    /*@Autowired
+    private DownloadFilePathService downloadFilePathService;*/
 
     /**
      * XML文件处理
@@ -43,11 +43,11 @@ public class ScheduleTask {
     /**
      * 签收单回传附件处理
      */
-    @Scheduled(fixedRate=1000*60*60)
+   /* @Scheduled(fixedRate=1000*60*60)
     public void downloadFile() {
         BaseUtil.getLogger().info("签收单回传附件开始");
         long timeMillis = System.currentTimeMillis();
         downloadFilePathService.runDownloadFilePath();
         BaseUtil.getLogger().info("签收单回传附件结束:用时" + ((System.currentTimeMillis() - timeMillis) / 1000));
-    }
+    }*/
 }

src/main/java/com/uas/util/SFTPUtil.java

@@ -557,55 +557,4 @@ public class SFTPUtil {
         }
        return result;
     }
-
-    //上传文件测试
-    /*public static void main(String[] args) throws SftpException, IOException {
-        SFTPUtil sftp = new SFTPUtil("wms_ufct", "ZjJ05GFV", "218.17.248.243", 45301);
-       //FtpUtil.connect("/To_XN_TEST/","218.4.62.135",21,"hsltoxn", "HtxN527%#");
-        try {
-            sftp.login();
-        } catch (JSchException e) {
-            e.printStackTrace();
-        }
-        /*File file = new File("C:\\Users\\usoft\\Downloads\\视图字段.xls");
-        InputStream is = new FileInputStream(file);
-
-        sftp.upload("/","To_XN_TEST", "uas_sftp.xls", is);*//*
-        //sftp.listFiles("/stockout/data/");
-        String ss = "/stockout/data/";
-        String addr = "D:/BaiduNetdiskDownload\\";
-        *//*String[] strings = sftp.lsFiles(ss);
-        for (String s:strings) {
-            System.err.println(s);
-            if (!".".equals(s)&&!"..".equals(s)) {
-                *//**//*sftp.download(ss,s,addr);
-                File file = new File(ss+s);
-                InputStream inputStream = new FileInputStream(file);*//**//*
-                boolean bat = sftp.downloadFile(ss, s, "D:/", s);
-                System.err.println(bat);
-            }
-        }
-
-        sftp.logout();*//*
-        String sss = "GR_20190521121137B.xml";
-        String str = "\\stockout\\data\\";
-        String str1= str.replace("\\","/");
-        System.err.println(str);
-        *//*try {
-            InputStream in = new FileInputStream(sss);
-            SAXReader reader = new SAXReader();
-            Document doc = reader.read(in);
-            in.close();
-            Element element = doc.getRootElement();
-            System.err.println(element);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }*//*
-        //String src = "/stockout/data/GR_20190521121137B.xml";
-        //sftp.copyfile(src,"/stockout/backup/GR_20190521121137B.xml");
-        //sftp.logout();
-        boolean connect = FtpUtil.connect("From_QF", "112.74.205.182", 21, "YTZH02", "Ytzh)@2018");
-        System.err.println(connect);
-        FtpUtil.closeFtpClient(new FTPClient());
-    }*/
 }

src/main/resources/properties/dbconfig.properties

@@ -1,22 +1,7 @@
 {
-	"N_YITOA_LHCT":{
+	"BSD_HK":{
 		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"N_YITOA_LHCT",
-		"password":"select!#%*("
-	},
-	"N_YITOA_LHCT_HK":{
-		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"N_YITOA_LHCT_HK",
-		"password":"select!#%*("
-	},
-	"LHCT_SZ":{
-		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"LHCT_SZ",
-		"password":"select!#%*("
-	},
-	"N_YITOA_LHCT_T":{
-		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"N_YITOA_LHCT_T",
+		"user":"BSD_HK",
 		"password":"select!#%*("
 	}
 }

src/main/resources/properties/ftpconfig.properties

@@ -1,74 +1,11 @@
 {
-    "N_YITOA_LHCT-SLC":{
-        "ip":"210.5.145.196",
-        "port":21,
-        "user":"yitoa",
-        "password":"Slc%YiToa",
-        "downloadpath":"YITOA/chuangt_postback",
-        "in":"YITOA/chuangt_normal",
-        "file":"YITOA/chuangt_signback"
-    },
-    "N_YITOA_LHCT-ZSD":{
+    "BSD_HK-ZSD":{
         "ip":"47.106.234.187",
         "port":21,
         "user":"lhct",
         "password":"bE!8M3#5y0",
-        "downloadpath":"LHCT/reply",
-        "in":"LHCT/appointment_in",
-        "file":"LHCT/signback"
-    },
-    "N_YITOA_LHCT_HK-FS":{
-        "ip":"113.100.137.106",
-        "port":21,
-        "user":"b2b_ftp",
-        "password":"24g777sW",
-        "downloadpath":"yingtang_chuangt_hk_postback",
-        "in":"yingtang_chuangt_hk_normal",
-        "file":""
-    },
-    "N_YITOA_LHCT-FS":{
-        "ip":"113.100.137.106",
-        "port":21,
-        "user":"b2b_ftp",
-        "password":"24g777sW",
-        "downloadpath":"chuangt_postback",
-        "in":"chuangt_normal",
-        "file":"chuangt_signback"
-    },
-    "N_YITOA_LHCT-HM":{
-        "ip":"180.235.64.251",
-        "port":21,
-        "user":"ufct",
-        "password":"yc00lk",
-        "downloadpath":"UFCT/send",
-        "in":"UFCT/recv",
-        "file":"UFCT/signback"
-    },
-    "N_YITOA_LHCT-SF":{
-        "ip":"mcs-cas-api-sftp.sf-express.com",
-        "port":3022,
-        "user":"wms_ufct",
-        "password":"g9Y0Op7K",
-        "downloadpath":"goodsreceipt/data",
-        "in":"stockin/data",
-        "file":"outbounddeliverydetails/data"
-    },
-    "N_YITOA_LHCT_T-SF":{
-        "ip":"218.17.248.243",
-        "port":45301,
-        "user":"wms_ufct",
-        "password":"ZjJ05GFV",
-        "downloadpath":"goodsreceipt/data",
-        "in":"stockin/data",
-        "file":"outbounddeliverydetails/data"
-    },
-    "LHCT_SZ-ZSD":{
-        "ip":"47.106.234.187",
-        "port":21,
-        "user":"lhctdz",
-        "password":"lhctdz@0121",
-        "downloadpath":"LHCT/LHCTDZ/postback",
-        "in":"LHCT/LHCTDZ/normal",
-        "file":"LHCT/LHCTDZ/signback"
+        "downloadpath":"HKHub/UPSTAR/reply",
+        "in":"HKHub/UPSTAR/appointment_in",
+        "file":"HKHub/UPSTAR/signback"
     }
 }