tianboguang преди 2 години
родител
ревизия
74454c9e15
променени са 1 файла, в които са добавени 2 реда и са изтрити 33 реда
  1. 2 33
      src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

+ 2 - 33
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -428,23 +428,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             //激光转台
             cameraType = 14L;
         }
-
-        ScenePlusVO scenePlusVO = buildScene(fileId, prefixBuffer.toString(), fdageJson, buildType, cameraType);
-
-        if(ObjectUtils.isEmpty(scenePlusVO)){
-            return ResultData.ok();
-        }
-        // 通知激光场景系统开始构建场景
-        if(cameraType.longValue() == 14){
-            ScenePlus scenePlus = scenePlusService.getScenePlusByNum(scenePlusVO.getNum());
-            Long sceneUserId = scenePlus.getUserId();
-            String userName = null;
-            if(!ObjectUtils.isEmpty(sceneUserId)){
-                userName = userService.getSSOUserByUserId(sceneUserId).getUserName();
-            }
-            //判断 是否为激光相机
-            Camera camera = cameraService.getByChildName(mac);
-        }
+        buildScene(fileId, prefixBuffer.toString(), fdageJson, buildType, cameraType);
         return ResultData.ok();
     }
 
@@ -462,17 +446,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         scenePlus.setCameraId(cameraId);
         scenePlus.setPhoneId(phoneId);
         scenePlus.setNum(projectNum);
-
         scenePlus.setSceneSource(1);
-         if(cameraType.longValue() == 14){
-            scenePlusExt.setDataSource(ConstantFilePath.BUILD_MODEL_LASER_PATH +
-                    cameraName.replace("4DKKPRO_", "").replace("-fdage", "").toLowerCase() + File.separator +
-                    fileId + File.separator + unicode);
-        }else{
-            scenePlusExt.setDataSource(ConstantFilePath.BUILD_MODEL_PATH +
-                    cameraName.replace("4DKKPRO_", "").replace("-fdage", "").toLowerCase() + File.separator +
-                    fileId + File.separator + unicode);
-        }
+        scenePlusExt.setDataSource(ConstantFilePath.BUILD_MODEL_PATH + cameraName.toLowerCase() + File.separator + fileId + File.separator + unicode);
 
         if(resolution == null || resolution.intValue() == 0){
             scenePlusExt.setSceneScheme(cameraType.intValue());
@@ -486,12 +461,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             scenePlusExt.setSceneScheme(10);
         }
 
-        //激光相机
-        if(cameraType.longValue() == 14 ){
-            scenePlus.setSceneSource(4);
-            scenePlusExt.setSceneScheme(10);
-        }
-
         if (pic != null && pic.length() > 5) {
             scenePlusExt.setThumb(pic);
         } else {