Prechádzať zdrojové kódy

深光slam增加点位统计 增加统计原始数据大小

dsx 1 rok pred
rodič
commit
fde5b791b7

+ 6 - 0
src/main/java/com/fdkankan/contro/entity/ScenePlusExt.java

@@ -65,6 +65,12 @@ public class ScenePlusExt implements Serializable {
     private Long space;
 
     /**
+     * 原始文件容量
+     */
+    @TableField("orig_space")
+    private Long origSpace;
+
+    /**
      * 云服务器类型
      */
     @TableField("ecs")

+ 11 - 0
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -90,6 +90,12 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     @Value("${env:gn}")
     private String env;
 
+    @Value("4dkk.laserService.bucket")
+    private String laserBucket;
+
+    @Value("${4dkk.laserService.dir}")
+    private String laserDir;
+
     @Autowired
     private RabbitMqProducer mqProducer;
 
@@ -323,10 +329,15 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 sceneEditControlsService.update(new LambdaUpdateWrapper<SceneEditControls>().set(SceneEditControls::getShowMap,0)
                         .eq(SceneEditControls::getEditInfoId,sceneEditInfo.getId()));
                 sceneEditControls.setShowMap(0);
+                scenePlusExt.setSpace(scenePlusExt.getSpace() + fYunFileService.getSpace(laserBucket, String.format(laserDir, sceneCode)));
             } else if (new File(path + "/results/laserData/vision_edit.txt").exists()) {
                 fdkkLaserService.cloudPointBuild(sceneCode,path);
             }
 
+            //统计原始资源大小
+            scenePlusExt.setOrigSpace(FileUtil.size(new File(path.concat(File.separator).concat("capture"))));
+
+
             log.info("生成scene.json上传oss并设置缓存,num:{}", sceneCode);
             CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
             Company company = !ObjectUtils.isEmpty(cameraDetail.getCompanyId()) ? companyService.getById(cameraDetail.getCompanyId()) : null;

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

@@ -98,7 +98,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
             FileUtils.copyDirectiory(dataSource + "/results/laserData/cover", jgPath + "/extras");
             FileUtils.copyFile(dataSource + "/results/laserData", jgPath, true);
 
-            updateSceneStatus(sceneNum, 2, jgPath + File.separator + "laserData",createTime);
+            updateSceneStatus(sceneNum, 2, jgPath + File.separator + "laserData",createTime, shootCount);
         } catch (Exception e) {
             log.error("激光转台相机同步失败", e);
         }