|
|
|
@ -91,15 +91,15 @@ public class DownRecordServiceImpl implements DownRecordService {
|
|
|
|
|
deliveryProperties.getEmailPassword(), deliveryProperties.getToEmailAddress(), downRecord.getDownUrl(), taskImeiName);
|
|
|
|
|
// 保存批次号
|
|
|
|
|
Long downId = downRecordRepository.save(downRecord).getId();
|
|
|
|
|
deliveryRecordService.saveDeliveryRecord(downRecord.getDownUrl(), taskImeiName, downRecord.getClueNum(), null,
|
|
|
|
|
SecurityUtils.getCurrentUserId(), DefaultNumberConstants.TWO_NUMBER, DefaultNumberConstants.TWO_NUMBER, downId);
|
|
|
|
|
deliveryRecordService.saveDeliveryRecord(downRecord.getDownUrl(), taskImeiName, null, downRecord.getClueNum(), null,
|
|
|
|
|
SecurityUtils.getCurrentUserId(), DefaultNumberConstants.TWO_NUMBER, DefaultNumberConstants.ZERO_NUMBER, downId);
|
|
|
|
|
return Boolean.TRUE;
|
|
|
|
|
}
|
|
|
|
|
throw new BadRequestException(ResponseCode.SEND_MAIL_FRIEND.getDesc());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public Boolean uploadFile(MultipartFile[] files, String taskName) {
|
|
|
|
|
public Boolean uploadFile(MultipartFile[] files, String taskName, Integer uploadType) {
|
|
|
|
|
if (files.length > DefaultNumberConstants.ZERO_NUMBER) {
|
|
|
|
|
List<ImeiDTO> dtoList = Lists.newArrayList();
|
|
|
|
|
for (MultipartFile file : files) {
|
|
|
|
@ -127,14 +127,14 @@ public class DownRecordServiceImpl implements DownRecordService {
|
|
|
|
|
SendMailDTO sendMailDTO = FileAndMailUtil.zipFileAndSendDMPMail(list, file, taskImeiName, deliveryProperties, DefaultNumberConstants.TWO_NUMBER);
|
|
|
|
|
String filePath = deliveryProperties.getDmpDownPath().concat(uuid).concat(FileConstant.ZIP_FILE_SUB_NAME);
|
|
|
|
|
Long downId = this.createRecord(list.size(), "超级管理员", taskName, sendMailDTO.getZipPath(), filePath, DefaultNumberConstants.TWO_NUMBER);
|
|
|
|
|
deliveryRecordService.saveDeliveryRecord(sendMailDTO.getZipPath(), taskImeiName, list.size(), null,
|
|
|
|
|
SecurityUtils.getCurrentUserId(), DefaultNumberConstants.TWO_NUMBER, DefaultNumberConstants.TWO_NUMBER, downId);
|
|
|
|
|
deliveryRecordService.saveDeliveryRecord(sendMailDTO.getZipPath(), taskImeiName,list.get(DefaultNumberConstants.ZERO_NUMBER).getTag(), list.size(), null,
|
|
|
|
|
SecurityUtils.getCurrentUserId(), DefaultNumberConstants.TWO_NUMBER, uploadType, downId);
|
|
|
|
|
}
|
|
|
|
|
return Boolean.TRUE;
|
|
|
|
|
}
|
|
|
|
|
// 每次1000 数据
|
|
|
|
|
// 每次100000 数据
|
|
|
|
|
List<List<ImeiDTO>> partition = Lists.partition
|
|
|
|
|
(dtoArrayList, DefaultNumberConstants.ONE_THOUSAND);
|
|
|
|
|
(dtoArrayList, DefaultNumberConstants.ONE_HUNDRED_THOUSAND);
|
|
|
|
|
String uuid = IdUtil.fastSimpleUUID();
|
|
|
|
|
String file = deliveryProperties.getFileUrl().concat(StrPool.SLASH).concat(uuid);
|
|
|
|
|
String filePath = deliveryProperties.getDmpDownPath().concat(uuid).concat(FileConstant.ZIP_FILE_SUB_NAME);
|
|
|
|
@ -144,10 +144,10 @@ public class DownRecordServiceImpl implements DownRecordService {
|
|
|
|
|
for (List<ImeiDTO> list : partition) {
|
|
|
|
|
String taskImeiName = redisUtils.acquisitionBatch(MailRequestEnum.MM.getCacheName());
|
|
|
|
|
Boolean result = deliveryRecordService.exchangeByInterFace
|
|
|
|
|
(list, taskImeiName, deliveryProperties.getPublicKey(), deliveryProperties.getPrivateKey());
|
|
|
|
|
(list, taskImeiName, uploadType, deliveryProperties.getPublicKey(), deliveryProperties.getPrivateKey());
|
|
|
|
|
if (Boolean.TRUE.equals(result)) {
|
|
|
|
|
deliveryRecordService.saveDeliveryRecord(zipPath, taskImeiName, list.size(), null,
|
|
|
|
|
SecurityUtils.getCurrentUserId(), DefaultNumberConstants.TWO_NUMBER, DefaultNumberConstants.ONE_NUMBER, downId);
|
|
|
|
|
deliveryRecordService.saveDeliveryRecord(zipPath, taskImeiName, list.get(DefaultNumberConstants.ZERO_NUMBER).getTag(), list.size(), null,
|
|
|
|
|
SecurityUtils.getCurrentUserId(), DefaultNumberConstants.TWO_NUMBER, uploadType, downId);
|
|
|
|
|
}
|
|
|
|
|
log.info("=========== the interface conversion result is {} =========== ", result);
|
|
|
|
|
}
|
|
|
|
|