BY-Team
/
ad-platform
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加自主上传兑换代码

Browse Source
master
bynt 11 months ago
parent e77f5cc981
commit c3f3a9d030
7 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File

4
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/domain/DownRecord.java
Unescape Escape View File

@ -64,6 +64,10 @@ public class DownRecord extends BaseEntity implements Serializable {
@ApiModelProperty(value = "1 自动任务 2 是 手动发送")
private Integer type;
@Column(name = "user_id")
@ApiModelProperty(value = "1 自动任务 2 是 手动发送")
private Long userId;
@Column(name = "resolve_file_path")
@ApiModelProperty(value = "解析文件地址")

2
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/rest/DownRecordController.java
Unescape Escape View File

@ -4,6 +4,7 @@ package com.baiye.modules.platform.rest;
import com.baiye.annotation.Inner;
import com.baiye.modules.platform.service.DownRecordService;
import com.baiye.modules.platform.service.dto.DownRecordQueryCriteria;
import com.baiye.util.SecurityUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@ -29,6 +30,7 @@ public class DownRecordController {
@ApiOperation("查询记录")
@GetMapping
public ResponseEntity<Object> query(DownRecordQueryCriteria criteria, Pageable pageable) {
criteria.setUserId(SecurityUtils.getCurrentUserId());
return new ResponseEntity<>(downRecordService.queryAll(criteria, pageable), HttpStatus.OK);
}

4
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/DownRecordService.java
Unescape Escape View File

@ -15,7 +15,7 @@ public interface DownRecordService {
/**
* 创建下载记录
*
* @param userId
* @param recordSize
* @param companyName
* @param taskName
@ -24,7 +24,7 @@ public interface DownRecordService {
* @param type
* @return
*/
Long createRecord(Integer recordSize, String companyName, String taskName, String zipPath, String filePath, Integer type);
Long createRecord(Long userId, Integer recordSize, String companyName, String taskName, String zipPath, String filePath, Integer type);
/**
* 分页查询

3
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/dto/DownRecordQueryCriteria.java
Unescape Escape View File

@ -30,6 +30,9 @@ import java.util.List;
@NoArgsConstructor
public class DownRecordQueryCriteria {
@Query
private Long userId;
@Query(type = Query.Type.BETWEEN)
private List<Timestamp> createTime;

10
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DownRecordServiceImpl.java
Unescape Escape View File

@ -64,10 +64,11 @@ public class DownRecordServiceImpl implements DownRecordService {
}
@Override
public Long createRecord(Integer recordSize, String componentName,
public Long createRecord(Long userId, Integer recordSize, String componentName,
String taskName, String zipPath, String filePath, Integer type) {
DownRecord downRecord = new DownRecord();
downRecord.setType(type);
downRecord.setUserId(userId);
downRecord.setDownUrl(zipPath);
downRecord.setFilePath(filePath);
downRecord.setTaskName(taskName);
@ -115,6 +116,7 @@ public class DownRecordServiceImpl implements DownRecordService {
throw new BadRequestException(ResponseCode.SEND_MAIL_NUM_FRIEND.getDesc());
}
// 传输方式
Long currentUserId = SecurityUtils.getCurrentUserId();
Integer type = (Integer) redisUtils.get(CacheKey.DMP_REQUEST_FILE_TYPE);
if (ObjectUtil.isNotNull(type) && type.equals(DefaultNumberConstants.TWO_NUMBER)) {
// 每次100000 数据
@ -126,7 +128,8 @@ public class DownRecordServiceImpl implements DownRecordService {
String taskImeiName = redisUtils.acquisitionBatch(MailRequestEnum.MM.getCacheName());
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);
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,
SecurityUtils.getCurrentUserId(), DefaultNumberConstants.TWO_NUMBER, uploadType, downId);
}
@ -140,7 +143,8 @@ public class DownRecordServiceImpl implements DownRecordService {
String filePath = deliveryProperties.getDmpDownPath().concat(uuid).concat(FileConstant.ZIP_FILE_SUB_NAME);
// 只保存文件地址不发送邮件
String zipPath = FileAndMailUtil.zipFile(dtoArrayList, file, deliveryProperties.getZipPassword());
Long downId = this.createRecord(dtoArrayList.size(), "超级管理员", taskName, zipPath, filePath, DefaultNumberConstants.TWO_NUMBER);
Long downId = this.createRecord(currentUserId, dtoArrayList.size(),
currentUserId == DefaultNumberConstants.ONE_NUMBER ? "超级管理员" : "渠道管理员", taskName, zipPath, filePath, DefaultNumberConstants.TWO_NUMBER);
for (List<ImeiDTO> list : partition) {
String taskImeiName = redisUtils.acquisitionBatch(MailRequestEnum.MM.getCacheName());
Boolean result = deliveryRecordService.exchangeByInterFace

5
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java
Unescape Escape View File

@ -241,9 +241,8 @@ public class DeliveryBalanceTask {
String filePath = deliveryProperties.getDmpDownPath().concat(uuid).concat(FileConstant.ZIP_FILE_SUB_NAME);
// 设置压缩文件
CompressUtil.decryptionCompression(zipPath, csvPath, deliveryProperties.getZipPassword());
downRecordService.createRecord(downList.size(),
userDto.getUsername(), taskTagDto.getTaskName(),
zipPath, filePath, DefaultNumberConstants.ONE_NUMBER);
downRecordService.createRecord((long) DefaultNumberConstants.ONE_NUMBER, downList.size(), userDto.getUsername(),
taskTagDto.getTaskName(), zipPath, filePath, DefaultNumberConstants.ONE_NUMBER);
// 修改状态
taskImeiService.updateBath(taskId, CharSequenceUtil.EMPTY, DefaultNumberConstants.ONE_NUMBER, minId, maxId);
FileUtil.del(csvPath);

24
ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java
Unescape Escape View File

@ -237,18 +237,20 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
CsvReader reader = CsvUtil.getReader();
CsvData read = reader.read(parseFile);
// 将原始内容解析
Set<String> originSet = read.getRows().stream().map
(origin -> origin.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet());
List<String> originList = read.getRows().stream().map
(origin -> origin.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toList());
log.info("=============== the parse the data {} ===============", originList.size());
// 追加新内容
originSet.addAll(originalList.stream().map
originList.addAll(originalList.stream().map
(str -> str.size() > DefaultNumberConstants.TWO_NUMBER
? str.get(DefaultNumberConstants.TWO_NUMBER) :
str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet()));
FileZipUtil.writeToCsv(Lists.newArrayList(originSet), parseFile.getPath(), Boolean.FALSE);
str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toList()));
log.info("=============== the addition the data {} ===============", originalList.size());
FileZipUtil.writeToCsv(Lists.newArrayList(originList), parseFile.getPath(), Boolean.FALSE);
// 设置压缩文件
CompressUtil.decryptionCompression(path, parseFile.getPath(), null);
deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, originalList.size(), bathNo);
deliveryRecordClient.updateOriginAndSize(byTaskName.getUserId(), format, originSet.size(), SecurityConstants.FROM_IN);
deliveryRecordClient.updateOriginAndSize(byTaskName.getUserId(), format, originList.size(), SecurityConstants.FROM_IN);
FileUtil.del(unzipPath);
return;
}
@ -256,11 +258,11 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
String csvPath = file.concat(StrPool.DOT).concat(FileConstant.CSV_FILE_SUB_NAME);
CsvWriter writer = CsvUtil.getWriter(csvPath, CharsetUtil.CHARSET_UTF_8);
String zipPath = file.concat(FileConstant.ZIP_FILE_SUB_NAME);
Set<String> stringSet = originalList.stream().map
List<String> stringList = originalList.stream().map
(str -> str.size() > DefaultNumberConstants.TWO_NUMBER
? str.get(DefaultNumberConstants.TWO_NUMBER) :
str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toSet());
writer.write(stringSet);
str.get(DefaultNumberConstants.ZERO_NUMBER)).collect(Collectors.toList());
writer.write(stringList);
writer.close();
// 设置压缩文件
CompressUtil.decryptionCompression(zipPath, csvPath, null);
@ -268,8 +270,8 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
(zipPath.lastIndexOf(StrPool.SLASH) + DefaultNumberConstants.ONE_NUMBER);
FileUtil.del(csvPath);
String downUrl = deliveryProperties.getDmpDownPath().concat(filePath);
deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, stringSet.size(), bathNo);
deliveryRecordClient.savePathAndSetDateStr(byTaskName.getUserId(), stringSet.size(), zipPath, downUrl, format, SecurityConstants.FROM_IN);
deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, stringList.size(), bathNo);
deliveryRecordClient.savePathAndSetDateStr(byTaskName.getUserId(), stringList.size(), zipPath, downUrl, format, SecurityConstants.FROM_IN);
redisUtils.set(CacheKey.DMP_TRIPARTITE_URL.concat(format), zipPath, DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS);
}

Write Preview
Loading…
Cancel
Save