From ff7b03055d36d1217858fd96d57a73c85e366bef Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 15 Sep 2021 09:14:24 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/FTP/FtpUtil.java | 1 +
src/main/java/org/springblade/modules/information/entity/Information.java | 2 ++
src/main/java/org/springblade/common/constant/FtpConstant.java | 2 +-
src/main/java/org/springblade/modules/information/controller/InformationController.java | 11 ++++-------
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/common/constant/FtpConstant.java b/src/main/java/org/springblade/common/constant/FtpConstant.java
index 67164e2..053a359 100644
--- a/src/main/java/org/springblade/common/constant/FtpConstant.java
+++ b/src/main/java/org/springblade/common/constant/FtpConstant.java
@@ -18,7 +18,7 @@
/**
* ftp服务器IP地址
*/
- String ftpHost_dev = "192.168.0.110";
+ String ftpHost_dev = "192.168.0.112";
/**
* ftp服务器IP地址
diff --git a/src/main/java/org/springblade/modules/FTP/FtpUtil.java b/src/main/java/org/springblade/modules/FTP/FtpUtil.java
index 8afe55c..3b76bc4 100644
--- a/src/main/java/org/springblade/modules/FTP/FtpUtil.java
+++ b/src/main/java/org/springblade/modules/FTP/FtpUtil.java
@@ -305,6 +305,7 @@
e.printStackTrace();
}
FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", "w"+response1+".json", in1);
+ MysqlCenlint.deletess("w"+response1+".json");
}
}
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index 03ef0b2..64cf6f6 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -231,13 +231,11 @@
format = new SimpleDateFormat("yyyy-MM-dd").format(information.getEstablishtime());
}
//内网同步
- String s1 = "update sys_information set creditcode = " + "'" + information.getCreditcode() + "'" +
- ",enterprisename = " + "'" + information.getEnterprisename() + "'" +
+ String s1 = "update sys_information set creditCode = " + "'" + information.getCreditcode() + "'" +
+ ",enterpriseName = " + "'" + information.getEnterprisename() + "'" +
",representative = " + "'" + information.getRepresentative() + "'" +
- ",establishtime = " + "'" + format + "'" +
- ",registeredcapital = " + "'" + information.getRegisteredcapital() + "'" +
- ",organizationcode = " + "'" + information.getOrganizationcode() + "'" +
- ",registrationnumber = " + "'" + information.getRegistrationnumber() + "'" +
+ ",establishTime = " + "'" + format + "'" +
+ ",registeredCapital = " + "'" + information.getRegisteredcapital() + "'" +
",jurisdiction = " + "'" + information.getJurisdiction() + "'" +
",enterprises = " + "'" + information.getEnterprises() + "'" +
",address = " + "'" + information.getAddress() + "'" +
@@ -247,7 +245,6 @@
",industry = " + "'" + information.getIndustry() + "'" +
",departmentid = " + "'" + information.getDepartmentid() + "'" +
",stats = " + "'" + information.getStats() + "'" +
- ",jurisdiction = " + "'" + information.getJurisdiction() + "'" +
",representativecell = " + "'" + information.getRepresentativecell() + "'" +
",contacts = " + "'" + information.getContacts() + "'" +
",contactscell = " + "'" + information.getContactscell() + "'" +
diff --git a/src/main/java/org/springblade/modules/information/entity/Information.java b/src/main/java/org/springblade/modules/information/entity/Information.java
index b71e9de..edb69e6 100644
--- a/src/main/java/org/springblade/modules/information/entity/Information.java
+++ b/src/main/java/org/springblade/modules/information/entity/Information.java
@@ -65,6 +65,8 @@
* 成立日期
*/
@ApiModelProperty(value = "成立日期")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@TableField("establishTime")
private Date establishtime;
/**
--
Gitblit v1.9.3