移除无关代码

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

@@ -1,21 +1,15 @@
 package com.fdkankan.contro.controller;
 
 import cn.hutool.core.util.ZipUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.SnowflakeIdGenerator;
 import com.fdkankan.contro.constant.RedisConstants;
 import com.fdkankan.contro.entity.SceneFileBuild;
-import com.fdkankan.contro.entity.ScenePro;
 import com.fdkankan.contro.service.ISceneFileBuildService;
 import com.fdkankan.contro.service.IScenePlusService;
-import com.fdkankan.contro.service.ISceneProService;
-import com.fdkankan.contro.vo.ResponseSceneFile;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.redis.util.RedisLockUtil;
@@ -23,13 +17,13 @@ import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.web.response.ResultData;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
 
 /**
  * 场景文件上传模块
@@ -54,41 +48,6 @@ public class SceneFileController{
     @Autowired
     private IScenePlusService scenePlusService;
 
-    @Autowired
-    private ISceneProService sceneProService;
-
-    /**
-     * 场景文件上传之前先获取fileId
-     * @param params
-     * @return
-     * @throws Exception
-     */
-    @PostMapping("preUpload")
-    public ResponseSceneFile preUpload(String params) throws Exception {
-        return sceneFileBuildService.preUpload(params);
-    }
-
-    /**
-     * 更新fileid文件的上传状态  - 后端八目上传逻辑
-     *
-     * @param params
-     * @return
-     */
-    @PostMapping("uploadSuccessBuild")
-    public ResultData uploadSuccessBuild(String params) throws Exception {
-        return sceneFileBuildService.uploadSuccessBuild(params);
-    }
-
-    /**
-     *
-     *
-     * @param params
-     * @return
-     */
-    @PostMapping("turntableUploadSuccess")
-    public ResultData turntableUploadSuccess(String params) throws Exception {
-        return sceneFileBuildService.turntableUploadSuccess(params);
-    }
 
     @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 {
@@ -96,46 +55,6 @@ public class SceneFileController{
     }
 
 
-    /**
-     * 国际八目相机调用
-     * @param params
-     * @return
-     * @throws Exception
-     */
-    @PostMapping("getS3UploadUrl")
-    public ResultData getS3UploadUrl(String params) throws Exception {
-        log.info("getS3UploadUrl 参数：{}",params);
-        if (StringUtils.isEmpty(params)) {
-            throw new BusinessException(ErrorCode.PARAM_ERROR,"params为空。");
-        }
-        JSONObject jsonObject = JSON.parseObject(params);
-        if(jsonObject == null){
-            throw new BusinessException(ErrorCode.PARAM_ERROR,"params为空。");
-        }
-        JSONArray files = jsonObject.getJSONArray("Files");
-        if(files == null){
-            throw new BusinessException(ErrorCode.PARAM_ERROR,"params为空。");
-        }
-        List<String> urls = new ArrayList<>();
-        for(int i = 0, len = files.size(); i < len; i++){
-            urls.add(files.getJSONObject(i).getString("filename"));
-        }
-        Map<String, String> uploadS3Url = getUploadS3Url(urls);
-        return ResultData.ok(uploadS3Url);
-    }
-
-    private Map<String, String> getUploadS3Url(List<String> urls) {
-        if(urls == null || urls.size() <= 0){
-            return null;
-        }
-        Map<String, String> map = new HashMap();
-        for(String path : urls){
-            map.put(path, fYunFileService.getPresignedUrl(path).toString());
-        }
-        return map;
-    }
-
-
     @PostMapping("sendCallAlgorithm")
     public ResultData sendCallAlgorithm(@RequestBody Map<String,String> params) throws Exception {
         log.info("sendCallAlgorithm 参数为：{}",JSONObject.toJSONString(params));
@@ -198,18 +117,7 @@ public class SceneFileController{
             throw new BusinessException(ErrorCode.FAILURE_CODE_5052);
         }
 
-        // 查找场景表
-        LambdaQueryWrapper<ScenePro> proWrapper = new LambdaQueryWrapper<>();
-        proWrapper.like(ScenePro::getDataSource, "/" + folderName).eq(ScenePro::getRecStatus, 'A');
-        ScenePro pro = sceneProService.getOne(proWrapper);
-
-        String dataSource = null;
-
-        if (!org.springframework.util.ObjectUtils.isEmpty(pro)) {
-            dataSource = pro.getDataSource();
-        } else {
-            dataSource = scenePlusService.getDataSourceLikeUnicode("/" + folderName);
-        }
+        String dataSource =  scenePlusService.getDataSourceLikeUnicode("/" + folderName);
 
         if (!org.springframework.util.ObjectUtils.isEmpty(dataSource)) {
             log.info("从数据库中查到与 fileId:{} 匹配的路径为:{}", fileId, dataSource);
@@ -235,10 +143,4 @@ public class SceneFileController{
         redisUtil.set(String.format(RedisConstants.FILEID_FOLDER_BUILD, fileId), folderName, 2 * 24 * 60 * 60);
         return fileId;
     }
-
-    @GetMapping("copyDataAndBuild")
-    public ResultData copyDataAndBuild(@RequestParam(value = "dataSource") String dataSource,@RequestParam(value = "sceneVer") String sceneVer,
-                                       @RequestParam(value = "sourceBucket",required = false) String sourceBucket) throws Exception {
-        return sceneFileBuildService.copyDataAndBuild(sourceBucket,dataSource ,sceneVer);
-    }
 }

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

@@ -1,93 +0,0 @@
-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.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 会员权益类型
- * </p>
- *
- * @author 
- * @since 2022-08-01
- */
-@Getter
-@Setter
-@TableName("t_increment_type")
-public class IncrementType implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 权益类型名称
-     */
-    @TableField("name")
-    private String name;
-
-    @TableField("type")
-    private String type;
-
-    /**
-     * 下载次数，-1代表无限次
-     */
-    @TableField("download_num")
-    private Integer downloadNum;
-    /**
-     * 下载次数，-1代表无限次
-     */
-    @TableField("download_price")
-    private BigDecimal downloadPrice;
-
-    /**
-     * 相机容量 单位 G
-     */
-    @TableField("camera_capacity")
-    private Integer cameraCapacity;
-
-    /**
-     * 购买之后，有效期天数，-1代表无限制
-     */
-    @TableField("valid_time")
-    private Integer validTime;
-
-    /**
-     * 0:年;1:月：2：日
-     */
-    @TableField("valid_time_type")
-    private Integer validTimeType;
-
-    /**
-     * 权益价格
-     */
-    @TableField("price")
-    private BigDecimal price;
-
-    /**
-     * 价格符号
-     */
-    @TableField("symbol")
-    private String symbol;
-
-    @TableField("create_time")
-    private String createTime;
-
-    @TableField("update_time")
-    private String updateTime;
-
-    @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
-    private String recStatus;
-
-
-}

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

@@ -1,235 +0,0 @@
-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.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * pro场景表
- * </p>
- *
- * @author 
- * @since 2022-07-04
- */
-@Getter
-@Setter
-@TableName("t_scene_pro")
-public class ScenePro implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景名称
-     */
-    @TableField("scene_name")
-    private String sceneName;
-
-    /**
-     * 场景描述
-     */
-    @TableField("scene_dec")
-    private String sceneDec;
-
-    /**
-     * 场景的链接地址
-     */
-    @TableField("web_site")
-    private String webSite;
-
-    /**
-     * 场景缩略图
-     */
-    @TableField("thumb")
-    private String thumb;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 0表示未建好，1表示建好，-1表示出错，-2表示不要在官网上显示
-     */
-    @TableField("status")
-    private Integer status;
-
-    /**
-     * 原始的大场景数据（七牛）
-     */
-    @TableField("data_source")
-    private String dataSource;
-
-    /**
-     * 用户表t_user的id
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 0表示未付款，1表示付款了，-1表示欠费，-2表示容量不足
-     */
-    @TableField("pay_status")
-    private Integer payStatus;
-
-    /**
-     * 相机主表t_camera的id
-     */
-    @TableField("camera_id")
-    private Long cameraId;
-
-    /**
-     * 手机id
-     */
-    @TableField("phone_id")
-    private String phoneId;
-
-    /**
-     * 场景logo
-     */
-    @TableField("scene_logo")
-    private String sceneLogo;
-
-    /**
-     * 大场景序号
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 0表示其他，1表示文博，2表示地产，3表示电商，4表示餐饮，5表示家居,99一件换装虚拟房源
-     */
-    @TableField("scene_type")
-    private Integer sceneType;
-
-    /**
-     * 1表示推荐，0表示正常
-     */
-    @TableField("recommend")
-    private Integer recommend;
-
-    /**
-     * 浏览次数
-     */
-    @TableField("view_count")
-    private Integer viewCount;
-
-    /**
-     * 拍摄数量 ps:点位数量
-     */
-    @TableField("shoot_count")
-    private Integer shootCount;
-
-    /**
-     * 所有资源文件名
-     */
-    @TableField("files_name")
-    private String filesName;
-
-    /**
-     * 点位视频
-     */
-    @TableField("videos")
-    private String videos;
-
-    /**
-     * 要gps定位
-     */
-    @TableField("gps")
-    private String gps;
-
-    /**
-     * 方案：1是双目，2是转台，3是六目,4是八目,10获取4k图，11获取2k，12获取1k
-     */
-    @TableField("scene_scheme")
-    private Integer sceneScheme;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableLogic(value = "A", delval = "I")
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 算法类型
-     */
-    @TableField("algorithm")
-    private String algorithm;
-
-    /**
-     * 服务器的服务商
-     */
-    @TableField("ecs")
-    private String ecs;
-
-    /**
-     * 使用容量
-     */
-    @TableField("space")
-    private Long space;
-
-    /**
-     * 固件版本
-     */
-    @TableField("firmware_version")
-    private String firmwareVersion;
-
-    /**
-     * 调用V2还是V3的算法
-     */
-    @TableField("build_type")
-    private String buildType;
-
-    /**
-     * 计算时间（秒为单位）
-     */
-    @TableField("compute_time")
-    private Long computeTime;
-
-    /**
-     * 场景来源，相机拍摄10以内表示，1表示八目，2双目，3转台，4 激光  其他来源10以上，11：一键换装，12：123看房，13文通虚拟场景,14上传的matterport场景
-     */
-    @TableField("scene_source")
-    private Integer sceneSource;
-
-    /**
-     * 大场景序号(随心装场景码)
-     */
-    @TableField("vrnum")
-    private String vrnum;
-
-    @TableField("unicode")
-    private String unicode;
-
-    @TableField("mosaics")
-    private String mosaics;
-
-    /**
-     * 是否已升级v4（0-否，1-是）
-     */
-    @TableField("is_upgrade")
-    private Integer isUpgrade;
-
-    /**
-     * 是否生成过OBJ
-     */
-    @TableField("is_obj")
-    private Integer isObj;
-}

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

@@ -1,285 +0,0 @@
-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.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * pro场景编辑数据表
- * </p>
- *
- * @author 
- * @since 2022-07-12
- */
-@Getter
-@Setter
-@TableName("t_scene_pro_edit")
-public class SceneProEdit implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * pro场景id
-     */
-    @TableField("pro_id")
-    private Long proId;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 大场景的密钥
-     */
-    @TableField("scene_key")
-    private String sceneKey;
-
-    /**
-     * 展示页面密码，0不需要，1需要
-     */
-    @TableField("need_key")
-    private Integer needKey;
-
-    /**
-     * 版本
-     */
-    @TableField("version")
-    private Integer version;
-
-    /**
-     * 表示缩略图是否存在
-     */
-    @TableField("thumb_status")
-    private Integer thumbStatus;
-
-    /**
-     * 地面点位标志
-     */
-    @TableField("marker_logo")
-    private String markerLogo;
-
-    /**
-     * 0表示默认，1表示自己上传
-     */
-    @TableField("floor_logo")
-    private String floorLogo;
-
-    /**
-     * 标记大小
-     */
-    @TableField("floor_logo_size")
-    private Integer floorLogoSize;
-
-    /**
-     * 要上传的热点的id集合，用逗号隔开
-     */
-    @TableField("hots_ids")
-    private String hotsIds;
-
-    /**
-     * 表示初始点信息
-     */
-    @TableField("entry")
-    private String entry;
-
-    /**
-     * 背景音乐名称
-     */
-    @TableField("bg_music")
-    private String bgMusic;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
-    private String recStatus;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 普通录屏文件地址
-     */
-    @TableField("screencap_voice_src")
-    private String screencapVoiceSrc;
-
-    /**
-     * 录音文件地址
-     */
-    @TableField("screencap_voice_sound")
-    private String screencapVoiceSound;
-
-    /**
-     * 同步录音地址
-     */
-    @TableField("screencap_voice_soundsync")
-    private String screencapVoiceSoundsync;
-
-    /**
-     * 选择的类型，sound为screencapVoiceSound，file为screencapVoiceSrc，soundsync为screencap_voice_soundsync
-     */
-    @TableField("screencap_voice_type")
-    private String screencapVoiceType;
-
-    /**
-     * 录屏文件地址
-     */
-    @TableField("play_data")
-    private String playData;
-
-    /**
-     * 重新建模的版本
-     */
-    @TableField("floor_edit_ver")
-    private Integer floorEditVer;
-
-    /**
-     * 正式发布重新建模的版本
-     */
-    @TableField("floor_publish_ver")
-    private Integer floorPublishVer;
-
-    /**
-     * 录屏图片存放文件
-     */
-    @TableField("screencap_thumb")
-    private String screencapThumb;
-
-    /**
-     * 分享的logo和生成二维码的logo
-     */
-    @TableField("share_logo")
-    private String shareLogo;
-
-    /**
-     * 小地图浏览
-     */
-    @TableField("map_visi")
-    private Integer mapVisi;
-
-    /**
-     * 自动导览
-     */
-    @TableField("tour_visi")
-    private Integer tourVisi;
-
-    /**
-     * vr模式
-     */
-    @TableField("vr_visi")
-    private Integer vrVisi;
-
-    /**
-     * 展示页面是否显示标尺
-     */
-    @TableField("ruler_visi")
-    private Integer rulerVisi;
-
-    /**
-     * 展示页面cad图在平面图是否显示
-     */
-    @TableField("cad_img_visi")
-    private Integer cadImgVisi;
-
-    /**
-     * cad平面图
-     */
-    @TableField("floor_plan_png")
-    private String floorPlanPng;
-
-    /**
-     * cad平面图参数
-     */
-    @TableField("cad_info")
-    private String cadInfo;
-
-    @TableField("pano_visi")
-    private Integer panoVisi;
-
-    @TableField("m2d_visi")
-    private Integer m2dVisi;
-
-    @TableField("m3d_visi")
-    private Integer m3dVisi;
-
-    @TableField("measure_visi")
-    private Integer measureVisi;
-
-    /**
-     * 肖安需求，场景于场景之间的关联
-     */
-    @TableField("link_scene")
-    private String linkScene;
-
-    @TableField("overlay")
-    private String overlay;
-
-    /**
-     * 是否显示底部logo，1显示，0不显示
-     */
-    @TableField("show_logo_bottom")
-    private Boolean showLogoBottom;
-
-    /**
-     * 全景图版本号
-     */
-    @TableField("images_version")
-    private Integer imagesVersion;
-
-    /**
-     * 上传的背景音乐
-     */
-    @TableField("bg_music_name")
-    private String bgMusicName;
-
-    @TableField("jump_scene")
-    private Boolean jumpScene;
-
-    /**
-     * 旋转角度
-     */
-    @TableField("floor_plan_angle")
-    private String floorPlanAngle;
-
-    /**
-     * 场景下载次数
-     */
-    @TableField("download_num")
-    private Integer downloadNum;
-
-    /**
-     * 绿幕抠图json数据
-     */
-    @TableField("videos_user")
-    private String videosUser;
-
-    /**
-     * 大场景序号(随心装场景码)
-     */
-    @TableField("vr_num")
-    private String vrNum;
-
-    /**
-     * 随心装封面图
-     */
-    @TableField("vr_thumb")
-    private String vrThumb;
-
-
-}

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

@@ -1,185 +0,0 @@
-package com.fdkankan.contro.entity;
-
-import lombok.Data;
-import org.springframework.data.annotation.Transient;
-
-import java.util.Date;
-
-@Data
-public class SceneProPO {
-
-    private Long id;
-
-    /**
-     * 场景名称
-     */
-    private String sceneName;
-
-    /**
-     * 场景描述
-     */
-    private String sceneDec;
-
-    /**
-     * 场景的链接地址
-     */
-    private String webSite;
-
-    /**
-     * 场景缩略图
-     */
-    private String thumb;
-
-    /**
-     * 用户表t_user的id
-     */
-    private Long userId;
-
-    /**
-     * 相机主表t_camera的id
-     */
-    private Long cameraId;
-
-    /**
-     * 场景logo
-     */
-    private String sceneLogo;
-
-    /**
-     * 大场景序号
-     */
-    private String num;
-
-    /**
-     * 0-其他，1-文博，2-地产，3-电商，4-餐饮，5-家居,99-一件换装虚拟房源
-     */
-    private Integer sceneType;
-
-    /**
-     * 浏览次数
-     */
-    private Integer viewCount;
-
-    /**
-     * 拍摄数量
-     */
-    private Integer shootCount;
-
-    /**
-     * 点位视频
-     */
-    private String videos;
-
-    /**
-     * 要gps定位
-     */
-    private String gps;
-
-    /**
-     * 方案：1-双目，2-转台，3-六目,4-八目,10-获取4k图，11-获取2k，12-获取1k
-     */
-    private Integer sceneScheme;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    private String recStatus;
-
-    /**
-     * 算法类型（V2,V3）
-     */
-    private String buildType;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    private Integer tbStatus;
-
-    private Integer sceneStatus;
-
-    /**
-     * 原始的大场景数据（七牛）
-     */
-    private String dataSource;
-
-    /**
-     * 0表示未付款，1表示付款了，-1表示欠费，-2表示容量不足
-     */
-    private Integer payStatus;
-
-    /**
-     * 手机id
-     */
-    private String phoneId;
-
-    /**
-     * 1表示推荐，0表示正常
-     */
-    private Integer recommend;
-
-    /**
-     * 所有资源文件名
-     */
-    private String filesName;
-
-    /**
-     * 算法类型
-     */
-    private String algorithm;
-
-    /**
-     * 服务器的服务商
-     */
-    private String ecs;
-
-    /**
-     * 使用容量
-     */
-    private Long space;
-
-    /**
-     * 固件版本
-     */
-    private String firmwareVersion;
-
-    /**
-     * 计算时间（秒为单位）
-     */
-    private Long computeTime;
-
-    /**
-     * 场景来源，相机拍摄10以内表示，1表示八目，2双目，3转台，4 激光  其他来源10以上，11：一键换装，12：123看房，13文通虚拟场景
-     */
-    private Integer sceneSource;
-
-    /**
-     * 大场景序号(随心装场景码)
-     */
-    private String vrnum;
-
-    private String unicode;
-
-    /**
-     * 相机类型
-     */
-    private Integer cameraType;
-
-    @Transient
-    private String cooperationUserId;
-
-//    /**
-//     * 触发mq调度，事务最后触发
-//     */
-//    private BuildSceneMqMessage mqMsg;
-
-}

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

@@ -1,81 +0,0 @@
-package com.fdkankan.contro.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 用户增值权益表
- * </p>
- *
- * @author 
- * @since 2021-12-24
- */
-@Getter
-@Setter
-@ToString
-@TableName("t_user_increment")
-public class UserIncrement implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-
-    /**
-     * 相机主表t_camera的id
-     */
-    @TableField("camera_id")
-    private Long cameraId;
-
-    /**
-     * 会员权益类型Id
-     */
-    @TableField("increment_type_id")
-    private Integer incrementTypeId;
-
-    /**
-     * 结束时间
-     */
-    @TableField("increment_end_time")
-    private Date incrementEndTime;
-
-    /**
-     * 是否过期（1过期，0未过期）
-     */
-    @TableField("is_expired")
-    private Integer isExpired;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 生效时间
-     */
-    @TableField("increment_start_time")
-    private Date incrementStartTime;
-
-
-    /**
-     * 0正常，1删除
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
-    private String recStatus;
-
-}

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

@@ -1,18 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.IncrementType;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 会员权益类型 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2022-08-01
- */
-@Mapper
-public interface IIncrementTypeMapper extends BaseMapper<IncrementType> {
-
-}

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

@@ -1,18 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.SceneProEdit;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * pro场景编辑数据表 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2022-07-12
- */
-@Mapper
-public interface ISceneProEditMapper extends BaseMapper<SceneProEdit> {
-
-}

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

@@ -1,18 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.ScenePro;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * pro场景表 Mapper 接口
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Mapper
-public interface ISceneProMapper extends BaseMapper<ScenePro> {
-
-}

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

@@ -1,24 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.UserIncrement;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * 用户增值权益表 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2021-12-24
- */
-@Mapper
-public interface IUserIncrementMapper extends BaseMapper<UserIncrement> {
-
-    @Select("SELECT * FROM t_user_increment x LEFT JOIN t_camera c ON x.camera_id = c.id and c.rec_status = 'A' WHERE c.child_name = #{childName} AND x.rec_status = 'A' ")
-    List<UserIncrement> getByChildName(@Param("childName")String childName);
-}

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

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.file.FileNameUtil;
 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.HttpUtil;
@@ -22,7 +21,6 @@ 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;
 import com.fdkankan.model.constants.ConstantFileName;
 import com.fdkankan.model.constants.ConstantFilePath;
@@ -96,20 +94,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     private ISceneEditInfoExtService sceneEditInfoExtService;
 
     @Autowired
-    private IUserIncrementService userIncrementService;
-
-    @Autowired
-    private IFdkkLaserService fdkkLaserService;
-
-
-    @Autowired
     private IBuildSceneDTService buildSceneDTService;
 
 
     @Autowired
-    private IIncrementTypeService incrementTypeService;
-
-    @Autowired
     private ICompanyService companyService;
 
     @Override
@@ -272,14 +260,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
             Company company = !ObjectUtils.isEmpty(cameraDetail.getCompanyId()) ? companyService.getById(cameraDetail.getCompanyId()) : null;
 
-            if (cameraType == 14) {
-                //计算成功  激光转台相机 同步 请求
-                fdkkLaserService.syncBuildResult(scenePlus.getNum(), scenePlusExt.getDataSource(),scenePlus.getCreateTime());
-                sceneEditControlsService.update(new LambdaUpdateWrapper<SceneEditControls>().set(SceneEditControls::getShowMap,0)
-                        .eq(SceneEditControls::getEditInfoId,sceneEditInfo.getId()));
-                sceneEditControls.setShowMap(0);
-            }
-
             this.writeSceneJson(sceneCode, videosJson,sceneEditInfo, sceneEditInfoExt, sceneEditControls, scenePlus,scenePlusExt,company);
 
             String qrLogo = !ObjectUtils.isEmpty(company) && !ObjectUtils.isEmpty(company.getQrLogo()) ? company.getQrLogo() : null;
@@ -293,8 +273,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             String pushToken = fdageData.getString("pushToken");
             this.pushMsgToApp(pushChannel,pushToken, cameraType, scenePlus.getTitle(), scenePlusExt.getWebSite());
 
-
-
             CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/") + "/capture");
 
             log.info("场景计算结果处理结束，场景码：{}", sceneCode);

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

@@ -1,26 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.fdkankan.contro.entity.Camera;
-import com.fdkankan.contro.entity.ScenePlus;
-import com.fdkankan.contro.entity.ScenePlusExt;
-import com.fdkankan.contro.entity.ScenePro;
-
-import java.util.Date;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/1/14
- **/
-public interface IFdkkLaserService {
-    void syncBuildResult(String sceneNum, String dataSource, Date createTime);
-
-    void pushBuildStatusToLaserSystem(String projectNum, String laserObjFilePath);
-
-    void saveScene(ScenePlus scenePlus, String scenePassword, Camera cameraEntity, String userName, boolean b);
-
-    void saveScene(ScenePro scenePro, String scenePassword, Camera cameraEntity, String phone, boolean rebuild);
-}

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

@@ -1,18 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.entity.IncrementType;
-
-import java.util.List;
-
-/**
- * <p>
- * 会员权益类型 服务类
- * </p>
- *
- * @author 
- * @since 2022-08-01
- */
-public interface IIncrementTypeService extends IService<IncrementType> {
-
-}

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

@@ -19,12 +19,6 @@ public interface ISceneFileBuildService extends IService<SceneFileBuild> {
 
     SceneFileBuild findByFileId(String fileId);
 
-    ResponseSceneFile preUpload(String params) throws Exception;
-
-    ResultData uploadSuccessBuild(String params) throws Exception;
-
-    ResultData turntableUploadSuccess(String params) throws Exception;
-
     ResultData rebuildScene(String num,Boolean force,Boolean deleteExtras) throws IOException;
 
     ResultData copyDataAndBuild(String sourceBucet,String dataSource,String sceneVer) throws Exception;

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

@@ -1,17 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.entity.SceneProEdit;
-
-/**
- * <p>
- * pro场景编辑数据表 服务类
- * </p>
- *
- * @author 
- * @since 2022-07-12
- */
-public interface ISceneProEditService extends IService<SceneProEdit> {
-
-    SceneProEdit getByProId(Long proId);
-}

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

@@ -1,18 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.entity.ScenePro;
-
-/**
- * <p>
- * pro场景表 服务类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-public interface ISceneProService extends IService<ScenePro> {
-
-    ScenePro getByNum(String num);
-
-}

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

@@ -1,21 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.entity.UserIncrement;
-
-import java.util.List;
-
-/**
- * <p>
- * 用户增值权益表 服务类
- * </p>
- *
- * @author 
- * @since 2021-12-24
- */
-public interface IUserIncrementService extends IService<UserIncrement> {
-
-    UserIncrement getByCameraId(Long cameraId);
-
-    List<UserIncrement> getByChildName(String childName);
-}

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

@@ -1,71 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.contro.common.Result;
-import com.fdkankan.contro.entity.ScenePro;
-import com.fdkankan.contro.service.ISceneProService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.client.RestTemplate;
-
-@Service
-public class FdkkV4Service {
-    private static final Logger log = LoggerFactory.getLogger(FdkkV4Service.class);
-
-    private final String UPGRADE_TO_V4="/api/user/scene/upgradeToV4?num=%s";
-
-    @Value("${main.url}")
-    private String mainUrl;
-
-    private RestTemplate restTemplate = new RestTemplate();
-
-    @Autowired
-    private ISceneProService sceneProService;
-
-    /**
-     * 场景升级
-     * @param num  场景码
-     * @return
-     * @throws Exception
-     */
-    public void upgradeToV4(String num){
-        // 如果场景在旧表中存在，则需要升级，否则不需要升级
-        ScenePro scenePro = sceneProService.getByNum(num);
-        if(ObjectUtils.isEmpty(scenePro)){
-            log.error("scene_pro 表中不存在该记录，退出升级!");
-            return;
-        }
-
-        String url = mainUrl + String.format(UPGRADE_TO_V4,num);
-        log.info("v3场景升级v4，url:{}",url);
-        ResponseEntity<Result> responseEntity = restTemplate.getForEntity(url, Result.class);
-        log.info("v3场景升级v4，url:{},结果,{}",url, JSONObject.toJSONString(responseEntity.getBody()));
-        if(responseEntity.getStatusCode() != HttpStatus.OK){
-            log.error("场景升级失败，请稍后再试！");
-        }
-        Integer code = responseEntity.getBody().getCode();
-        if(code != 0){
-            String msg = "场景升级失败，请稍后再试！";
-            if(code == 7019){
-                msg = "场景升级中，请勿重复升级";
-            }else if(code == 7020){
-                msg = "场景已升级，不能重复升级";
-            }
-            log.error(msg);
-            return;
-        }
-
-        //修改场景状态为升级中
-        LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.set(ScenePro::getIsUpgrade,2).eq(ScenePro::getNum,num);
-        sceneProService.update(wrapper);
-    }
-
-}

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

@@ -1,37 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import com.fdkankan.contro.entity.Camera;
-import com.fdkankan.contro.entity.ScenePlus;
-import com.fdkankan.contro.entity.ScenePro;
-import com.fdkankan.contro.service.IFdkkLaserService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
-@Service
-@Slf4j
-public class IFdkkLaserServiceImpl implements IFdkkLaserService {
-
-    public void updateSceneStatus(String sceneCode, int sceneStatus, String path, Date createTime) {
-
-    }
-
-    public void syncBuildResult(String sceneNum, String dataSource,Date createTime) {
-
-    }
-
-    @Override
-    public void pushBuildStatusToLaserSystem(String projectNum, String laserObjFilePath) {
-
-    }
-
-
-    public void saveScene(ScenePlus scenePlus, String scenePassword, Camera cameraEntity, String phone, boolean rebuild) {
-
-    }
-
-    public void saveScene(ScenePro scenePro, String scenePassword, Camera cameraEntity, String phone, boolean rebuild) {
-
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.contro.entity.IncrementType;
-import com.fdkankan.contro.mapper.IIncrementTypeMapper;
-import com.fdkankan.contro.service.IIncrementTypeService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 会员权益类型 服务实现类
- * </p>
- *
- * @author 
- * @since 2022-08-01
- */
-@Service
-public class IncrementTypeServiceImpl extends ServiceImpl<IIncrementTypeMapper, IncrementType> implements IIncrementTypeService {
-
-}

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

@@ -1,33 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.contro.entity.SceneProEdit;
-import com.fdkankan.contro.mapper.ISceneProEditMapper;
-import com.fdkankan.contro.service.ISceneProEditService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * pro场景编辑数据表 服务实现类
- * </p>
- *
- * @author 
- * @since 2022-07-12
- */
-@Service
-public class SceneProEditServiceImpl extends ServiceImpl<ISceneProEditMapper, SceneProEdit> implements ISceneProEditService {
-
-    @Override
-    public SceneProEdit getByProId(Long proId) {
-        LambdaQueryWrapper<SceneProEdit> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(SceneProEdit::getProId,proId);
-        List<SceneProEdit> list = this.list(wrapper);
-        if(list != null && list.size() >0){
-            return list.get(0);
-        }
-        return null;
-    }
-}

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

@@ -1,27 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.contro.entity.ScenePro;
-import com.fdkankan.contro.mapper.ISceneProMapper;
-import com.fdkankan.contro.service.ISceneProService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * pro场景表 服务实现类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Slf4j
-@Service
-public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro> implements ISceneProService {
-
-    @Override
-    public ScenePro getByNum(String num) {
-        return this.getOne(new LambdaQueryWrapper<ScenePro>().eq(ScenePro::getNum, num));
-    }
-}

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

@@ -1,44 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.contro.entity.UserIncrement;
-import com.fdkankan.contro.mapper.IUserIncrementMapper;
-import com.fdkankan.contro.service.IUserIncrementService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <p>
- * 用户增值权益表 服务实现类
- * </p>
- *
- * @author 
- * @since 2021-12-24
- */
-@Service
-public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper, UserIncrement> implements IUserIncrementService {
-
-    @Resource
-    private IUserIncrementMapper userIncrementMapper;
-
-    @Override
-    public UserIncrement getByCameraId(Long cameraId) {
-        QueryWrapper<UserIncrement> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(UserIncrement::getCameraId,cameraId);
-        List<UserIncrement> list = this.list(queryWrapper);
-        if(list == null || list.size()<=0){
-            return null;
-        }
-        return list.get(0);
-    }
-
-    @Override
-    public List<UserIncrement> getByChildName(String childName) {
-        return userIncrementMapper.getByChildName(childName);
-    }
-
-}