Commit 31d80b11 authored by 陈家荣's avatar 陈家荣

update

parent 9be4da88
...@@ -9,6 +9,8 @@ import java.util.Date; ...@@ -9,6 +9,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -34,6 +36,9 @@ import com.hdp.pi.utils.kolon.Util; ...@@ -34,6 +36,9 @@ import com.hdp.pi.utils.kolon.Util;
*/ */
public class KolonMemberServiceImpl implements KolonMemberService { public class KolonMemberServiceImpl implements KolonMemberService {
private static final Logger LOGGER = LoggerFactory
.getLogger(KolonMemberServiceImpl.class);
@Autowired @Autowired
private FtpMemberUtil ftpMemberUtil; private FtpMemberUtil ftpMemberUtil;
...@@ -305,14 +310,13 @@ public class KolonMemberServiceImpl implements KolonMemberService { ...@@ -305,14 +310,13 @@ public class KolonMemberServiceImpl implements KolonMemberService {
@Override @Override
public Date sendData(Date time) { public Date sendData(Date time) {
LOGGER.info("kolon发送数据 最后更新时间【" + time.toString() + "】");
Date lastSendDate = time; Date lastSendDate = time;
Date tempSendDate = time; Date tempSendDate = time;
//获取记录 //获取记录
List<KolonMember> kolonMembers = kolonMemberRepository.findByJoinTimeGreaterThanOrUpdateTimeGreaterThan(time, time); List<KolonMember> kolonMembers = kolonMemberRepository.findByJoinTimeGreaterThanOrUpdateTimeGreaterThan(time, time);
List<String[]> addData = getDataList(); List<String[]> addData = getDataList();
List<String[]> updateData = getDataList(); List<String[]> updateData = getDataList();
for(KolonMember km : kolonMembers){ for(KolonMember km : kolonMembers){
if(km.dataSource == 2){ if(km.dataSource == 2){
updateData.add(new String[] { km.csNo.toString(), km.phone, km.email, km.wechatFirstName, km.wechatLastName}); updateData.add(new String[] { km.csNo.toString(), km.phone, km.email, km.wechatFirstName, km.wechatLastName});
...@@ -321,10 +325,13 @@ public class KolonMemberServiceImpl implements KolonMemberService { ...@@ -321,10 +325,13 @@ public class KolonMemberServiceImpl implements KolonMemberService {
}else{ }else{
updateData.add(new String[] { km.csNo.toString(), km.phone, km.email, km.wechatFirstName, km.wechatLastName}); updateData.add(new String[] { km.csNo.toString(), km.phone, km.email, km.wechatFirstName, km.wechatLastName});
} }
if(km.updateTime != null && tempSendDate.before(km.updateTime)){ //获取数据较后的更新时间 if(km.updateTime != null && tempSendDate.before(km.updateTime)){ //获取数据较后的更新时间
tempSendDate = km.updateTime; tempSendDate = km.updateTime;
} }
} }
LOGGER.info("kolon发送新增数据【" + addData.size() + "】条");
LOGGER.info("kolon发送更新数据【" + updateData.size() + "】条");
lastSendDate = tempSendDate; lastSendDate = tempSendDate;
CSVWriter addWriter = ftpMemberUtil.getCSVWriter(1); CSVWriter addWriter = ftpMemberUtil.getCSVWriter(1);
writeDataToFile(addWriter, addData); writeDataToFile(addWriter, addData);
......
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