1111

src/main/java/com/fdkankan/scene/Interceptor/CheckCooperationPermitAspect.java

@@ -54,7 +54,7 @@ public class CheckCooperationPermitAspect {
 	public void doBefore(JoinPoint joinPoint) throws Exception {
 		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
 		// 读取session中的用户
-		SSOUser user = ssoLoginHelper.loginCheck(request.getHeader("token"));
+		SSOUser user = ssoLoginHelper.getSsoUser(request.getHeader("token"));
 		if(Objects.isNull(user)){
 			throw new BusinessException(ErrorCode.TOKEN_NOT_FOUND);
 		}

src/main/java/com/fdkankan/scene/bean/IconBean.java

@@ -4,7 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 
 /**
  * <p>

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

@@ -1,7 +1,6 @@
 package com.fdkankan.scene.bean;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fdkankan.scene.vo.SceneEditControlsVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -77,21 +76,21 @@ public class SceneJsonBean {
      */
     private Date createTime;
 
-//    /**
-//     * 点位数量
-//     */
-//    private Integer panoCount;
-//
-//    /**
-//     * 球幕视频数量
-//     */
-//    private Integer videoCount;
-
     /**
      * 版本
      */
     private Integer version;
 
+    /**
+     * 图片版本
+     */
+    private Integer imgVersion;
+
+    /**
+     * 场景关联版本
+     */
+    private Integer linkVersion;
+
 //    /**
 //     * 户型图文件路径集合
 //     */
@@ -102,23 +101,6 @@ public class SceneJsonBean {
      */
     private Byte floorPlanUser;
 
-//    private String cadInfo;
-
-//    /**
-//     * 是否上传模型
-//     */
-//    private Byte isUploadObj;
-//
-//    /**
-//     * 重新建模的版本
-//     */
-//    private Integer floorEditVer;
-//
-//    /**
-//     * 正式发布重新建模的版本
-//     */
-//    private Integer floorPublishVer;
-
     /**
      * 初始点信息
      */
@@ -135,6 +117,11 @@ public class SceneJsonBean {
     private String sceneFrom;
 
     /**
+     * 切图方式（tiles：瓦片图，face：切片图，pan：全景图 ，local：本地切片，cube：立体图）
+     */
+    private String sceneKind;
+
+    /**
      * 空间视频数据
      */
     private String boxVideos;
@@ -181,5 +168,25 @@ public class SceneJsonBean {
      */
     private Integer tours;
 
+    /**
+     * 是否有场景关联（0-否，1-是）
+     */
+    private Integer links;
+
+    /**
+     * 是否有马赛克
+     */
+    private Integer mosaic;
+
+    /**
+     * 马赛克列表
+     */
+    private List<JSONObject> mosaicList;
+
+    /**
+     * 水印文件名
+     */
+    private String waterMark;
+
 
 }

src/main/java/com/fdkankan/scene/bean/StyleBean.java

@@ -0,0 +1,27 @@
+package com.fdkankan.scene.bean;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/3/24
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StyleBean {
+
+    private Long createTime;
+
+    private JSONObject style;
+
+}

src/main/java/com/fdkankan/scene/bean/UpgradeBean.java

@@ -0,0 +1,26 @@
+package com.fdkankan.scene.bean;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/6/28
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class UpgradeBean {
+
+    private Long sceneProId;
+
+    private boolean reUpgrade;
+
+}

src/main/java/com/fdkankan/scene/callback/FdkkMiniReqErrorCallback.java

@@ -3,7 +3,6 @@ package com.fdkankan.scene.callback;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.dtflys.forest.callback.OnError;
-import com.dtflys.forest.callback.OnSuccess;
 import com.dtflys.forest.exceptions.ForestRuntimeException;
 import com.dtflys.forest.http.ForestRequest;
 import com.dtflys.forest.http.ForestResponse;
@@ -11,7 +10,6 @@ import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.Result;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
 
 /**
  * <p>

src/main/java/com/fdkankan/scene/callback/FdkkMiniReqSuccessCallback.java

@@ -3,11 +3,7 @@ package com.fdkankan.scene.callback;
 import com.dtflys.forest.callback.OnSuccess;
 import com.dtflys.forest.http.ForestRequest;
 import com.dtflys.forest.http.ForestResponse;
-import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.Result;
-import java.util.Arrays;
-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 
 /**

src/main/java/com/fdkankan/scene/callback/FdkkMiniReqSuccessCondition.java

@@ -6,7 +6,6 @@ import com.dtflys.forest.callback.SuccessWhen;
 import com.dtflys.forest.http.ForestRequest;
 import com.dtflys.forest.http.ForestResponse;
 import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.Result;
 
 /**

src/main/java/com/fdkankan/scene/config/DataSourceInitFunc.java

@@ -1,4 +1,4 @@
-//package com.fdkankan.scene.config;
+package com.fdkankan.scene.config;//package com.fdkankan.scene.config;
 //
 //import com.alibaba.cloud.sentinel.SentinelProperties;
 //import com.alibaba.cloud.sentinel.datasource.config.NacosDataSourceProperties;

src/main/java/com/fdkankan/scene/controller/FileConvertController.java

@@ -27,11 +27,11 @@ public class FileConvertController extends BaseController {
 
     /**
      * <p>
-     txt转modeldata
+            TODO
      * </p>      
      * @author dengsixing
-     * @date 2022/7/1
-     * @param file 
+     * @date 2022/8/1
+     * @param file
      * @return com.fdkankan.common.response.ResultData
      **/
     @PostMapping("/convertTxtToModeldata")
@@ -42,10 +42,10 @@ public class FileConvertController extends BaseController {
 
     /**
      * <p>
-     txt转dam
+            TODO
      * </p>      
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1 
      * @param file 
      **/
     @PostMapping("/convertTxtToDam")
@@ -55,10 +55,10 @@ public class FileConvertController extends BaseController {
 
     /**
      * <p>
-     txt转lzma
+            TODO
      * </p>      
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1 
      * @param file 
      **/
     @PostMapping("/convertTxtToLzma")

src/main/java/com/fdkankan/scene/controller/CameraDetailController.java

@@ -7,15 +7,15 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 相机子表 前端控制器
+ * 视频重算进度 前端控制器
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-01-14
  */
 @RestController
-@RequestMapping("/scene/cameraDetail")
-public class CameraDetailController {
+@RequestMapping("/scene/picSceneProgress")
+public class PicSceneProgressController {
 
 }
 

src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -2,16 +2,14 @@ package com.fdkankan.scene.controller;
 
 
 import com.fdkankan.common.constant.SceneInfoReqType;
-import com.fdkankan.web.controller.BaseController;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.IScenePlusService;
-import com.fdkankan.scene.service.ISceneService;
-import com.fdkankan.scene.service.ISceneUpgradeToV4Service;
 import com.fdkankan.scene.vo.BaseSceneParamVO;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
 import com.fdkankan.scene.vo.SceneInfoParamVO;
 import com.fdkankan.scene.vo.SceneInfoVO;
+import com.fdkankan.web.controller.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,24 +28,19 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/service/scene")
-public class SceneController extends BaseController{
+public class SceneController extends BaseController {
 
     @Autowired
-    ISceneService sceneService;
-    @Autowired
-    ISceneEditInfoService sceneEditInfoService;
+    private ISceneEditInfoService sceneEditInfoService;
     @Autowired
-    IScenePlusService scenePlusService;
-    @Autowired
-    ISceneUpgradeToV4Service sceneUpgradeToV4Service;
-
+    private IScenePlusService scenePlusService;
 
     /**
      * <p>
      获取场景详情
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param param
      * @return com.fdkankan.scene.vo.SceneInfoVO
      **/
@@ -62,7 +55,7 @@ public class SceneController extends BaseController{
      根据场景密码打开场景
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param param
      * @return com.fdkankan.common.response.ResultData
      **/
@@ -73,16 +66,16 @@ public class SceneController extends BaseController{
 
     /**
      * <p>
-            场景同步数据包下载
+     获取数据对接下载信息
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param param
      * @return com.fdkankan.common.response.ResultData
      **/
     @PostMapping(value = "/downLoadZSData")
     public ResultData downLoadZSData(@Validated BaseSceneParamVO param) throws Exception{
-        return sceneService.downLoadZSData(param);
+        return scenePlusService.downLoadZSData(param);
     }
 
 }

src/main/java/com/fdkankan/scene/controller/SceneCooperationController.java

@@ -1,8 +1,8 @@
 package com.fdkankan.scene.controller;
 
 
+import com.fdkankan.web.controller.BaseController;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -10,12 +10,14 @@ import org.springframework.web.bind.annotation.RestController;
  *  前端控制器
  * </p>
  *
- * @author 
- * @since 2022-07-18
+ * @author dengsixing
+ * @since 2021-12-23
  */
 @RestController
-@RequestMapping("/scene/sceneCooperation")
-public class SceneCooperationController {
+@RequestMapping("/service/scene/user/scene/cooperation")
+public class SceneCooperationController extends BaseController {
+
+
 
 }
 

src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -2,7 +2,6 @@ package com.fdkankan.scene.controller;
 
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneInfoReqType;
-import com.fdkankan.web.controller.BaseController;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.annotation.CheckCooperationPermit;
@@ -12,25 +11,30 @@ import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.service.ISceneUploadService;
 import com.fdkankan.scene.vo.BallScreenVideoParamVO;
 import com.fdkankan.scene.vo.BaseDataParamVO;
+import com.fdkankan.scene.vo.BaseFileParamVO;
 import com.fdkankan.scene.vo.BaseSceneParamVO;
 import com.fdkankan.scene.vo.DeleteFileParamVO;
 import com.fdkankan.scene.vo.DeleteHotIconParamVO;
 import com.fdkankan.scene.vo.DeleteHotParamVO;
+import com.fdkankan.scene.vo.DeleteLinkPanParamVO;
+import com.fdkankan.scene.vo.DeleteLinkSceneStylesParamVO;
+import com.fdkankan.scene.vo.DeleteMosaicParamVO;
 import com.fdkankan.scene.vo.DeleteSidParamVO;
 import com.fdkankan.scene.vo.DownloadVO;
 import com.fdkankan.scene.vo.FileNameAndDataParamVO;
 import com.fdkankan.scene.vo.FileParamVO;
 import com.fdkankan.scene.vo.LocalesParamVO;
 import com.fdkankan.scene.vo.RenameCadParamVO;
+import com.fdkankan.scene.vo.SaveLinkPanParamVO;
 import com.fdkankan.scene.vo.SaveTagsParamVO;
 import com.fdkankan.scene.vo.SaveTagsVisibleParamVO;
-import com.fdkankan.scene.vo.SaveUploadParamVO;
 import com.fdkankan.scene.vo.SceneAuthVO;
 import com.fdkankan.scene.vo.SceneEditInfoParamVO;
 import com.fdkankan.scene.vo.SceneEditInfoVO;
 import com.fdkankan.scene.vo.SceneInfoParamVO;
 import com.fdkankan.scene.vo.SceneInfoVO;
 import com.fdkankan.scene.vo.UploadContentParamVO;
+import com.fdkankan.web.controller.BaseController;
 import java.io.IOException;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -144,7 +148,7 @@ public class SceneEditController extends BaseController {
             热点列表
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param num
      * @return com.fdkankan.common.response.ResultData
      **/
@@ -188,7 +192,7 @@ public class SceneEditController extends BaseController {
      保存热点可见性的数据
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param param
      * @return com.fdkankan.common.response.ResultData
      **/
@@ -200,10 +204,10 @@ public class SceneEditController extends BaseController {
 
     /**
      * <p>
-            模型下载
+            下载模型
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param num
      * @return com.fdkankan.common.response.ResultData
      **/
@@ -218,7 +222,7 @@ public class SceneEditController extends BaseController {
             上传模型
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param num
      * @param file
      * @return com.fdkankan.common.response.ResultData
@@ -229,20 +233,87 @@ public class SceneEditController extends BaseController {
         return sceneProService.uploadObjAndImg(num, file);
     }
 
+    /**
+     * <p>
+     保存关联全景图
+     * </p>      
+     * @author dengsixing
+     * @date 2022/8/1 
+     * @param num
+     * @param sid
+     * @param fileName
+     * @param file 
+     * @return com.fdkankan.common.response.ResultData
+     **/
+    @CheckCooperationPermit
+    @PostMapping(value = "/linkPan/upload")
+    public ResultData uploadLinkPan(
+        @RequestParam(value = "num") String num,
+        @RequestParam(value = "sid") String sid,
+        @RequestParam(value = "fileName") String fileName,
+        @RequestParam("file") MultipartFile file) throws Exception{
+        return sceneEditInfoService.uploadLinkPan(num, sid, fileName, file);
+    }
+
+    /**
+     * <p>
+     保存关联全景图
+     * </p>
+     * @author dengsixing
+     * @date 2022/8/1
+     * @param param
+     * @return com.fdkankan.common.response.ResultData
+     **/
+    @CheckCooperationPermit
+    @PostMapping(value = "/linkPan/save")
+    public ResultData saveLinkPan(@RequestBody @Validated SaveLinkPanParamVO param) throws Exception{
+        return sceneEditInfoService.saveLinkPan(param);
+    }
 
-//    /**
-//     * <p>
-//            上传后保存
-//     * </p>
-//     * @author dengsixing
-//     * @date 2022/1/20
-//     * @param param
-//     * @return com.fdkankan.common.response.ResultData
-//     **/
-//    @PostMapping(value = "/saveUpload")
-//    public ResultData saveUpload(@RequestBody @Validated SaveUploadParamVO param) throws Exception{
-//        return sceneEditInfoService.saveUpload(param);
-//    }
+    /**
+     * <p>
+            删除场景关联
+     * </p>
+     * @author dengsixing
+     * @date 2022/8/1
+     * @param param
+     * @return com.fdkankan.common.response.ResultData
+     **/
+    @CheckCooperationPermit
+    @PostMapping(value = "/linkPan/delete")
+    public ResultData deleteLinkPan(@RequestBody @Validated DeleteLinkPanParamVO param) throws Exception {
+        return sceneEditInfoService.deleteLinkPan(param);
+    }
+
+    /**
+     * <p>
+            删除场景关联图标
+     * </p>
+     * @author dengsixing
+     * @date 2022/8/1
+     * @param param
+     * @return com.fdkankan.common.response.ResultData
+     **/
+    @CheckCooperationPermit
+    @PostMapping(value = "/styles/delete")
+    public ResultData deleteStyles(@RequestBody @Validated DeleteLinkSceneStylesParamVO param) throws Exception {
+        return sceneEditInfoService.deleteStyles(param);
+    }
+
+    /**
+     * <p>
+            场景关联列表
+     * </p>
+     * @author dengsixing
+     * @date 2022/8/1
+     * @param num
+     * @return com.fdkankan.common.response.ResultData
+     **/
+    @CheckCooperationPermit
+    @PostMapping(value = "/linkPan/list")
+    public ResultData listLinkPan(@RequestParam(value = "num") String num) throws Exception {
+        return sceneEditInfoService.listLinkPan(num);
+    }
 
     /**
      * <p>
@@ -270,7 +341,7 @@ public class SceneEditController extends BaseController {
      **/
     @CheckCooperationPermit
     @PostMapping(value = "/cad/reset")
-    public ResultData resetCad(@RequestParam(value = "num") String num){
+    public ResultData resetCad(@RequestParam(value = "num") String num) throws Exception {
         return sceneEditInfoService.resetCad(num);
     }
 
@@ -293,7 +364,7 @@ public class SceneEditController extends BaseController {
      获取场景详情
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param param
      * @return com.fdkankan.scene.vo.SceneInfoVO
      **/
@@ -432,17 +503,17 @@ public class SceneEditController extends BaseController {
 
     /**
      * <p>
-     上传图片到oss,base64
+            上传文件
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
-     * @param base64 图片base64
-     * @param fileName 文件名称
-     * @param bizType 业务类型
-     * @param files 文件
-     * @param num 场景码
-     * @param type 操作类型 0添加，1替换
-     * @param uploadPath  上传路径，此字段为扩展字段，前端可自定义上传路径，注意是完全的文件路径
+     * @date 2022/8/1
+     * @param base64
+     * @param fileName
+     * @param bizType
+     * @param files
+     * @param num
+     * @param type
+     * @param uploadPath
      * @return java.lang.String
      **/
     @CheckCooperationPermit
@@ -462,7 +533,7 @@ public class SceneEditController extends BaseController {
      用户自定义上传文本内容上传
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param param
      * @return java.lang.String
      **/
@@ -491,7 +562,7 @@ public class SceneEditController extends BaseController {
      场景同步
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param num
      * @param type
      * @param floorPlanJson
@@ -517,7 +588,7 @@ public class SceneEditController extends BaseController {
      获取场景权限
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param num
      * @return com.fdkankan.scene.vo.SceneAuthVO
      **/
@@ -549,7 +620,7 @@ public class SceneEditController extends BaseController {
      保存导览
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param param
      * @return com.fdkankan.common.response.ResultData
      **/
@@ -564,7 +635,7 @@ public class SceneEditController extends BaseController {
      删除导览
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param param
      * @return com.fdkankan.common.response.ResultData
      **/
@@ -579,7 +650,7 @@ public class SceneEditController extends BaseController {
      添加马赛克
      * </p>
      * @author dengsixing
-     * @date 2022/7/1
+     * @date 2022/8/1
      * @param param
      * @return com.fdkankan.common.response.ResultData
      **/
@@ -589,4 +660,64 @@ public class SceneEditController extends BaseController {
         return sceneEditInfoService.addMosaics(param);
     }
 
+    /**
+     * <p>
+     删除马赛克
+     * </p>
+     * @author dengsixing
+     * @date 2022/8/1
+     * @param param
+     * @return com.fdkankan.common.response.ResultData
+     **/
+    @CheckCooperationPermit
+    @PostMapping(value = "/mosaics/delete")
+    public ResultData deleteMosaics(@RequestBody @Validated DeleteMosaicParamVO param) throws Exception{
+        return sceneEditInfoService.deleteMosaics(param);
+    }
+
+    /**
+     * <p>
+     马赛克列表
+     * </p>
+     * @author dengsixing
+     * @date 2022/8/1
+     * @param param
+     * @return com.fdkankan.common.response.ResultData
+     **/
+    @CheckCooperationPermit
+    @PostMapping(value = "/mosaics/list")
+    public ResultData getMosaicList(@RequestBody @Validated BaseSceneParamVO param) throws Exception{
+        return ResultData.ok(sceneEditInfoService.getMosaicList(param.getNum()));
+    }
+
+    /**
+     * <p>
+     添加水印
+     * </p>
+     * @author dengsixing
+     * @date 2022/8/1
+     * @param param
+     * @return com.fdkankan.common.response.ResultData
+     **/
+    @CheckCooperationPermit
+    @PostMapping(value = "/waterMark/add")
+    public ResultData addWaterMark(@RequestBody @Validated BaseFileParamVO param) throws Exception{
+        return sceneEditInfoService.addWaterMark(param);
+    }
+
+    /**
+     * <p>
+     删除水印
+     * </p>
+     * @author dengsixing
+     * @date 2022/8/1
+     * @param param
+     * @return com.fdkankan.common.response.ResultData
+     **/
+    @CheckCooperationPermit
+    @PostMapping(value = "/waterMark/delete")
+    public ResultData deleteWaterMark(@RequestBody @Validated BaseFileParamVO param) throws Exception{
+        return sceneEditInfoService.deleteWaterMark(param);
+    }
+
 }

src/main/java/com/fdkankan/scene/controller/SceneProController.java

@@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RestController;
  * pro场景表 前端控制器
  * </p>
  *
- * @author 
- * @since 2022-07-11
+ * @author dengsixing
+ * @since 2021-12-23
  */
 @RestController
 @RequestMapping("/scene/scenePro")

src/main/java/com/fdkankan/scene/controller/CompanyController.java

@@ -7,15 +7,15 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 客户企业logo信息 前端控制器
+ * pro场景编辑数据表 前端控制器
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-04-22
  */
 @RestController
-@RequestMapping("/scene/company")
-public class CompanyController {
+@RequestMapping("/scene/sceneProEditV3")
+public class SceneProEditV3Controller {
 
 }
 

src/main/java/com/fdkankan/scene/controller/CameraController.java

@@ -7,15 +7,15 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 相机主表 前端控制器
+ * pro场景表 前端控制器
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-04-22
  */
 @RestController
-@RequestMapping("/scene/camera")
-public class CameraController {
+@RequestMapping("/scene/sceneProV3")
+public class SceneProV3Controller {
 
 }
 

src/main/java/com/fdkankan/scene/controller/SceneResourceController.java

@@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RestController;
  * 场景资源表 前端控制器
  * </p>
  *
- * @author 
- * @since 2022-07-18
+ * @author dengsixing
+ * @since 2021-12-23
  */
 @RestController
 @RequestMapping("/scene/sceneResource")

src/main/java/com/fdkankan/scene/controller/SceneResourceCooperationController.java

@@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RestController;
  * 场景资源和协作用户关联表 前端控制器
  * </p>
  *
- * @author 
- * @since 2022-07-18
+ * @author dengsixing
+ * @since 2021-12-23
  */
 @RestController
 @RequestMapping("/scene/sceneResourceCooperation")

src/main/java/com/fdkankan/scene/controller/SceneUploadController.java

@@ -2,15 +2,8 @@ package com.fdkankan.scene.controller;
 
 
 import com.fdkankan.web.controller.BaseController;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.scene.service.ISceneUploadService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
 @RestController
 @RequestMapping("/service/scene/edit")

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

@@ -1,228 +0,0 @@
-//package com.fdkankan.scene.controller;
-//
-//import com.alibaba.druid.pool.DruidDataSource;
-//import com.alibaba.fastjson.JSONObject;
-//import com.fdkankan.common.constant.UploadFilePath;
-//import com.fdkankan.common.controller.BaseController;
-//import com.fdkankan.common.response.ResultData;
-//import com.fdkankan.common.util.SpringUtil;
-//import com.fdkankan.fyun.oss.UploadToOssUtil;
-//import com.fdkankan.platform.api.dto.Camera;
-//import com.fdkankan.platform.api.dto.Company;
-//import com.fdkankan.platform.api.dto.User;
-//import com.fdkankan.platform.api.feign.PlatformGoodsClient;
-//import com.fdkankan.platform.api.feign.PlatformUserClient;
-//import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
-//import com.fdkankan.rabbitmq.config.ModelingQueueConfig;
-//import com.fdkankan.rabbitmq.util.RabbitMqProducer;
-//import com.fdkankan.redis.util.RedisLockUtil;
-//import com.fdkankan.redis.util.RedisUtil;
-//import com.fdkankan.scene.service.IFolderService;
-//import com.fdkankan.scene.service.IScene3dNumService;
-//import com.fdkankan.scene.service.ISceneService;
-//import com.google.common.collect.Lists;
-//import com.yomahub.tlog.task.spring.SpringScheduledTaskAop;
-//import java.sql.SQLException;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//import javax.sql.DataSource;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.amqp.rabbit.core.RabbitTemplate;
-//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.data.redis.core.RedisTemplate;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//@RefreshScope
-//@RestController
-//@RequestMapping("/service/scene/test")
-//@Slf4j
-//public class TestController extends BaseController {
-//
-//
-//
-//    @Autowired
-//    RedisUtil redisUtil;
-//
-//    @Autowired
-//    IFolderService folderService;
-//
-//    @GetMapping("/testdb")
-//    public List testdb(){
-//        return folderService.list();
-//    }
-//
-//    @Autowired
-//    private PlatformUserClient platformUserClient;
-//
-//    @Autowired
-//    private PlatformGoodsClient platformGoodsClient;
-//
-//    @Autowired
-//    private IScene3dNumService scene3dNumService;
-//
-//    @Autowired
-//    RedisTemplate redisTemplate;
-//
-//    @Autowired
-//    RedisLockUtil redisLockUtil;
-//
-//    @Autowired
-//    private RabbitTemplate rabbitTemplate;
-//
-//    @Autowired
-//    ModelingQueueConfig modelingQueueConfig;
-//    @Autowired
-//    private RabbitMqProducer rabbitMqProducer;
-//
-//    @Autowired
-//    private UploadToOssUtil uploadToOssUtil;
-//
-//
-//
-//    @GetMapping("/test")
-//    public ResultData test() throws Exception {
-//
-////        uploadToOssUtil.uploadBySh(path, "test_dsx/bin.tar");
-//
-//        return ResultData.ok();
-//
-//    }
-//
-//    public static void main(String[] args) throws Exception {
-//
-////        MatrixToImageWriterUtil.createQRCode("http://baidu.com" + "123123", ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+"123123"+".png",
-////                ConstantFilePath.SCENE_PATH + "images/images" + "123123" + "/QRShareLogo.png");
-//    }
-//
-//    @GetMapping("/testSetStr")
-//    public void testSetStr() throws Exception {
-//        redisUtil.set("testIncr", "1");
-//        redisUtil.incr("testIncr",1);
-//        String testIncr = redisUtil.get("testIncr");
-//        System.out.println(testIncr);
-//
-//
-//    }
-//
-//    @GetMapping("/testGetStr")
-//    public String testGetStr() throws Exception {
-//        boolean b = redisUtil.hasKey("90c82bdac_202201050951313830");
-//        String abc = (String)redisUtil.get("abc");
-//        return "123";
-//    }
-//
-//    @GetMapping("/testSetObject")
-//    public boolean testSetObject() throws Exception {
-////        User user = new User();
-////        user.setCity("珠海");
-////        user.setId(123l);
-////
-////        String jsons = JSON.toJSONString(user);
-////
-////        redisTemplate.opsForValue().set("test:66", jsons);
-////        redisTemplate.opsForValue().set("test:67", jsons);
-//
-//        ResultData<Camera>  cameraById = platformGoodsClient.getCameraById(111L);
-//
-//        Camera data = cameraById.getData();
-//
-//        ResultData<Company> companyById = platformUserClient.getCompanyById(111L);
-//
-//
-//
-//
-//
-//
-//        return true;
-//    }
-//
-////
-//    @GetMapping("/testGetObject")
-//    public User testGetObject() throws Exception {
-//        String test12 = redisUtil.get("test66");
-//        User user = JSONObject.parseObject(test12, User.class);
-//        return user;
-//    }
-//
-//
-//    @GetMapping("/testSetList")
-//    public boolean testSetList() throws Exception {
-//
-//        List<String> users = Lists.newArrayList();
-//        users.add("sdfsdf");
-//        users.add("dfgdfg");
-//        return redisUtil.lRightPushAll("test5595jj", users);
-//    }
-//
-//    @GetMapping("/testGetList")
-//    public List<String> testGetList() throws Exception {
-//        return redisUtil.lGet("test5595jj", 0, -1);
-//    }
-//
-//    @GetMapping("/testSetMap")
-//    public boolean testSetMap() throws Exception {
-//
-//        Map<String, User> userMap = new HashMap<>();
-//
-//        User user1 = new User();
-//        user1.setCity("珠海");
-//        user1.setId(123l);
-//
-//        User user2 = new User();
-//        user2.setCity("广州");
-//        user2.setId(124l);
-//
-//        userMap.put("user1", user1);
-//        userMap.put("user2", user2);
-//
-//
-//        return redisUtil.hmset("userMap", userMap);
-//    }
-//
-//    @GetMapping("/testGetMap")
-//    public Map<String ,User> testGetMap() throws Exception {
-//        return redisUtil.hmget("userMap");
-//    }
-//
-//    @Autowired
-//    ISceneService sceneService;
-//
-//    @GetMapping("/testSchedule")
-//    public void testSchedule(){
-//        sceneService.updatePv();
-//    }
-//
-//    @RefreshScope
-//    @GetMapping("/testResult")
-//    public void testResult(){
-////        rocketMQProducer.sendOneWay("topic_modeling_a_result", BuildSceneResultMqMessage.builder().buildSuccess(true).cameraType("3").build());
-//        String dsfsdf = (String) redisUtil.get("dsfsdf");
-//        System.out.println(2134);
-//
-//    }
-//
-//    @Autowired
-//    DataSource dataSource;
-//
-//    @GetMapping("/testDatasource")
-//    public void testDatasource() throws SQLException {
-////        Connection connection = dataSource.getConnection();
-////        System.out.println(connection);
-//
-//        System.out.println(dataSource.getClass());
-//        DruidDataSource druidDataSource = (DruidDataSource) dataSource;
-//        System.out.println(druidDataSource.getName());
-//        System.out.println("druidDataSource 数据源最大连接数：" + druidDataSource.getMaxActive());
-//        System.out.println("druidDataSource 数据源初始化连接数：" + druidDataSource.getInitialSize());
-//
-////        connection.close();
-//
-//    }
-//
-//}

src/main/java/com/fdkankan/scene/controller/UserIncrementController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.scene.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 用户增值权益表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-07-18
- */
-@RestController
-@RequestMapping("/scene/userIncrement")
-public class UserIncrementController {
-
-}
-

src/main/java/com/fdkankan/scene/controller/V3Controller.java

@@ -1,6 +1,5 @@
 package com.fdkankan.scene.controller;
 
-import com.fdkankan.web.controller.BaseController;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.IScenePlusService;
@@ -8,6 +7,7 @@ import com.fdkankan.scene.service.ISceneUpgradeToV4Service;
 import com.fdkankan.scene.vo.MoveSceneParamVO;
 import com.fdkankan.scene.vo.UnbindOrBindCameraParamVO;
 import com.fdkankan.scene.vo.UpgradeToV4ParamVO;
+import com.fdkankan.web.controller.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -107,5 +107,20 @@ public class V3Controller extends BaseController {
         return scenePlusService.moveScene(param.getNumList(), param.getCameraId(), param.getUserId());
     }
 
+//    /**
+//     * <p>
+//         场景拷贝
+//     * </p>
+//     * @author tianboguang
+//     * @date 2022/6/29
+//     * @return com.fdkankan.common.response.ResultData
+//     **/
+//    @PostMapping(value = "/copyScene")
+//    public ResultData copyScene(
+//            @RequestBody @Validated CopySceneParamVO param) throws Exception {
+//        sceneService.copyScene(param);
+//        return ResultData.ok();
+//    }
+
 
 }

src/main/java/com/fdkankan/scene/controller/UserController.java

@@ -7,15 +7,15 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户信息表 前端控制器
+ * 视频重算进度 前端控制器
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-01-14
  */
 @RestController
-@RequestMapping("/scene/user")
-public class UserController {
+@RequestMapping("/scene/videoSceneProgress")
+public class VideoSceneProgressController {
 
 }
 

src/main/java/com/fdkankan/scene/entity/Camera.java

@@ -16,7 +16,7 @@ import lombok.Setter;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 @Getter
 @Setter

src/main/java/com/fdkankan/scene/entity/CameraDetail.java

@@ -10,14 +10,13 @@ import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 
-
 /**
  * <p>
  * 相机子表
  * </p>
  *
- * @author
- * @since 2022-07-18
+ * @author 
+ * @since 2022-07-05
  */
 @Getter
 @Setter

src/main/java/com/fdkankan/scene/entity/Company.java

@@ -108,4 +108,4 @@ public class Company implements Serializable {
     private String companyDesc;
 
 
-}
+}

src/main/java/com/fdkankan/scene/entity/SceneCooperation.java

@@ -16,7 +16,7 @@ import lombok.Setter;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-04
  */
 @Getter
 @Setter
@@ -46,8 +46,8 @@ public class SceneCooperation implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-    @TableField("rec_status")
     @TableLogic("A")
+    @TableField("rec_status")
     private String recStatus;
 
 

src/main/java/com/fdkankan/scene/entity/SceneEditInfo.java

@@ -107,6 +107,18 @@ public class SceneEditInfo implements Serializable {
     private Integer version;
 
     /**
+     * 图片版本
+     */
+    @TableField("img_version")
+    private Integer imgVersion;
+
+    /**
+     * 场景关联版本
+     */
+    @TableField("link_version")
+    private Integer linkVersion;
+
+    /**
      * 是否上传模型
      */
     @TableField("is_upload_obj")

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

@@ -5,7 +5,6 @@ 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 com.fdkankan.db.base.BaseEntity;
 import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
@@ -56,10 +55,22 @@ public class SceneEditInfoExt {
     private Integer tours;
 
     /**
-     * mosaics数据
+     * 是否有马赛克
      */
-    @TableField("mosaics")
-    private String mosaics;
+    @TableField("mosaic")
+    private Integer mosaic;
+
+    /**
+     * 水印文件名
+     */
+    @TableField("water_mark")
+    private String waterMark;
+
+    /**
+     * 是否有场景关联(0-否，1-是)
+     */
+    @TableField("links")
+    private Integer links;
 
     /**
      * 创建时间

src/main/java/com/fdkankan/scene/entity/ScenePlus.java

@@ -113,4 +113,5 @@ public class ScenePlus implements Serializable {
     @TableLogic("A")
     private String recStatus;
 
+
 }

src/main/java/com/fdkankan/scene/entity/ScenePlusExt.java

@@ -107,7 +107,7 @@ public class ScenePlusExt implements Serializable {
     private String buildType;
 
     /**
-     * 全景图加载方式，tiles/1k：1k瓦片图，tiles/2：2k瓦片图，tiles/4k：4k瓦片图，pan：全景图 ，local：本地切片，cube：立体图
+     * 分辨率（2k,4k）
      */
     @TableField("scene_resolution")
     private String sceneResolution;
@@ -119,6 +119,12 @@ public class ScenePlusExt implements Serializable {
     private String sceneFrom;
 
     /**
+     * 切图方式（tiles：瓦片图，face：切片图，pan：全景图 ，local：本地切片，cube：立体图）
+     */
+    @TableField("scene_kind")
+    private String sceneKind;
+
+    /**
      * 计算耗时
      */
     @TableField("compute_time")

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

@@ -16,7 +16,7 @@ import lombok.Setter;
  * </p>
  *
  * @author 
- * @since 2022-07-11
+ * @since 2022-07-04
  */
 @Getter
 @Setter
@@ -157,8 +157,8 @@ public class ScenePro implements Serializable {
     /**
      * 记录的状态，A: 生效，I: 禁用
      */
-    @TableField("rec_status")
     @TableLogic("A")
+    @TableField("rec_status")
     private String recStatus;
 
     /**

src/main/java/com/fdkankan/scene/entity/SceneResource.java

@@ -1,22 +1,19 @@
 package com.fdkankan.scene.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 com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 场景资源表
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -31,8 +28,8 @@ public class SceneResource implements Serializable {
     /**
      * 权限名称
      */
-    @TableField("name")
-    private String name;
+    @TableField("resource_name")
+    private String resourceName;
 
     /**
      * 英文名
@@ -59,17 +56,20 @@ public class SceneResource implements Serializable {
     private String description;
 
     /**
-     * 版本(v3,v4)
+     * 创建时间
      */
-    @TableField("version")
-    private String version;
-
     @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/scene/entity/SceneResourceCooperation.java

@@ -1,22 +1,19 @@
 package com.fdkankan.scene.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 com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 场景资源和协作用户关联表
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -40,14 +37,23 @@ public class SceneResourceCooperation implements Serializable {
     @TableField("scene_cooperation_id")
     private Long sceneCooperationId;
 
+    /**
+     * 创建时间
+     */
     @TableField("create_time")
     private Date createTime;
 
+    /**
+     * 更新时间
+     */
     @TableField("update_time")
     private Date updateTime;
 
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
     @TableField("rec_status")
-    @TableLogic
+    @TableLogic("A")
     private String recStatus;
 
 

src/main/java/com/fdkankan/scene/entity/User.java

@@ -16,7 +16,7 @@ import lombok.Setter;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 @Getter
 @Setter
@@ -128,7 +128,7 @@ public class User implements Serializable {
      * 记录的状态，A: 生效，I: 禁用
      */
     @TableField("rec_status")
-    @TableLogic
+    @TableLogic("A")
     private String recStatus;
 
     /**

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

@@ -16,7 +16,7 @@ import lombok.Setter;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 @Getter
 @Setter
@@ -74,7 +74,7 @@ public class UserIncrement implements Serializable {
      * 记录的状态，A: 生效，I: 禁用
      */
     @TableField("rec_status")
-    @TableLogic
+    @TableLogic("A")
     private String recStatus;
 
     /**

src/main/java/com/fdkankan/scene/feign/UserSceenFeign.java

@@ -1,217 +0,0 @@
-//package com.fdkankan.scene.feign;
-//
-//import com.aliyuncs.utils.StringUtils;
-//import com.fdkankan.common.response.ResultData;
-//import com.fdkankan.scene.api.dto.SceneCntDTO;
-//import com.fdkankan.scene.api.dto.SceneInfoDTO;
-//import com.fdkankan.scene.api.dto.ScenePODTO;
-//import com.fdkankan.scene.api.dto.SceneProDTO;
-//import com.fdkankan.scene.entity.SceneCooperation;
-//import com.fdkankan.scene.entity.ScenePO;
-//import com.fdkankan.scene.entity.SceneProPO;
-//import com.fdkankan.scene.service.*;
-//import com.fdkankan.scene.vo.SceneInfoParamVO;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.BeanUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.util.CollectionUtils;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.stream.Collectors;
-//
-///**
-// * 提供计算调用
-// */
-//@RestController
-//@RequestMapping("/feign/user/scene")
-//@Slf4j
-//public class UserSceenFeign {
-//
-//    @Autowired
-//    IUserSceneService userSceneService;
-//    @Autowired
-//    ISceneDownloadLogService sceneDownloadLogService;
-//    @Autowired
-//    ISceneEditInfoService sceneEditInfoService;
-//    @Autowired
-//    ISceneService sceneService;
-//    @Autowired
-//    ISceneProService sceneProService;
-//    @Autowired
-//    ISceneResourceCameraService sceneResourceCameraService;
-//    @Autowired
-//    ISceneResourceCooperationService sceneResourceCooperationService;
-//    @Autowired
-//    ISceneCooperationService sceneCooperationService;
-//    @Autowired
-//    IFdkkLaserService fdkkLaserService;
-//    @Autowired
-//    ISceneProEditService sceneProEditService;
-//    @Autowired
-//    ISceneResourceService sceneResourceService;
-//
-//    @PostMapping("/getSceneCnt")
-//    ResultData<SceneCntDTO> getSceneCnt(@RequestParam(value = "userId") Long userId, Long cameraId){
-//        SceneCntDTO sceneCntDTO = userSceneService.getSceneCnt(userId, cameraId);
-//        return ResultData.ok(sceneCntDTO);
-//    }
-//
-//    @PostMapping("/getSceneNumByCameraId")
-//    ResultData<Integer> getSceneNumByCameraId(@RequestParam(value = "cameraId") Long cameraId,
-//                                              @RequestParam(value = "cameraType")Integer cameraType,
-//                                              @RequestParam(value = "snCode")String snCode) {
-//        Integer sceneNum = userSceneService.getSceneNumByCameraId(cameraId,cameraType,snCode);
-//        return ResultData.ok(sceneNum);
-//    }
-//
-//    @PostMapping("/getLastSceneByCameraId")
-//    ResultData<SceneProDTO> getLastSceneByCameraId(@RequestParam(value = "cameraId") Long cameraId){
-//        return ResultData.ok(userSceneService.getLastSceneByCameraId(cameraId));
-//    }
-//
-//    @PostMapping("/updateSceneDownloadLog")
-//    ResultData updateSceneDownloadLog(@RequestParam(value = "num") String num,
-//        @RequestParam(value = "status") Integer status, String url, String reason){
-//        sceneDownloadLogService.updateSceneDownloadLog(num, status, url, reason);
-//        return ResultData.ok();
-//    }
-//
-//    @PostMapping("/getSceneViewInfo")
-//    ResultData<SceneInfoDTO> getSceneViewInfo(@RequestParam(value = "num") String num) throws Exception{
-//        return ResultData.ok(
-//            sceneEditInfoService.getSceneInfo4Download(
-//                SceneInfoParamVO.builder().num(num).build()));
-//    }
-//    @Autowired
-//    private ISceneProAppService sceneProAppService;
-//
-//    @PostMapping("/lockBeyondSpaceScenes")
-//    ResultData lockBeyondSpaceScenes(@RequestParam(value = "usedSpace")Long usedSpace,
-//                                     @RequestParam(value = "totalSpace")Long totalSpace,
-//                                     @RequestParam(value = "cameraId")Long cameraId) throws Exception{
-//        sceneProAppService.lockBeyondSpaceScenes(usedSpace,totalSpace,cameraId);
-//        return ResultData.ok();
-//    }
-//
-//    @PostMapping("/unlockBeyondSpaceScenes")
-//    ResultData unlockBeyondSpaceScenes(@RequestParam(value = "usedSpace")Long usedSpace,
-//                                       @RequestParam(value = "cameraId")Long cameraId) throws Exception{
-//        sceneProAppService.unlockBeyondSpaceScenes(usedSpace,cameraId);
-//        return ResultData.ok();
-//    }
-//    @PostMapping("/findAllByYesterday")
-//    ResultData<List<ScenePO>> findAllByYesterday() throws Exception{
-//        List<ScenePO> allByYesterday = sceneService.findAllByYesterday();
-//        List<ScenePODTO> List = new ArrayList<>();
-//        for (ScenePO scenePO : allByYesterday) {
-//            ScenePODTO scenePODTO = new ScenePODTO();
-//            BeanUtils.copyProperties(scenePO,scenePODTO);
-//            List.add(scenePODTO);
-//        }
-//        return ResultData.ok(List);
-//    }
-//
-//    @PostMapping("/updatePayStatus")
-//    ResultData updatePayStatus(@RequestParam(value = "num")String num ,
-//                               @RequestParam(value = "payStatus")Integer payStatus){
-//        sceneService.updatePayStatus(num,payStatus);
-//        return ResultData.ok();
-//    }
-//
-//    @PostMapping("/updateUserIdByCameraId")
-//    ResultData updateUserIdByCameraId(@RequestParam(value = "userId")Long userId,
-//                                      @RequestParam(value = "cameraId")Long cameraId) throws Exception{
-//
-//        sceneService.updateUserIdByCameraId(userId,cameraId);
-//        sceneProService.updateUserIdByCameraId(userId,cameraId);
-//        return ResultData.ok();
-//    }
-//
-//    @PostMapping("/getSceneCount")
-//    ResultData getSceneCount(@RequestParam(value = "cameraId")Long cameraId,
-//                             @RequestParam(value = "userId")Long userId ,
-//                             @RequestParam(value = "cameraType")Integer cameraType ) throws Exception{
-//        if(cameraId!=null){
-//            return ResultData.ok(sceneProService.getSceneCount(cameraId,null));
-//        }
-//        if(cameraType == null || cameraType != 4){
-//            return ResultData.ok(sceneService.getSceneCount(null,userId));
-//        }
-//        return ResultData.ok(sceneProService.getSceneCount(null,userId));
-//    }
-//
-//
-//    @PostMapping("/disableCooperation")
-//    ResultData disableCooperation(@RequestParam(value = "cameraId")Long cameraId,
-//                                 @RequestParam(value = "snCode")String snCode,
-//                                 @RequestParam(value = "cooperationUserName")String cooperationUserName){
-//
-//        sceneResourceCameraService.deleteByCameraId(cameraId);
-//        deleteCooperation(cameraId);
-//        if(StringUtils.isEmpty(snCode)){
-//            fdkkLaserService.disableCooperation(snCode,cooperationUserName);
-//        }
-//        return ResultData.ok();
-//    }
-//
-//
-//    @PostMapping("/saveCooperation")
-//    ResultData saveCooperation(@RequestParam(value = "cameraId") Long cameraId,
-//                               @RequestParam(value = "resourceIds") String resourceIds,
-//                               @RequestParam(value = "userId") Long userId,
-//                               @RequestParam(value = "snCode")String snCode,
-//                               @RequestParam(value = "cooperationUserName")String cooperationUserName){
-//        sceneResourceCameraService.saveByResourceIds(cameraId,resourceIds);
-//        List<SceneProPO> sceneProPOS = deleteCooperation(cameraId);
-//        sceneCooperationService.saveByResourceIds(sceneProPOS,cameraId,resourceIds,userId);
-//
-//        if(StringUtils.isEmpty(snCode)){
-//            fdkkLaserService.disableCooperation(snCode,cooperationUserName);
-//            fdkkLaserService.enableCameraCooperation(snCode,cooperationUserName);
-//        }
-//        return ResultData.ok();
-//    }
-//
-//    private List<SceneProPO>  deleteCooperation(Long cameraId){
-//        List<SceneProPO> sceneProList = sceneProService.findByCameraIdPro(cameraId);
-//        if(!CollectionUtils.isEmpty(sceneProList)) {
-//            List<String> numList = sceneProList.stream().map(SceneProPO::getNum).collect(Collectors.toList());
-//            List<SceneCooperation> list = sceneCooperationService.getListByNums(numList);
-//            List<Long> cooIds = list.parallelStream().map(SceneCooperation::getId).collect(Collectors.toList());
-//            if(cooIds.size() >0){
-//                //删除相机下每个场景的关联关系
-//                sceneResourceCooperationService.deleteByCooperationIds(cooIds);
-//                sceneCooperationService.updateRecStatusList(cooIds);
-//            }
-//        }
-//        return sceneProList;
-//    }
-//
-//    @PostMapping("/updateImageVersionFromSceneProEdit")
-//    ResultData updateImageVersionFromSceneProEdit(@RequestParam(value = "num" ) String num){
-//        sceneProEditService.updateImageVersionByNum(num);
-//        return ResultData.ok();
-//    }
-//
-//    @PostMapping("/getSceneResourceByCameraId")
-//    ResultData getSceneResourceByCameraId(@RequestParam(value = "cameraId" ) Long cameraId){
-//        return ResultData.ok(sceneResourceService.findByCameraId(cameraId));
-//    }
-//    @PostMapping("/checkDownLoad")
-//    ResultData checkDownLoad(@RequestParam(value = "sceneNum") String sceneNum){
-//        return sceneProService.checkDownLoad(sceneNum);
-//    }
-//
-//    @PostMapping("/findByCameraIds")
-//    ResultData findByCameraIds(@RequestParam(value = "cameraIds") String cameraIds,
-//                                      @RequestParam(value = "startTime") String startTime,
-//                                      @RequestParam(value = "endTime")   String endTime){
-//        return ResultData.ok( sceneProService.findByCameraIds(cameraIds,startTime,endTime));
-//    }
-//}
-//

src/main/java/com/fdkankan/scene/generate/AutoGenerate.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.generator.FastAutoGenerator;
 import com.baomidou.mybatisplus.generator.config.OutputFile;
 import com.baomidou.mybatisplus.generator.config.rules.DateType;
 
-import com.fdkankan.db.base.BaseEntity;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -18,8 +17,8 @@ public class AutoGenerate {
 
         String path =System.getProperty("user.dir") + "\\4dkankan-center-scene";
 
-        generate(path,"scene", getTables(new String[]{
-                "t_scene_resource_cooperation"
+        generate(path,"test", getTables(new String[]{
+                "t_scene_cooperation"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/scene/httpclient/FdkankanMiniClient.java

@@ -1,29 +1,30 @@
-package com.fdkankan.scene.httpclient;
-
-import com.dtflys.forest.annotation.Body;
-import com.dtflys.forest.annotation.Header;
-import com.dtflys.forest.annotation.Post;
-import com.dtflys.forest.annotation.Retry;
-import com.dtflys.forest.annotation.Success;
-import com.dtflys.forest.annotation.Var;
-import com.dtflys.forest.callback.OnError;
-import com.dtflys.forest.callback.OnSuccess;
-import com.fdkankan.common.response.Result;
-import com.fdkankan.scene.bean.RequestSceneProV4;
-import com.fdkankan.scene.callback.FdkkMiniReqSuccessCondition;
-import java.util.Map;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/24
- **/
-@Success(condition = FdkkMiniReqSuccessCondition.class)
-public interface FdkankanMiniClient {
-
+//package com.fdkankan.scene.httpclient;
+//
+//import com.dtflys.forest.annotation.Get;
+//import com.dtflys.forest.annotation.Header;
+//import com.dtflys.forest.annotation.Post;
+//import com.dtflys.forest.annotation.Retry;
+//import com.dtflys.forest.annotation.Success;
+//import com.dtflys.forest.annotation.Var;
+//import com.dtflys.forest.callback.OnError;
+//import com.dtflys.forest.callback.OnSuccess;
+//import com.fdkankan.common.response.Result;
+//import java.util.Map;
+//import com.fdkankan.scene.bean.CameraBean;
+//import com.fdkankan.scene.bean.UserIncrementBean;
+//import com.fdkankan.scene.callback.FdkkMiniReqSuccessCondition;
+//
+///**
+// * <p>
+// * TODO
+// * </p>
+// *
+// * @author dengsixing
+// * @since 2022/4/24
+// **/
+//@Success(condition = FdkkMiniReqSuccessCondition.class)
+//public interface FdkankanMiniClient {
+//
 //    @Get(url="{url}"
 ////        ,interceptor = TLogForestInterceptor.class    加这个拦截器，打印的tlog日志会详细一些，包括头信息等等
 //    )
@@ -37,20 +38,20 @@ public interface FdkankanMiniClient {
 //    @Get("{url}")
 //    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
 //    Result<CameraBean> getCameraByCameraId(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
-
-//    @Get(url="{url}")
-//    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-//    Result<SceneProV3> getSceneProByNum(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
-
+//
+////    @Get(url="{url}")
+////    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
+////    Result<SceneProV3> getSceneProByNum(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
+//
 //    @Post(url="{url}")
 //    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
 //    Result<Map<String, Object>> getIsLogin(@Var("url") String url, @Header("token") String token, OnSuccess<Result> onSuccess, OnError onError);
 //
-//    @Post(
-//        url = "${url}",
-//        contentType = "application/json"
-//    )
-//    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-//    Result upgradeToV4ResultSync(@Var("url") String url, @Body RequestSceneProV4 param, OnSuccess<Result> onSuccess, OnError onError);
-
-}
+////    @Post(
+////        url = "${url}",
+////        contentType = "application/json"
+////    )
+////    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
+////    Result upgradeToV4ResultSync(@Var("url") String url, @Body RequestSceneProV4 param, OnSuccess<Result> onSuccess, OnError onError);
+//
+//}

src/main/java/com/fdkankan/scene/listener/RabbitMqListener.java

@@ -1,4 +1,4 @@
-//package com.fdkankan.scene.listener;
+package com.fdkankan.scene.listener;//package com.fdkankan.scene.listener;
 //
 //import com.alibaba.fastjson.JSONObject;
 //import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;

src/main/java/com/fdkankan/scene/mapper/ICameraDetailMapper.java

@@ -1,7 +1,7 @@
 package com.fdkankan.scene.mapper;
 
-import com.fdkankan.scene.entity.CameraDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.scene.entity.CameraDetail;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 @Mapper
 public interface ICameraDetailMapper extends BaseMapper<CameraDetail> {

src/main/java/com/fdkankan/scene/mapper/ICameraMapper.java

@@ -1,7 +1,7 @@
 package com.fdkankan.scene.mapper;
 
-import com.fdkankan.scene.entity.Camera;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.scene.entity.Camera;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 @Mapper
 public interface ICameraMapper extends BaseMapper<Camera> {

src/main/java/com/fdkankan/scene/mapper/ICompanyMapper.java

@@ -15,4 +15,4 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ICompanyMapper extends BaseMapper<Company> {
 
-}
+}

src/main/java/com/fdkankan/scene/mapper/ISceneCooperationMapper.java

@@ -1,7 +1,7 @@
 package com.fdkankan.scene.mapper;
 
-import com.fdkankan.scene.entity.SceneCooperation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.scene.entity.SceneCooperation;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -9,8 +9,8 @@ import org.apache.ibatis.annotations.Mapper;
  *  Mapper 接口
  * </p>
  *
- * @author 
- * @since 2022-07-18
+ * @author dengsixing
+ * @since 2021-12-23
  */
 @Mapper
 public interface ISceneCooperationMapper extends BaseMapper<SceneCooperation> {

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

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

src/main/java/com/fdkankan/scene/mapper/ISceneResourceCooperationMapper.java

@@ -9,8 +9,8 @@ import org.apache.ibatis.annotations.Mapper;
  * 场景资源和协作用户关联表 Mapper 接口
  * </p>
  *
- * @author 
- * @since 2022-07-18
+ * @author dengsixing
+ * @since 2021-12-23
  */
 @Mapper
 public interface ISceneResourceCooperationMapper extends BaseMapper<SceneResourceCooperation> {

src/main/java/com/fdkankan/scene/mapper/ISceneResourceMapper.java

@@ -9,8 +9,8 @@ import org.apache.ibatis.annotations.Mapper;
  * 场景资源表 Mapper 接口
  * </p>
  *
- * @author 
- * @since 2022-07-18
+ * @author dengsixing
+ * @since 2021-12-23
  */
 @Mapper
 public interface ISceneResourceMapper extends BaseMapper<SceneResource> {

src/main/java/com/fdkankan/scene/mapper/ISceneUpgradeMapper.java

@@ -1,42 +0,0 @@
-package com.fdkankan.scene.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 文件夹表 Mapper 接口
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-24
- */
-@Mapper
-public interface ISceneUpgradeMapper extends BaseMapper {
-
-    public void transferScenePro(Long sceneProId);
-
-    public void transferSceneProExt(Long sceneProId);
-
-    public void transferScenePlus(Long sceneProId);
-
-    public void transferScenePlusExt(Long sceneProId);
-
-    public void transferSceneProEdit(Long sceneProEditId);
-
-    public void transferSceneProEditExt(Long sceneProEditId);
-
-    public void deleteSceneProEdit(Long sceneProEditId);
-
-    public void deleteSceneProEditExt(Long sceneProEditId);
-
-    public void deleteScenePlus(Long sceneProId);
-
-    public void deleteScenePlusExt(Long sceneProId);
-
-    public void deleteScenePro(Long sceneProId);
-
-    public void deleteSceneProExt(Long sceneProId);
-
-
-}

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

@@ -1,7 +1,7 @@
 package com.fdkankan.scene.mapper;
 
-import com.fdkankan.scene.entity.UserIncrement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.scene.entity.UserIncrement;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 @Mapper
 public interface IUserIncrementMapper extends BaseMapper<UserIncrement> {

src/main/java/com/fdkankan/scene/mapper/IUserMapper.java

@@ -1,7 +1,7 @@
 package com.fdkankan.scene.mapper;
 
-import com.fdkankan.scene.entity.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.scene.entity.User;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 @Mapper
 public interface IUserMapper extends BaseMapper<User> {

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

@@ -0,0 +1,99 @@
+package com.fdkankan.scene.schedule;//package com.fdkankan.scene.schedule;
+//
+//import com.fdkankan.common.util.RubberSheetingUtil;
+//import com.fdkankan.rabbitmq.util.RabbitMqProducer;
+//import com.fdkankan.redis.constant.RedisKey;
+//import com.fdkankan.redis.constant.RedisLockKey;
+//import com.fdkankan.redis.util.RedisLockUtil;
+//import com.fdkankan.scene.service.IScene3dNumService;
+//import com.fdkankan.scene.service.ISceneService;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Component;
+//
+//@Slf4j
+//@Component
+//public class ScheduleJob {
+//
+//    @Value("${environment}")
+//    private String environment;
+//    @Value("${queue.modeling.modeling-call}")
+//    private String queueModelingCall;
+//    @Value("${scaling.mq.threshold.modeling-call}")
+//    private String modelingCallMqThreshold;
+//
+//    @Autowired
+//    ISceneService sceneService;
+//    @Autowired
+//    private IScene3dNumService scene3dNumService;
+//    @Autowired
+//    private RedisLockUtil redisLockUtil;
+//    @Autowired
+//    RubberSheetingUtil rubberSheetingUtil;
+//    @Autowired
+//    RabbitMqProducer rabbitMqProducer;
+//
+////    /**
+////     * 更新浏览量
+////     */
+////    @Scheduled(cron = "0 0/10 * * * ? ")
+////    public void updateViewCount() {
+////        if("hq".equals(environment)){
+////            return;
+////        }
+////        log.info("执行定时任务开始：更新浏览量");
+////        try {
+////            //更新浏览量
+////            sceneService.updatePv();
+////        } catch (Exception e) {
+////            log.error("更新浏览量定时任务出错：", e);
+////        }
+////        log.info("执行定时任务结束：更新浏览量");
+////    }
+////
+////    /**
+////     * <p>
+////            定时生成场景码
+////            查询码池中未使用场景码数量，如果小于阈值，执行批量生成
+////     * </p>
+////     * @author dengsixing
+////     * @date 2022/3/26
+////     **/
+////    @Scheduled(cron = "0 0/1 * * * ? ")
+////    public void generateSceneCode(){
+////        log.info("执行定时任务开始：批量生成场景码");
+////        scene3dNumService.batchCreateSceneNum();
+////        log.info("执行定时任务结束：批量生成场景码");
+////    }
+//
+////    /**
+////     * 开启场景计算弹性伸缩
+////     */
+////    @Scheduled(cron = "0 0/5 8-21 * * ? ")
+////    public void startupModelingServer() {
+////        if("hq".equals(environment)){
+////            return;
+////        }
+////        boolean lock = redisLockUtil.lock(
+////            RedisLockKey.LOCK_STARTUP_MODELING_SERVER, RedisKey.EXPIRE_TIME_5_MINUTE);
+////        if(!lock){
+////            return;
+////        }
+////        try {
+////            //当mq排队数大于指定数量时使用弹性升缩
+////            int mqNum = rabbitMqProducer.getMessageCount(queueModelingCall);
+////            log.info("每5分钟查询一次排队队列,mqNum:" + mqNum);
+////            if(mqNum - Integer.parseInt(modelingCallMqThreshold) > 0){
+////                String responce = rubberSheetingUtil.createEcs();
+////                log.info("开启弹性伸缩:{}", responce);
+////            }
+////        } catch (Exception e) {
+////            log.error(e.getMessage());
+////        }finally {
+////            redisLockUtil.unlockLua(RedisLockKey.LOCK_STARTUP_MODELING_SERVER);
+////        }
+////    }
+//
+//}

src/main/java/com/fdkankan/scene/service/ICameraDetailService.java

@@ -1,7 +1,7 @@
 package com.fdkankan.scene.service;
 
-import com.fdkankan.scene.entity.CameraDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.scene.entity.CameraDetail;
 
 /**
  * <p>
@@ -9,10 +9,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 public interface ICameraDetailService extends IService<CameraDetail> {
 
-    CameraDetail getByCameraId(long cameraId);
+    CameraDetail findByCameraId(Long cameraId);
 
 }

src/main/java/com/fdkankan/scene/service/ICameraService.java

@@ -1,7 +1,7 @@
 package com.fdkankan.scene.service;
 
-import com.fdkankan.scene.entity.Camera;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.scene.entity.Camera;
 
 /**
  * <p>
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 public interface ICameraService extends IService<Camera> {
 

src/main/java/com/fdkankan/scene/service/ICompanyService.java

@@ -13,4 +13,4 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICompanyService extends IService<Company> {
 
-}
+}

src/main/java/com/fdkankan/scene/service/ISceneCooperationService.java

@@ -1,15 +1,15 @@
 package com.fdkankan.scene.service;
 
-import com.fdkankan.scene.entity.SceneCooperation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.scene.entity.SceneCooperation;
 
 /**
  * <p>
  *  服务类
  * </p>
  *
- * @author 
- * @since 2022-07-18
+ * @author dengsixing
+ * @since 2021-12-23
  */
 public interface ISceneCooperationService extends IService<SceneCooperation> {
 

src/main/java/com/fdkankan/scene/service/ISceneEditInfoExtService.java

@@ -13,8 +13,6 @@ import com.fdkankan.scene.entity.SceneEditInfoExt;
  */
 public interface ISceneEditInfoExtService extends IService<SceneEditInfoExt> {
 
-    SceneEditInfoExt getBySceneProId(long sceneProId);
-
     SceneEditInfoExt getByScenePlusId(long scenePlusId);
 
     SceneEditInfoExt getByEditInfoId(long editInfoId);

src/main/java/com/fdkankan/scene/service/ISceneEditInfoService.java

@@ -1,23 +1,28 @@
 package com.fdkankan.scene.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.entity.SceneEditInfo;
 import com.fdkankan.scene.vo.BallScreenVideoParamVO;
 import com.fdkankan.scene.vo.BaseDataParamVO;
+import com.fdkankan.scene.vo.BaseFileParamVO;
+import com.fdkankan.scene.vo.DeleteLinkPanParamVO;
+import com.fdkankan.scene.vo.DeleteLinkSceneStylesParamVO;
+import com.fdkankan.scene.vo.DeleteMosaicParamVO;
 import com.fdkankan.scene.vo.DeleteSidParamVO;
 import com.fdkankan.scene.vo.DownloadVO;
 import com.fdkankan.scene.vo.FileNameAndDataParamVO;
 import com.fdkankan.scene.vo.FileParamVO;
 import com.fdkankan.scene.vo.RenameCadParamVO;
+import com.fdkankan.scene.vo.SaveLinkPanParamVO;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
 import com.fdkankan.scene.vo.SceneEditInfoParamVO;
 import com.fdkankan.scene.vo.SceneEditInfoVO;
 import com.fdkankan.scene.vo.SceneInfoParamVO;
 import com.fdkankan.scene.vo.SceneInfoVO;
 import java.io.IOException;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
+import java.util.List;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -44,13 +49,15 @@ public interface ISceneEditInfoService extends IService<SceneEditInfo> {
 
     ResultData saveCad(BaseDataParamVO param) throws Exception;
 
-    ResultData resetCad(String num);
+    ResultData resetCad(String num) throws IOException;
 
     ResultData renameCad(RenameCadParamVO param) throws IOException;
 
     void upgradeVersionById(Long id);
 
-    void upgradeSceneJsonVersion(String num, int version) throws IOException ;
+    void upgradeVersionAndImgVersionById(Long id);
+
+    void upgradeSceneJsonVersion(String num, int version, Integer imgVersion) throws IOException ;
 
     ResultData uploadPanorama(String num, MultipartFile file) throws Exception;
 
@@ -76,8 +83,25 @@ public interface ISceneEditInfoService extends IService<SceneEditInfo> {
 
     ResultData checkKey(SceneCheckKeyParamVO param) throws Exception;
 
-    ResultData addMosaics(@RequestBody @Validated BaseDataParamVO param) throws Exception;
+    ResultData addMosaics(BaseDataParamVO param) throws Exception;
+
+    ResultData uploadLinkPan(String num, String sid, String fileName, MultipartFile file) throws Exception;
+
+    ResultData saveLinkPan(SaveLinkPanParamVO param) throws Exception;
+
+    ResultData listLinkPan(String num) throws Exception;
+
+    ResultData deleteLinkPan(DeleteLinkPanParamVO param) throws Exception;
+
+    ResultData deleteStyles(DeleteLinkSceneStylesParamVO param) throws Exception;
+
+    ResultData deleteMosaics(DeleteMosaicParamVO param) throws Exception;
+
+    List<JSONObject> getMosaicList(String num) throws Exception;
+
+    ResultData addWaterMark(BaseFileParamVO param) throws Exception;
 
+    ResultData deleteWaterMark(BaseFileParamVO param) throws Exception;
 
 
 

src/main/java/com/fdkankan/scene/service/ISceneEditService.java

@@ -1,14 +1,12 @@
 package com.fdkankan.scene.service;
 
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.web.user.SSOUser;
 import com.fdkankan.scene.vo.BaseDataParamVO;
 import com.fdkankan.scene.vo.BaseSceneParamVO;
 import com.fdkankan.scene.vo.LocalesParamVO;
 import com.fdkankan.scene.vo.SceneAuthVO;
+import com.fdkankan.web.user.SSOUser;
 import java.io.IOException;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>

src/main/java/com/fdkankan/scene/service/IScenePlusService.java

@@ -2,9 +2,10 @@ package com.fdkankan.scene.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.common.response.ResultData;
+import com.fdkankan.scene.vo.BaseSceneParamVO;
+import java.util.List;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
-import java.util.List;
 
 /**
  * <p>
@@ -24,6 +25,8 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     ResultData moveScene(List<String> numList, Long cameraId, Long userId);
 
+    ResultData downLoadZSData(BaseSceneParamVO param) throws Exception;
+
     ScenePlus checkSceneAvail(String num);
 
     ResultData updateViewCount(String num) throws Exception;

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

@@ -1,14 +1,20 @@
 package com.fdkankan.scene.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.entity.ScenePro;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.scene.vo.BaseDataParamVO;
 import com.fdkankan.scene.vo.DeleteHotIconParamVO;
 import com.fdkankan.scene.vo.DeleteHotParamVO;
 import com.fdkankan.scene.vo.FileNameAndDataParamVO;
+import com.fdkankan.scene.vo.FileParamVO;
 import com.fdkankan.scene.vo.SaveTagsParamVO;
 import com.fdkankan.scene.vo.SaveTagsVisibleParamVO;
+import com.fdkankan.scene.vo.SceneEditParamVO;
+import com.fdkankan.scene.vo.SceneParamVO;
+import com.fdkankan.scene.vo.SceneVO;
+import java.util.List;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -16,29 +22,29 @@ import org.springframework.web.multipart.MultipartFile;
  * pro场景表 服务类
  * </p>
  *
- * @author 
- * @since 2022-07-11
+ * @author dengsixing
+ * @since 2021-12-23
  */
 public interface ISceneProService extends IService<ScenePro> {
 
-    ScenePro findBySceneNum(String sceneNum);
-
     ResultData saveInitialPage(FileNameAndDataParamVO param) throws Exception;
 
     ResultData addOrUpdateTag(SaveTagsParamVO param) throws Exception;
 
     ResultData deleteTag(DeleteHotParamVO param) throws Exception;
 
-    ResultData listTags(String num) throws Exception;
-
     ResultData deleteIcons(DeleteHotIconParamVO param) throws Exception;
 
+    ResultData listTags(String num) throws Exception;
+
     ResultData saveRoam(BaseDataParamVO param) throws Exception;
 
     ResultData saveTagsVisible(SaveTagsVisibleParamVO param) throws Exception;
 
-    ResultData downloadTexData(String num) throws Exception ;
+    void updateUserIdByCameraId(Long userId, Long cameraId);
 
     ResultData uploadObjAndImg(String num, MultipartFile file) throws Exception;
 
+    ResultData downloadTexData(String num) throws Exception;
+
 }

src/main/java/com/fdkankan/scene/service/ISceneResourceCooperationService.java

@@ -1,16 +1,21 @@
 package com.fdkankan.scene.service;
 
-import com.fdkankan.scene.entity.SceneResourceCooperation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.scene.entity.SceneResourceCooperation;
+
+import java.util.List;
 
 /**
  * <p>
  * 场景资源和协作用户关联表 服务类
  * </p>
  *
- * @author 
- * @since 2022-07-18
+ * @author dengsixing
+ * @since 2021-12-23
  */
 public interface ISceneResourceCooperationService extends IService<SceneResourceCooperation> {
 
+    void deleteByCooperationId(Long id);
+
+    void deleteByCooperationIds(List<Long> ids);
 }

src/main/java/com/fdkankan/scene/service/ISceneResourceService.java

@@ -2,6 +2,7 @@ package com.fdkankan.scene.service;
 
 import com.fdkankan.scene.entity.SceneResource;
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import java.util.List;
 
 /**
@@ -9,11 +10,11 @@ import java.util.List;
  * 场景资源表 服务类
  * </p>
  *
- * @author 
- * @since 2022-07-18
+ * @author dengsixing
+ * @since 2021-12-23
  */
 public interface ISceneResourceService extends IService<SceneResource> {
 
-    List<SceneResource> findByCooperationId(Long resourceCooperationId);
+    List<SceneResource> findByCooperationId(Long id);
 
 }

src/main/java/com/fdkankan/scene/service/ISceneService.java

@@ -1,19 +1,18 @@
-package com.fdkankan.scene.service;
-
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.scene.vo.BaseSceneParamVO;
-
-/**
- * <p>
- * 场景表 服务类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-public interface ISceneService  {
-
-
-    ResultData downLoadZSData(BaseSceneParamVO param) throws Exception;
-
-}
+//package com.fdkankan.scene.service;
+//
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.fdkankan.common.response.ResultData;
+//import com.fdkankan.scene.vo.SceneEditParamVO;
+//import com.fdkankan.scene.vo.SceneParamVO;
+//
+///**
+// * <p>
+// * 场景表 服务类
+// * </p>
+// *
+// * @author dengsixing
+// * @since 2021-12-23
+// */
+//public interface ISceneService extends IService<Scene>
+//{
+//}

src/main/java/com/fdkankan/scene/service/ISceneUpgradeToV4Service.java

@@ -13,8 +13,6 @@ import com.fdkankan.scene.vo.UpgradeToV4ParamVO;
  **/
 public interface ISceneUpgradeToV4Service {
 
-//    ResultData upgradeToV4(UpgradeToV4ParamVO param);
-
     ResultData getUpgradeToV4Progress(String num);
 
     ResultData getSceneViewInfo(String num);

src/main/java/com/fdkankan/scene/service/ISceneUploadService.java

@@ -5,8 +5,6 @@ import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.entity.SceneUpload;
 import com.fdkankan.scene.vo.DeleteFileParamVO;
 import com.fdkankan.scene.vo.UploadContentParamVO;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
 
 /**

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

@@ -1,7 +1,7 @@
 package com.fdkankan.scene.service;
 
-import com.fdkankan.scene.entity.UserIncrement;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.scene.entity.UserIncrement;
 
 /**
  * <p>
@@ -9,10 +9,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 public interface IUserIncrementService extends IService<UserIncrement> {
 
     UserIncrement findByCameraId(Long cameraId);
-
 }

src/main/java/com/fdkankan/scene/service/IUserService.java

@@ -1,7 +1,7 @@
 package com.fdkankan.scene.service;
 
-import com.fdkankan.scene.entity.User;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.scene.entity.User;
 
 /**
  * <p>
@@ -9,10 +9,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 public interface IUserService extends IService<User> {
 
-    User getByUserName(String userName);
+    User findByUserName(String userName);
 
 }

src/main/java/com/fdkankan/scene/service/impl/CameraDetailServiceImpl.java

@@ -1,10 +1,10 @@
 package com.fdkankan.scene.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.entity.CameraDetail;
 import com.fdkankan.scene.mapper.ICameraDetailMapper;
 import com.fdkankan.scene.service.ICameraDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,13 +13,13 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 @Service
 public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, CameraDetail> implements ICameraDetailService {
 
     @Override
-    public CameraDetail getByCameraId(long cameraId) {
+    public CameraDetail findByCameraId(Long cameraId) {
         return this.getOne(new LambdaQueryWrapper<CameraDetail>().eq(CameraDetail::getCameraId, cameraId));
     }
 }

src/main/java/com/fdkankan/scene/service/impl/CameraServiceImpl.java

@@ -1,10 +1,10 @@
 package com.fdkankan.scene.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.entity.Camera;
 import com.fdkankan.scene.mapper.ICameraMapper;
 import com.fdkankan.scene.service.ICameraService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 @Service
 public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implements ICameraService {
@@ -22,5 +22,4 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     public Camera findByChildName(String childName) {
         return this.getOne(new LambdaQueryWrapper<Camera>().eq(Camera::getChildName, childName));
     }
-
 }

src/main/java/com/fdkankan/scene/service/impl/CompanyServiceImpl.java

@@ -17,4 +17,4 @@ import org.springframework.stereotype.Service;
 @Service
 public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> implements ICompanyService {
 
-}
+}

src/main/java/com/fdkankan/scene/service/impl/SceneCooperationServiceImpl.java

@@ -1,10 +1,10 @@
 package com.fdkankan.scene.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.entity.SceneCooperation;
 import com.fdkankan.scene.mapper.ISceneCooperationMapper;
 import com.fdkankan.scene.service.ISceneCooperationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -12,8 +12,8 @@ import org.springframework.stereotype.Service;
  *  服务实现类
  * </p>
  *
- * @author 
- * @since 2022-07-18
+ * @author dengsixing
+ * @since 2021-12-23
  */
 @Service
 public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMapper, SceneCooperation> implements ISceneCooperationService {

src/main/java/com/fdkankan/scene/service/impl/SceneDataDownloadServiceImpl.java

@@ -2,14 +2,16 @@ package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.TbStatus;
+import com.fdkankan.scene.entity.SceneCooperation;
 import com.fdkankan.scene.entity.SceneDataDownload;
 import com.fdkankan.scene.mapper.ISceneDataDownloadMapper;
 import com.fdkankan.scene.service.ISceneDataDownloadService;
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 安居客场景数据下载 服务实现类

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoExtServiceImpl.java

@@ -32,11 +32,6 @@ public class SceneEditInfoExtServiceImpl extends ServiceImpl<ISceneEditInfoExtMa
     private ISceneEditInfoService sceneEditInfoService;
 
     @Override
-    public SceneEditInfoExt getBySceneProId(long sceneProId) {
-        return this.getOne(new LambdaQueryWrapper<SceneEditInfoExt>().eq(SceneEditInfoExt::getSceneProId, sceneProId));
-    }
-
-    @Override
     public SceneEditInfoExt getByScenePlusId(long scenePlusId) {
         return this.getOne(new LambdaQueryWrapper<SceneEditInfoExt>().eq(SceneEditInfoExt::getScenePlusId, scenePlusId));
     }

src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -28,6 +28,7 @@ import com.fdkankan.scene.service.ISceneEditInfoExtService;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.ISceneEditService;
 import com.fdkankan.scene.service.IScenePlusService;
+import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.service.ISceneResourceService;
 import com.fdkankan.scene.service.ISceneUploadService;
 import com.fdkankan.scene.service.IUserIncrementService;
@@ -69,8 +70,8 @@ public class SceneEditServiceImpl implements ISceneEditService {
     private String fkankanMiniHost;
     @Value("${http.api-v4.getSceneProByNum}")
     private String URL_GET_SCENEPRO_BY_NUM;
-    @Value("${http.api.isLogin}")
-    private String URL_ISLOGIN;
+    @Autowired
+    ISceneProService sceneProService;
     @Autowired
     IScenePlusService scenePlusService;
     @Autowired
@@ -160,7 +161,7 @@ public class SceneEditServiceImpl implements ISceneEditService {
                 throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
             }
 
-            CameraDetail cameraDetailEntity = cameraDetailService.getByCameraId(camera.getId());
+            CameraDetail cameraDetailEntity = cameraDetailService.findByCameraId(camera.getId());
             if(cameraDetailEntity.getCompanyId() != null){
                 if(cameraDetailEntity.getCompanyId().longValue() == 1 || cameraDetailEntity.getCompanyId().longValue() == 14){
                     sceneAuthVO.setExclude(new ArrayList<>());
@@ -170,7 +171,7 @@ public class SceneEditServiceImpl implements ISceneEditService {
             return sceneAuthVO;
         }
 
-        User user = userService.getByUserName(username);
+        User user = userService.findByUserName(username);
         if("18750226207".equals(username)){
             log.info("18750226207该账号默认超级管理员，可以操作所有场景");
         }
@@ -193,7 +194,7 @@ public class SceneEditServiceImpl implements ISceneEditService {
         if(scenePlus.getCameraId() != null){
             camera = cameraService.getById(scenePlus.getCameraId());
             if(camera != null){
-                CameraDetail cameraDetail = cameraDetailService.getByCameraId(camera.getId());
+                CameraDetail cameraDetail = cameraDetailService.findByCameraId(camera.getId());
                 if(cameraDetail.getCompanyId() != null){
                     if(cameraDetail.getCompanyId().longValue() == 1 || cameraDetail.getCompanyId().longValue() == 14){
                         sceneAuthVO.setExclude(new ArrayList<>());

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

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -13,14 +14,18 @@ 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 com.fdkankan.scene.entity.SceneDataDownload;
 import com.fdkankan.scene.entity.SceneEditInfo;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.ScenePlusExt;
 import com.fdkankan.scene.mapper.IScenePlusMapper;
+import com.fdkankan.scene.service.ISceneDataDownloadService;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.IScenePlusExtService;
 import com.fdkankan.scene.service.IScenePlusService;
+import com.fdkankan.scene.vo.BaseSceneParamVO;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
+import com.fdkankan.scene.vo.SceneDataDownloadVO;
 import java.util.List;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
@@ -44,7 +49,9 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     @Autowired
     private IScenePlusService scenePlusService;
     @Autowired
-    ISceneEditInfoService sceneEditInfoService;
+    private ISceneEditInfoService sceneEditInfoService;
+    @Autowired
+    private ISceneDataDownloadService sceneDataDownloadService;
     @Autowired
     private RedisUtil redisUtil;
     @Autowired
@@ -55,12 +62,9 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         return this.getOne(new LambdaQueryWrapper<ScenePlus>().eq(ScenePlus::getNum, num));
     }
 
+
     @Override
     public ResultData checkKey(SceneCheckKeyParamVO param) throws Exception {
-//        ScenePro scenePro = sceneProService.getOne(
-//            new LambdaQueryWrapper<ScenePro>()
-//                .eq(ScenePro::getNum, param.getNum())
-//                .eq(ScenePro::getPayStatus, PayStatus.PAY.code()));
         ScenePlus scenePlus = scenePlusService.getOne(new LambdaQueryWrapper<ScenePlus>()
             .eq(ScenePlus::getNum, param.getNum())
             .eq(ScenePlus::getPayStatus, PayStatus.PAY.code()));
@@ -101,6 +105,22 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     }
 
     @Override
+    public ResultData downLoadZSData(BaseSceneParamVO param) throws Exception {
+        String num = param.getNum();
+        ScenePlus scenePlus = this.getScenePlusByNum(num);
+        if(Objects.isNull(scenePlus)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+
+        SceneDataDownload sceneDataDownload = sceneDataDownloadService.findBySceneNum(num);
+        if(sceneDataDownload == null){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5025);
+        }
+
+        return ResultData.ok(BeanUtil.copyProperties(sceneDataDownload, SceneDataDownloadVO.class));
+    }
+
+    @Override
     public ScenePlus checkSceneAvail(String num) {
         ScenePlus scenePlus = this.getScenePlusByNum(num);
         if(Objects.isNull(scenePlus)){
@@ -143,6 +163,4 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         redisUtil.hincr(key, sceneNum, 1);
         return ResultData.ok();
     }
-
-
 }

src/main/java/com/fdkankan/scene/service/impl/SceneResourceCooperationServiceImpl.java

@@ -1,20 +1,32 @@
 package com.fdkankan.scene.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.entity.SceneResourceCooperation;
 import com.fdkankan.scene.mapper.ISceneResourceCooperationMapper;
 import com.fdkankan.scene.service.ISceneResourceCooperationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 场景资源和协作用户关联表 服务实现类
  * </p>
  *
- * @author 
- * @since 2022-07-18
+ * @author dengsixing
+ * @since 2021-12-23
  */
 @Service
 public class SceneResourceCooperationServiceImpl extends ServiceImpl<ISceneResourceCooperationMapper, SceneResourceCooperation> implements ISceneResourceCooperationService {
 
+    @Override
+    public void deleteByCooperationId(Long id) {
+        this.remove(new LambdaQueryWrapper<SceneResourceCooperation>().eq(SceneResourceCooperation::getSceneCooperationId, id));
+    }
+
+    @Override
+    public void deleteByCooperationIds(List<Long> ids) {
+        this.remove(new LambdaQueryWrapper<SceneResourceCooperation>().in(SceneResourceCooperation::getSceneCooperationId, ids));
+    }
 }

src/main/java/com/fdkankan/scene/service/impl/SceneResourceServiceImpl.java

@@ -2,12 +2,12 @@ package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.entity.SceneResource;
 import com.fdkankan.scene.entity.SceneResourceCooperation;
 import com.fdkankan.scene.mapper.ISceneResourceMapper;
 import com.fdkankan.scene.service.ISceneResourceCooperationService;
 import com.fdkankan.scene.service.ISceneResourceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/fdkankan/scene/service/impl/SceneUpgradeToV4Service.java

@@ -10,13 +10,14 @@ import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.bean.SceneUpgradeProgressBean;
 import com.fdkankan.scene.entity.ScenePlus;
-import com.fdkankan.scene.mapper.ISceneUpgradeMapper;
+import com.fdkankan.scene.entity.SceneRepairLog;
 import com.fdkankan.scene.service.IScenePlusExtService;
 import com.fdkankan.scene.service.IScenePlusService;
 import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.service.ISceneRepairLogService;
 import com.fdkankan.scene.service.ISceneUpgradeToV4Service;
 import com.fdkankan.scene.vo.SceneInfoVO;
+import java.util.Calendar;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,19 +36,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
 
-//    @Value("${queue.scene.upgrade-to-v4}")
-//    private String upgradeToV4;
     @Value("${oss.bucket:4dkankan}")
     private String bucket;
 
     @Autowired
-    private ISceneUpgradeMapper sceneUpgradeMapper;
-    @Autowired
     private RedisLockUtil redisLockUtil;
     @Autowired
     private ISceneRepairLogService sceneRepairLogService;
-//    @Autowired
-//    private RabbitMqProducer rabbitMqProducer;
     @Autowired
     private RedisUtil redisUtil;
     @Autowired
@@ -59,68 +54,17 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
     @Autowired
     private UploadToOssUtil uploadToOssUtil;
 
-//    @Override
-//    public ResultData upgradeToV4(UpgradeToV4ParamVO param) {
-//
-//        String num = param.getNum();
-//        ScenePro scenePro = sceneProService.findBySceneNum(num);
-//
-//        //加锁
-//        String lockKey = String.format(RedisLockKey.LOCK_SCENE_UPGRADE_V4, num);
-//        boolean lock = redisLockUtil.lock(lockKey,RedisKey.EXPIRE_TIME_2_HOUR);
-//        if(!lock){
-//            return ResultData.error(ErrorCode.FAILURE_CODE_7019);
-//        }
-//
-//        try {
-//            //查询升级日志，如果已经升级成功，不允许重复升级
-//            SceneRepairLog sceneRepairLog = sceneRepairLogService.getOne(
-//                new LambdaQueryWrapper<SceneRepairLog>()
-//                    .eq(SceneRepairLog::getNum, num));
-//            if(Objects.nonNull(sceneRepairLog)){
-//                if(sceneRepairLog.getState() == 0){
-//                    redisLockUtil.unlockLua(lockKey);
-//                    return ResultData.error(ErrorCode.FAILURE_CODE_7019);
-//                }
-//                if(!param.isReUpgrade()){
-//                    if(sceneRepairLog.getState() == 1){
-//                        redisLockUtil.unlockLua(lockKey);
-//                        return ResultData.error(ErrorCode.FAILURE_CODE_7020);
-//                    }
-//                }
-//            }
-//
-//
-//            //同步到scenePlus、scenePlus
-//            sceneUpgradeMapper.deleteScenePlus(scenePro.getId());
-//            sceneUpgradeMapper.transferScenePlus(scenePro.getId());
-//            sceneUpgradeMapper.deleteScenePlusExt(scenePro.getId());
-//            sceneUpgradeMapper.transferScenePlusExt(scenePro.getId());
-//
-//            //国际版需要兼容切片图
-//            ScenePlus scenePlus = scenePlusService.getById(scenePro.getId());
-//            ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-//            if(scenePlusExt.getSceneScheme() == 3){
-//                scenePlusExt.setSceneResolution(SceneResolution.TILES.code());
-//                scenePlusExtService.updateById(scenePlusExt);
-//            }
-//
-//            //发送mq
-//            rabbitMqProducer.sendByWorkQueue(upgradeToV4, scenePro.getId());
-//
-//            //写入进度条
-//            Map<String, Integer> progress = new HashMap<>();
-//            progress.put("status", 0);
-//            progress.put("progress", 0);
-//            redisUtil.set(RedisKey.scene_upgrade_progress_num, JSON.toJSONString(progress));
-//
-//        }catch (Exception e){
-//            log.error("场景升级失败", e);
-//            return ResultData.error(ErrorCode.FAILURE_CODE_7021);
-//        }
-//
-//        return ResultData.ok();
-//    }
+    private void upgradeLog(SceneRepairLog sceneRepairLog, String num, int status, String reason){
+        //写入升级日志
+        if(Objects.isNull(sceneRepairLog)){
+            sceneRepairLog = new SceneRepairLog();
+            sceneRepairLog.setNum(num);
+        }
+        sceneRepairLog.setState(status);
+        sceneRepairLog.setReason(reason);
+        sceneRepairLog.setCreateTime(Calendar.getInstance().getTime());
+        sceneRepairLogService.saveOrUpdate(sceneRepairLog);
+    }
 
     @Override
     public ResultData getUpgradeToV4Progress(String num) {

src/main/java/com/fdkankan/scene/service/impl/SceneUploadServiceImpl.java

@@ -12,8 +12,6 @@ import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.web.user.SSOLoginHelper;
-import com.fdkankan.web.user.SSOUser;
 import com.fdkankan.common.util.BASE64DecodedMultipartFile;
 import com.fdkankan.common.util.FileUtil;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
@@ -22,6 +20,8 @@ import com.fdkankan.scene.mapper.ISceneUploadMapper;
 import com.fdkankan.scene.service.ISceneUploadService;
 import com.fdkankan.scene.vo.DeleteFileParamVO;
 import com.fdkankan.scene.vo.UploadContentParamVO;
+import com.fdkankan.web.user.SSOLoginHelper;
+import com.fdkankan.web.user.SSOUser;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -104,8 +104,7 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
             .set(SceneUpload::getRecStatus, RecStatus.DISABLE.code())
             .eq(SceneUpload::getNum, param.getNum())
             .eq(SceneUpload::getBizType, param.getBizType())
-            .in(SceneUpload::getFilePath, filePaths)
-            .eq(SceneUpload::getRecStatus, RecStatus.VALID.code()));
+            .in(SceneUpload::getFilePath, filePaths));
 
         return ResultData.ok();
     }
@@ -133,6 +132,11 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
             if(files.size() ==1 && StringUtils.isNotBlank(sendFileName)){
                 realFileName = sendFileName ;
             }
+
+            String oldExtName = cn.hutool.core.io.FileUtil.extName(realFileName);
+            String newExtName = oldExtName.toLowerCase();
+            realFileName = realFileName.substring(0, realFileName.lastIndexOf(oldExtName)) + newExtName;
+
             String ossPath = StrUtil.isNotBlank(uploadPath) ? uploadPath : (String.format(UploadFilePath.USER_EDIT_PATH ,sceneCode) + realFileName);
             try {
                 uploadToOssUtil.upload2(newFile.getPath(),ossPath);
@@ -160,8 +164,7 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
     private void updateFileByPreFix(String sceneCode, String blzType) {
         LambdaQueryWrapper<SceneUpload> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SceneUpload::getNum,sceneCode)
-                .eq(SceneUpload::getBizType,blzType)
-                .eq(SceneUpload::getRecStatus,RecStatus.VALID.code());
+                .eq(SceneUpload::getBizType,blzType);
         List<SceneUpload> list = this.list(queryWrapper);
 
         if(list != null && list.size() >0){
@@ -177,7 +180,7 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
     }
 
     private void removeEntity(SceneUpload sceneUpload) {
-        sceneUpload.setRecStatus(RecStatus.DISABLE.code());
+        sceneUpload.setRecStatus(RecStatus.VALID.code());
         this.updateById(sceneUpload);
     }
 

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

@@ -1,10 +1,10 @@
 package com.fdkankan.scene.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.entity.UserIncrement;
 import com.fdkankan.scene.mapper.IUserIncrementMapper;
 import com.fdkankan.scene.service.IUserIncrementService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 @Service
 public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper, UserIncrement> implements IUserIncrementService {

src/main/java/com/fdkankan/scene/service/impl/UserServiceImpl.java

@@ -1,10 +1,10 @@
 package com.fdkankan.scene.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.entity.User;
 import com.fdkankan.scene.mapper.IUserMapper;
 import com.fdkankan.scene.service.IUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,13 +13,13 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author 
- * @since 2022-07-18
+ * @since 2022-07-05
  */
 @Service
 public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements IUserService {
 
     @Override
-    public User getByUserName(String userName) {
+    public User findByUserName(String userName) {
         return this.getOne(new LambdaQueryWrapper<User>().eq(User::getUserName, userName));
     }
 }

src/main/java/com/fdkankan/scene/vo/BallScreenVideoParamVO.java

@@ -1,6 +1,5 @@
 package com.fdkankan.scene.vo;
 
-import javax.validation.constraints.NotBlank;
 import lombok.Data;
 
 /**

src/main/java/com/fdkankan/scene/vo/BaseDataParamVO.java

@@ -1,7 +1,6 @@
 package com.fdkankan.scene.vo;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

src/main/java/com/fdkankan/scene/vo/CopySceneParamVO.java

@@ -0,0 +1,32 @@
+package com.fdkankan.scene.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/4/21
+ **/
+@Data
+public class CopySceneParamVO {
+
+    @NotNull(message = "oldNum不能为空")
+    private String oldNum;
+
+    @NotNull(message = "newSceneProId不能为空")
+    private Long newSceneProId;
+
+    @NotNull(message = "newNum不能为空")
+    private String newNum;
+
+    @NotNull(message = "datasource不能为空")
+    private String datasource;
+
+    @NotNull(message = "newSceneName不能为空")
+    private String newSceneName;
+}

src/main/java/com/fdkankan/scene/vo/DeleteHotParamVO.java

@@ -1,7 +1,6 @@
 package com.fdkankan.scene.vo;
 
 import java.util.List;
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import lombok.Data;

src/main/java/com/fdkankan/scene/vo/DeleteLinkPanParamVO.java

@@ -0,0 +1,27 @@
+package com.fdkankan.scene.vo;
+
+import java.util.List;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * <p>
+ * 删除场景关联数据参数类
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/2/8
+ **/
+@Data
+public class DeleteLinkPanParamVO {
+
+    @NotBlank(message = "场景码不能为空")
+    private String num;
+
+    @NotNull(message = "sid不能为空")
+    private List<String> sidList;
+
+
+
+}

src/main/java/com/fdkankan/scene/vo/DeleteLinkSceneStylesParamVO.java

@@ -0,0 +1,27 @@
+package com.fdkankan.scene.vo;
+
+import java.util.List;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * <p>
+ * 删除场景关联图标参数类
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/2/8
+ **/
+@Data
+public class DeleteLinkSceneStylesParamVO {
+
+    @NotBlank(message = "场景码不能为空")
+    private String num;
+
+    @NotNull(message = "sidList不能为空")
+    private List<String> sidList;
+
+
+
+}

src/main/java/com/fdkankan/scene/vo/DeleteMosaicParamVO.java

@@ -0,0 +1,28 @@
+package com.fdkankan.scene.vo;
+
+import java.util.List;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * <p>
+        删除马赛克入参
+ * </p>
+ * @author dengsixing
+ * @date 2022/7/12
+ * @param null
+ * @return null
+ **/
+@Data
+public class DeleteMosaicParamVO {
+
+    @NotBlank(message = "场景码不能为空")
+    private String num;
+
+    @NotNull(message = "panoIdList不能为空")
+    private List<String> panoIdList;
+
+
+
+}

src/main/java/com/fdkankan/scene/vo/FileParamVO.java

@@ -3,7 +3,6 @@ package com.fdkankan.scene.vo;
 import lombok.*;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * <p>

src/main/java/com/fdkankan/scene/vo/HotParamVO.java

@@ -1,8 +1,6 @@
 package com.fdkankan.scene.vo;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**

src/main/java/com/fdkankan/scene/vo/LinkPanParamVO.java

@@ -0,0 +1,25 @@
+package com.fdkankan.scene.vo;
+
+import com.alibaba.fastjson.JSONObject;
+import javax.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * <p>
+ * 场景关联点参数
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/2/8
+ **/
+@Data
+public class LinkPanParamVO {
+
+    @NotBlank(message = "sid不能为空")
+    private String sid;
+
+    private JSONObject linkPanData;
+
+
+
+}

src/main/java/com/fdkankan/scene/vo/SaveLinkPanParamVO.java

@@ -0,0 +1,32 @@
+package com.fdkankan.scene.vo;
+
+import com.alibaba.fastjson.JSONObject;
+import java.util.List;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * <p>
+ * 保存场景关联参数
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/2/8
+ **/
+@Data
+public class SaveLinkPanParamVO {
+
+    @NotBlank(message = "场景码不能为空")
+    private String num;
+
+//    @Valid
+    @NotNull(message = "linkPans不能为空")
+//    private List<LinkPanParamVO> linkPans;
+    private List<JSONObject> linkPans;
+
+    private List<JSONObject> styles;
+
+
+
+}

src/main/java/com/fdkankan/scene/vo/SaveTagsVisibleParamVO.java

@@ -1,6 +1,5 @@
 package com.fdkankan.scene.vo;
 
-import com.alibaba.fastjson.JSONArray;
 import javax.validation.constraints.NotBlank;
 import lombok.Data;
 

src/main/java/com/fdkankan/scene/vo/SaveUploadParamVO.java

@@ -6,8 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
 
 /**
  * <p>

src/main/java/com/fdkankan/scene/vo/SceneAuthVO.java

@@ -1,10 +1,7 @@
 package com.fdkankan.scene.vo;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;