Prechádzať zdrojové kódy

优化重复构建逻辑

tianboguang 2 rokov pred
rodič
commit
b88264049e

+ 7 - 4
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -252,16 +252,19 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if (ObjectUtils.isEmpty(scenePlus)) {
             sceneNum = scene3dNumService.generateSceneNum(cameraDetail.getType());
             rebuild = 0;
-        } else if (scenePlus.getSceneStatus().equals(SceneStatus.wait.code())) {
-            log.info(scenePlus.getNum() + ":场景处于计算中,不能再计算");
-            return null;
+        } else {
+            sceneNum = scenePlus.getNum();
+            if (scenePlus.getSceneStatus().equals(SceneStatus.wait.code())) {
+                log.info(scenePlus.getNum() + ":场景处于计算中,不能再计算");
+                return null;
+            }
         }
-
         if (sceneNum == null) {
             log.error("大场景序号为空:" + sceneNum);
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
 
+
         String localDataPath = String.format(ConstantFilePath.DATABUFFER_FORMAT, sceneNum);
         String imgViewPath = String.format(UploadFilePath.IMG_VIEW_PATH, sceneNum);
         String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, sceneNum);