|
@@ -5,10 +5,7 @@ import cn.kdan.pdf.backend.core.constant.MissionConstant;
|
|
|
import cn.kdan.pdf.backend.core.enums.MissionFileStatusEnum;
|
|
|
import cn.kdan.pdf.backend.core.enums.SubscriberTypeEnum;
|
|
|
import cn.kdan.pdf.backend.core.mapper.MissionsMapper;
|
|
|
-import cn.kdan.pdf.backend.core.model.ConvertTypes;
|
|
|
-import cn.kdan.pdf.backend.core.model.Members;
|
|
|
-import cn.kdan.pdf.backend.core.model.MissionFiles;
|
|
|
-import cn.kdan.pdf.backend.core.model.Missions;
|
|
|
+import cn.kdan.pdf.backend.core.model.*;
|
|
|
import cn.kdan.pdf.backend.core.model.member.MemberInfo;
|
|
|
import cn.kdan.pdf.backend.core.params.MissionCreateParam;
|
|
|
import cn.kdan.pdf.backend.core.pojo.ConvertTypeVo;
|
|
@@ -18,10 +15,7 @@ import cn.kdan.pdf.backend.core.pojo.comPdfKit.CreateTaskResult;
|
|
|
import cn.kdan.pdf.backend.core.pojo.comPdfKit.FileInfoDto;
|
|
|
import cn.kdan.pdf.backend.core.pojo.comPdfKit.QueryTaskInfoResult;
|
|
|
import cn.kdan.pdf.backend.core.pojo.comPdfKit.WebhookSendDTO;
|
|
|
-import cn.kdan.pdf.backend.core.service.ConvertFileService;
|
|
|
-import cn.kdan.pdf.backend.core.service.MemberService;
|
|
|
-import cn.kdan.pdf.backend.core.service.MissionFilesService;
|
|
|
-import cn.kdan.pdf.backend.core.service.MissionService;
|
|
|
+import cn.kdan.pdf.backend.core.service.*;
|
|
|
import cn.kdan.pdf.backend.core.utils.ComPdfKitUtils;
|
|
|
import constant.CommonConstant;
|
|
|
import exception.BackendRuntimeException;
|
|
@@ -38,7 +32,6 @@ import utils.DistributedLocker;
|
|
|
import utils.JsonUtils;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
-import java.math.BigDecimal;
|
|
|
import java.util.*;
|
|
|
|
|
|
/**
|
|
@@ -60,6 +53,8 @@ public class MissionServiceImpl implements MissionService {
|
|
|
ConvertFileService convertFileService;
|
|
|
@Resource
|
|
|
private DistributedLocker distributedLocker;
|
|
|
+ @Resource
|
|
|
+ private OutputFileService outputFileService;
|
|
|
|
|
|
/**
|
|
|
* saas任务完成状态
|
|
@@ -313,6 +308,16 @@ public class MissionServiceImpl implements MissionService {
|
|
|
missionFiles.setStatus(MissionFileStatusEnum.SUCCESS.value());
|
|
|
missionFiles.setUpdatedAt(new Date());
|
|
|
missionFilesService.update(missionFiles);
|
|
|
+ OutputFiles outputFile = new OutputFiles();
|
|
|
+ outputFile.setId(CommonUtils.generateId());
|
|
|
+ outputFile.setMissionId(missionFiles.getMissionId());
|
|
|
+ outputFile.setMemberId(members.getId());
|
|
|
+ outputFile.setMissionFileId(missionFiles.getId());
|
|
|
+ outputFile.setFileName(missionFiles.getOutFilename());
|
|
|
+ outputFile.setOriginalFilename(missionFiles.getOriginalFilename());
|
|
|
+ outputFile.setPath(missionFiles.getPath());
|
|
|
+ outputFile.setSize(Integer.valueOf(file.getConvertSize()));
|
|
|
+ outputFileService.insert(outputFile);
|
|
|
}
|
|
|
}else if ("failed".equals(file.getStatus())){
|
|
|
//先查询文件状态是否已更新成失败状态,已更新则不返回券数
|
|
@@ -346,7 +351,7 @@ public class MissionServiceImpl implements MissionService {
|
|
|
missionFiles.setFailReason(file.getFailureReason());
|
|
|
}
|
|
|
missionFiles.setPrice(0);
|
|
|
- missionFiles.setSize(BigDecimal.ZERO);
|
|
|
+// missionFiles.setSize(BigDecimal.ZERO);
|
|
|
missionFiles.setUpdatedAt(new Date());
|
|
|
missionFiles.setConvertEndAt(new Date());
|
|
|
missionFilesService.update(missionFiles);
|