Sfoglia il codice sorgente

故宫博物馆需求

dengsixing 11 mesi fa
parent
commit
b80aab9544

+ 0 - 2
src/main/java/com/fdkankan/contro/controller/SceneFileController.java

@@ -153,8 +153,6 @@ public class SceneFileController{
 
     /**
      * 计算理光相机格式场景
-     *
-     * @param params
      * @return
      */
     @PostMapping("uploadLiguang")

+ 1 - 60
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -1965,65 +1965,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         rabbitMqProducer.sendByWorkQueue(queueLiguangModelingPre, mqMessage);
 
         //推送mq到前置计算
-        return ResultData.ok();
-    }
-
-    @Override
-    public ResultData uploadLiguang(String num, String snCode, String ossZipPath) throws Exception {
-
-        if(StrUtil.isEmpty(ossZipPath)){
-            return ResultData.error(-1, "压缩路径不能为空");
-        }
-
-        if(StrUtil.isEmpty(num) && StrUtil.isEmpty(snCode)){
-            return ResultData.error(-1, "场景码或者相机码不能同时为空");
-        }
-
-        String fileId = null, unicode = null;
-        String dataSource = null;
-        String[] arr = null;
-        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
-        if(Objects.nonNull(scenePlus)){
-            ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-            dataSource = scenePlusExt.getDataSource();
-            arr = dataSource.replace(ConstantFilePath.BUILD_MODEL_PATH, "").split("/");
-            fileId = arr[1];
-            unicode = arr[2];
-            snCode = arr[0];
-        }
-
-        //生成unicode
-        if(StrUtil.isEmpty(unicode)){
-            unicode = snCode + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss");
-        }
-
-        //生成fileid
-        if (StrUtil.isEmpty(fileId)) {
-            fileId = new SnowflakeIdGenerator(0, 0).nextId() + "";
-        }
-
-        SceneFileBuild sceneFileBuild = new SceneFileBuild();
-        sceneFileBuild.setChildName(snCode);
-        sceneFileBuild.setFileId(fileId);
-        sceneFileBuild.setRecStatus("A");
-        sceneFileBuild.setUnicode(folderName);
-        sceneFileBuild.setTotalPicNum(Integer.valueOf(totalPicNum));
-        sceneFileBuild.setChunks(Integer.valueOf(chunks));
-        sceneFileBuild.setCreateTime(new Date());
-        this.save(sceneFileBuild);
-
-
-        //生成场景吗
-
-        //生成主表
-
-        //生成编辑表
-
-        //生成控制表
-
-        //推送mq到前置计算
-
-        return ResultData.ok();
+        return ResultData.ok(num);
     }
-
 }