数据同步由读取单个文件改成读取目录下的匹配文件列表

src/main/java/com/hdp/pi/service/kolon/KolonMemberServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.Date;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.net.ftp.FTPClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Propagation;
@@ -45,6 +46,12 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 	@Value("${kolon.property.ftp.productFileName}")
 	private String productFileName;
 	
+	/**
+	 * FTP获取文件目录
+	 */
+	@Value("${kolon.property.ftp.getFileDir}")
+	private String getFileDir;
+	
 	@Autowired
 	private KolonMemberRepository kolonMemberRepository;
 
@@ -152,18 +159,29 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 
 	@Override
 	public void syncMemberData() {
-		List<String[]> list = ftpUtil.readCSVFile(memberFileName);
-		if (list != null) {
-			boolean firstRow = true;
-			for (String[] row : list) {
-				if (firstRow) {
-					firstRow = false;
-				} else {
-					this.matchData(row);
+		FTPClient ftpClient = ftpUtil.getFTPClient();
+		try {
+			String[]  listNames = ftpClient.listNames(getFileDir);
+			for(String name : listNames){
+				String sortName = name.substring(name.lastIndexOf("/") + 1, name.length());
+				if(sortName.contains(memberFileName)){
+					List<String[]> list = ftpUtil.readCSVFile(sortName);
+					if (list != null) {
+						boolean firstRow = true;
+						for (String[] row : list) {
+							if (firstRow) {
+								firstRow = false;
+							} else {
+								this.matchData(row);
+							}
+						}
+					}
+					ftpUtil.moveFile(sortName);
 				}
 			}
+		} catch (IOException e) {
+			e.printStackTrace();
 		}
-		ftpUtil.moveFile(memberFileName);
 	}
 
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)

src/main/resources/kolon.properties

@@ -28,9 +28,9 @@ kolon.property.ftp.port = 21
 kolon.property.ftp.userName = mark
 kolon.property.ftp.password = yang19821123
 
-kolon.property.ftp.getFileDir = /Emarsys/
-kolon.property.ftp.getFileHistoryDir = /Emarsys/history/
-kolon.property.ftp.getFileName = contact.csv
+kolon.property.ftp.getFileDir = /SCRM/export/
+kolon.property.ftp.getFileHistoryDir = /SCRM/history/
+kolon.property.ftp.getFileName = Wechat_export
 kolon.property.ftp.saleFileName = sales.csv
 kolon.property.ftp.productFileName = products.csv