Commit 2f816372 authored by 陈家荣's avatar 陈家荣

update

parent 0ea71217
...@@ -72,9 +72,10 @@ public class KolonMemberServiceImpl implements KolonMemberService { ...@@ -72,9 +72,10 @@ public class KolonMemberServiceImpl implements KolonMemberService {
kolonMember.lifecycle = kolonMemberDTO.lifecycle; kolonMember.lifecycle = kolonMemberDTO.lifecycle;
kolonMember.customerType = kolonMemberDTO.customerType; kolonMember.customerType = kolonMemberDTO.customerType;
kolonMember.lastPurchaseDate = kolonMemberDTO.lastPurchaseDate; kolonMember.lastPurchaseDate = kolonMemberDTO.lastPurchaseDate;
kolonMember.dataSource = 1; kolonMember.dataSource = 2;
kolonMember.joinTime = new Date(); Date date = new Date();
kolonMember.updateTime = new Date(); kolonMember.joinTime = date;
kolonMember.updateTime = date;
this.save(kolonMember); this.save(kolonMember);
} else { // 更新 } else { // 更新
boolean flag = false; boolean flag = false;
......
...@@ -57,6 +57,12 @@ public class FtpUtil { ...@@ -57,6 +57,12 @@ public class FtpUtil {
@Value("${kolon.property.ftp.getFileName}") @Value("${kolon.property.ftp.getFileName}")
private String getFileName; private String getFileName;
/**
* 临时路径
*/
@Value("${kolon.property.ftp.tempFileDir}")
private String tempFileDir;
/** /**
* 临时存放生成的新注册用户文件路径 * 临时存放生成的新注册用户文件路径
*/ */
...@@ -151,9 +157,10 @@ public class FtpUtil { ...@@ -151,9 +157,10 @@ public class FtpUtil {
try { try {
FTPClient ftpClient = this.getFTPClient(); FTPClient ftpClient = this.getFTPClient();
//新的文件名 // 新的文件名
String suffix = getFileName.substring(getFileName.lastIndexOf(".")); String suffix = getFileName.substring(getFileName.lastIndexOf("."));
String name = getFileName.substring(0, getFileName.lastIndexOf(".")); String name = getFileName
.substring(0, getFileName.lastIndexOf("."));
String newFileName = name + "_" + getTime() + suffix; String newFileName = name + "_" + getTime() + suffix;
ftpClient.rename(getFileDir + getFileName, getFileHistoryDir ftpClient.rename(getFileDir + getFileName, getFileHistoryDir
...@@ -171,6 +178,7 @@ public class FtpUtil { ...@@ -171,6 +178,7 @@ public class FtpUtil {
* @return * @return
*/ */
public CSVWriter getCSVWriter(Integer type) { public CSVWriter getCSVWriter(Integer type) {
createdDirIfNotExist(tempFileDir);
CSVWriter writer = null; CSVWriter writer = null;
try { try {
if (type == 1) { if (type == 1) {
...@@ -216,4 +224,11 @@ public class FtpUtil { ...@@ -216,4 +224,11 @@ public class FtpUtil {
return formattedDateTime; return formattedDateTime;
} }
public void createdDirIfNotExist(String path) {
File file = new File(path);
if (!file.exists() && !file.isDirectory()) {
file.mkdir();
}
}
} }
...@@ -27,6 +27,7 @@ kolon.property.ftp.getFileDir = /Emarsys/ ...@@ -27,6 +27,7 @@ kolon.property.ftp.getFileDir = /Emarsys/
kolon.property.ftp.getFileHistoryDir = /Emarsys/history/ kolon.property.ftp.getFileHistoryDir = /Emarsys/history/
kolon.property.ftp.getFileName = contact.csv kolon.property.ftp.getFileName = contact.csv
kolon.property.ftp.tempFileDir = /temp
kolon.property.ftp.tempAddFileName = /temp/tempAddContact.csv kolon.property.ftp.tempAddFileName = /temp/tempAddContact.csv
kolon.property.ftp.tempUpdateFileName = /temp/tempUpdateContact.csv kolon.property.ftp.tempUpdateFileName = /temp/tempUpdateContact.csv
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment