鹏利达-富森-EDI

.idea/.gitignore

@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml

.idea/encodings.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>

.idea/misc.xml

@@ -3,6 +3,13 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/bin" />
   </component>

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>hsl</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>hsl</name>
-    <description>华商龙仓库EDI</description>
+    <description>鹏利达EDI</description>
 
     <properties>
         <java.version>1.8</java.version>
@@ -24,6 +24,17 @@
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

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

@@ -29,12 +29,8 @@ import java.util.Map;
 public class DownloadFilePathServiceImpl implements DownloadFilePathService{
     @Override
     public void runDownloadFilePath(){
-        //香港华商龙-得尔达-回签单扫描回传
-        downloadFilePath("N_HUASL_T-DRD","N_HUASL_T");
-        //香港华商龙-富森-回签单扫描回传
-        downloadFilePath("N_HUASL_T-FS","N_HUASL_T");
-        //柏建控股-富森
-        downloadFilePath("N_BJKG_T-FS","N_BJKG_T");
+        //富森
+        downloadFilePath("N_PLD-FS","N_PLD");
     }
 
 

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

@@ -32,36 +32,8 @@ public class DownloadServiceImpl implements DownloadService {
 
     @Override
 	public void downloadRun(){
-		//香港华商龙-得尔达
-		downloadByDepotAndSob("N_HUASL_T-DRD","N_HUASL_T","香港华商龙");
-		//香港华商龙-富森
-		downloadByDepotAndSob("N_HUASL_T-FS","N_HUASL_T","香港华商龙");
-		//威尔电子-富森
-		downloadByDepotAndSob("N_WILICHK_T-FS","N_WILICHK_T","(华商龙)威尔电子");
-		//柏建控股-富森
-		downloadByDepotAndSob("N_BJKG_T-FS","N_BJKG_T","柏建控股");
-		//深圳华商龙-得尔达
-		downloadByDepotAndSob("N_HUASL_SZ-DRD","N_HUASL_SZ","深圳华商龙");
-		//上海宇声-得尔达
-		downloadByDepotAndSob("N_E_SHINE_SH-DRD","N_E_SHINE_SH","上海宇声");
-		//重庆华商龙-得尔达
-		downloadByDepotAndSob("HSL_CQ-DRD","HSL_CQ","重庆华商龙");
-		//北京华商龙-得尔达
-		downloadByDepotAndSob("HSL_BJ-DRD","HSL_BJ","北京华商龙");
-		//青岛华商龙-得尔达
-		downloadByDepotAndSob("N_HUASL_QD-DRD","N_HUASL_QD","青岛华商龙");
-        //香港华商龙-新宁
-        //downloadByDepotAndSob("N_HUASL-XN","N_HUASL","香港华商龙");
-
-		//downloadByDepotAndSob("N_BJKG-QF","N_BJKG","柏建控股");//柏建控股-旗丰
-		//downloadByDepotAndSob("N_WILICHK-QF","N_WILICHK","(华商龙)威尔电子");//威尔电子-旗丰
-		//downloadByDepotAndSob("N_HUASL-QF","N_HUASL","香港华商龙");//华商龙-旗丰
-//    	downloadByDepotAndSob("N_HUASL-JS","N_HUASL"); //华商龙-嘉晟
-//    	downloadByDepotAndSob("N_WILICHK-JS","N_WILICHK"); //威尔电子-嘉晟
-//    	downloadByDepotAndSob("N_BJKG-JS","N_BJKG"); //柏建控股-嘉晟
-//    	downloadByDepotAndSob("USOFT_MALL_HK-JS","USOFT_MALL_HK"); //优软商城香港-嘉晟
-//    	downloadByDepotAndSob("t_n_huasl-QF","t_n_huasl");
-
+		//鹏利达-富森
+		downloadByDepotAndSob("N_PLD-FS","N_PLD","鹏利达");
 	}
 
 

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

@@ -29,22 +29,8 @@ public class UploadServiceImpl implements UploadService {
 
     @Override
     public void uploadRun() {
-        //香港华商龙
-        uploadBySob("N_HUASL_T");
-        //威尔电子
-        uploadBySob("N_WILICHK_T");
-        //柏建控股
-        uploadBySob("N_BJKG_T");
-        //深圳华商龙
-        uploadBySob("N_HUASL_SZ");
-        //上海宇声
-        uploadBySob("N_E_SHINE_SH");
-        //青岛华商龙
-        uploadBySob("N_HUASL_QD");
-        //重庆华商龙
-        uploadBySob("HSL_CQ");
-        //北京华商龙
-        uploadBySob("HSL_BJ");
+        //鹏利达
+        uploadBySob("N_PLD");
     }
 
     @SuppressWarnings({ "unchecked"})

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

@@ -28,22 +28,26 @@ public class ScheduleTask {
 
     @Autowired
     private DownloadFilePathService downloadFilePathService;
-
+    /**
+     * xml报文上传下载
+     * */
    @Scheduled(fixedRate=1000*60*5)
     public void ediSendAndReceive() {
         uploadService.uploadRun();
         downloadService.downloadRun();
     }
 
-    @Scheduled(fixedRate=1000*60*60)
+    /*@Scheduled(fixedRate=1000*60*60)
     public void downloadStcockQty() {
         downloadStcockQtyService.downloadQty();
-    }
-
+    }*/
 
-    @Scheduled(fixedRate=1000*60*60)
+    /**
+     * 回签单
+     * */
+   /* @Scheduled(fixedRate=1000*60*60)
     public void filePath() {
         downloadFilePathService.runDownloadFilePath();
-     }
+     }*/
 
 }

src/main/resources/properties/dbconfig.properties

@@ -1,42 +1,7 @@
 {
-	"N_E_SHINE_SH":{
-		"url":"jdbc:oracle:thin:@10.10.10.103:1521:orcl",
-		"user":"N_E_SHINE_SH",
-		"password":"select!#%*("
-	},
-	"N_HUASL_T":{
-		"url":"jdbc:oracle:thin:@10.10.10.103:1521:orcl",
-		"user":"N_HUASL_T",
-		"password":"select!#%*("
-	},
-	"N_HUASL_SZ":{
-		"url":"jdbc:oracle:thin:@10.10.10.103:1521:orcl",
-		"user":"N_HUASL_SZ",
-		"password":"select!#%*("
-	},
-	"HSL_BJ":{
-		"url":"jdbc:oracle:thin:@10.10.10.103:1521:orcl",
-		"user":"HSL_BJ",
-		"password":"select!#%*("
-	},
-	"HSL_CQ":{
-		"url":"jdbc:oracle:thin:@10.10.10.103:1521:orcl",
-		"user":"HSL_CQ",
-		"password":"select!#%*("
-	},
-	"N_HUASL_QD":{
-		"url":"jdbc:oracle:thin:@10.10.10.103:1521:orcl",
-		"user":"N_HUASL_QD",
-		"password":"select!#%*("
-	},
-	"N_WILICHK_T":{
-		"url":"jdbc:oracle:thin:@10.10.10.103:1521:orcl",
-		"user":"N_WILICHK_T",
-		"password":"select!#%*("
-	},
-	"N_BJKG_T":{
-		"url":"jdbc:oracle:thin:@10.10.10.103:1521:orcl",
-		"user":"N_BJKG_T",
+	"N_PLD":{
+		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
+		"user":"N_PLD",
 		"password":"select!#%*("
 	}
 }

src/main/resources/properties/dbconfig3.properties

@@ -1,27 +0,0 @@
-{
-    "t_n_huasl":{
-		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"t_n_huasl",
-		"password":"select!#%*("    
-    },
-	"N_HUASL":{
-		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"N_HUASL",
-		"password":"select!#%*("
-	},
-	"N_WILICHK":{
-		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"N_WILICHK",
-		"password":"select!#%*("
-	},
-	"N_BJKG":{
-		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"N_BJKG",
-		"password":"select!#%*("
-	},
-	"USOFT_MALL_HK":{
-		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"USOFT_MALL_HK",
-		"password":"select!#%*("
-	}
-}

src/main/resources/properties/ftpconfig.properties

@@ -1,93 +1,10 @@
 {
-    "N_HUASL_SZ-DRD":{
-        "ip":"58.211.24.196",
+    "N_PLD-FS":{
+        "ip":"10.1.1.105",
         "port":21,
-        "user":"yitoa",
-        "password":"yitoa@2020",
-        "downloadpath":"Ack/SZHSL",
-        "in":"Order/SZHSL",
-        "qty":"Inv/SZHSL",
-        "file":""
-    },
-    "N_E_SHINE_SH-DRD":{
-        "ip":"58.211.24.196",
-        "port":21,
-        "user":"yitoa",
-        "password":"yitoa@2020",
-        "downloadpath":"Ack/SHYS",
-        "in":"Order/SHYS",
-        "qty":"Inv/SHYS",
-        "file":""
-    },
-    "N_HUASL_QD-DRD":{
-        "ip":"58.211.24.196",
-        "port":21,
-        "user":"yitoa",
-        "password":"yitoa@2020",
-        "downloadpath":"Ack/QDHSL",
-        "in":"Order/QDHSL",
-        "qty":"Inv/QDHSL",
-        "file":""
-    },
-    "HSL_BJ-DRD":{
-        "ip":"58.211.24.196",
-        "port":21,
-        "user":"yitoa",
-        "password":"yitoa@2020",
-        "downloadpath":"Ack/BJHSL",
-        "in":"Order/BJHSL",
-        "qty":"Inv/BJHSL",
-        "file":""
-    },
-    "HSL_CQ-DRD":{
-        "ip":"58.211.24.196",
-        "port":21,
-        "user":"yitoa",
-        "password":"yitoa@2020",
-        "downloadpath":"Ack/CQHSL",
-        "in":"Order/CQHSL",
-        "qty":"Inv/CQHSL",
-        "file":""
-    },
-    "N_BJKG_T-FS":{
-        "ip":"113.100.137.106",
-        "port":21,
-        "user":"b2b_ftp",
-        "password":"24g777sW",
-        "downloadpath":"baij_postback",
-        "in":"baij_normal",
-        "qty":"",
-        "file":"baij_signback"
-    },
-    "N_WILICHK_T-FS":{
-        "ip":"113.100.137.106",
-        "port":21,
-        "user":"b2b_ftp",
-        "password":"24g777sW",
-        "downloadpath":"weier_postback",
-        "in":"weier_normal",
-        "qty":"",
-        "file":""
-    },
-    "N_HUASL_T-FS":{
-        "ip":"113.100.137.106",
-        "port":21,
-        "user":"b2b_ftp",
-        "password":"24g777sW",
+        "user":"N_PLD",
+        "password":"pT3q4bTx",
         "downloadpath":"postback",
-        "in":"normal",
-        "qty":"",
-        "file":"signback"
-    },
-"N_HUASL_T-DRD":{
-"ip":"58.211.24.196",
-"port":21,
-"user":"yitoa_bond",
-"password":"yitoa_bond@2022",
-"downloadpath":"Ack/HSL",
-"in":"Order/HSL",
-"qty":"Inv/HSL",
-"file":""
-}
-
+        "in":"normal"
+    }
 }

src/main/resources/properties/ftpconfig3.properties

@@ -1,104 +0,0 @@
-{
-    "N_HUASL_SZ-DRD":{
-        "ip":"58.211.24.196",
-        "port":21,
-        "user":"yitoa",
-        "password":"yitoa@2020",
-        "downloadpath":"Ack/SZHSL",
-        "in":"Order/SZHSL",
-        "qty":"Inv/SZHSL"
-    },
-    "N_E_SHINE_SH-DRD":{
-        "ip":"58.211.24.196",
-        "port":21,
-        "user":"yitoa",
-        "password":"yitoa@2020",
-        "downloadpath":"Ack/SHYS",
-        "in":"Order/SHYS",
-        "qty":"Inv/SHYS"
-    },
-    "N_HUASL_QD-DRD":{
-        "ip":"58.211.24.196",
-        "port":21,
-        "user":"yitoa",
-        "password":"yitoa@2020",
-        "downloadpath":"Ack/QDHSL",
-        "in":"Order/QDHSL",
-        "qty":"Inv/QDHSL"
-    },
-    "HSL_BJ-DRD":{
-        "ip":"58.211.24.196",
-        "port":21,
-        "user":"yitoa",
-        "password":"yitoa@2020",
-        "downloadpath":"Ack/BJHSL",
-        "in":"Order/BJHSL",
-        "qty":"Inv/BJHSL"
-    },
-    "HSL_CQ-DRD":{
-        "ip":"58.211.24.196",
-        "port":21,
-        "user":"yitoa",
-        "password":"yitoa@2020",
-        "downloadpath":"Ack/CQHSL",
-        "in":"Order/CQHSL",
-        "qty":"Inv/CQHSL"
-    },
-    "N_BJKG-FS":{
-        "ip":"113.100.137.106",
-        "port":21,
-        "user":"b2b_ftp",
-        "password":"24g777sW",
-        "downloadpath":"baij_postback",
-        "in":"baij_normal"
-    },
-    "N_WILICHK-FS":{
-        "ip":"113.100.137.106",
-        "port":21,
-        "user":"b2b_ftp",
-        "password":"24g777sW",
-        "downloadpath":"weier_postback",
-        "in":"weier_normal"
-    },
-    "N_HUASL-FS":{
-        "ip":"113.100.137.106",
-        "port":21,
-        "user":"b2b_ftp",
-        "password":"24g777sW",
-        "downloadpath":"postback",
-        "in":"normal",
-        "file":"hsl/hkhsl/file"
-    },
-    "N_HUASL-XN":{
-        "ip":"218.4.62.135",
-        "port":21,
-        "user":"hsltoxn",
-        "password":"HtxN527%#",
-        "downloadpath":"From_XN",
-        "in":"To_XN"
-    },
-    "N_HUASL-QF":{
-		"ip":"omsftp.icorebuy.com",
-		"port":21,
-		"user":"YTZH02",
-		"password":"Ytzh)@2018",
-		"downloadpath":"From_QF",
-		"in":"TO_QF"
-	},
-	"N_WILICHK-QF":{
-		"ip":"omsftp.icorebuy.com",
-		"port":21,
-		"user":"YTZH02",
-		"password":"Ytzh)@2018",
-		"downloadpath":"From_QF",
-		"in":"TO_QF"
-	},
-	"N_BJKG-QF":{
-		"ip":"omsftp.icorebuy.com",
-		"port":21,
-		"user":"YTZH02",
-		"password":"Ytzh)@2018",
-		"downloadpath":"From_QF",
-		"in":"TO_QF"
-	}
-}