Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
task-kolon
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
piplus-v3
task-kolon
Commits
2f816372
Commit
2f816372
authored
Apr 27, 2016
by
陈家荣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
0ea71217
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
8 deletions
+25
-8
KolonMemberServiceImpl.java
...java/com/hdp/pi/service/kolon/KolonMemberServiceImpl.java
+4
-3
FtpUtil.java
src/main/java/com/hdp/pi/utils/kolon/FtpUtil.java
+20
-5
kolon.properties
src/main/resources/kolon.properties
+1
-0
No files found.
src/main/java/com/hdp/pi/service/kolon/KolonMemberServiceImpl.java
View file @
2f816372
...
@@ -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
;
...
...
src/main/java/com/hdp/pi/utils/kolon/FtpUtil.java
View file @
2f816372
...
@@ -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
;
/**
/**
* 临时存放生成的新注册用户文件路径
* 临时存放生成的新注册用户文件路径
*/
*/
...
@@ -150,12 +156,13 @@ public class FtpUtil {
...
@@ -150,12 +156,13 @@ public class FtpUtil {
public
void
moveFile
()
{
public
void
moveFile
()
{
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
+
newFileName
);
+
newFileName
);
ftpClient
.
disconnect
();
ftpClient
.
disconnect
();
...
@@ -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
();
}
}
}
}
src/main/resources/kolon.properties
View file @
2f816372
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment