Преглед изворни кода

增加上海保税仓的回签单回传到附件

koul пре 5 година
родитељ
комит
8a324cc518

+ 1 - 36
src/main/java/com/uas/LhctApplication.java

@@ -1,17 +1,9 @@
 package com.uas;
 package com.uas;
 
 
-import com.uas.util.BaseUtil;
-import com.uas.util.JdbcUtil;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-
-import java.util.Date;
-
-import static com.uas.main.Download.downloadRun;
-import static com.uas.main.DownloadFilePath.runDownloadFilePath;
-import static com.uas.main.Upload.uploadRun;
 
 
 /**
 /**
  * @author koul
  * @author koul
@@ -21,34 +13,7 @@ import static com.uas.main.Upload.uploadRun;
 @SpringBootApplication
 @SpringBootApplication
 @EnableScheduling
 @EnableScheduling
 public class LhctApplication {
 public class LhctApplication {
-
     public static void main(String[] args) {
     public static void main(String[] args) {
         SpringApplication.run(LhctApplication.class, args);
         SpringApplication.run(LhctApplication.class, args);
     }
     }
-
-    @Scheduled(fixedRate=1000*60*5)
-    public void ediSendAndReceive() {
-        uploadRun();
-        downloadRun();
-        closeJdbc();
-    }
-
-    @Scheduled(fixedRate=1000*60*60)
-    public void downloadFile() {
-        runDownloadFilePath();
-        closeJdbc();
-    }
-    private void closeJdbc(){
-        //关闭数据库连接
-        try{
-            if(JdbcUtil.connection!=null){
-                JdbcUtil.connection.close();
-            }
-        }catch(Exception e){
-            BaseUtil.getLogger().error(e.toString());
-            e.printStackTrace();
-        }finally{
-            JdbcUtil.connection = null;
-        }
-    }
 }
 }

+ 2 - 0
src/main/java/com/uas/main/DownloadFilePath.java

@@ -25,6 +25,8 @@ public class DownloadFilePath {
         downloadFilePath("N_YITOA_LHCT-FS","N_YITOA_LHCT");
         downloadFilePath("N_YITOA_LHCT-FS","N_YITOA_LHCT");
 		//联合创泰-顺丰
 		//联合创泰-顺丰
 		downloadFilePath("N_YITOA_LHCT-SF","N_YITOA_LHCT");
 		downloadFilePath("N_YITOA_LHCT-SF","N_YITOA_LHCT");
+		//联合创泰-上海保税仓
+		downloadFilePath("N_YITOA_LHCT-SLC","N_YITOA_LHCT");
 
 
 	}
 	}
 	
 	

+ 65 - 0
src/main/java/com/uas/task/ScheduleTask.java

@@ -0,0 +1,65 @@
+package com.uas.task;
+
+
+import com.uas.util.BaseUtil;
+import com.uas.util.JdbcUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import static com.uas.main.Download.downloadRun;
+import static com.uas.main.DownloadFilePath.runDownloadFilePath;
+import static com.uas.main.Upload.uploadRun;
+
+
+/**
+ * @author koul
+ * @email koul@usoftchina.com
+ * @date 2020-11-20 09:42
+ */
+@Component("scheduleTask")
+public class ScheduleTask {
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    /**
+     * XML文件处理
+     */
+    @Scheduled(fixedRate=1000*60*5)
+    public void ediSendAndReceive() {
+        logger.info("XML文件处理开始");
+        long timeMillis = System.currentTimeMillis();
+        uploadRun();
+        downloadRun();
+        closeJdbc();
+        logger.info("XML文件处理结束:用时" + ((System.currentTimeMillis() - timeMillis) / 1000));
+    }
+
+    /**
+     * 签收单回传附件处理
+     */
+    @Scheduled(fixedRate=1000*60*60)
+    public void downloadFile() {
+        logger.info("签收单回传附件开始");
+        long timeMillis = System.currentTimeMillis();
+        runDownloadFilePath();
+        closeJdbc();
+        logger.info("签收单回传附件结束:用时" + ((System.currentTimeMillis() - timeMillis) / 1000));
+    }
+
+    /**
+     * 关闭数据库连接
+     */
+    private void closeJdbc(){
+        try{
+            if(JdbcUtil.connection!=null){
+                JdbcUtil.connection.close();
+            }
+        }catch(Exception e){
+            BaseUtil.getLogger().error(e.toString());
+            e.printStackTrace();
+        }finally{
+            JdbcUtil.connection = null;
+        }
+    }
+}

+ 1 - 1
src/main/resources/properties/ftpconfig.properties

@@ -6,7 +6,7 @@
         "password":"Slc%YiToa",
         "password":"Slc%YiToa",
         "downloadpath":"YITOA/chuangt_postback",
         "downloadpath":"YITOA/chuangt_postback",
         "in":"YITOA/chuangt_normal",
         "in":"YITOA/chuangt_normal",
-        "file":""
+        "file":"YITOA/chuangt_signback"
     },
     },
     "N_YITOA_LHCT-ZSD":{
     "N_YITOA_LHCT-ZSD":{
         "ip":"47.106.234.187",
         "ip":"47.106.234.187",