|
|
|
@ -18,6 +18,7 @@ import com.baiye.enums.MailRequestEnum;
|
|
|
|
|
import com.baiye.exception.BadRequestException;
|
|
|
|
|
import com.baiye.model.dto.wechat.SendMailDTO;
|
|
|
|
|
import com.baiye.model.enums.ResponseCode;
|
|
|
|
|
import com.baiye.modules.platform.domain.DeliveryRecord;
|
|
|
|
|
import com.baiye.modules.platform.domain.DownRecord;
|
|
|
|
|
import com.baiye.modules.platform.repository.DownRecordRepository;
|
|
|
|
|
import com.baiye.modules.platform.service.DeliveryRecordService;
|
|
|
|
@ -60,6 +61,17 @@ public class DownRecordServiceImpl implements DownRecordService {
|
|
|
|
|
public Map<String, Object> queryAll(DownRecordQueryCriteria criteria, Pageable pageable) {
|
|
|
|
|
Page<DownRecord> page = downRecordRepository.findAll((root, query, cb) ->
|
|
|
|
|
QueryHelp.getPredicate(root, criteria, cb), pageable);
|
|
|
|
|
|
|
|
|
|
page.get().forEach(downRecord -> {
|
|
|
|
|
if (ObjectUtil.isNotNull(downRecord.getType())
|
|
|
|
|
&& downRecord.getType() == DefaultNumberConstants.TWO_NUMBER) {
|
|
|
|
|
DeliveryRecord deliveryRecord = deliveryRecordService.queryByDownId(downRecord.getId());
|
|
|
|
|
if (ObjectUtil.isNotNull(deliveryRecord) && ObjectUtil.isNotNull(deliveryRecord.getId())) {
|
|
|
|
|
downRecord.setDeliveryTaskName(deliveryRecord.getTaskName());
|
|
|
|
|
downRecord.setExchangeType(deliveryRecord.getExchangeType());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
return PageUtil.toPage(page);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -130,7 +142,7 @@ public class DownRecordServiceImpl implements DownRecordService {
|
|
|
|
|
String filePath = deliveryProperties.getDmpDownPath().concat(uuid).concat(FileConstant.ZIP_FILE_SUB_NAME);
|
|
|
|
|
Long downId = this.createRecord(currentUserId, list.size(), currentUserId == DefaultNumberConstants.ONE_NUMBER ? "超级管理员" :
|
|
|
|
|
"渠道管理员", taskName, sendMailDTO.getZipPath(), filePath, DefaultNumberConstants.TWO_NUMBER);
|
|
|
|
|
deliveryRecordService.saveDeliveryRecord(sendMailDTO.getZipPath(), taskImeiName,list.get(DefaultNumberConstants.ZERO_NUMBER).getTag(), list.size(), null,
|
|
|
|
|
deliveryRecordService.saveDeliveryRecord(sendMailDTO.getZipPath(), taskImeiName, list.get(DefaultNumberConstants.ZERO_NUMBER).getTag(), list.size(), null,
|
|
|
|
|
SecurityUtils.getCurrentUserId(), DefaultNumberConstants.TWO_NUMBER, uploadType, downId);
|
|
|
|
|
}
|
|
|
|
|
return Boolean.TRUE;
|
|
|
|
|