|
@@ -8,15 +8,12 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.fdkankan.common.constant.*;
|
|
|
import com.fdkankan.common.util.FileUtils;
|
|
|
-import com.fdkankan.contro.entity.Camera;
|
|
|
-import com.fdkankan.contro.entity.SSOUser;
|
|
|
import com.fdkankan.contro.entity.ScenePlus;
|
|
|
import com.fdkankan.contro.entity.ScenePlusExt;
|
|
|
import com.fdkankan.contro.mq.service.IBuildSceneService;
|
|
|
import com.fdkankan.contro.service.*;
|
|
|
import com.fdkankan.fyun.config.FYunFileConfig;
|
|
|
import com.fdkankan.fyun.face.FYunFileServiceInterface;
|
|
|
-import com.fdkankan.model.constants.ConstantFileName;
|
|
|
import com.fdkankan.model.constants.ConstantFilePath;
|
|
|
import com.fdkankan.model.constants.UploadFilePath;
|
|
|
import com.fdkankan.model.enums.ModelTypeEnums;
|
|
@@ -244,39 +241,10 @@ public class BuildIntermitSceneServiceImpl implements IBuildSceneService {
|
|
|
throw new Exception(filePath + "文件不存在");
|
|
|
}
|
|
|
|
|
|
- if (fileJson.getIntValue("clazz") == 2) {
|
|
|
- map.put(filePath, imagesPath + ConstantFileName.modelUUID + "_50k_texture_jpg_high1/" + fileName.replace("tex/", ""));
|
|
|
- } else if (fileJson.getIntValue("clazz") == 3) {
|
|
|
- map.put(filePath, imagesPath + "pan/high/" + fileName.replace("high/", ""));
|
|
|
- } else if (fileJson.getIntValue("clazz") == 4) {
|
|
|
- map.put(filePath, imagesPath + "pan/low/" + fileName.replace("low/", ""));
|
|
|
- } else if (fileJson.getIntValue("clazz") == 5) {
|
|
|
+ if(fileJson.getIntValue("clazz") == 1 || fileJson.getIntValue("clazz") == 22){
|
|
|
map.put(filePath, imagesPath + fileName);
|
|
|
- } else if (fileJson.getIntValue("clazz") == 7) {
|
|
|
- map.put(filePath, imagesPath + fileName);
|
|
|
- } else if (fileJson.getIntValue("clazz") == 10) {
|
|
|
- String updown = FileUtils.readFile(filePath);
|
|
|
- JSONObject updownJson = JSONObject.parseObject(updown);
|
|
|
- String mappingOssPath = String.format("scene_edit_data/%s/data/", projectNum) + fileName.replace("updown", "mapping");
|
|
|
- map.put(filePath, mappingOssPath);
|
|
|
- } else {
|
|
|
- if (fileJson.getIntValue("clazz") == 11 || fileJson.getIntValue("clazz") == 12) {
|
|
|
- map.put(filePath, videoPath + fileName.replace("videos/", ""));
|
|
|
- if (fileName.contains(".mp4")) {
|
|
|
- map.put(resultsPath + fileName.replace("mp4", "flv"), videoPath + fileName.replace("videos/", "").replace("mp4", "flv"));
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if (fileJson.getIntValue("clazz") == 16) {
|
|
|
- map.put(filePath, dataViewPath + fileName);
|
|
|
- }
|
|
|
-
|
|
|
- if (fileJson.getIntValue("clazz") == 18) {
|
|
|
- map.put(filePath, imagesPath + fileName);
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
- map.put(resultsPath + "vision.txt", imagesPath + "vision.txt");
|
|
|
return map;
|
|
|
}
|
|
|
|