Browse Source

增加部分日志做记录

koul 5 years ago
parent
commit
6ac36915d0

+ 2 - 0
.idea/compiler.xml

@@ -12,11 +12,13 @@
     </annotationProcessing>
     </annotationProcessing>
     <bytecodeTargetLevel target="8">
     <bytecodeTargetLevel target="8">
       <module name="hsl" target="1.8" />
       <module name="hsl" target="1.8" />
+      <module name="warehouse-edi" target="1.8" />
     </bytecodeTargetLevel>
     </bytecodeTargetLevel>
   </component>
   </component>
   <component name="JavacSettings">
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
       <module name="hsl" options="-parameters" />
       <module name="hsl" options="-parameters" />
+      <module name="warehouse-edi" options="-parameters" />
     </option>
     </option>
   </component>
   </component>
 </project>
 </project>

+ 0 - 4
src/main/java/com/uas/LhctApplication.java

@@ -29,18 +29,14 @@ public class LhctApplication {
     @Scheduled(fixedRate=1000*60*5)
     @Scheduled(fixedRate=1000*60*5)
     public void ediSendAndReceive() {
     public void ediSendAndReceive() {
         uploadRun();
         uploadRun();
-        System.out.println("begin"+new Date());
         downloadRun();
         downloadRun();
         closeJdbc();
         closeJdbc();
-        System.out.println("run over!");
     }
     }
 
 
     @Scheduled(fixedRate=1000*60*60)
     @Scheduled(fixedRate=1000*60*60)
     public void downloadFile() {
     public void downloadFile() {
-        System.out.println("begin download"+new Date());
         runDownloadFilePath();
         runDownloadFilePath();
         closeJdbc();
         closeJdbc();
-        System.out.println("download over!");
     }
     }
     private void closeJdbc(){
     private void closeJdbc(){
         //关闭数据库连接
         //关闭数据库连接

+ 3 - 8
src/main/java/com/uas/main/Download.java

@@ -19,10 +19,7 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 public class Download{
 public class Download{
 
 
@@ -453,6 +450,7 @@ public class Download{
 
 
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	public static void downloadByDepotAndSob(String depot,String sob,String enterprise){
 	public static void downloadByDepotAndSob(String depot,String sob,String enterprise){
+		BaseUtil.getLogger().info("download xml" + " from "+depot);
 		FTPClient client = null;
 		FTPClient client = null;
 		SFTPUtil sftp = null;
 		SFTPUtil sftp = null;
 		List<String> sqls = new ArrayList<String>();
 		List<String> sqls = new ArrayList<String>();
@@ -488,12 +486,11 @@ public class Download{
 				String fileName = "";
 				String fileName = "";
 				if (files != null && files.size() > 0) {
 				if (files != null && files.size() > 0) {
 					connect = JdbcUtil.getConnectBySob(sob);
 					connect = JdbcUtil.getConnectBySob(sob);
+					Statement statement = connect.createStatement();
 					if (connect != null) {
 					if (connect != null) {
 						for (File file : files) {
 						for (File file : files) {
 							try {
 							try {
 								fileName += "," + file.getName();
 								fileName += "," + file.getName();
-								Statement statement = connect.createStatement();
-								System.err.println(statement);
 								//判断当前帐套和文件是否一致
 								//判断当前帐套和文件是否一致
 								if (!checkXmlFileToSqlToEnterprise(file, enterprise)) {
 								if (!checkXmlFileToSqlToEnterprise(file, enterprise)) {
 									continue;
 									continue;
@@ -509,11 +506,9 @@ public class Download{
 									if ("N_YITOA_LHCT-SF".equals(depot)) {
 									if ("N_YITOA_LHCT-SF".equals(depot)) {
 										String s = file.getName().substring(0, file.getName().indexOf(".")) + ".xml";
 										String s = file.getName().substring(0, file.getName().indexOf(".")) + ".xml";
 										Boolean rename = sftp.rename(ftpMap.get("downloadpath").toString() + "/" + s, "goodsreceipt/backup/" + s);
 										Boolean rename = sftp.rename(ftpMap.get("downloadpath").toString() + "/" + s, "goodsreceipt/backup/" + s);
-										System.err.println(rename);
 									}else if("N_YITOA_LHCT-ZX".equals(depot)){
 									}else if("N_YITOA_LHCT-ZX".equals(depot)){
 										String s = file.getName().substring(0, file.getName().indexOf(".")) + ".xml";
 										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);
 										Boolean rename = sftp.rename(ftpMap.get("downloadpath").toString() + "/" + s,ftpMap.get("downloadpath").toString() + "/bak/" + s);
-										System.err.println(rename);
 									} else {
 									} else {
 										//移动处理完的文件到bak文件夹下
 										//移动处理完的文件到bak文件夹下
 										client.rename(file.getName(), "bak/" + file.getName());
 										client.rename(file.getName(), "bak/" + file.getName());

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

@@ -32,6 +32,7 @@ public class DownloadFilePath {
 	
 	
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	public static void downloadFilePath(String depot,String sob){
 	public static void downloadFilePath(String depot,String sob){
+		BaseUtil.getLogger().info("download file" + " from "+depot);
 		FTPClient client = null;
 		FTPClient client = null;
 		SFTPUtil sftp = null;
 		SFTPUtil sftp = null;
 		Connection connect = null;
 		Connection connect = null;

+ 3 - 1
src/main/java/com/uas/main/Upload.java

@@ -12,6 +12,7 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Statement;
+import java.util.Date;
 import java.util.Map;
 import java.util.Map;
 import java.util.regex.Pattern;
 import java.util.regex.Pattern;
 
 
@@ -95,7 +96,8 @@ public class Upload {
 	}
 	}
 	
 	
 	@SuppressWarnings({ "unchecked"})
 	@SuppressWarnings({ "unchecked"})
-	public static void uploadBySob(String sob) {		
+	public static void uploadBySob(String sob) {
+		BaseUtil.getLogger().info("upload" + " from "+sob);
 		Statement statement = null;
 		Statement statement = null;
 		FTPClient client = null;
 		FTPClient client = null;
 		SFTPUtil sftp = null;
 		SFTPUtil sftp = null;

+ 83 - 0
warehouse-edi.iml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.1.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.1.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.1.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.16.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:ojdbc8:19.3.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:ucp:19.3.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:oraclepki:19.3.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:osdt_cert:19.3.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:osdt_core:19.3.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:simplefan:19.3.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:ons:19.3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
+    <orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.7.RELEASE" level="project" />
+  </component>
+</module>