Merge branch 'release' into project-jmga-v1.4.0

# Conflicts:
#	src/main/java/com/fdkankan/contro/controller/SceneFileController.java
#	src/main/java/com/fdkankan/contro/generate/AutoGenerate.java
#	src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java
#	src/main/java/com/fdkankan/contro/mq/service/impl/BuildV3SceneServiceImpl.java
#	src/main/java/com/fdkankan/contro/schedule/ScheduleJob.java
#	src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java
#	src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

src/main/java/com/fdkankan/contro/bean/SceneJsonBean.java

@@ -211,5 +211,17 @@ public class SceneJsonBean implements Serializable {
      */
     private Integer billboards;
 
+    /**
+     * 模型裁剪
+     */
+    private Integer cutModel;
+
+    /**
+     * 入场设置
+     */
+    private JSONObject started;
+
+    private Integer sceneDraw;
+
 
 }

src/main/java/com/fdkankan/contro/constant/UserEditDataType.java

@@ -7,6 +7,8 @@ public enum UserEditDataType {
 
     BOX_MODEL("boxModel", "boxModelHandler"),
     FLOORPLAN("floorplan", "floorplanHandler"),
+
+    FILTERS("filters", "filtersHandler"),
     ;
 
     private String code;

src/main/java/com/fdkankan/contro/controller/SceneCleanOrigController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.contro.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 删除oss原始资源记录 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-04-17
- */
-@RestController
-@RequestMapping("/contro/sceneCleanOrig")
-public class SceneCleanOrigController {
-
-}
-

src/main/java/com/fdkankan/contro/controller/SceneCopyLogController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.contro.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2023-04-17
- */
-@RestController
-@RequestMapping("/contro/sceneCopyLog")
-public class SceneCopyLogController {
-
-}
-

src/main/java/com/fdkankan/contro/controller/SceneFileController.java

@@ -16,11 +16,15 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.contro.service.IAppCameraFailLogService;
 import com.fdkankan.contro.service.ISceneFileBuildService;
+import com.fdkankan.contro.service.ISceneUploadCountService;
+import com.fdkankan.contro.vo.ReportFailLogVO;
 import com.fdkankan.contro.vo.ResponseSceneFile;
 import com.fdkankan.contro.vo.SendCallAlgorithmParam;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
+import com.fdkankan.contro.vo.SceneUploadCountParamVO;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.web.response.ResultData;
 import lombok.extern.log4j.Log4j2;
@@ -33,6 +37,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.File;
+import javax.validation.Valid;
 import java.io.IOException;
 import java.util.Date;
 import java.util.Map;
@@ -56,6 +61,12 @@ public class SceneFileController{
     @Autowired
     private FYunFileServiceInterface fYunFileService;
 
+    @Autowired
+    private ISceneUploadCountService sceneUploadCountService;
+
+    @Autowired
+    private IAppCameraFailLogService appCameraFailLogService;
+
 
     /**
      * 场景文件上传之前先获取fileId
@@ -91,8 +102,11 @@ public class SceneFileController{
     }
 
     @GetMapping("rebuildScene")
-    public ResultData rebuildScene(@RequestParam(value = "num") String num,@RequestParam(value = "force",defaultValue = "false") Boolean force ,@RequestParam(value = "deleteExtras",defaultValue = "true") Boolean deleteExtras) throws IOException {
-        return sceneFileBuildService.rebuildScene(num,force,deleteExtras);
+    public ResultData rebuildScene(@RequestParam(value = "num") String num,
+                                   @RequestParam(value = "force",defaultValue = "false") Boolean force ,
+                                   @RequestParam(value = "deleteExtras",defaultValue = "true") Boolean deleteExtras,
+                                   @RequestParam(value = "from", defaultValue = "api") String from) throws IOException {
+        return sceneFileBuildService.rebuildScene(num,force,deleteExtras, from);
     }
 
 
@@ -239,11 +253,21 @@ public class SceneFileController{
         return ResultData.ok();
     }
 
-    public static void main(String[] args) {
-        List<String> strings = FileUtil.listFileNames("D:\\test5\\aaa");
-        System.out.println(JSON.toJSONString(strings));
-
+    /**
+     * 记录app触发上传场景
+     * @param param
+     * @return
+     */
+    @PostMapping("/increSceneUploadCount")
+    public ResultData increSceneUploadCount(@RequestBody @Valid SceneUploadCountParamVO param){
+        sceneUploadCountService.increSceneUploadCount(param);
+        return ResultData.ok();
     }
 
+    @PostMapping("/reportFailLog")
+    public ResultData reportFailLog(@RequestBody @Valid ReportFailLogVO param){
+        appCameraFailLogService.reportFailLog(param);
+        return ResultData.ok();
+    }
 
 }

src/main/java/com/fdkankan/contro/controller/TestController.java

@@ -4,6 +4,7 @@ import com.fdkankan.contro.service.ICommonService;
 import com.fdkankan.contro.service.IScene3dNumService;
 import com.fdkankan.web.response.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,11 +24,12 @@ public class TestController {
     private IScene3dNumService scene3dNumService;
     @Autowired
     private ICommonService commonService;
+    @Value("${4dkk.laserService.bucket}")
+    private String bucket;
 
     @GetMapping("/test")
     public ResultData test(String num) throws Exception {
-        commonService.sendEmail(num);
-        return ResultData.ok();
+        return ResultData.ok(bucket);
     }
 
 }

src/main/java/com/fdkankan/contro/entity/AppCameraFailLog.java

@@ -0,0 +1,52 @@
+package com.fdkankan.contro.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * app错误上报
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-20
+ */
+@Getter
+@Setter
+@TableName("t_app_camera_fail_log")
+public class AppCameraFailLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField("uuid")
+    private String uuid;
+
+    /**
+     * 错误来源（app，camera）
+     */
+    @TableField("source")
+    private String source;
+
+    /**
+     * 错误原因
+     */
+    @TableField("reason")
+    private String reason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+
+}

src/main/java/com/fdkankan/contro/entity/MqSendLog.java

@@ -0,0 +1,61 @@
+package com.fdkankan.contro.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+@TableName("mq_send_log")
+public class MqSendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 发送的队列
+     */
+    @TableField("queue")
+    private String queue;
+
+    /**
+     * 发送的mq消息
+     */
+    @TableField("content")
+    private String content;
+
+    @TableField("num")
+    private String num;
+
+    @TableField("es_name")
+    private String esName;
+
+    /**
+     * 0未发送，1已发送
+     */
+    @TableField("status")
+    private Integer status;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/contro/entity/SceneEditControls.java

@@ -9,10 +9,10 @@ import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
- * @author 
+ * @author
  * @since 2022-01-20
  */
 @Getter
@@ -113,6 +113,12 @@ public class SceneEditControls implements Serializable {
     private Integer showCapture;
 
     /**
+     * 是否显示空间绘制标题
+     */
+    @TableField("show_draw_title")
+    private Integer showDrawTitle;
+
+    /**
      * 创建时间
      */
     @TableField("create_time")

src/main/java/com/fdkankan/contro/entity/SceneEditInfoExt.java

@@ -11,10 +11,10 @@ import lombok.Setter;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
- * @author 
+ * @author
  * @since 2022-03-07
  */
 @Getter
@@ -97,6 +97,24 @@ public class SceneEditInfoExt {
     private Integer billboards;
 
     /**
+     * 模型裁剪
+     */
+    @TableField("cut_model")
+    private Integer cutModel;
+
+    /**
+     * 入厂设置
+     */
+    @TableField("started")
+    private String started;
+
+    /**
+     * 是否有空间绘制
+     */
+    @TableField("scene_draw")
+    private Integer sceneDraw;
+
+    /**
      * 创建时间
      */
     @TableField("create_time")

src/main/java/com/fdkankan/contro/entity/SceneInfoSyncMqConfig.java

@@ -0,0 +1,60 @@
+package com.fdkankan.contro.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 场景信息变更需要发送mq信息队列配置表
+ * </p>
+ *
+ * @author
+ * @since 2024-04-16
+ */
+@Getter
+@Setter
+@TableName("t_scene_info_sync_mq_config")
+public class SceneInfoSyncMqConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 需要同步的消息类型
+     */
+    @TableField("info_type")
+    private String infoType;
+
+    /**
+     * 队列名
+     */
+    @TableField("queue_name")
+    private String queueName;
+
+    /**
+     * 需要同步信息的应用名
+     */
+    @TableField("app_name")
+    private String appName;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * A正常，I删除
+     */
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
+
+
+}

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")

src/main/java/com/fdkankan/contro/entity/SceneRebuildLog.java

@@ -0,0 +1,49 @@
+package com.fdkankan.contro.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 场景重算接口调用日志表
+ * </p>
+ *
+ * @author
+ * @since 2024-05-17
+ */
+@Getter
+@Setter
+@TableName("t_scene_rebuild_log")
+public class SceneRebuildLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 调用来源（api-接口调用，manage-管理后台调用，laser-点位校准调用）
+     */
+    @TableField("source")
+    private String source;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+
+}

src/main/java/com/fdkankan/contro/entity/SceneUploadCount.java

@@ -0,0 +1,51 @@
+package com.fdkankan.contro.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * app触发场景上传统计表
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-20
+ */
+@Getter
+@Setter
+@TableName("t_scene_upload_count")
+public class SceneUploadCount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    @TableField("uuid")
+    private String uuid;
+
+    /**
+     * 相机码
+     */
+    @TableField("sn_code")
+    private String snCode;
+
+    /**
+     * 触发上传次数
+     */
+    @TableField("count")
+    private Integer count;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/contro/factory/UserEditData/FiltersHandler.java

@@ -0,0 +1,145 @@
+package com.fdkankan.contro.factory.UserEditData;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.constant.CommonStatus;
+import com.fdkankan.common.constant.SceneSource;
+import com.fdkankan.common.util.FileUtils;
+import com.fdkankan.contro.entity.SceneEditInfo;
+import com.fdkankan.contro.entity.SceneEditInfoExt;
+import com.fdkankan.contro.entity.ScenePlus;
+import com.fdkankan.contro.entity.ScenePlusExt;
+import com.fdkankan.contro.service.ISceneEditInfoExtService;
+import com.fdkankan.contro.service.ISceneEditInfoService;
+import com.fdkankan.contro.service.IScenePlusExtService;
+import com.fdkankan.contro.service.IScenePlusService;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkankan.model.constants.ConstantFilePath;
+import com.fdkankan.model.constants.UploadFilePath;
+import com.fdkankan.model.utils.SceneUtil;
+import com.fdkankan.redis.constant.RedisKey;
+import com.fdkankan.redis.constant.RedisLockKey;
+import com.fdkankan.redis.util.RedisLockUtil;
+import com.fdkankan.redis.util.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * 初始化空间模型
+ */
+@Slf4j
+@Component("filtersHandler")
+public class FiltersHandler implements UserEditDataHandler {
+
+    @Autowired
+    private IScenePlusService scenePlusService;
+    @Autowired
+    private IScenePlusExtService scenePlusExtService;
+    @Autowired
+    private ISceneEditInfoService sceneEditInfoService;
+    @Autowired
+    private ISceneEditInfoExtService sceneEditInfoExtService;
+    @Resource
+    private FYunFileServiceInterface fYunFileService;
+    @Autowired
+    private RedisUtil redisUtil;
+    @Value("${env:gn}")
+    private String env;
+    @Resource
+    private RedisLockUtil redisLockUtil;
+
+    @Override
+    public void init(String num, Map<String, Object> params) throws Exception {
+
+        //国际服且看看且没有滤镜数据的才需要生成默认滤镜信息
+        if(!"eur".equals(env)){
+            return;
+        }
+        log.info("国际环境，开始初始化滤镜,num:{}", num);
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+        if(scenePlus.getSceneSource() != SceneSource.BM.code()){
+            return;
+        }
+        log.info("看看场景，开始初始化滤镜,num:{}", num);
+        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+        String dataSource = scenePlusExt.getDataSource();
+        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
+        SceneEditInfoExt sceneEditInfoExt = sceneEditInfoExtService.getByEditInfoId(sceneEditInfo.getId());
+//        if(Objects.nonNull(sceneEditInfoExt.getFilters())
+//                && sceneEditInfoExt.getFilters() == CommonStatus.YES.code().intValue()){
+//            return;
+//        }
+
+        //获取全景图id
+        String visionPath = dataSource + File.separator + "results" + File.separator + "vision.txt";
+
+        List<String> panoramaUuidList = SceneUtil.getPanoramaUuidList(visionPath);
+        log.info("点位id,{}",JSON.toJSONString(panoramaUuidList));
+        //{saturation: 0.35, brightness: 0.35, contrast: 0.4, temperature: 0.25, id: "0"}
+        List<JSONObject> collect = panoramaUuidList.stream().map(v -> {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("id", v);
+            jsonObject.put("saturation", new BigDecimal(-4).divide(new BigDecimal(20)).setScale(2));//饱和度
+            jsonObject.put("brightness", new BigDecimal(0).divide(new BigDecimal(20)).setScale(2));//亮度
+            jsonObject.put("contrast", new BigDecimal(0).divide(new BigDecimal(20)).setScale(2));//对比度
+            jsonObject.put("temperature", new BigDecimal(2).divide(new BigDecimal(20)).setScale(2));//对比度
+            return jsonObject;
+        }).collect(Collectors.toList());
+
+        String key = String.format(RedisKey.SCENE_filter_DATA,num);
+        List<String> filterList = collect.stream().map(item->JSON.toJSONString(item)).collect(Collectors.toList());
+        log.info("滤镜数据，filterList,{}",JSON.toJSONString(filterList));
+        redisUtil.del(key);
+        redisUtil.lRightPushAll(key, filterList);
+
+        String userViewPath = String.format(UploadFilePath.USER_VIEW_PATH, num);
+        List<String> list = redisUtil.lGet(key, 0, -1);
+        JSONArray jsonArray = new JSONArray();
+        list.stream().forEach(str->jsonArray.add(JSON.parseObject(str)));
+        fYunFileService.uploadFile(JSON.toJSONBytes(jsonArray), userViewPath + "filter.json");
+
+        //写本地文件，作为备份
+        this.writeFilter(num);
+
+        sceneEditInfoExt.setFilters(CommonStatus.YES.code().intValue());
+        sceneEditInfoExtService.updateById(sceneEditInfoExt);
+
+    }
+
+    private void writeFilter(String num) throws Exception{
+
+        String filterPath = String.format(ConstantFilePath.SCENE_USER_PATH_V4, num) + "filter.json";
+
+        String key = String.format(RedisKey.SCENE_filter_DATA, num);
+        List<String> filters = redisUtil.lGet(key, 0, -1);
+        if(CollUtil.isEmpty(filters)){
+            FileUtils.deleteFile(filterPath);
+            return;
+        }
+
+        String lockKey = String.format(RedisLockKey.LOCK_filter_JSON, num);
+        String lockVal = cn.hutool.core.lang.UUID.randomUUID().toString();
+        boolean lock = redisLockUtil.lock(lockKey, lockVal, RedisKey.EXPIRE_TIME_1_MINUTE);
+        if(!lock){
+            return;
+        }
+        try{
+            FileUtils.writeFile(filterPath, JSON.toJSONString(filters));
+        }finally {
+            redisLockUtil.unlockLua(lockKey, lockVal);
+        }
+    }
+}

src/main/java/com/fdkankan/contro/factory/UserEditData/UserEditDataHandler.java

@@ -4,6 +4,6 @@ import java.util.Map;
 
 public interface UserEditDataHandler {
 
-    void init(String num, Map<String, Object> params);
+    void init(String num, Map<String, Object> params) throws Exception;
 
 }

src/main/java/com/fdkankan/contro/mapper/IAppCameraFailLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.mapper;
+
+import com.fdkankan.contro.entity.AppCameraFailLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * app错误上报 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-20
+ */
+@Mapper
+public interface IAppCameraFailLogMapper extends BaseMapper<AppCameraFailLog> {
+
+}

src/main/java/com/fdkankan/contro/mapper/IMqSendLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.mapper;
+
+import com.fdkankan.contro.entity.MqSendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Mapper
+public interface IMqSendLogMapper extends BaseMapper<MqSendLog> {
+
+}

src/main/java/com/fdkankan/contro/mapper/ISceneInfoSyncMqConfigMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.mapper;
+
+import com.fdkankan.contro.entity.SceneInfoSyncMqConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 场景信息变更需要发送mq信息队列配置表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-16
+ */
+@Mapper
+public interface ISceneInfoSyncMqConfigMapper extends BaseMapper<SceneInfoSyncMqConfig> {
+
+}

src/main/java/com/fdkankan/contro/mapper/ISceneRebuildLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.mapper;
+
+import com.fdkankan.contro.entity.SceneRebuildLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 场景重算接口调用日志表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-17
+ */
+@Mapper
+public interface ISceneRebuildLogMapper extends BaseMapper<SceneRebuildLog> {
+
+}

src/main/java/com/fdkankan/contro/mapper/ISceneUploadCountMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.mapper;
+
+import com.fdkankan.contro.entity.SceneUploadCount;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * app触发场景上传统计表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-20
+ */
+@Mapper
+public interface ISceneUploadCountMapper extends BaseMapper<SceneUploadCount> {
+
+}

src/main/java/com/fdkankan/contro/mq/listener/AbstrackBuildSceneListener.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.CommonOperStatus;
 import com.fdkankan.contro.constant.RedisConstants;
 import com.fdkankan.contro.mq.service.IBuildSceneService;
+import com.fdkankan.contro.service.ICommonService;
 import com.fdkankan.contro.service.ISceneBuildProcessLogService;
 import com.fdkankan.model.constants.SceneBuildProcessType;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
@@ -27,6 +28,8 @@ public class AbstrackBuildSceneListener implements IBuildSceneListener {
     private RedisLockUtil redisLockUtil;
     @Autowired
     private ISceneBuildProcessLogService sceneBuildProcessLogService;
+    @Autowired
+    private ICommonService commonService;
 
     @Override
     public void preHandle(Channel channel, String queueName, Message message, IBuildSceneService buildSceneService) throws IOException {
@@ -57,6 +60,7 @@ public class AbstrackBuildSceneListener implements IBuildSceneListener {
             sceneBuildProcessLogService.clearSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueName);
             sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueName, CommonOperStatus.WAITING.code(), null);
             buildSceneService.buildScenePre(buildSceneMessage);
+            commonService.saveMqSendLog(num, buildSceneMessage);
             sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueName, CommonOperStatus.SUCCESS.code(), null);
         }catch (Exception e){
             log.error("场景计算前置处理出错,num=" + num, e);

src/main/java/com/fdkankan/contro/mq/listener/BuildIntermitSceneListener.java

@@ -0,0 +1,54 @@
+package com.fdkankan.contro.mq.listener;
+
+import com.fdkankan.contro.mq.service.impl.BuildIntermitSceneServiceImpl;
+import com.fdkankan.contro.mq.service.impl.BuildSceneServiceImpl;
+import com.rabbitmq.client.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class BuildIntermitSceneListener extends AbstrackBuildSceneListener {
+
+    @Value("${queue.modeling.intermit.modeling-pre}")
+    private String queueModelingPre;
+    @Value("${queue.modeling.intermit.modeling-post}")
+    private String queueModelingPost;
+
+    @Autowired
+    private BuildIntermitSceneServiceImpl buildSceneService;
+
+    /**
+     * 场景计算前置资源准备处理
+     * @param channel
+     * @param message
+     * @throws Exception
+     */
+    @RabbitListener(
+            queuesToDeclare = @Queue("${queue.modeling.intermit.modeling-pre}"),
+            concurrency = "${maxThread.modeling.modeling-pre}"
+    )
+    public void buildScenePreHandler(Channel channel, Message message) throws Exception {
+        preHandle(channel,queueModelingPre,message,buildSceneService);
+    }
+
+    /**
+     * 场景计算后置结果处理
+     * @param channel
+     * @param message
+     * @throws Exception
+     */
+    @RabbitListener(
+            queuesToDeclare = @Queue("${queue.modeling.intermit.modeling-post}"),
+            concurrency = "${maxThread.modeling.modeling-post}"
+    )
+    public void buildScenePostHandler(Channel channel, Message message) throws Exception {
+        postHandle(channel,queueModelingPost,message,buildSceneService);
+
+    }
+}

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

@@ -0,0 +1,436 @@
+package com.fdkankan.contro.mq.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.io.FileUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.common.constant.*;
+import com.fdkankan.common.util.FileUtils;
+import com.fdkankan.contro.entity.ScenePlus;
+import com.fdkankan.contro.entity.ScenePlusExt;
+import com.fdkankan.contro.mq.service.IBuildSceneService;
+import com.fdkankan.contro.service.*;
+import com.fdkankan.fyun.config.FYunFileConfig;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkankan.model.constants.ConstantFilePath;
+import com.fdkankan.model.constants.UploadFilePath;
+import com.fdkankan.model.enums.ModelTypeEnums;
+import com.fdkankan.model.utils.CreateObjUtil;
+import com.fdkankan.model.utils.SceneUtil;
+import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
+import com.fdkankan.rabbitmq.bean.BuildSceneResultMqMessage;
+import com.fdkankan.rabbitmq.util.RabbitMqProducer;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/4/20
+ **/
+@Slf4j
+@Service
+@RefreshScope
+public class BuildIntermitSceneServiceImpl implements IBuildSceneService {
+
+    @Value("${queue.modeling.modeling-call}")
+    private String queueModelingCall;
+    @Value("${queue.modeling.intermit.modeling-post}")
+    private String queueModelingPost;
+    @Value("${model.type:#{null}}")
+    private String modelType;
+    @Value("${env:gn}")
+    private String env;
+    @Value("#{'${build.scene.post.not-delete-nas-nums:}'.split(',')}")
+    private List<String> notDeleteNasNumList;
+    @Autowired
+    private RabbitMqProducer mqProducer;
+    @Resource
+    private FYunFileServiceInterface fYunFileService;
+    @Autowired
+    private FYunFileConfig fYunFileConfig;
+    @Autowired
+    private IScenePlusService scenePlusService;
+    @Autowired
+    private IScenePlusExtService scenePlusExtService;
+    @Autowired
+    private IBuildSceneDTService buildSceneDTService;
+    @Autowired
+    private ICommonService commonService;
+    @Autowired
+    private ISceneColdStorageService sceneColdStorageService;
+    @Autowired
+    private IntermitSceneService intermitSceneService;
+
+    @Override
+    public void buildScenePre(BuildSceneCallMessage message) throws Exception{
+        String num = message.getSceneNum();
+        try {
+            //重新计算时需要删除文件夹，否知使用缓存
+            if(new File(message.getPath() + File.separator + "results").exists()){
+                FileUtils.deleteDirectory(message.getPath() + File.separator + "results");
+            }
+            //由于刘强说caches会影响计算结果,所以这里删除caches
+            if(new File(message.getPath() + File.separator + "caches").exists()){
+                FileUtils.deleteDirectory(message.getPath() + File.separator + "caches");
+            }
+
+            //删除点位校准数据
+            if (Objects.nonNull(message.getExt())
+                    && message.getExt().containsKey("deleteExtras")
+                    && (Boolean) message.getExt().get("deleteExtras")) {
+                String extras = String.format(UploadFilePath.scene_result_data_path, num).concat("extras");
+                if(CollUtil.isNotEmpty(fYunFileService.listRemoteFiles(extras))){
+                    fYunFileService.deleteFolder(extras);
+                }
+            }
+
+            //用户相机重新全量上传，需要解冻结
+            sceneColdStorageService.unfreeze(num, "用户相机重新全量上传", message.getPath());
+
+            //根据相机类型，组装资源路径
+            //下载资源到本地
+            this.downLoadSource(message, message.getPath());
+
+            message.getBuildContext().put("cameraType",message.getCameraType());
+
+            //发送mq，就进行计算
+            message.setResultReceiverMqName(queueModelingPost);
+
+            log.info("场景计算资源准备结束，场景码：{}", message.getSceneNum());
+
+        }catch (Exception e){
+            log.error("场景计算前置处理出错,num"+num, e);
+            buildSceneDTService.handBaseFail("场景计算资源准备异常！", message.getPath(), message.getSceneNum(), "计算控制服务器");
+            throw e;
+        }
+    }
+
+    private String getOssPath(String path) {
+        String ossPath = ConstantFilePath.OSS_PREFIX
+                + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
+                .replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "");
+        if (!ossPath.endsWith("/")) {
+            ossPath = ossPath.concat("/");
+        }
+        return ossPath;
+    }
+
+    @Override
+    public void downLoadSource(BuildSceneCallMessage buildSceneMqMessage,String path){
+        String ossPath = getOssPath(path);
+        fYunFileService.downloadFileByCommand(path + File.separator + "capture", ossPath);
+    }
+
+    @Override
+    public void buildScenePost(BuildSceneResultMqMessage message) throws Exception {
+        String sceneCode = message.getBuildContext().get("sceneNum").toString();
+        String path = message.getPath();
+        try {
+            // 上传计算日志
+            //如果是重复计算，没有走到计算逻辑，不需要上传日志文件
+            log.info("开始上传计算日志");
+            String buildLogPath = String.format(UploadFilePath.BUILD_LOG_PATH, sceneCode);
+            fYunFileService.uploadFile(path + File.separator + "console.log", buildLogPath + "console.log");
+            log.info("计算日志上传完成");
+
+            if (!message.getBuildSuccess()) {
+                log.error("建模失败，修改状态为失败状态");
+                scenePlusService.update(new LambdaUpdateWrapper<ScenePlus>()
+                        .set(ScenePlus::getSceneStatus, SceneStatus.FAILD.code())
+                        .eq(ScenePlus::getNum, sceneCode));
+
+                // 发送钉钉消息，计算失败
+                buildSceneDTService.handModelFail("计算失败", message.getPath(), sceneCode, message.getHostName());
+                return;
+            }
+            JSONObject fdageData = getFdageData(path + File.separator + "capture" +File.separator+"data.fdage");
+
+            ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneCode);
+
+            Integer cameraType = Integer.parseInt(message.getBuildContext().get("cameraType").toString());
+            Map<String, String> uploadFiles = getUploadFiles(scenePlus,path);
+
+            scenePlus.setPayStatus(PayStatus.PAY.code());
+            scenePlus.setUpdateTime(new Date());
+            scenePlus.setSceneStatus(SceneStatus.NO_DISPLAY.code());
+
+            Integer videoVersion = fdageData.getInteger("videoVersion");
+            //读取计算结果文件生成videosJson
+            JSONObject videosJson = this.getVideosJson(path, videoVersion, sceneCode, cameraType);
+
+            ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+
+            log.info("开始上传场景计算结果数据，num:{}", sceneCode);
+            //上传文件
+            fYunFileService.uploadMulFiles(uploadFiles);
+
+            //容量统计
+            Long space = commonService.getSpace(sceneCode);
+
+            //写入数据库
+            this.updateDbPlus(scenePlus.getSceneSource(), space, videosJson.toJSONString(), message.getComputeTime(),false,scenePlusExt);
+
+            Object[] editInfoArr = commonService.updateEditInfo(scenePlus);
+
+            //统计原始资源大小
+            scenePlusExt.setOrigSpace(FileUtil.size(new File(path.concat(File.separator).concat("capture"))));
+
+            //删除计算目录
+            if(CollUtil.isEmpty(notDeleteNasNumList) || !notDeleteNasNumList.contains(sceneCode)){
+                CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/"));
+            }
+
+            //如果相机容量不足，需要把场景的paystatus改为容量不足状态
+            scenePlus.setPayStatus(commonService.getPayStatus(scenePlus.getCameraId(), space));
+
+            this.uploadStatusJson(scenePlus, scenePlusExt);
+
+            scenePlusService.updateById(scenePlus);
+            scenePlusExtService.updateById(scenePlusExt);
+
+            //推送到全景看看
+            intermitSceneService.sendMq(sceneCode, fdageData, CommonSuccessStatus.SUCCESS.code());
+
+            log.info("场景计算结果处理结束，场景码：{}", sceneCode);
+
+        }catch (Exception e){
+            log.error("场景计算结果处理出错,num"+sceneCode, e);
+            buildSceneDTService.handBaseFail("场景计算结果处理出错！", message.getPath(), sceneCode, "计算控制服务器");
+            throw e;
+        }
+    }
+
+    private Map<String, String> getUploadFiles(ScenePlus scenePlus,String path) throws Exception {
+        String projectNum = scenePlus.getNum();
+        String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, projectNum);
+        String imagesPath = String.format(UploadFilePath.IMG_VIEW_PATH, projectNum);
+        String videoPath = String.format(UploadFilePath.VIDEOS_VIEW_PATH, projectNum);
+        String resultsPath = path + File.separator + "results" + File.separator;
+
+        String uploadData = FileUtils.readFile(resultsPath + "upload.json");
+        JSONArray array = JSONObject.parseObject(uploadData).getJSONArray("upload");
+
+        JSONObject fileJson = null;
+        String fileName = "";
+
+        Map<String, String> map = new HashMap();
+
+        for (int i = 0; i < array.size(); ++i) {
+            fileJson = array.getJSONObject(i);
+            fileName = fileJson.getString("file");
+            String filePath = resultsPath + fileName;
+
+            if (!(new File(filePath)).exists()) {
+                throw new Exception(filePath + "文件不存在");
+            }
+
+            if(fileJson.getIntValue("clazz") == 1 || fileJson.getIntValue("clazz") == 22){
+                map.put(filePath, imagesPath + fileName);
+            }
+        }
+        return map;
+    }
+
+    private JSONObject getFdageData(String dataFdagePath) {
+        log.info("dataFdagePath 文件路径 ：{}", dataFdagePath);
+        String data = FileUtils.readFile(dataFdagePath);
+        //获取data.fdage的内容
+        JSONObject dataJson = new JSONObject();
+        if(data!=null){
+            dataJson = JSONObject.parseObject(data);
+        }
+        return dataJson;
+    }
+
+    private void uploadStatusJson(ScenePlus scenePlus, ScenePlusExt scenePlusExt){
+        String num = scenePlus.getNum();
+        String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
+
+        Integer status = 1;
+        // 上传status JSON.
+        JSONObject statusJson = new JSONObject();
+        //临时将-2改成1，app还没完全更新
+        statusJson.put("status", status);
+        statusJson.put("webSite", scenePlusExt.getWebSite());
+        statusJson.put("sceneNum", num);
+        statusJson.put("thumb", scenePlusExt.getThumb());
+        statusJson.put("payStatus", scenePlus.getPayStatus());
+        statusJson.put("sceneScheme", scenePlusExt.getSceneScheme());
+        FileUtils.writeFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json", statusJson.toString());
+
+        fYunFileService.uploadFile(statusJson.toJSONString().getBytes(StandardCharsets.UTF_8), dataViewPath + "status.json");
+    }
+
+    private JSONObject getVideosJson(String path, Integer videoVersion, String projectNum, int cameraType) throws Exception {
+        //读取videos_hdr_param.json, 保存点位视频的value
+        Map<String, Object> videoMap = new HashMap<>();
+        String videosHdr = FileUtils.readFile(path + File.separator + "results/videos/videos_hdr_param.json");
+        JSONArray videoArray = null;
+        if(StringUtils.isNotEmpty(videosHdr)){
+            videoArray = JSONObject.parseObject(videosHdr).getJSONArray("hdr_param");
+        }
+        if(videoArray != null){
+            for(int i = 0, len = videoArray.size(); i < len; i++) {
+                videoMap.put(videoArray.getJSONObject(i).getString("name"), videoArray.getJSONObject(i).getString("value"));
+                if(videoArray.getJSONObject(i).containsKey("fov")){
+                    videoMap.put(videoArray.getJSONObject(i).getString("name") + "_fov", videoArray.getJSONObject(i).getString("fov"));
+                }
+            }
+        }
+
+        //获取upload中的video视频名称
+        String uploadData = FileUtils.readFile(path + File.separator + "results" +File.separator+"upload.json");
+        JSONObject uploadJson = null;
+        JSONArray array = null;
+        if(uploadData!=null) {
+            uploadJson = JSONObject.parseObject(uploadData);
+            array = uploadJson.getJSONArray("upload");
+        }
+        JSONObject fileJson = null;
+        String fileName = "";
+
+        //计算ts文件的大小，并拼接成json格式
+        JSONArray jsonArray = new JSONArray();
+        JSONObject videoJson = null;
+        JSONObject videosJson = new JSONObject();
+        long videoSize = 0L;
+        for(int i = 0, len = array.size(); i < len; i++) {
+            fileJson = array.getJSONObject(i);
+            fileName = fileJson.getString("file");
+            if(fileJson.getIntValue("clazz") == 11 && fileName.contains(".mp4") && !fileName.contains("-ios.mp4")){
+                videoJson = new JSONObject();
+                videoJson.put("id", fileName.substring(
+                    0, fileName.lastIndexOf(".")).replace("videos/", ""));
+
+                //如果ts文件存在，就计算ts大小
+                if(new File(path + File.separator + "results" +File.separator+ fileName.replace(".mp4", ".ts")).exists()){
+                    videoSize = new File(path + File.separator + "results" +File.separator+ fileName.replace(".mp4", ".ts")).length();
+                    videoJson.put("tsSize", videoSize);
+                }
+                if(videoMap.containsKey(videoJson.get("id"))){
+                    videoJson.put("value", videoMap.get(videoJson.get("id")));
+                }
+                if(videoMap.containsKey(videoJson.get("id") + "_fov")){
+                    videoJson.put("blend_fov", videoMap.get(videoJson.get("id") + "_fov"));
+                }else {
+                    videoJson.put("blend_fov", 7);
+                }
+                jsonArray.add(videoJson);
+            }
+        }
+
+        videosJson.put("data", jsonArray);
+        if(Objects.nonNull(videoVersion) && videoVersion >= 4){
+            videosJson.put("version", 3);
+            videosJson.put("upPath", fYunFileConfig.getHost() + String.format(UploadFilePath.DATA_VIEW_PATH, projectNum) + "Up.xml");
+            if(cameraType == 13){
+                //转台相机
+                videosJson.put("upPath", videosJson.getString("upPath").replace(".xml", ".txt"));
+            }
+        }else {
+            videosJson.put("version", 1);
+            videosJson.put("upPath", fYunFileConfig.getHost() + String.format(UploadFilePath.DATA_VIEW_PATH, projectNum) + "Up2.xml");
+            if(cameraType == 13){
+                //转台相机
+                videosJson.put("upPath", videosJson.getString("upPath").replace(".xml", ".txt"));
+            }
+        }
+
+        if(cameraType == 5 || cameraType == 6){
+            videosJson.put("version", 1);
+            videosJson.put("upPath", fYunFileConfig.getHost() + String.format(UploadFilePath.DATA_VIEW_PATH, projectNum) + "stitch_params.txt");
+        }
+
+        return videosJson;
+    }
+    private void updateDbPlus(int sceneSource,Long space,String videosJson, Long computeTime,boolean isObj,ScenePlusExt scenePlusExt){
+
+        scenePlusExt.setSpace(space);
+        scenePlusExt.setComputeTime(computeTime.toString());
+        scenePlusExt.setAlgorithmTime(new Date());
+        scenePlusExt.setVideos(videosJson);
+        scenePlusExt.setIsObj(isObj ? 1 : 0);
+
+        if(ModelTypeEnums.TILE_CODE.equals(modelType)){
+            scenePlusExt.setSceneScheme(3);
+        }
+
+        switch (SceneSource.get(sceneSource)){
+            case BM:
+                scenePlusExt.setSceneResolution(SceneResolution.two_K.code());
+                scenePlusExt.setSceneFrom(SceneFrom.PRO.code());
+                break;
+            case SM:
+                scenePlusExt.setSceneResolution(SceneResolution.one_k.code());
+                scenePlusExt.setSceneFrom(SceneFrom.LITE.code());
+                break;
+            case ZT:
+                scenePlusExt.setSceneResolution(SceneResolution.four_K.code());
+                scenePlusExt.setSceneFrom(SceneFrom.MINION.code());
+                break;
+            case JG:
+                scenePlusExt.setSceneResolution(SceneResolution.four_K.code());
+                scenePlusExt.setSceneFrom(SceneFrom.LASER.code());
+                break;
+            case SG:
+                scenePlusExt.setSceneResolution(SceneResolution.four_K.code());
+                scenePlusExt.setSceneFrom(SceneFrom.LASER.code());
+                break;
+        }
+
+        String sceneKind = scenePlusExt.getSceneScheme() == 3 ? SceneKind.FACE.code():SceneKind.TILES.code();
+        scenePlusExt.setSceneKind(sceneKind);
+//        scenePlusExt.setModelKind(modelKind);
+
+        //统计点位数量
+        scenePlusExt.setShootCount(this.getShootCount(scenePlusExt));
+
+        scenePlusExtService.updateById(scenePlusExt);
+    }
+
+    private Integer getShootCount(ScenePlusExt scenePlusExt){
+        Integer shootCount = null;
+        String homePath = SceneUtil.getHomePath(scenePlusExt.getDataSource());
+        JSONObject dataFdageObj = JSON.parseObject(fYunFileService.getFileContent(homePath.concat("data.fdage")));
+        if(Objects.nonNull(dataFdageObj)){
+            JSONArray points = dataFdageObj.getJSONArray("points");
+            if(CollUtil.isNotEmpty(points)){
+                shootCount = points.size();
+            }
+        }
+        if(Objects.nonNull(shootCount) && shootCount > 0){
+            return shootCount;
+        }
+
+        String slamDataStr = fYunFileService.getFileContent(homePath.concat("slam_data.json"));
+        JSONObject slamDataObj = JSON.parseObject(slamDataStr);
+        if(Objects.nonNull(slamDataObj)){
+            JSONArray viewsInfo = slamDataObj.getJSONArray("views_info");
+            if(CollUtil.isNotEmpty(viewsInfo)){
+                shootCount = viewsInfo.stream().mapToInt(info -> {
+                    return  ((JSONObject) info).getJSONArray("list_pose").size();
+                }).sum();
+            }
+        }
+
+        return shootCount;
+    }
+
+
+}

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

@@ -8,10 +8,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.*;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.contro.entity.ScenePlus;
-import com.fdkankan.contro.entity.ScenePlusExt;
-import com.fdkankan.contro.entity.ScenePro;
-import com.fdkankan.contro.entity.SceneProEdit;
+import com.fdkankan.contro.constant.UserEditDataType;
+import com.fdkankan.contro.entity.*;
 import com.fdkankan.contro.mq.service.IBuildSceneService;
 import com.fdkankan.contro.service.ICommonService;
 import com.fdkankan.contro.service.*;
@@ -33,10 +31,9 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import javax.annotation.Resource;
 import java.io.File;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * <p>
@@ -71,7 +68,7 @@ public class BuildObjServiceImpl implements IBuildSceneService {
     @Autowired
     private RabbitMqProducer mqProducer;
 
-    @Autowired
+    @Resource
     private FYunFileServiceInterface fYunFileService;
 
     @Autowired
@@ -102,6 +99,10 @@ public class BuildObjServiceImpl implements IBuildSceneService {
     private IScenePlusExtService scenePlusExtService;
     @Autowired
     private RedisUtil redisUtil;
+    @Autowired
+    private ICameraDetailService cameraDetailService;
+    @Autowired
+    private ICompanyService companyService;
 
     @Override
     public void buildScenePre(BuildSceneCallMessage message) throws Exception{
@@ -143,9 +144,6 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             message.setPath(laserObjFilePath);
             message.setResultReceiverMqName(queueObjModelingPost);
 
-            //发送mq，就进行计算
-            mqProducer.sendByWorkQueue(queueModelingCall, message);
-
             success = true;
 
             log.info("场景计算资源准备结束，场景码：{}", message.getSceneNum());
@@ -225,6 +223,8 @@ public class BuildObjServiceImpl implements IBuildSceneService {
                     log.error("3dtiles目录异常，3dtiles地址：{}", new File(path + File.separator + "results" + File.separator + ModelKind.THREE_D_TILE.code()));
                     throw new Exception("3dtiles目录异常");
                 }
+                //先删除
+                fYunFileService.deleteFolder(oss3dtilesPath);
                 //上传3dtiles文件
                 fYunFileService.uploadFileByCommand(threedtilesPath, oss3dtilesPath);
             }
@@ -248,6 +248,8 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             log.info("开始拷贝obj文件");
             FileUtils.copyFolderAllFiles(laserObjFilePath + "/results/mesh", laserObjFilePath + "/laserData/mesh/", true);
 
+            //先删除
+            fYunFileService.deleteFolder(String.format(UploadFilePath.DATA_VIEW_PATH,  projectNum) + "mesh");
             //上传mesh文件
             fYunFileService.uploadFileByCommand(laserObjFilePath + "/results/mesh", String.format(UploadFilePath.DATA_VIEW_PATH,  projectNum) + "mesh");
 
@@ -265,6 +267,13 @@ public class BuildObjServiceImpl implements IBuildSceneService {
 
             ScenePlus scenePlus = scenePlusService.getScenePlusByNum(projectNum);
             if(Objects.nonNull(scenePlus)){
+
+//                //清除用户编辑业务数据
+//                Set<String> bizs = new HashSet<>();
+//                bizs.add(UserEditDataType.BOX_MODEL.message());
+//                bizs.add(UserEditDataType.FLOORPLAN.message());
+//                commonService.initUserEditData(projectNum, bizs, null);
+
                 LambdaUpdateWrapper<ScenePlus> plusUpdateWrapper = new LambdaUpdateWrapper<ScenePlus>()
                         .set(ScenePlus::getSceneStatus, -2).eq(ScenePlus::getNum, projectNum);
                 scenePlusService.update(plusUpdateWrapper);
@@ -275,24 +284,28 @@ public class BuildObjServiceImpl implements IBuildSceneService {
                 Long space = commonService.getSpace(projectNum);
                 scenePlusExt.setSpace(space);
 
+                Object[] editInfoArr = commonService.updateEditInfo(scenePlus);
+                SceneEditInfo sceneEditInfo = (SceneEditInfo)editInfoArr[0];
+                SceneEditInfoExt sceneEditInfoExt = (SceneEditInfoExt)editInfoArr[1];
+                SceneEditControls sceneEditControls = (SceneEditControls)editInfoArr[2];
 
                 if(this.modelKind.equals(ModelKind.THREE_D_TILE.code())
                         && CollUtil.isNotEmpty(sdTilesSceneSourceList)
                         && sdTilesSceneSourceList.contains(scenePlus.getSceneSource())){
                     scenePlusExt.setModelKind(ModelKind.THREE_D_TILE.code());
                     scenePlusExtService.updateById(scenePlusExt);
-
-                    String sceneJsonStr = fYunFileService.getFileContent(String.format(UploadFilePath.DATA_VIEW_PATH, projectNum) + "scene.json");
-                    if(StrUtil.isNotEmpty(sceneJsonStr)){
-                        JSONObject sceneJson = JSON.parseObject(sceneJsonStr);
-                        sceneJson.put("modelKind", ModelKind.THREE_D_TILE.code());
-                        fYunFileService.uploadFile(sceneJson.toJSONString().getBytes(), String.format(UploadFilePath.DATA_VIEW_PATH, projectNum) + "scene.json");
-                        redisUtil.del(String.format(RedisKey.SCENE_JSON, projectNum));
-                    }
-
                 }
+
+                log.info("生成scene.json上传oss并设置缓存，num:{}", projectNum);
+                CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
+                Company company = !org.apache.commons.lang3.ObjectUtils.isEmpty(cameraDetail.getCompanyId()) ? companyService.getById(cameraDetail.getCompanyId()) : null;
+                //写scene.json
+                commonService.writeSceneJson(projectNum, new JSONObject(),sceneEditInfo, sceneEditInfoExt, sceneEditControls, scenePlus,scenePlusExt,company);
             }
 
+            //重置异步操作记录
+            commonService.removeSceneAsynOperLog(projectNum);
+
             // 如果未升级V4,则升级V4
             if("v3".equals(version)){
                 fdkkV4Service.upgradeToV4(projectNum);

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

@@ -1,13 +1,13 @@
 package com.fdkankan.contro.mq.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.file.FileNameUtil;
+import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
 import cn.hutool.extra.qrcode.QrCodeUtil;
 import cn.hutool.extra.qrcode.QrConfig;
+import cn.hutool.http.ContentType;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -16,12 +16,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.*;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.contro.bean.SceneJsonBean;
 import com.fdkankan.contro.constant.UserEditDataType;
 import com.fdkankan.contro.entity.*;
 import com.fdkankan.contro.mq.service.IBuildSceneService;
 import com.fdkankan.contro.service.*;
-import com.fdkankan.contro.vo.SceneEditControlsVO;
 import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.constant.FYunTypeEnum;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
@@ -37,18 +35,20 @@ import com.fdkankan.push.utils.PushMsgUtil;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.bean.BuildSceneResultMqMessage;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
-import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpHeaders;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
@@ -91,10 +91,13 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     @Value("#{'${build.scene.post.not-delete-nas-nums:}'.split(',')}")
     private List<String> notDeleteNasNumList;
 
+    @Value("4dkk.laserService.bucket")
+    private String laserBucket;
+
     @Autowired
     private RabbitMqProducer mqProducer;
 
-    @Autowired
+    @Resource
     private FYunFileServiceInterface fYunFileService;
     @Autowired
     private ICameraDetailService cameraDetailService;
@@ -152,6 +155,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
     }
 
+
     @Override
     public void buildScenePre(BuildSceneCallMessage message) throws Exception{
         boolean success = false;
@@ -216,16 +220,17 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
             message.getBuildContext().put("cameraType",message.getCameraType());
 
-            // 判断企业是否配置了弹性伸缩
-            if (message.getFlexibility() == 0) {
-                //发送mq，就进行计算
-                mqProducer.sendByWorkQueue(queueModelingCall, message);
-            } else {
-                //发送mq，就进行计算
-                mqProducer.sendByWorkQueue(singleModelingCall, message);
+            //查询是否超过比例50%，如果超过，则启动128G服务器弹性伸缩
+            Float maxRate = fdageJson.getFloat("maxRate");
+            if(env.equals("gn") && Objects.nonNull(maxRate) && maxRate > 50){
+                Map<String, Object> ext = message.getExt();
+                if(Objects.isNull(ext)){
+                    ext = new HashMap<>();
+                    message.setExt(ext);
+                }
+                ext.put("128G", 1);
             }
-
-            success = true;
+            mqProducer.sendByWorkQueue(queueModelingCall, message);
 
             log.info("场景计算资源准备结束，场景码：{}", message.getSceneNum());
 
@@ -330,6 +335,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             log.info("开始上传场景计算结果数据，num:{}", sceneCode);
             //由于3dtiles算法mesh文件发生变化，所以这里需要先清除一下oss的mesh目录，避免存在旧算法obj文件
             fYunFileService.deleteFolder(String.format(UploadFilePath.DATA_VIEW_PATH, sceneCode) + "mesh");
+            fYunFileService.deleteFolder(String.format(UploadFilePath.IMG_VIEW_PATH,  sceneCode) + ModelKind.THREE_D_TILE.code());
             //上传文件
             fYunFileService.uploadMulFiles(uploadFiles);
 
@@ -353,12 +359,13 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             commonService.uploadFloorplanJson(sceneCode, path);
 
             //重置异步操作记录
-            this.removeSceneAsynOperLog(sceneCode);
+            commonService.removeSceneAsynOperLog(sceneCode);
 
             //清除用户编辑业务数据
             Set<String> bizs = new HashSet<>();
             bizs.add(UserEditDataType.BOX_MODEL.message());
             bizs.add(UserEditDataType.FLOORPLAN.message());
+            bizs.add(UserEditDataType.FILTERS.message());
             commonService.initUserEditData(sceneCode, bizs, null);
 
             //上传计算结果文件
@@ -370,14 +377,20 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             //写入数据库
             this.updateDbPlus(scenePlus.getSceneSource(), space, videosJson.toJSONString(), message.getComputeTime(),isObj,scenePlusExt);
 
-            Object[] editInfoArr = this.updateEditInfo(scenePlus);
+            Object[] editInfoArr = commonService.updateEditInfo(scenePlus);
             SceneEditInfo sceneEditInfo = (SceneEditInfo)editInfoArr[0];
             SceneEditInfoExt sceneEditInfoExt = (SceneEditInfoExt)editInfoArr[1];
             SceneEditControls sceneEditControls = (SceneEditControls)editInfoArr[2];
 
+            //更新场景主表
+            //如果相机容量不足，需要把场景的paystatus改为容量不足状态
+            scenePlus.setPayStatus(commonService.getPayStatus(scenePlus.getCameraId(), space));
+            //统计原始资源大小
+            scenePlusExt.setOrigSpace(FileUtil.size(new File(path.concat(File.separator).concat("capture"))));
+
             if (cameraType == 14) {
                 //计算成功  激光转台相机 同步 请求
-                fdkkLaserService.syncBuildResult(scenePlus.getNum(), path, scenePlus.getCreateTime(), Calendar.getInstance().getTime());
+                fdkkLaserService.syncBuildResult(scenePlus.getNum(), path, scenePlus.getCreateTime(), Calendar.getInstance().getTime(), scenePlusExt.getShootCount(), scenePlus.getPayStatus());
                 sceneEditControlsService.update(new LambdaUpdateWrapper<SceneEditControls>().set(SceneEditControls::getShowMap,0)
                         .eq(SceneEditControls::getEditInfoId,sceneEditInfo.getId()));
                 sceneEditControls.setShowMap(0);
@@ -385,11 +398,12 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 fdkkLaserService.cloudPointBuild(sceneCode,path);
             }
 
+
             log.info("生成scene.json上传oss并设置缓存，num:{}", sceneCode);
             CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
             Company company = !ObjectUtils.isEmpty(cameraDetail.getCompanyId()) ? companyService.getById(cameraDetail.getCompanyId()) : null;
             //写scene.json
-            this.writeSceneJson(sceneCode, videosJson,sceneEditInfo, sceneEditInfoExt, sceneEditControls, scenePlus,scenePlusExt,company);
+            commonService.writeSceneJson(sceneCode, videosJson,sceneEditInfo, sceneEditInfoExt, sceneEditControls, scenePlus,scenePlusExt,company);
 
             String qrLogo = !ObjectUtils.isEmpty(company) && !ObjectUtils.isEmpty(company.getQrLogo()) ? company.getQrLogo() : null;
 
@@ -416,6 +430,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             this.uploadStatusJson(scenePlus, scenePlusExt);
 
             scenePlusService.updateById(scenePlus);
+            scenePlusExtService.updateById(scenePlusExt);
 
             OrigFileUploadBatch condition = new OrigFileUploadBatch();
             condition.setBatchId(batchId);
@@ -451,29 +466,14 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             log.error("场景计算结果处理出错,num"+sceneCode, e);
 //            buildSceneDTService.handBaseFail("场景计算结果处理出错！", message.getPath(), sceneCode, "计算控制服务器");
             throw e;
+        } finally {
+            Map<String, Object> sceneStatusParam = new HashMap<>();
+            sceneStatusParam.put("num", sceneCode);
+            sceneStatusParam.put("status", message.getBuildSuccess() ? 1 : -1);
+            commonService.sendUpdateSceneStatusMqToQueues(sceneStatusParam);
         }
     }
 
-    private void removeSceneAsynOperLog(String num){
-        List<SceneAsynOperLog> list = sceneAsynOperLogService.list(new LambdaQueryWrapper<SceneAsynOperLog>().eq(SceneAsynOperLog::getNum, num));
-        if(CollUtil.isEmpty(list)){
-            return;
-        }
-        //删除数据库记录
-        List<Long> deleteIdList = list.parallelStream().map(item -> item.getId()).collect(Collectors.toList());
-        sceneAsynOperLogService.removeByIds(deleteIdList);
-
-        list.parallelStream().forEach(item -> {
-            if(StrUtil.isNotEmpty(item.getUrl())){
-                try {
-                    fYunFileService.deleteFile(item.getUrl());
-                } catch (IOException e) {
-                    log.warn("删除oss全景图下载压缩包失败，key:{}", item.getUrl());
-                }
-            }
-        });
-    }
-
 //    private void cachePanorama(String dataSource, String num){
 //        String cachedImagesPath = String.format(ConstantFilePath.SCENE_CACHE_IMAGES, num);
 //        //将全景图缓存到缓存目录
@@ -639,75 +639,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
     }
 
-    private void writeSceneJson(String num, JSONObject videosJson, SceneEditInfo sceneEditInfo, SceneEditInfoExt sceneEditInfoExt,
-                                SceneEditControls sceneEditControls, ScenePlus scenePlus, ScenePlusExt scenePlusExt,Company company){
-        String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
-
-        String oldSceneJson = fYunFileService.getFileContent(dataViewPath + "scene.json");
-
-        SceneJsonBean sceneJson = new SceneJsonBean();
-        BeanUtil.copyProperties(sceneEditInfoExt, sceneJson);
-        BeanUtil.copyProperties(sceneEditInfo, sceneJson);
-        SceneEditControlsVO sceneEditControlsVO = BeanUtil.copyProperties(sceneEditControls, SceneEditControlsVO.class);
-        sceneJson.setControls(sceneEditControlsVO);
-        sceneJson.setNum(num);
-        sceneJson.setCreateTime(scenePlus.getCreateTime());
-        sceneJson.setSceneResolution(scenePlusExt.getSceneResolution());
-        sceneJson.setVersion(sceneEditInfo.getVersion());
-        sceneJson.setImgVersion(sceneEditInfo.getImgVersion());
-        sceneJson.setSceneFrom(scenePlusExt.getSceneFrom());
-        sceneJson.setSceneKind(scenePlusExt.getSceneKind());
-        sceneJson.setModelKind(scenePlusExt.getModelKind());
-        sceneJson.setVideos(JSON.toJSONString(videosJson));
-        sceneJson.setPayStatus(scenePlus.getPayStatus());
-        if(StrUtil.isNotEmpty(oldSceneJson)){
-            SceneJsonBean oldSceneJsonBean = JSON.parseObject(oldSceneJson, SceneJsonBean.class);
-            List<JSONObject> mosaicList = JSON.parseObject(oldSceneJson, SceneJsonBean.class).getMosaicList();
-            sceneJson.setMosaicList(mosaicList);
-            sceneJson.setFloorLogo(oldSceneJsonBean.getFloorLogo());
-            sceneJson.setFloorLogoFile(oldSceneJsonBean.getFloorLogoFile());
-            sceneJson.setBoxModels(oldSceneJsonBean.getBoxModels());
-            sceneJson.setBoxVideos(oldSceneJsonBean.getBoxVideos());
-            sceneJson.setBoxPhotos(oldSceneJsonBean.getBoxPhotos());
-        }
-
-        if(!ObjectUtils.isEmpty(company)){
-            String userViewPath = String.format(UploadFilePath.USER_VIEW_PATH, num);
-            String userEditPath = String.format(UploadFilePath.USER_EDIT_PATH, num);
-            String localLogoPath = null;
-            if (StrUtil.isNotEmpty(company.getTopLogo())) {
-                localLogoPath = ConstantFilePath.AGENT_PATH + company.getTopLogo().substring(company.getTopLogo().lastIndexOf("//") + 1);
-                HttpUtil.downloadFile(company.getTopLogo(), localLogoPath);
-                fYunFileService.uploadFile(localLogoPath, userViewPath + "loadingLogo-user.png");
-                fYunFileService.uploadFile(localLogoPath, userEditPath + "loadingLogo-user.png");
-                sceneJson.setLoadingLogo("user");
-                sceneJson.setLoadingLogoFile("loadingLogo-user.png");
-                sceneEditInfo.setLoadingLogo("user");
-                sceneEditInfo.setLoadingLogoFile("loadingLogo-user.png");
-            }
-            if (StrUtil.isNotEmpty(company.getFloorLogo())) {
-                localLogoPath = ConstantFilePath.AGENT_PATH + company.getFloorLogo().substring(company.getFloorLogo().lastIndexOf("//") + 1);
-                HttpUtil.downloadFile(company.getFloorLogo(), localLogoPath);
-                fYunFileService.uploadFile(localLogoPath, userViewPath + "floorLogo-user.png");
-                fYunFileService.uploadFile(localLogoPath, userEditPath + "floorLogo-user.png");
-                sceneJson.setFloorLogo("user");
-                sceneJson.setFloorLogoFile("floorLogo-user.png");
-
-                sceneEditInfo.setFloorLogo("user");
-                sceneEditInfo.setFloorLogoFile("floorLogo-user.png");
-            }
-            if(!ObjectUtils.isEmpty(localLogoPath)){
-                sceneEditInfoService.updateById(sceneEditInfo);
-                FileUtils.deleteFile(localLogoPath);
-            }
-        }
-        String sceneJsonStr = JSON.toJSONString(sceneJson);
-        //上传sceneJson文件
-        fYunFileService.uploadFile(sceneJsonStr.getBytes(), dataViewPath + "scene.json");
-        //scenejson写入缓存
-        redisUtil.set(String.format(RedisKey.SCENE_JSON, num), sceneJsonStr);
-    }
-
     private void uploadStatusJson(ScenePlus scenePlus, ScenePlusExt scenePlusExt){
         String num = scenePlus.getNum();
         String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
@@ -728,8 +659,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         statusJson.put("sceneScheme", scenePlusExt.getSceneScheme());
         FileUtils.writeFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json", statusJson.toString());
 
-        fYunFileService.uploadFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json",
-                dataViewPath + "status.json");
+        Map<String,String> headers = new HashMap<>();
+        headers.put(HttpHeaders.CONTENT_TYPE, ContentType.JSON.getValue());
+        fYunFileService.uploadFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json", dataViewPath + "status.json", headers);
     }
 
     private void createQrCode(String num, ScenePlusExt scenePlusExt, String qrLogo) {
@@ -908,11 +840,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
         return videosJson;
     }
-
-    private Long calUseSpace(Map<String, String> uploadFile) {
-        return uploadFile.keySet().stream().map(File::new).filter(File::exists).mapToLong(File::length).sum();
-    }
-
     private void updateDbPlus(int sceneSource,Long space,String videosJson, Long computeTime,boolean isObj,ScenePlusExt scenePlusExt){
 
         scenePlusExt.setSpace(space);
@@ -952,68 +879,43 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         scenePlusExt.setSceneKind(sceneKind);
 //        scenePlusExt.setModelKind(modelKind);
 
-        String dataFdage = FileUtil.readUtf8String(scenePlusExt.getDataSource().concat("/capture/").concat("data.fdage"));
-        JSONObject jsonObject = JSON.parseObject(dataFdage);
-        int points = jsonObject.getJSONArray("points").size();
-        scenePlusExt.setShootCount(points);
+        //统计点位数量
+        scenePlusExt.setShootCount(this.getShootCount(scenePlusExt));
 
         scenePlusExtService.updateById(scenePlusExt);
     }
 
-    private Object[] updateEditInfo(ScenePlus scenePlus){
-        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
-        SceneEditControls sceneEditControls = null;
-        SceneEditInfoExt sceneEditInfoExt = null;
-        if(sceneEditInfo == null){
-            sceneEditInfo = new SceneEditInfo();
-            sceneEditInfo.setScenePlusId(scenePlus.getId());
-            sceneEditInfo.setDescription(scenePlus.getDescription());
-            sceneEditInfo.setTitle(scenePlus.getTitle());
-            sceneEditInfoService.save(sceneEditInfo);
-        }else{
-
-            int version = 0;
-            int imgVersion = 0;
-            int linkVersion = 0;
-            //获取展示页的版本号
-            String sceneJsonStr = fYunFileService.getFileContent(String.format(UploadFilePath.DATA_VIEW_PATH, scenePlus.getNum()) + "scene.json");
-            if(StrUtil.isNotEmpty(sceneJsonStr)){
-                JSONObject sceneJson = JSON.parseObject(sceneJsonStr);
-                version = sceneJson.getIntValue("version");
-                imgVersion = sceneJson.getIntValue("imgVersion");
-                linkVersion =  sceneJson.getIntValue("linkVersion");
+    private Integer getShootCount(ScenePlusExt scenePlusExt){
+        Integer shootCount = null;
+        String homePath = SceneUtil.getHomePath(scenePlusExt.getDataSource());
+        JSONObject dataFdageObj = JSON.parseObject(fYunFileService.getFileContent(homePath.concat("data.fdage")));
+        if(Objects.nonNull(dataFdageObj)){
+            JSONArray points = dataFdageObj.getJSONArray("points");
+            if(CollUtil.isNotEmpty(points)){
+                shootCount = points.size();
             }
-
-            if(version < sceneEditInfo.getVersion()){
-                version = sceneEditInfo.getVersion();
-            }
-            if(imgVersion < sceneEditInfo.getImgVersion()){
-                imgVersion = sceneEditInfo.getImgVersion();
-            }
-            if(linkVersion < sceneEditInfo.getLinkVersion()){
-                linkVersion = sceneEditInfo.getLinkVersion();
-            }
-
-            sceneEditControls = sceneEditControlsService.getBySceneEditId(sceneEditInfo.getId());
-            sceneEditInfoExt = sceneEditInfoExtService.getByEditInfoId(sceneEditInfo.getId());
-            sceneEditInfo.setVersion(version + 1);
-            sceneEditInfo.setImgVersion(imgVersion + 1);
-            sceneEditInfo.setLinkVersion(linkVersion + 1);
-            sceneEditInfo.setIsUploadObj(CommonStatus.NO.code());
-            sceneEditInfoService.updateById(sceneEditInfo);
         }
-        if(sceneEditControls == null){
-            sceneEditControls = new SceneEditControls();
-            sceneEditControls.setEditInfoId(sceneEditInfo.getId());
-            sceneEditControlsService.save(sceneEditControls);
+        if(Objects.nonNull(shootCount) && shootCount > 0){
+            return shootCount;
         }
-        if(sceneEditInfoExt == null){
-            sceneEditInfoExt = new SceneEditInfoExt();
-            sceneEditInfoExt.setScenePlusId(scenePlus.getId());
-            sceneEditInfoExt.setEditInfoId(sceneEditInfo.getId());
-            sceneEditInfoExtService.save(sceneEditInfoExt);
+
+        String slamDataStr = fYunFileService.getFileContent(homePath.concat("slam_data.json"));
+        JSONObject slamDataObj = JSON.parseObject(slamDataStr);
+        if(Objects.nonNull(slamDataObj)){
+            JSONArray viewsInfo = slamDataObj.getJSONArray("views_info");
+            if(CollUtil.isNotEmpty(viewsInfo)){
+                shootCount = viewsInfo.stream().mapToInt(info -> {
+                    return  ((JSONObject) info).getJSONArray("list_pose").size();
+                }).sum();
+            }
         }
-        return new Object[]{sceneEditInfo, sceneEditInfoExt, sceneEditControls};
+
+        return shootCount;
+    }
+
+    public static void main(String[] args) {
+        JSONObject dataFdageObj = JSON.parseObject(null);
+        System.out.println(dataFdageObj);
     }
 
     public boolean uploadHouseTypeJson(String num, String dataSource) {

src/main/java/com/fdkankan/contro/schedule/ScheduleJob.java

@@ -10,34 +10,10 @@ import org.springframework.stereotype.Component;
 @Component
 public class ScheduleJob {
 
-//    @Value("${rocketmq.autoScaling.num.normal}")
-//    private String baseNum;
-//
-//    @Autowired
-//    private RabbitMqProducer rabbitMqProducer;
-//
-//    @Value("${queue.modeling.modeling-call}")
-//    private String queueModelingCall;
     @Autowired
     private IScene3dNumService scene3dNumService;
 
 
-//    @Scheduled(cron = "${rocketmq.autoScaling.corn:0 0/5 8-21 * * ?}")
-//    public void job8() {
-//        try {
-//            //当mq排队数大于指定数量时使用弹性升缩
-//            int mqNum = rabbitMqProducer.getMessageCount(queueModelingCall);
-//            log.info("每5分钟查询一次排队队列,mqNum:" + mqNum);
-//            if(mqNum - Integer.parseInt(baseNum) > 0){
-//                log.info("使用弹性升缩开启一台ECS");
-//                log.info(scalingService.createEcs());
-//            }
-//        } catch (Exception e) {
-//            log.error("弹性升缩开启失败！", e);
-//            log.error(e.getMessage());
-//        }
-//    }
-
     /**
      * 定时生成场景码，间隔1小时执行一次，项目启动一秒后执行一次
      */

src/main/java/com/fdkankan/contro/service/IAppCameraFailLogService.java

@@ -0,0 +1,23 @@
+package com.fdkankan.contro.service;
+
+import com.fdkankan.contro.entity.AppCameraFailLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.contro.vo.ReportFailLogVO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ * app错误上报 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-05-20
+ */
+public interface IAppCameraFailLogService extends IService<AppCameraFailLog> {
+
+    void reportFailLog(ReportFailLogVO param);
+
+
+}

src/main/java/com/fdkankan/contro/service/ICommonService.java

@@ -1,7 +1,9 @@
 package com.fdkankan.contro.service;
 
-import com.fdkankan.contro.entity.CameraDetail;
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.contro.entity.*;
 import com.fdkankan.contro.vo.ScenePlusVO;
+import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 
 import java.util.Map;
 import java.util.Set;
@@ -24,7 +26,7 @@ public interface ICommonService {
      *               key : bizType
      *               value: Map<String ,Object> 参数map
      */
-    public void initUserEditData(String num, Set<String> bizs, Map<String, Map<String ,Object>> params);
+    public void initUserEditData(String num, Set<String> bizs, Map<String, Map<String ,Object>> params) throws Exception;
 
     public void uploadFloorplanJson(String num, String dataSource) throws Exception;
 
@@ -39,4 +41,15 @@ public interface ICommonService {
     Long getSpaceLimit(CameraDetail cameraDetail);
 
     Long getSpace(String num);
+
+    Object[] updateEditInfo(ScenePlus scenePlus);
+
+    void writeSceneJson(String num, JSONObject videosJson, SceneEditInfo sceneEditInfo, SceneEditInfoExt sceneEditInfoExt,
+                        SceneEditControls sceneEditControls, ScenePlus scenePlus, ScenePlusExt scenePlusExt, Company company);
+
+    void saveMqSendLog(String num, BuildSceneCallMessage message);
+
+    void sendUpdateSceneStatusMqToQueues(Map<String, Object> content);
+
+    void removeSceneAsynOperLog(String num);
 }

src/main/java/com/fdkankan/contro/service/IFdkkLaserService.java

@@ -16,13 +16,13 @@ import java.util.Date;
  * @since 2022/1/14
  **/
 public interface IFdkkLaserService {
-    void syncBuildResult(String sceneNum, String dataSource, Date createTime, Date algorithmTime);
+    void syncBuildResult(String sceneNum, String dataSource, Date createTime, Date algorithmTime, Integer shootCount, Integer payStatus);
 
     void pushBuildStatusToLaserSystem(String projectNum, String laserObjFilePath, Integer buildObjStatus);
 
-    void saveScene(ScenePlus scenePlus, JSONObject jsonObject, Camera cameraEntity, String userName, boolean b);
+    void saveScene(ScenePlus scenePlus, JSONObject jsonObject, Camera cameraEntity, String userName, boolean b, Integer payStatus);
 
-    void saveScene(ScenePro scenePro, String scenePassword, Camera cameraEntity, String phone, boolean rebuild);
+    void saveScene(ScenePro scenePro, String scenePassword, Camera cameraEntity, String phone, boolean rebuild, Integer payStatus);
 
     void cloudPointBuild(String sceneCode, String visionEditFilePath);
 }

src/main/java/com/fdkankan/contro/service/IMqSendLogService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.contro.service;
+
+import com.fdkankan.contro.entity.MqSendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+public interface IMqSendLogService extends IService<MqSendLog> {
+
+}

src/main/java/com/fdkankan/contro/service/ISceneFileBuildService.java

@@ -29,7 +29,7 @@ public interface ISceneFileBuildService extends IService<SceneFileBuild> {
 
     ResultData turntableUploadSuccess(String params) throws Exception;
 
-    ResultData rebuildScene(String num,Boolean force,Boolean deleteExtras) throws IOException;
+    ResultData rebuildScene(String num,Boolean force,Boolean deleteExtras, String from) throws IOException;
 
     ResultData uploadFile(MultipartFile file, String params) throws Exception;
 

src/main/java/com/fdkankan/contro/service/ISceneInfoSyncMqConfigService.java

@@ -0,0 +1,21 @@
+package com.fdkankan.contro.service;
+
+import com.fdkankan.contro.entity.SceneInfoSyncMqConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 场景信息变更需要发送mq信息队列配置表 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-04-16
+ */
+public interface ISceneInfoSyncMqConfigService extends IService<SceneInfoSyncMqConfig> {
+
+    List<SceneInfoSyncMqConfig> listByInfoType(String infoType);
+
+
+}

src/main/java/com/fdkankan/contro/service/ISceneRebuildLogService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.contro.service;
+
+import com.fdkankan.contro.entity.SceneRebuildLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 场景重算接口调用日志表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-17
+ */
+public interface ISceneRebuildLogService extends IService<SceneRebuildLog> {
+
+}

src/main/java/com/fdkankan/contro/service/ISceneUploadCountService.java

@@ -0,0 +1,27 @@
+package com.fdkankan.contro.service;
+
+import com.fdkankan.contro.entity.SceneUploadCount;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.contro.vo.SceneUploadCountParamVO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ * app触发场景上传统计表 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-05-20
+ */
+public interface ISceneUploadCountService extends IService<SceneUploadCount> {
+
+    void increSceneUploadCount(SceneUploadCountParamVO param);
+
+    void resetCountByUuid(String uuid);
+
+    SceneUploadCount getByUUid(String uuid);
+
+
+}

src/main/java/com/fdkankan/contro/service/IntermitSceneService.java

@@ -0,0 +1,9 @@
+package com.fdkankan.contro.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+public interface IntermitSceneService {
+
+    void sendMq(String num, JSONObject fdageData, int status);
+
+}

src/main/java/com/fdkankan/contro/service/impl/AppCameraFailLogServiceImpl.java

@@ -0,0 +1,27 @@
+package com.fdkankan.contro.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.fdkankan.contro.entity.AppCameraFailLog;
+import com.fdkankan.contro.mapper.IAppCameraFailLogMapper;
+import com.fdkankan.contro.service.IAppCameraFailLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.contro.vo.ReportFailLogVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * app错误上报 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-05-20
+ */
+@Service
+public class AppCameraFailLogServiceImpl extends ServiceImpl<IAppCameraFailLogMapper, AppCameraFailLog> implements IAppCameraFailLogService {
+
+    @Override
+    public void reportFailLog(ReportFailLogVO param) {
+        AppCameraFailLog bean = BeanUtil.toBean(param, AppCameraFailLog.class);
+        this.save(bean);
+    }
+}

src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -1,7 +1,10 @@
 package com.fdkankan.contro.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.util.FileUtils;
 import cn.hutool.core.util.StrUtil;
@@ -12,25 +15,34 @@ import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.constant.SceneStatus;
 import com.fdkankan.common.constant.SpaceType;
 import com.fdkankan.common.util.FileUtils;
+import com.fdkankan.contro.bean.SceneJsonBean;
 import com.fdkankan.contro.entity.*;
 import com.fdkankan.contro.factory.UserEditData.UserEditDataHandler;
 import com.fdkankan.contro.factory.UserEditData.UserEditDataHandlerFactory;
 import com.fdkankan.contro.service.ICommonService;
 import com.fdkankan.contro.service.*;
+import com.fdkankan.contro.vo.SceneEditControlsVO;
 import com.fdkankan.contro.vo.ScenePlusVO;
 import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.model.utils.FloorPlanUserUtil;
+import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
+import com.fdkankan.rabbitmq.util.RabbitMqProducer;
+import com.fdkankan.redis.constant.RedisKey;
+import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.sms.SendMailAcceUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.io.File;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +50,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.Objects;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -57,6 +70,12 @@ public class CommonServiceImpl implements ICommonService {
     private String helpLinkEn;
 
 
+    @Value("#{'${camType.laser:}'.split(',')}")
+    private List<Integer> laserCamTypeList;
+    @Autowired
+    private ISceneAsynOperLogService sceneAsynOperLogService;
+
+
     @Autowired
     private IScenePlusService scenePlusService;
     @Autowired
@@ -79,6 +98,20 @@ public class CommonServiceImpl implements ICommonService {
     private FYunFileServiceInterface fYunFileService;
     @Autowired
     private FYunFileConfig fYunFileConfig;
+    @Autowired
+    private ISceneEditInfoService sceneEditInfoService;
+    @Autowired
+    private ISceneEditControlsService sceneEditControlsService;
+    @Autowired
+    private ISceneEditInfoExtService sceneEditInfoExtService;
+    @Autowired
+    private RedisUtil redisUtil;
+    @Autowired
+    private IMqSendLogService mqSendLogService;
+    @Autowired
+    private RabbitMqProducer rabbitMqProducer;
+    @Autowired
+    private ISceneInfoSyncMqConfigService sceneInfoSyncMqConfigService;
 
     @Override
     public void uploadBuildResultData(String num, String dataSource, String version) {
@@ -201,7 +234,7 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public void initUserEditData(String num, Set<String> bizs, Map<String, Map<String ,Object>> params) {
+    public void initUserEditData(String num, Set<String> bizs, Map<String, Map<String ,Object>> params) throws Exception {
         if(StrUtil.isEmpty(num) || CollUtil.isEmpty(bizs)){
             return;
         }
@@ -340,4 +373,172 @@ public class CommonServiceImpl implements ICommonService {
         space += fYunFileService.getSpace(fYunFileConfig.getBucket(), String.format(UploadFilePath.scene_result_data_path, num).concat("caches"));
         return  space;
     }
+
+    public Object[] updateEditInfo(ScenePlus scenePlus){
+        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
+        SceneEditControls sceneEditControls = null;
+        SceneEditInfoExt sceneEditInfoExt = null;
+        if(sceneEditInfo == null){
+            sceneEditInfo = new SceneEditInfo();
+            sceneEditInfo.setScenePlusId(scenePlus.getId());
+            sceneEditInfo.setDescription(scenePlus.getDescription());
+            sceneEditInfo.setTitle(scenePlus.getTitle());
+            sceneEditInfoService.save(sceneEditInfo);
+        }else{
+
+            int version = 0;
+            int imgVersion = 0;
+            int linkVersion = 0;
+            //获取展示页的版本号
+            String sceneJsonStr = fYunFileServiceInterface.getFileContent(String.format(UploadFilePath.DATA_VIEW_PATH, scenePlus.getNum()) + "scene.json");
+            if(StrUtil.isNotEmpty(sceneJsonStr)){
+                JSONObject sceneJson = JSON.parseObject(sceneJsonStr);
+                version = sceneJson.getIntValue("version");
+                imgVersion = sceneJson.getIntValue("imgVersion");
+                linkVersion =  sceneJson.getIntValue("linkVersion");
+            }
+
+            if(version < sceneEditInfo.getVersion()){
+                version = sceneEditInfo.getVersion();
+            }
+            if(imgVersion < sceneEditInfo.getImgVersion()){
+                imgVersion = sceneEditInfo.getImgVersion();
+            }
+            if(linkVersion < sceneEditInfo.getLinkVersion()){
+                linkVersion = sceneEditInfo.getLinkVersion();
+            }
+
+            sceneEditControls = sceneEditControlsService.getBySceneEditId(sceneEditInfo.getId());
+            sceneEditInfoExt = sceneEditInfoExtService.getByEditInfoId(sceneEditInfo.getId());
+            sceneEditInfo.setVersion(version + 1);
+            sceneEditInfo.setImgVersion(imgVersion + 1);
+            sceneEditInfo.setLinkVersion(linkVersion + 1);
+            sceneEditInfo.setIsUploadObj(CommonStatus.NO.code());
+            sceneEditInfoService.updateById(sceneEditInfo);
+        }
+        if(sceneEditControls == null){
+            sceneEditControls = new SceneEditControls();
+            sceneEditControls.setEditInfoId(sceneEditInfo.getId());
+            sceneEditControlsService.save(sceneEditControls);
+        }
+        if(sceneEditInfoExt == null){
+            sceneEditInfoExt = new SceneEditInfoExt();
+            sceneEditInfoExt.setScenePlusId(scenePlus.getId());
+            sceneEditInfoExt.setEditInfoId(sceneEditInfo.getId());
+            sceneEditInfoExtService.save(sceneEditInfoExt);
+        }
+        return new Object[]{sceneEditInfo, sceneEditInfoExt, sceneEditControls};
+    }
+
+    public void writeSceneJson(String num, JSONObject videosJson, SceneEditInfo sceneEditInfo, SceneEditInfoExt sceneEditInfoExt,
+                                SceneEditControls sceneEditControls, ScenePlus scenePlus, ScenePlusExt scenePlusExt,Company company){
+        String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
+
+        String oldSceneJson = fYunFileService.getFileContent(dataViewPath + "scene.json");
+
+        SceneJsonBean sceneJson = new SceneJsonBean();
+        BeanUtil.copyProperties(sceneEditInfoExt, sceneJson, "started");
+        BeanUtil.copyProperties(sceneEditInfo, sceneJson);
+        SceneEditControlsVO sceneEditControlsVO = BeanUtil.copyProperties(sceneEditControls, SceneEditControlsVO.class);
+        sceneJson.setControls(sceneEditControlsVO);
+        sceneJson.setNum(num);
+        sceneJson.setCreateTime(scenePlus.getCreateTime());
+        sceneJson.setSceneResolution(scenePlusExt.getSceneResolution());
+        sceneJson.setVersion(sceneEditInfo.getVersion());
+        sceneJson.setImgVersion(sceneEditInfo.getImgVersion());
+        sceneJson.setSceneFrom(scenePlusExt.getSceneFrom());
+        sceneJson.setSceneKind(scenePlusExt.getSceneKind());
+        sceneJson.setModelKind(scenePlusExt.getModelKind());
+        sceneJson.setVideos(JSON.toJSONString(videosJson));
+        sceneJson.setPayStatus(scenePlus.getPayStatus());
+        if(StrUtil.isNotEmpty(oldSceneJson)){
+            SceneJsonBean oldSceneJsonBean = JSON.parseObject(oldSceneJson, SceneJsonBean.class);
+            List<JSONObject> mosaicList = JSON.parseObject(oldSceneJson, SceneJsonBean.class).getMosaicList();
+            sceneJson.setMosaicList(mosaicList);
+            sceneJson.setFloorLogo(oldSceneJsonBean.getFloorLogo());
+            sceneJson.setFloorLogoFile(oldSceneJsonBean.getFloorLogoFile());
+            sceneJson.setBoxModels(oldSceneJsonBean.getBoxModels());
+            sceneJson.setBoxVideos(oldSceneJsonBean.getBoxVideos());
+            sceneJson.setBoxPhotos(oldSceneJsonBean.getBoxPhotos());
+        }
+        if(StrUtil.isNotEmpty(sceneEditInfoExt.getStarted())){
+            sceneJson.setStarted(JSON.parseObject(sceneEditInfoExt.getStarted()));
+        }
+
+        if(!ObjectUtils.isEmpty(company)){
+            String userViewPath = String.format(UploadFilePath.USER_VIEW_PATH, num);
+            String userEditPath = String.format(UploadFilePath.USER_EDIT_PATH, num);
+            String localLogoPath = null;
+            if (StrUtil.isNotEmpty(company.getTopLogo())) {
+                localLogoPath = ConstantFilePath.AGENT_PATH + company.getTopLogo().substring(company.getTopLogo().lastIndexOf("//") + 1);
+                HttpUtil.downloadFile(company.getTopLogo(), localLogoPath);
+                fYunFileService.uploadFile(localLogoPath, userViewPath + "loadingLogo-user.png");
+                fYunFileService.uploadFile(localLogoPath, userEditPath + "loadingLogo-user.png");
+                sceneJson.setLoadingLogo("user");
+                sceneJson.setLoadingLogoFile("loadingLogo-user.png");
+                sceneEditInfo.setLoadingLogo("user");
+                sceneEditInfo.setLoadingLogoFile("loadingLogo-user.png");
+            }
+            if (StrUtil.isNotEmpty(company.getFloorLogo())) {
+                localLogoPath = ConstantFilePath.AGENT_PATH + company.getFloorLogo().substring(company.getFloorLogo().lastIndexOf("//") + 1);
+                HttpUtil.downloadFile(company.getFloorLogo(), localLogoPath);
+                fYunFileService.uploadFile(localLogoPath, userViewPath + "floorLogo-user.png");
+                fYunFileService.uploadFile(localLogoPath, userEditPath + "floorLogo-user.png");
+                sceneJson.setFloorLogo("user");
+                sceneJson.setFloorLogoFile("floorLogo-user.png");
+
+                sceneEditInfo.setFloorLogo("user");
+                sceneEditInfo.setFloorLogoFile("floorLogo-user.png");
+            }
+            if(!ObjectUtils.isEmpty(localLogoPath)){
+                sceneEditInfoService.updateById(sceneEditInfo);
+                FileUtils.deleteFile(localLogoPath);
+            }
+        }
+        String sceneJsonStr = JSON.toJSONString(sceneJson);
+        //上传sceneJson文件
+        fYunFileService.uploadFile(sceneJsonStr.getBytes(), dataViewPath + "scene.json");
+        //scenejson写入缓存
+        redisUtil.set(String.format(RedisKey.SCENE_JSON, num), sceneJsonStr);
+    }
+
+    @Override
+    public void saveMqSendLog(String num, BuildSceneCallMessage message) {
+        MqSendLog mqSendLog = new MqSendLog();
+        mqSendLog.setNum(num);
+        mqSendLog.setContent(JSON.toJSONString(message));
+        mqSendLogService.save(mqSendLog);
+    }
+
+    @Override
+    public void sendUpdateSceneStatusMqToQueues(Map<String, Object> content) {
+        List<SceneInfoSyncMqConfig> configs = sceneInfoSyncMqConfigService.listByInfoType("update_scene_status");
+        if(CollUtil.isEmpty(configs)){
+            return;
+        }
+        for (SceneInfoSyncMqConfig config : configs) {
+            rabbitMqProducer.sendByWorkQueue(config.getQueueName(), content);
+        }
+    }
+
+    @Override
+    public void removeSceneAsynOperLog(String num) {
+        List<SceneAsynOperLog> list = sceneAsynOperLogService.list(new LambdaQueryWrapper<SceneAsynOperLog>().eq(SceneAsynOperLog::getNum, num));
+        if(CollUtil.isEmpty(list)){
+            return;
+        }
+        //删除数据库记录
+        List<Long> deleteIdList = list.parallelStream().map(item -> item.getId()).collect(Collectors.toList());
+        sceneAsynOperLogService.removeByIds(deleteIdList);
+
+        list.parallelStream().forEach(item -> {
+            if(StrUtil.isNotEmpty(item.getUrl())){
+                try {
+                    fYunFileService.deleteFile(item.getUrl());
+                } catch (IOException e) {
+                    log.warn("删除oss全景图下载压缩包失败，key:{}", item.getUrl());
+                }
+            }
+        });
+    }
 }

src/main/java/com/fdkankan/contro/service/impl/IFdkkLaserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.contro.service.impl;
 
+import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileUtils;
@@ -57,7 +58,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
     private FYunFileServiceInterface fYunFileService;
 
 
-    public void updateSceneStatus(String sceneCode, int sceneStatus, String path, Date createTime, Date algorithmTime) {
+    public void updateSceneStatus(String sceneCode, int sceneStatus, String path, Date createTime, Date algorithmTime, Integer shootCount, Integer payStatus) {
         Map<String, Object> params = new HashMap<>();
         params.put("sceneCode", sceneCode);
         params.put("status", sceneStatus);
@@ -67,10 +68,12 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         if (!ObjectUtils.isEmpty(path)) {
             params.put("path", path);
         }
+        params.put("shootCount", shootCount);
+        params.put("payStatus", payStatus);
         rabbitMqProducer.sendByWorkQueue(updateScene, params);
     }
 
-    public void syncBuildResult(String sceneNum, String dataSource,Date createTime, Date algorithmTime) {
+    public void syncBuildResult(String sceneNum, String dataSource,Date createTime, Date algorithmTime, Integer shootCount, Integer payStatus) {
         log.info("激光转台相机构建结果 同步 请求 ");
         try {
             String jgPath = dataSource;
@@ -96,9 +99,13 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
             FileUtils.copyDirectiory(dataSource + "/results/mesh", jgPath + "/laserData/mesh");
 
             FileUtils.copyDirectiory(dataSource + "/results/laserData/cover", jgPath + "/extras");
+            //删除旧的深度图
+            if(FileUtil.exist( jgPath+"/laserData/depthmap/")){
+                FileUtil.del(jgPath+"/laserData/depthmap/");
+            }
             FileUtils.copyFile(dataSource + "/results/laserData", jgPath, true);
 
-            updateSceneStatus(sceneNum, 2, jgPath + File.separator + "laserData",createTime, algorithmTime);
+            updateSceneStatus(sceneNum, 2, jgPath + File.separator + "laserData",createTime, algorithmTime, shootCount, payStatus);
         } catch (Exception e) {
             log.error("激光转台相机同步失败", e);
         }
@@ -114,7 +121,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
     }
 
 
-    public void saveScene(ScenePlus scenePlus, JSONObject fdageJson, Camera cameraEntity, String phone, boolean rebuild) {
+    public void saveScene(ScenePlus scenePlus, JSONObject fdageJson, Camera cameraEntity, String phone, boolean rebuild, Integer payStatus) {
         Map<String, Object> params = new HashMap<>();
         params.put("childName", cameraEntity.getChildName());
         params.put("createTime", scenePlus.getCreateTime());
@@ -136,10 +143,11 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         if(Objects.nonNull(fdageJson)){
             params.put("location", fdageJson.getInteger("location"));
         }
+        params.put("payStatus", payStatus);
         rabbitMqProducer.sendByWorkQueue(updateScene, params);
     }
 
-    public void saveScene(ScenePro scenePro, String scenePassword, Camera cameraEntity, String phone, boolean rebuild) {
+    public void saveScene(ScenePro scenePro, String scenePassword, Camera cameraEntity, String phone, boolean rebuild, Integer payStatus) {
         Map<String, Object> params = new HashMap<>();
         params.put("childName", cameraEntity.getChildName());
         if(ObjectUtils.isEmpty(scenePro.getCreateTime())){
@@ -158,6 +166,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         params.put("version",getSceneVersion(scenePro.getNum()));
         params.put("title", scenePro.getSceneName());
         params.put("userId", scenePro.getUserId());
+        params.put("payStatus", payStatus);
         rabbitMqProducer.sendByWorkQueue(updateScene, params);
     }
 
@@ -186,6 +195,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         }
 
         // 上传点云编辑文件，并通知激光系统
+        log.info("开始上传点云文件,bucket:{}", bucket);
         fYunFileService.uploadFile(bucket,path + "/results/laserData/vision_edit.txt", String.format(cloudPointFyunPath,sceneCode,sceneCode) + "vision_edit.txt");
         fYunFileService.uploadFileByCommand(bucket,path + "/results/laserData/uuidcloud", String.format(cloudPointFyunPath,sceneCode,sceneCode) + "uuidcloud");
 

src/main/java/com/fdkankan/contro/service/impl/IntermitSceneServiceImpl.java

@@ -0,0 +1,60 @@
+package com.fdkankan.contro.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.constant.CommonSuccessStatus;
+import com.fdkankan.contro.entity.Camera;
+import com.fdkankan.contro.entity.SSOUser;
+import com.fdkankan.contro.entity.ScenePlus;
+import com.fdkankan.contro.entity.ScenePlusExt;
+import com.fdkankan.contro.service.*;
+import com.fdkankan.rabbitmq.util.RabbitMqProducer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+@Service
+public class IntermitSceneServiceImpl implements IntermitSceneService {
+
+    @Autowired
+    private IScenePlusService scenePlusService;
+    @Autowired
+    private IScenePlusExtService scenePlusExtService;
+    @Autowired
+    private IUserService userService;
+    @Autowired
+    private ICameraService cameraService;
+    @Autowired
+    private RabbitMqProducer mqProducer;
+
+    @Override
+    public void sendMq(String num, JSONObject fdageData, int status) {
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+
+        String phoneNum = null;
+        if(Objects.nonNull(scenePlus.getUserId())){
+            SSOUser user = userService.getSSOUserByUserId(scenePlus.getUserId());
+            phoneNum = user.getUserName();
+        }
+        Camera camera = cameraService.getById(scenePlus.getCameraId());
+        Map<String, Object> params = new HashMap<>();
+        params.put("sceneCode", num);
+        params.put("location", fdageData.getInteger("location"));
+        params.put("algorithmTime", scenePlusExt.getAlgorithmTime());
+        params.put("snCode", camera.getSnCode());
+        params.put("userId", scenePlus.getUserId());
+        params.put("phoneNum", phoneNum);
+        params.put("status", status);
+        params.put("sceneName", scenePlus.getTitle());
+        params.put("pwd", fdageData.getString("pwd"));
+        params.put("shootCount", fdageData.getJSONArray("points").size());
+        params.put("gps", fdageData.getJSONObject("gps"));
+        params.put("createTime", scenePlus.getCreateTime());
+        params.put("sceneSource", 6);//代表断续拍摄场景（全景看看系统用）
+        params.put("payStatus", scenePlus.getPayStatus());
+        mqProducer.sendByWorkQueue("queue-pano-scene", params);
+    }
+}

src/main/java/com/fdkankan/contro/service/impl/MqSendLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.contro.service.impl;
+
+import com.fdkankan.contro.entity.MqSendLog;
+import com.fdkankan.contro.mapper.IMqSendLogMapper;
+import com.fdkankan.contro.service.IMqSendLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Service
+public class MqSendLogServiceImpl extends ServiceImpl<IMqSendLogMapper, MqSendLog> implements IMqSendLogService {
+
+}

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -37,6 +37,7 @@ import com.fdkankan.fyun.local.constant.LocalConstants;
 import com.fdkankan.image.MatrixToImageWriterUtil;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
+import com.fdkankan.model.utils.SceneUtil;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.constant.RedisKey;
@@ -106,6 +107,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Value("${queue.modeling.v3.modeling-pre}")
     private String queueV3ModelingPre;
 
+    @Value("${queue.modeling.intermit.modeling-pre}")
+    private String queueIntermitModelingPre;
+
     @Value("${v3.controlUrl:#{null}}")
     private String v3controlUrl;
 
@@ -172,6 +176,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     private ISceneFileUploadService sceneFileUploadService;
 
     @Resource
+    private ICompanyService companyService;
+
+    @Resource
     private FYunFileServiceInterface fYunFileService;
 
     @Autowired
@@ -208,6 +215,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
     @Autowired
     private ISceneColdStorageService sceneColdStorageService;
+    @Autowired
+    private IntermitSceneService intermitSceneService;
+    @Autowired
+    private ISceneRebuildLogService sceneRebuildLogService;
+    @Autowired
+    private ISceneUploadCountService sceneUploadCountService;
 
     @Autowired
     private ISceneProService sceneProService;
@@ -409,7 +422,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
 
         //如果是相机计算容量的模式是场景个数模式，则需要拦截计算
-        if(rebuild == CommonStatus.NO.code() && cameraType != 14){//新场景需要校验容量是否超出限制
+        if(rebuild == CommonStatus.NO.code()){//新场景需要校验容量是否超出限制
             boolean exceedSpace = exceedSpaceSceneService.cehckExceedSpace(sceneNum, cameraDetail, cameraName, fileId, unicode);
             if(exceedSpace){
                 ScenePlusVO scenePlusVO = new ScenePlusVO();
@@ -462,13 +475,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         //重算的场景，先移除该场景对应的容量
         if (rebuild == 1) {
-            if(CollUtil.isEmpty(laserCamTypeList) || !laserCamTypeList.contains(cameraDetail.getType())){
-                try {
-                    scenePlusService.resetSpace(sceneNum);
-                }catch (Exception e){
-                    log.error("重置容量失败", e);
-                }
-            }
+            scenePlusService.resetSpace(sceneNum);
         } else {
             //上传log-main.png
             fYunFileService.uploadFile(ConstantFilePath.LOGO_PATH + "logo-main.png", imgViewPath + "logo-main.png");
@@ -499,6 +506,14 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
         mqMessage.getExt().put("deleteExtras", true);
         rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
+        if(jsonObject.getIntValue("location") == 7){
+            //发送到全景看看进行初始化
+            intermitSceneService.sendMq(scenePlusVO.getNum(), jsonObject, CommonSuccessStatus.WAITING.code());
+            rabbitMqProducer.sendByWorkQueue(queueIntermitModelingPre, mqMessage);
+        }else{
+            rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
+        }
+
         return scenePlusVO;
     }
 
@@ -661,6 +676,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             folderName = fileBuild.getUnicode();
             redisUtil.set(String.format(RedisConstants.FILEID_FOLDER_BUILD, fileId), folderName,2 * 24 * 60 * 60);
         }
+        sceneUploadCountService.resetCountByUuid(folderName);
+
         StringBuilder prefixBuffer = new StringBuilder(mac).append(File.separator).append(fileId).append(File.separator).append(folderName).append(File.separator);
 
         String buildType = "V2";
@@ -809,6 +826,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             redisUtil.set(String.format(RedisConstants.FILEID_FOLDER_BUILD, fileId), folderName);
         }
 
+        sceneUploadCountService.resetCountByUuid(folderName);
+
         //云目录
         StringBuilder prefixBuffer = new StringBuilder(mac).append(File.separator).append(fileId).append(File.separator).append(folderName).append(File.separator);
 
@@ -860,7 +879,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             return ResultData.ok();
         }
         // 通知激光场景系统开始构建场景
-        if(cameraType.longValue() == 14){
+        if(cameraType.longValue() == 14 && fdageJson.getIntValue("location") != 7){
             ScenePlus scenePlus = scenePlusService.getScenePlusByNum(scenePlusVO.getNum());
             Long sceneUserId = scenePlus.getUserId();
             String userName = null;
@@ -870,11 +889,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             //判断 是否为激光相机
             Camera camera = cameraService.getByChildName(mac);
             if(Objects.nonNull(scenePlus)){
-                fdkkLaserService.saveScene(scenePlus,fdageJson,camera,userName,false);
+                fdkkLaserService.saveScene(scenePlus,fdageJson,camera,userName,false, scenePlus.getPayStatus());
             }else{
-                fdkkLaserService.saveScene(scenePro,fdageJson.getString("pwd"),camera,userName,false);
+                fdkkLaserService.saveScene(scenePro,fdageJson.getString("pwd"),camera,userName,false, scenePro.getPayStatus());
             }
         }
+
         return ResultData.ok();
     }
 
@@ -917,6 +937,11 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             }
         }
 
+        //全景看看场景用相机类型包括 看看 看见 深时 深光，所以这里做一个统一处理，为了让场景不在各平台中显示出来
+        if(Objects.nonNull(location) && location == 7){
+            scenePlus.setSceneSource(SceneSource.QJKK.code());
+        }
+
         if(ModelKind.THREE_D_TILE.code().equals(modelKind)
                 && CollUtil.isNotEmpty(sdTilesSceneSourceList)
                 && sdTilesSceneSourceList.contains(scenePlus.getSceneSource())){
@@ -1213,7 +1238,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     }
 
     @Override
-    public ResultData rebuildScene(String num,Boolean force,Boolean deleteExtras) throws IOException {
+    public ResultData rebuildScene(String num,Boolean force,Boolean deleteExtras, String from) throws IOException {
 
         ScenePro scenePro = sceneProService.getByNum(num);
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
@@ -1231,10 +1256,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if(Objects.nonNull(scenePlus)){
             scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
             laseCallTime = scenePlusExt.getAlgorithmTime();
-            cameraId = scenePlus.getCameraId();
         }else{
             laseCallTime = scenePro.getCreateTime();
-            cameraId = scenePro.getCameraId();
         }
 
 //        //查询场景是否处于冻结状态，如果已冻结，不允许重算
@@ -1313,7 +1336,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 userName = user.getUserName();
             }
             Camera cameraEntity = cameraService.getById(scenePlus.getCameraId());
-            fdkkLaserService.saveScene(scenePlus,null,cameraEntity,userName,true);
+            if(Objects.isNull(scenePlusExt.getLocation()) || scenePlusExt.getLocation() != 7){
+                fdkkLaserService.saveScene(scenePlus,null,cameraEntity,userName,true, scenePlus.getPayStatus());
+            }
             message = this.getBuildSceneMqMessage(
                     num, cameraType, fdageData.getString("location") != null && "1".equals(fdageData.getString("location")) ? "sfm" : "slam",
                     fdageData, buildType, path);
@@ -1328,7 +1353,16 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if (force) {
             message.setRebuild("1");
         }
-        rabbitMqProducer.sendByWorkQueue(queueModelingPre, message);
+
+        if(Objects.nonNull(scenePlusExt.getLocation()) && scenePlusExt.getLocation() == 7){
+            //发送到全景看看进行初始化
+            JSONObject jsonObject = JSONObject.parseObject(fYunFileService.getFileContent(SceneUtil.getHomePath(scenePlusExt.getDataSource()) + "data.fdage"));
+            intermitSceneService.sendMq(num, jsonObject, CommonSuccessStatus.WAITING.code());
+            rabbitMqProducer.sendByWorkQueue(queueIntermitModelingPre, message);
+        }else{
+            rabbitMqProducer.sendByWorkQueue(queueModelingPre, message);
+        }
+
         scenePlusService.update(new LambdaUpdateWrapper<ScenePlus>()
             .set(ScenePlus::getSceneStatus, SceneStatus.wait.code())
             .eq(ScenePlus::getNum, num));
@@ -1340,6 +1374,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
         scenePlusExtService.updateById(scenePlusExt);
 
+        //记录日志表
+        SceneRebuildLog rebuildLog = new SceneRebuildLog();
+        rebuildLog.setNum(num);
+        rebuildLog.setSource(from);
+        sceneRebuildLogService.save(rebuildLog);
+
         return ResultData.ok();
     }
 
@@ -1670,7 +1710,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         // 通知激光场景系统开始构建场景
         if(cameraType == 14){
             scenePro.setStatus(0);
-            fdkkLaserService.saveScene(scenePro, jsonObject.getString("pwd"), cameraEntity, userName, false);
+            fdkkLaserService.saveScene(scenePro, jsonObject.getString("pwd"), cameraEntity, userName, false, scenePro.getPayStatus());
         }
 
         BuildSceneCallMessage buildSceneMqMessage = this.getBuildSceneMqMessage(

src/main/java/com/fdkankan/contro/service/impl/SceneInfoSyncMqConfigServiceImpl.java

@@ -0,0 +1,27 @@
+package com.fdkankan.contro.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.contro.entity.SceneInfoSyncMqConfig;
+import com.fdkankan.contro.mapper.ISceneInfoSyncMqConfigMapper;
+import com.fdkankan.contro.service.ISceneInfoSyncMqConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 场景信息变更需要发送mq信息队列配置表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-04-16
+ */
+@Service
+public class SceneInfoSyncMqConfigServiceImpl extends ServiceImpl<ISceneInfoSyncMqConfigMapper, SceneInfoSyncMqConfig> implements ISceneInfoSyncMqConfigService {
+
+    @Override
+    public List<SceneInfoSyncMqConfig> listByInfoType(String infoType) {
+        return this.list(new LambdaQueryWrapper<SceneInfoSyncMqConfig>().eq(SceneInfoSyncMqConfig::getInfoType, infoType));
+    }
+}

src/main/java/com/fdkankan/contro/service/impl/ScenePlusServiceImpl.java

@@ -4,10 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.PayStatus;
-import com.fdkankan.common.constant.SceneStatus;
-import com.fdkankan.common.constant.SpaceType;
+import com.fdkankan.common.constant.*;
 import com.fdkankan.contro.entity.CameraDetail;
 import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.entity.ScenePlusExt;
@@ -67,7 +64,11 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
             if(spaceType.equals(SpaceType.SP.code())){
                 space = -1L;
             }
-            cameraDetailService.updateCameraDetailByCameraIdAndSpace(scenePlus.getCameraId(), space);
+            if(scenePlus.getSceneSource() == SceneSource.BM.code()
+                    || scenePlus.getSceneSource() == SceneSource.ZT.code()
+                    || (spaceType.equals(SpaceType.SP.code()))){
+                cameraDetailService.updateCameraDetailByCameraIdAndSpace(scenePlus.getCameraId(), space);
+            }
         }
 
         scenePlusExt.setSpace(Long.parseLong("0"));

src/main/java/com/fdkankan/contro/service/impl/SceneRebuildLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.contro.service.impl;
+
+import com.fdkankan.contro.entity.SceneRebuildLog;
+import com.fdkankan.contro.mapper.ISceneRebuildLogMapper;
+import com.fdkankan.contro.service.ISceneRebuildLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 场景重算接口调用日志表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-17
+ */
+@Service
+public class SceneRebuildLogServiceImpl extends ServiceImpl<ISceneRebuildLogMapper, SceneRebuildLog> implements ISceneRebuildLogService {
+
+}

src/main/java/com/fdkankan/contro/service/impl/SceneUploadCountServiceImpl.java

@@ -0,0 +1,69 @@
+package com.fdkankan.contro.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.CameraConstant;
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.contro.entity.Camera;
+import com.fdkankan.contro.entity.SceneUploadCount;
+import com.fdkankan.contro.mapper.ISceneUploadCountMapper;
+import com.fdkankan.contro.service.ICameraService;
+import com.fdkankan.contro.service.ISceneUploadCountService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.contro.vo.SceneUploadCountParamVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+/**
+ * <p>
+ * app触发场景上传统计表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-05-20
+ */
+@Service
+public class SceneUploadCountServiceImpl extends ServiceImpl<ISceneUploadCountMapper, SceneUploadCount> implements ISceneUploadCountService {
+
+    @Autowired
+    private ICameraService cameraService;
+
+    @Override
+    public void increSceneUploadCount(SceneUploadCountParamVO param) {
+        String uuid = param.getUuid();
+        String snCode = uuid.split("_")[0];
+
+        Camera camera = cameraService.getBySnCode(snCode);
+        if (camera == null) {
+            throw new BusinessException(CameraConstant.FAILURE_6003);
+        }
+
+        SceneUploadCount sceneUploadCount = this.getByUUid(uuid);
+        if(Objects.isNull(sceneUploadCount)){
+            sceneUploadCount = new SceneUploadCount();
+            sceneUploadCount.setUuid(uuid);
+            sceneUploadCount.setSnCode(snCode);
+            sceneUploadCount.setCount(1);
+        }else{
+            sceneUploadCount.setCount(sceneUploadCount.getCount() + 1);
+        }
+
+        this.saveOrUpdate(sceneUploadCount);
+    }
+
+    @Override
+    public void resetCountByUuid(String uuid) {
+        SceneUploadCount sceneUploadCount = this.getByUUid(uuid);
+        if(Objects.isNull(sceneUploadCount)){
+            return;
+        }
+        sceneUploadCount.setCount(0);
+        this.updateById(sceneUploadCount);
+    }
+
+    @Override
+    public SceneUploadCount getByUUid(String uuid) {
+        return this.getOne(new LambdaQueryWrapper<SceneUploadCount>().eq(SceneUploadCount::getUuid, uuid));
+    }
+}

src/main/java/com/fdkankan/contro/vo/ReportFailLogVO.java

@@ -0,0 +1,25 @@
+package com.fdkankan.contro.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReportFailLogVO {
+
+    @NotBlank(message = "uuid不能为空")
+    private String uuid;
+
+    @NotBlank(message = "source不能为空")
+    private String source;
+
+    private String reason;
+
+
+}

src/main/java/com/fdkankan/contro/vo/SceneEditControlsVO.java

@@ -73,5 +73,9 @@ public class SceneEditControlsVO implements Serializable {
 
     private Integer tagshare;
 
+    private Integer showDrawTitle;
+
+    private Integer showTagshare;
+
 
 }

src/main/java/com/fdkankan/contro/vo/SceneUploadCountParamVO.java

@@ -0,0 +1,17 @@
+package com.fdkankan.contro.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SceneUploadCountParamVO {
+    @NotBlank(message = "uuid不能为空")
+    private String uuid;
+}

src/main/resources/mapper/contro/AppCameraFailLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.contro.mapper.IAppCameraFailLogMapper">
+
+</mapper>

src/main/resources/mapper/contro/MqSendLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.contro.mapper.IMqSendLogMapper">
+
+</mapper>

src/main/resources/mapper/contro/SceneInfoSyncMqConfigMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.contro.mapper.ISceneInfoSyncMqConfigMapper">
+
+</mapper>

src/main/resources/mapper/contro/SceneRebuildLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.contro.mapper.ISceneRebuildLogMapper">
+
+</mapper>

src/main/resources/mapper/contro/SceneUploadCountMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.contro.mapper.ISceneUploadCountMapper">
+
+</mapper>