Merge branch 'obt' into obt-copyDataAndBuild

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -259,6 +259,8 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                     .forEach(entry-> uploadHouseTypeJson(sceneCode,entry.getKey()));
 
             //写scene.json
+
+
             log.info("生成scene.json上传oss并设置缓存，num:{}", sceneCode);
             CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
             Company company = !ObjectUtils.isEmpty(cameraDetail.getCompanyId()) ? companyService.getById(cameraDetail.getCompanyId()) : null;

src/main/java/com/fdkankan/contro/mq/service/impl/BuildV3SceneServiceImpl.java

@@ -176,7 +176,7 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
                 return;
             }
 
-            Map<String, String> uploadFiles = getUploadFiles(path,cameraType,fdageData);
+            Map<String, String> uploadFiles = getUploadFiles(sceneCode,path,cameraType,fdageData);
 
             //建模成功走以下逻辑
             log.info("cameraType:{}",cameraType);
@@ -260,16 +260,7 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
         }
     }
 
-    private Map<String, String> getUploadFiles(String path,Integer cameraType,JSONObject fdageData) throws Exception {
-        ScenePro scenePro = sceneProService.getOne(
-                new LambdaQueryWrapper<ScenePro>().like(ScenePro::getDataSource, path));
-        if (ObjectUtils.isEmpty(scenePro)) {
-            throw new Exception("未找到场景信息：" + path);
-        }
-
-        String projectNum = scenePro.getNum();
-
-
+    private Map<String, String> getUploadFiles(String projectNum,String path,Integer cameraType,JSONObject fdageData) throws Exception {
         String dataViewPath = String.format(ConstantFilePath.DATA_PATH_FORMAT, projectNum);
         String imagesPath = String.format(ConstantFilePath.IMAGE_PATH_FORMAT, projectNum);
         String videoPath = String.format(ConstantFilePath.VIDEO_PATH_FORMAT, projectNum);
@@ -559,13 +550,8 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
     }
 
     private ScenePro updateDbPlus(String num, Long space, String videosJson, Long computeTime,boolean isObj){
-        ScenePro scenePro = sceneProService.getByNum(num);
-        if (ObjectUtils.isEmpty(scenePro)) {
-            return null;
-        }
-
         sceneProService.update(new LambdaUpdateWrapper<ScenePro>()
-                .in(ScenePro::getId, scenePro.getId())
+                .eq(ScenePro::getNum, num)
                 .set(ScenePro::getStatus, SceneStatus.NO_DISPLAY.code())
                 .set(ScenePro::getUpdateTime, new Date())
                 .set(ScenePro::getCreateTime, new Date())
@@ -574,8 +560,7 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
                 .set(ScenePro::getVideos, videosJson)
                 .set(ScenePro::getIsObj, isObj ? 1 : 0)
                 .set(ScenePro::getPayStatus, PayStatus.PAY.code()));
-
-        return scenePro;
+       return sceneProService.getByNum(num);
     }
 
     private int getPayStatus(Long cameraId, Long space) throws Exception{