去掉recStatus

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneFileBuildServiceImpl.java

@@ -900,6 +900,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             sceneNum = scene3dNumService.generateSceneNum();
             rebuild = 0;
         }
+        log.info("是否是重算，rebuild：{}",rebuild);
 
         if(sceneNum == null){
             log.error("大场景序号为空：" + sceneNum);
@@ -957,6 +958,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             
             // TODO: 2022/1/24 暂时保留旧版本，系统稳定后删除
             uploadToOssUtil.upload(filePath + jsonObject.getString("icon"), "images/images" + sceneNum + "/" + jsonObject.getString("icon"));
+
+            log.info("上传icon成功....");
         }
 
         JSONObject firmwareVersion = new JSONObject();
@@ -990,6 +993,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             uploadToOssUtil.upload(ConstantFilePath.LOGO_PATH + "logo-main.png", "images/images" + sceneNum + "/logo-main.png");
             uploadToOssUtil.upload(ConstantFilePath.LOGO_PATH + "logo-main-en.png", "images/images" + sceneNum + "/logo-main-en.png");
 
+            log.info("第一次计算场景,上传logo-main.png");
+
         }
         SceneProPO scene = null;
         scene = this.createScenePro(sceneNum, camera.getId(), camera.getChildName(), jsonObject.getString("creator"),
@@ -1017,6 +1022,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             // TODO: 2022/1/24 暂时保留旧版本，系统稳定后删除
             uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"data/data"+sceneNum+File.separator+"status.json",
                     "data/data"+sceneNum+File.separator+"status.json");
+
+            log.info("上传status.json,上传内容：{}" + statusJson.toString());
         }
 
         if(cameraDetail.getCompanyId() != null){
@@ -1119,6 +1126,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
 
         //激光转台 八目相机占用 10 和 11
+        log.info("发送mq，camType:{}", jsonObject.getJSONObject("cam").getIntValue("type"));
         if(jsonObject.getJSONObject("cam").getIntValue("type") == 10){
             mqProducer.sendOneWay(topicLaserA, scene.getMqMsg());
         }else  if(scene != null){

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProEditServiceImpl.java

@@ -39,7 +39,6 @@ public class SceneProEditServiceImpl extends ServiceImpl<ISceneProEditMapper, Sc
     public SceneProEdit findByProId(Long proId) {
         return this.getOne(new QueryWrapper<SceneProEdit>()
                             .eq("tb_status", TbStatus.VALID.code())
-                            .eq("rec_status", RecStatus.VALID.code())
                             .eq("pro_id", proId));
 
     }