@@ -6,8 +6,8 @@ import lombok.Getter;
@Getter
public enum JmUploadStatus {
FAILED(-1, "入队失败"),
- WAIT(0, "等待入队"),
- SCHEDULEING(1, "入队成功, 排队中"),
+ WAIT(0, "上传中"),
+ SCHEDULEING(1, "已入队"),
MODELING(2, "计算中"),
SUCCESS(3, "计算成功"),
ERROR(4, "计算失败"); // 新增超时状态
@@ -1921,9 +1921,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
condition.setStatus(0);
OrigFileUploadBatch origFileUploadBatch = origFileUploadBatchService.getByCondition(condition);
origFileUploadBatch.setStatus(4);//修改为等待通知计算状态,由定时任务统一分配计算
- origFileUploadBatch.setMqContent(JSON.toJSONString(mqMessage));
origFileUploadBatchService.updateById(origFileUploadBatch);
- redisUtil.del("single:upload:uuid:" + unicode);
+ redisUtil.del("single:upload:uuid:" + unicode);//删除当前批次缓存,如果场景补拍上传就会创建一个新的批次号
buildScenePost(dataSource, fdageData, "V3", cameraType, sceneNum, camera, cameraDetail, rebuild, "", user, ryId, uploadType);