|
@@ -814,6 +814,19 @@ public class RunBuild {
|
|
|
if (token != null) {
|
|
|
RunBuild.log.info("暂无的fileId:" + fileId + "消费,继续执行处理逻辑模型上传逻辑");
|
|
|
try {
|
|
|
+
|
|
|
+ switch (UploadType) {
|
|
|
+ case "1":
|
|
|
+ redisUtil.setEx("modelUploadStatus:id:" + modelUploadEntity.getId(), "biz", 5, TimeUnit.MINUTES);
|
|
|
+ break;
|
|
|
+ case "2":
|
|
|
+ redisUtil.setEx("modelUploadStatus:id:" + modelUploadEntity.getId(), "biz", 5, TimeUnit.MINUTES);
|
|
|
+ break;
|
|
|
+ case "3":
|
|
|
+ redisUtil.setEx("componentUploadStatus:id:" + componentModelUploadEntity.getId(), "biz", 5, TimeUnit.MINUTES);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
String path = buildPath + "upload";
|
|
|
String filePath = path + File.separator + fileId + File.separator;
|
|
|
|
|
@@ -886,7 +899,6 @@ public class RunBuild {
|
|
|
switch (UploadType) {
|
|
|
case "1":
|
|
|
modelUploadEntity = modelUploadService.findById(Long.valueOf(modelUploadId));
|
|
|
- redisUtil.setEx("modelUploadStatus:id:" + modelUploadEntity.getId(), "biz", 5, TimeUnit.MINUTES);
|
|
|
|
|
|
if (!ObjProcess.hasVt(obj)) {
|
|
|
//没有vt,直接报错
|
|
@@ -1000,7 +1012,6 @@ public class RunBuild {
|
|
|
case "2":
|
|
|
|
|
|
modelUploadEntity = modelUploadService.findById(Long.valueOf(modelUploadId));
|
|
|
- redisUtil.setEx("modelUploadStatus:id:" + modelUploadEntity.getId(), "biz", 5, TimeUnit.MINUTES);
|
|
|
|
|
|
if (!ObjProcess.hasVt(obj)) {
|
|
|
//没有vt,直接报错
|
|
@@ -1193,8 +1204,6 @@ public class RunBuild {
|
|
|
|
|
|
case "3":
|
|
|
componentModelUploadEntity = componentModelUploadService.findById(Long.valueOf(modelUploadId));
|
|
|
- redisUtil.setEx("componentUploadStatus:id:" + componentModelUploadEntity.getId(), "biz", 5, TimeUnit.MINUTES);
|
|
|
-
|
|
|
for (String file : files) {
|
|
|
target = new File(filePath + max.replace(".max", "") + file);
|
|
|
uploadToOssUtil.uploadTo4dTjw(filePath + max.replace(".max", "") + file, "domain/eHome/furniture/InitialData/" + modelType + "/" + fileId + "/" + target.getName());
|