数据库场景码字段统一改成num

去掉rec_status字段

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneAppController.java

@@ -1,18 +1,16 @@
 package com.fdkankan.scene.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fdkankan.common.controller.BaseController;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.RubberSheetingUtil;
-import com.fdkankan.scene.service.*;
+import com.fdkankan.scene.service.ISceneFileBuildService;
+import com.fdkankan.scene.service.ISceneProAppService;
 import com.fdkankan.scene.vo.BuildSceneParamVO;
 import com.fdkankan.scene.vo.SceneParamVO;
 import com.fdkankan.scene.vo.SceneVO;
 import com.fdkankan.scene.vo.UserParamVO;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneAppEditController.java

@@ -91,7 +91,7 @@ public class SceneAppEditController {
      */
     @PostMapping(value = "/uploadPic")
     public ResultData uploadPic(FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception {
-        return sceneProAppService.uploadPic(param.getSceneNum(), param.getFolderName(), file);
+        return sceneProAppService.uploadPic(param.getNum(), param.getFolderName(), file);
     }
 
     /**
@@ -101,7 +101,7 @@ public class SceneAppEditController {
      */
     @PostMapping(value = "/uploadScreencapVoice")
     public ResultData uploadScreencapVoice(FileParamVO param, @RequestParam("file")  MultipartFile file) throws Exception {
-        return sceneProAppService.uploadScreencapVoice(param.getSceneNum(), file);
+        return sceneProAppService.uploadScreencapVoice(param.getNum(), file);
     }
 
     /**
@@ -202,7 +202,7 @@ public class SceneAppEditController {
      */
     @PostMapping(value = "/uploadFloorplanPng")
     public ResultData uploadFloorplanPng(FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception {
-        return sceneProAppService.uploadFloorplanPng(param.getSceneNum(), file, param.getCadInfo());
+        return sceneProAppService.uploadFloorplanPng(param.getNum(), file, param.getCadInfo());
     }
 
     /**
@@ -210,7 +210,7 @@ public class SceneAppEditController {
      */
     @PostMapping(value = "/uploadBgMusic")
     public ResultData uploadBgMusic(FileParamVO param, @RequestParam("file") MultipartFile file) throws Exception{
-        return sceneProAppService.uploadBgMusic(param.getSceneNum(), param.getFileName(), file);
+        return sceneProAppService.uploadBgMusic(param.getNum(), param.getFileName(), file);
     }
 
     /**
@@ -218,7 +218,7 @@ public class SceneAppEditController {
      */
     @PostMapping(value = "/deleteUploadBgMusic")
     public ResultData deleteUploadBgMusic(@RequestBody FileParamVO param) throws Exception{
-        return sceneProAppService.deleteUploadBgMusic(param.getSceneNum());
+        return sceneProAppService.deleteUploadBgMusic(param.getNum());
     }
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -43,7 +43,7 @@ public class SceneController {
 //     */
 //    @PostMapping(value = "/getInfo")
 //    public SceneVO getInfo(@RequestBody SceneParamVO param){
-//        return sceneProService.getInfo(param.getSceneNum());
+//        return sceneProService.getInfo(param.getNum());
 //    }
 
     /**
@@ -89,7 +89,7 @@ public class SceneController {
      */
     @PostMapping(value = "/updateViewCount")
     public ResultData updateViewCount(@RequestBody SceneParamVO param){
-        return sceneService.updateViewCount(param.getSceneNum());
+        return sceneService.updateViewCount(param.getNum());
     }
 
     /**
@@ -106,7 +106,7 @@ public class SceneController {
      */
     @PostMapping(value = "/rebuildScene")
     public ResultData rebuildScene(@RequestBody SceneParamVO param) throws Exception {
-        return sceneFileBuildService.rebuildScene(param.getSceneNum());
+        return sceneFileBuildService.rebuildScene(param.getNum());
     }
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneCooperationController.java

@@ -46,7 +46,7 @@ public class SceneCooperationController extends BaseController {
     public ResultData sceneResourceBySceneNum(@RequestBody SceneCooperationParamVO param) throws Exception{
         SSOUser ssoUser = ssoLoginHelper.loginCheck(getToken());
 
-        if(StrUtil.isEmpty(param.getSceneNum())){
+        if(StrUtil.isEmpty(param.getNum())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -47,7 +47,7 @@ public class SceneEditController extends BaseController {
      * </p>
      * @author dengsixing
      * @date 2022/1/12
-     * @param sceneEditParamVO
+     * @param param
      * @return com.fdkankan.common.response.ResultData
      **/
     @PostMapping(value = "/saveSceneEditInfo")
@@ -61,7 +61,7 @@ public class SceneEditController extends BaseController {
      * </p>
      * @author dengsixing
      * @date 2022/1/12
-     * @param sceneEditParamVO
+     * @param param
      * @return com.fdkankan.common.response.ResultData
      **/
     @PostMapping(value = "/publicScene")
@@ -404,9 +404,9 @@ public class SceneEditController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/uploadShareLogo", method = RequestMethod.POST)
-    public ResultData uploadShareLogo(@RequestParam("sceneNum") String sceneNum, @RequestParam("file") MultipartFile file) throws Exception {
+    public ResultData uploadShareLogo(@RequestParam("num") String sceneNum, @RequestParam("file") MultipartFile file) throws Exception {
         SceneEditParamVO base = new SceneEditParamVO();
-        base.setSceneNum(sceneNum);
+        base.setNum(sceneNum);
         return sceneProService.uploadShareLogo(base, file);
     }
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneFileController.java

@@ -25,53 +25,6 @@ import org.springframework.web.multipart.MultipartFile;
 @Transactional(rollbackFor = Exception.class)
 public class SceneFileController extends BaseController {
 
-//    @Autowired
-//    private FileService fileService;
-    @Autowired
-    private ISceneFileUploadService sceneFileUploadService;
-    @Autowired
-    private ISceneFileBuildService sceneFileBuildService;
-//    @Autowired
-//    private FileRouteConfig routeConfig;
-//    @Autowired
-//    private ModelingMsgProducer producer;
-    private String splice = "#";
-
-//    @Autowired
-//    private GoodsFeignClient goodsService;
-    @Autowired
-    private ObjectMapper mapper;
-
-    @Autowired
-    private ISceneProService sceneProService;
-
-    @Autowired
-    private ISceneProEditService sceneProEditService;
-
-//    @Autowired
-//    private UserFeignClient userService;
-//
-//    @Autowired
-//    private IScene3dNumNewService numService;
-//
-//    @Autowired
-//    private UploadToOssUtil uploadToOssUtil;
-//
-//    @Autowired
-//    private ICompanyService companyService;
-
-    @Autowired
-    private ISceneCooperationService sceneCooperationService;
-
-    @Autowired
-    private ISceneResourceCooperationService sceneResourceCooperationService;
-
-    @Autowired
-    private ISceneResourceCameraService sceneResourceCameraService;
-
-    @Autowired
-    RedisLockUtil redisLockUtil;
-
     @Value("${main.url}")
     private String mainUrl;
 
@@ -93,15 +46,15 @@ public class SceneFileController extends BaseController {
     @Value("${ecs.type}")
     private String ecsType;
 
-//    @Autowired
-//    private RubberSheetingUtil rubberSheetingUtil;
-//
-//    @Autowired
-//    private SceneNumService sceneNumService;
-
     @Value("${unCalculated.company.ids:#{null}}")
     private String[] unCalculatedCompanyIds;
 
+    @Autowired
+    private ISceneFileBuildService sceneFileBuildService;
+    private String splice = "#";
+    @Autowired
+    RedisLockUtil redisLockUtil;
+
     /**
      * 场景文件上传之前先获取fileId
      * @param params

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/TestController.java

@@ -59,11 +59,8 @@ public class TestController {
 
     @GetMapping("/test")
     public String test() throws Exception {
-
-//        platformClient.getCameraByChildName()
-        MatrixToImageWriterUtil.createQRCode("http://baidu.com" + "123123", ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+"123123"+".png",
-                null);
-        return null;
+        ResultData<Camera> cameraByChildName = platformGoodsClient.getCameraByChildName("123");
+        return "123";
 
     }
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/UserSceneController.java

@@ -2,7 +2,8 @@ package com.fdkankan.scene.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.controller.BaseController;
-import com.fdkankan.scene.service.UserSceneService;
+import com.fdkankan.scene.service.IUserSceneService;
+import com.fdkankan.scene.service.impl.UserSceneService;
 import com.fdkankan.scene.vo.SceneParamVO;
 import com.fdkankan.scene.vo.SceneVO;
 import lombok.extern.log4j.Log4j2;
@@ -21,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class UserSceneController extends BaseController {
 
     @Autowired
-    private UserSceneService userSceneService;
+    private IUserSceneService userSceneService;
     /**
      * 获取用户场景记录
      * pageNum          分页

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/Folder.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-24
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -52,12 +50,6 @@ public class Folder implements Serializable {
     private Long parentId;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 创建时间
      */
     @TableField("create_time")
@@ -73,6 +65,7 @@ public class Folder implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/FolderScene.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -40,12 +38,6 @@ public class FolderScene implements Serializable {
     private Long sceneId;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 创建时间
      */
     @TableField("create_time")
@@ -61,6 +53,7 @@ public class FolderScene implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/PicSceneProgress.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-01-14
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -31,8 +28,8 @@ public class PicSceneProgress implements Serializable {
     /**
      * 大场景序号
      */
-    @TableField("scene_code")
-    private String sceneCode;
+    @TableField("num")
+    private String num;
 
     /**
      * 重算开始时间（进入队列）
@@ -89,12 +86,6 @@ public class PicSceneProgress implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/Scene.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-30
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -90,8 +88,8 @@ public class Scene implements Serializable {
     /**
      * 大场景序号
      */
-    @TableField("scene_code")
-    private String sceneCode;
+    @TableField("num")
+    private String num;
 
     /**
      * 大场景的密钥
@@ -142,12 +140,6 @@ public class Scene implements Serializable {
     private Integer floorLogoSize;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 创建时间
      */
     @TableField("create_time")
@@ -163,6 +155,7 @@ public class Scene implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/Scene3dNum.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -42,14 +40,8 @@ public class Scene3dNum implements Serializable {
     /**
      * 记录的状态，A: 生效，I: 禁用
      */
-    @TableField("scene_code")
-    private String sceneCode;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
+    @TableField("num")
+    private String num;
 
     /**
      * 更新时间
@@ -67,6 +59,7 @@ public class Scene3dNum implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/Scene3dfamily.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -30,8 +28,8 @@ public class Scene3dfamily implements Serializable {
     /**
      * 场景码
      */
-    @TableField("scene_code")
-    private String sceneCode;
+    @TableField("num")
+    private String num;
 
     /**
      * zip包存放路径
@@ -82,15 +80,10 @@ public class Scene3dfamily implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneCooperation.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -30,8 +28,8 @@ public class SceneCooperation implements Serializable {
     /**
      * 场景码
      */
-    @TableField("scene_code")
-    private String sceneCode;
+    @TableField("num")
+    private String num;
 
     /**
      * 协作的用户id
@@ -40,7 +38,7 @@ public class SceneCooperation implements Serializable {
     private Long userId;
 
     /**
-     * 协作的用户名
+     * 协作用户名
      */
     @TableField("user_name")
     private String userName;
@@ -58,15 +56,10 @@ public class SceneCooperation implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneDataDownload.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -30,8 +28,8 @@ public class SceneDataDownload implements Serializable {
     /**
      * 场景码
      */
-    @TableField("scene_code")
-    private String sceneCode;
+    @TableField("num")
+    private String num;
 
     /**
      * 文件md5
@@ -58,15 +56,10 @@ public class SceneDataDownload implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneDownloadLog.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -36,8 +34,8 @@ public class SceneDownloadLog implements Serializable {
     /**
      * 场景码
      */
-    @TableField("scene_code")
-    private String sceneCode;
+    @TableField("num")
+    private String num;
 
     /**
      * 场景版本
@@ -58,12 +56,6 @@ public class SceneDownloadLog implements Serializable {
     private Integer downloadStatus;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 创建时间
      */
     @TableField("create_time")
@@ -79,6 +71,7 @@ public class SceneDownloadLog implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneEditControls.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-01-18
+ * @since 2022-01-20
  */
 @Getter
 @Setter

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneEditInfo.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * </p>
  *
  * @author 
- * @since 2022-01-19
+ * @since 2022-01-20
  */
 @Getter
 @Setter

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneExt.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-30
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -163,6 +161,7 @@ public class SceneExt implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneFeedback.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -30,8 +28,8 @@ public class SceneFeedback implements Serializable {
     /**
      * 大场景序号
      */
-    @TableField("scene_code")
-    private String sceneCode;
+    @TableField("num")
+    private String num;
 
     /**
      * 联系电话
@@ -70,12 +68,6 @@ public class SceneFeedback implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")
@@ -85,6 +77,7 @@ public class SceneFeedback implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneFileBuild.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -73,12 +71,6 @@ public class SceneFileBuild implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")
@@ -88,6 +80,7 @@ public class SceneFileBuild implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneFileUpload.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -73,12 +71,6 @@ public class SceneFileUpload implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")
@@ -88,6 +80,7 @@ public class SceneFileUpload implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneModuleVideo.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -30,8 +28,8 @@ public class SceneModuleVideo implements Serializable {
     /**
      * 场景码
      */
-    @TableField("scene_num")
-    private String sceneNum;
+    @TableField("num")
+    private String num;
 
     /**
      * 模块名称
@@ -58,10 +56,11 @@ public class SceneModuleVideo implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
+     * 0-有效，1-删除
      */
-    @TableField("rec_status")
-    private String recStatus;
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
 
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/ScenePO.java

@@ -66,7 +66,7 @@ public class ScenePO{
     /**
      * 大场景序号
      */
-    private String sceneCode;
+    private String num;
 
     /**
      * 大场景的密钥

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/ScenePro.java

@@ -1,21 +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.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>
  * pro场景表
  * </p>
  *
- * @author dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -72,8 +70,8 @@ public class ScenePro implements Serializable {
     /**
      * 大场景序号
      */
-    @TableField("scene_code")
-    private String sceneCode;
+    @TableField("num")
+    private String num;
 
     /**
      * 0-其他，1-文博，2-地产，3-电商，4-餐饮，5-家居,99-一件换装虚拟房源
@@ -82,19 +80,6 @@ public class ScenePro implements Serializable {
     private Integer sceneType;
 
     /**
-     * 0表示未建好，1表示建好，-1表示出错，-2表示不要在官网上显示
-     */
-    @TableField("scene_status")
-    private Integer sceneStatus;
-
-    /**
-     * 0表示未付款，1表示付款了，-1表示欠费，-2表示容量不足
-     */
-    @TableField("pay_status")
-    private Integer payStatus;
-
-
-    /**
      * 点位视频
      */
     @TableField("videos")
@@ -113,10 +98,16 @@ public class ScenePro implements Serializable {
     private Integer sceneScheme;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
+     * 0表示未付款，1表示付款了，-1表示欠费，-2表示容量不足
      */
-    @TableField("rec_status")
-    private String recStatus;
+    @TableField("pay_status")
+    private Integer payStatus;
+
+    /**
+     * 0表示未建好，1表示建好，-1表示出错，-2表示不要在官网上显示
+     */
+    @TableField("scene_status")
+    private Integer sceneStatus;
 
     /**
      * 算法类型（V2,V3）
@@ -140,6 +131,7 @@ public class ScenePro implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneProEdit.java

@@ -1,21 +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.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>
  * pro场景编辑数据表
  * </p>
  *
- * @author dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -94,12 +92,6 @@ public class SceneProEdit implements Serializable {
     private String bgMusic;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 普通录屏文件地址
      */
     @TableField("screencap_voice_src")
@@ -169,6 +161,7 @@ public class SceneProEdit implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneProEditExt.java

@@ -1,21 +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.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>
  * pro场景编辑数据表
  * </p>
  *
- * @author dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -34,7 +32,7 @@ public class SceneProEditExt implements Serializable {
     private Long proEditId;
 
     /**
-     * proid
+     * 场景proid
      */
     @TableField("pro_id")
     private Long proId;
@@ -163,6 +161,7 @@ public class SceneProEditExt implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneProExt.java

@@ -1,21 +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.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>
  * pro场景表
  * </p>
  *
- * @author dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -115,7 +113,7 @@ public class SceneProExt implements Serializable {
     private Integer shootCount;
 
     /**
-     * 相机类型
+     * 相机类型，0表示双目，1四维看看pro，2 四维看看lite，9 双目转台，10 激光转台
      */
     @TableField("camera_type")
     private Integer cameraType;
@@ -136,6 +134,7 @@ public class SceneProExt implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneProPO.java

@@ -50,7 +50,7 @@ public class SceneProPO {
     /**
      * 大场景序号
      */
-    private String sceneCode;
+    private String num;
 
     /**
      * 0-其他，1-文博，2-地产，3-电商，4-餐饮，5-家居,99-一件换装虚拟房源

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneRecord.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -30,8 +28,8 @@ public class SceneRecord implements Serializable {
     /**
      * 大场景序号
      */
-    @TableField("scene_code")
-    private String sceneCode;
+    @TableField("num")
+    private String num;
 
     /**
      * 发布时间
@@ -58,12 +56,6 @@ public class SceneRecord implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")
@@ -73,6 +65,7 @@ public class SceneRecord implements Serializable {
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneResource.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -70,15 +68,10 @@ public class SceneResource implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneResourceCamera.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -52,15 +50,10 @@ public class SceneResourceCamera implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneResourceCooperation.java

@@ -1,21 +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.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 dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -52,15 +50,10 @@ public class SceneResourceCooperation implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneStatistics.java

@@ -1,22 +1,20 @@
 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.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>
  * 百度统计场景流量量表
  * </p>
  *
- * @author dengsixing
- * @since 2021-12-23
+ * @author 
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -31,8 +29,8 @@ public class SceneStatistics implements Serializable {
     /**
      * 场景码
      */
-    @TableField("scene_code")
-    private String sceneCode;
+    @TableField("num")
+    private String num;
 
     /**
      * 浏览量(PV)
@@ -107,15 +105,10 @@ public class SceneStatistics implements Serializable {
     private Date updateTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 0-有效，1-删除
      */
     @TableField("tb_status")
+    @TableLogic
     private Integer tbStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/VideoSceneProgress.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-01-14
+ * @since 2022-01-20
  */
 @Getter
 @Setter
@@ -31,8 +28,8 @@ public class VideoSceneProgress implements Serializable {
     /**
      * 大场景序号
      */
-    @TableField("scene_code")
-    private String sceneCode;
+    @TableField("num")
+    private String num;
 
     /**
      * 重算开始时间（进入队列）
@@ -89,12 +86,6 @@ public class VideoSceneProgress implements Serializable {
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
      * 更新时间
      */
     @TableField("update_time")

4dkankan-center-scene/src/main/java/com/fdkankan/scene/generate/AutoGenerate.java

@@ -21,7 +21,32 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") + "\\4dkankan-center-scene";
 
         generate(path,"test", getTables(new String[]{
-                "t_scene_edit_info"
+                "t_folder",
+                "t_folder_scene",
+                "t_pic_scene_progress",
+                "t_scene",
+                "t_scene_3d_num",
+                "t_scene_3dfamily",
+                "t_scene_cooperation",
+                "t_scene_data_download",
+                "t_scene_download_log",
+                "t_scene_edit_controls",
+                "t_scene_edit_info",
+                "t_scene_ext",
+                "t_scene_feedback",
+                "t_scene_file_build",
+                "t_scene_file_upload",
+                "t_scene_module_video",
+                "t_scene_pro",
+                "t_scene_pro_edit",
+                "t_scene_pro_edit_ext",
+                "t_scene_pro_ext",
+                "t_scene_record",
+                "t_scene_resource",
+                "t_scene_resource_camera",
+                "t_scene_resource_cooperation",
+                "t_scene_statistics",
+                "t_video_scene_progress"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/ISceneMapper.java

@@ -29,8 +29,6 @@ public interface ISceneMapper extends BaseMapper<Scene> {
 
     List<SceneVO> queryByParamNew(Page<SceneVO> page, SceneParamVO param);
 
-//    List<SceneVO> findSceneProBySnCode(SceneParamVO param);
-
     List<ScenePO> findAllByYesterday();
 
     Page<SceneProPO> findAllScene(Page page, @Param("param")SceneParamVO param);

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

@@ -67,7 +67,7 @@ public interface ISceneService extends IService<Scene> {
 
     ResultData recover(String sceneNum) throws Exception;
 
-    Scene getSceneStatusByUnicode(String unicode, String recStatus);
+    Scene getSceneStatusByUnicode(String unicode, int tbStatus);
 
     void updateStatus(String sceneNum, int status);
 

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

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.scene.vo.SceneParamVO;
+import com.fdkankan.scene.vo.SceneVO;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/1/20
+ **/
+public interface IUserSceneService {
+
+    Page<SceneVO> getScenes(String token, SceneParamVO param);
+}

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

@@ -29,9 +29,6 @@ public class FolderSceneServiceImpl extends ServiceImpl<IFolderSceneMapper, Fold
 
     @Override
     public void deleteByFolderId(Long folderId) {
-//        FolderScene folderScene  = new FolderScene();
-//        folderScene.setTbStatus(TbStatus.DELETE.code());
-//        folderSceneMapper.update(folderScene, new QueryWrapper<FolderScene>().eq("folderId", folderId));
         remove(new QueryWrapper<FolderScene>().eq("folderId", folderId));
     }
 
@@ -47,7 +44,10 @@ public class FolderSceneServiceImpl extends ServiceImpl<IFolderSceneMapper, Fold
 
     @Override
     public List<FolderScene> findByFolderId(Long folderId) {
-        return folderSceneMapper.selectList(new QueryWrapper<FolderScene>().eq("folderId", folderId).eq("tbStatus", TbStatus.VALID.code()));
+        return folderSceneMapper.selectList(
+                new QueryWrapper<FolderScene>()
+                        .eq("folderId", folderId)
+                        .eq("tbStatus", TbStatus.VALID.code()));
     }
 
 }

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

@@ -3,7 +3,9 @@ package com.fdkankan.scene.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.util.DateExtUtil;
@@ -39,24 +41,21 @@ import java.util.Set;
 public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implements IFolderService {
 
     @Autowired
-    IFolderMapper folderMapper;
-    @Autowired
     IFolderSceneService folderSceneService;
     @Autowired
     ISceneProService sceneProService;
 
     @Override
     public List<Folder> findByParentId(Long parentId) {
-        return folderMapper.selectList(
+        return baseMapper.selectList(
                 new QueryWrapper<Folder>()
                         .eq("tbStatus", TbStatus.VALID.code())
-                        .eq("recStatus", RecStatus.VALID.code())
                         .eq("parentId", parentId));
     }
 
     @Override
     public List<Folder> findByParentIdAndName(Long parentId, String folderName, Long userId) {
-        return folderMapper.selectByCondition(
+        return baseMapper.selectByCondition(
                 FolderVO.builder()
                         .recStatus(RecStatus.VALID.code())
                         .folderName(folderName)
@@ -66,7 +65,7 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
 
     @Override
     public List<Folder> findByUserIdAndType(Long userId, Integer folderType, String folderName) {
-        return folderMapper.selectByUserIdAndType(
+        return baseMapper.selectByUserIdAndType(
                 FolderVO.builder()
                         .folderName(folderName)
                         .userId(userId)
@@ -81,8 +80,11 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
     @Override
     public void deleteAllFile(Long id, Set<Long> ids) {
         Folder folder = new Folder();
-        folder.setRecStatus(RecStatus.DISABLE.code());
-        folderMapper.update(folder, new QueryWrapper<Folder>().eq("id", id));
+        folder.setTbStatus(TbStatus.DELETE.code());
+
+        this.update(new LambdaUpdateWrapper<Folder>()
+                .eq(Folder::getId, id)
+                .set(Folder::getTbStatus, TbStatus.DELETE.code()));
 
         List<FolderScene> folderSceneList = folderSceneService.findByFolderId(id);
         if(CollUtil.isNotEmpty(folderSceneList)){
@@ -115,10 +117,9 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
         Folder folder = null;
         for (String folderId : folderIds) {
             folder = this.getOne(
-                    new QueryWrapper<Folder>()
-                            .eq("tbStatus", TbStatus.VALID.code())
-                            .eq("resStatus", RecStatus.VALID.code())
-                            .eq("id",Long.valueOf(folderId)));
+                    new LambdaQueryWrapper<Folder>()
+                            .eq(Folder::getTbStatus, TbStatus.VALID.code())
+                            .eq(Folder::getId, Long.valueOf(folderId)));
             if(Objects.isNull(folder)){
                 continue;
             }
@@ -191,7 +192,7 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
             //获取当前文件夹里面文件夹的场景数
             sceneNum = folderChildrenSceneNum(folderVO.getId(), sceneNum);
 //                log.info(responseFolder.getName() + ",该场景最终数量：" + sceneNum);
-            folderVO.setSceneNum(sceneNum);
+            folderVO.setNum(sceneNum);
             if(CollUtil.isNotEmpty(folderSceneList)){
                 ScenePro scenePro = sceneProService.getOne(
                             new QueryWrapper<ScenePro>()

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.RebuildResult;
 import com.fdkankan.common.constant.RecStatus;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.entity.PicSceneProgress;
@@ -41,15 +42,15 @@ public class PicSceneProgressServiceImpl extends ServiceImpl<IPicSceneProgressMa
     public VideoSceneProgressVO findPicSceneProgress(RebuildVedioSceneParamVO param) {
         List<PicSceneProgress> list = this.list(
                 new LambdaQueryWrapper<PicSceneProgress>()
-                        .eq(PicSceneProgress::getRecStatus, RecStatus.VALID.code())
-                        .eq(PicSceneProgress::getSceneCode, param.getSceneNum()));
+                        .eq(PicSceneProgress::getTbStatus, TbStatus.VALID.code())
+                        .eq(PicSceneProgress::getNum, param.getNum()));
         VideoSceneProgressVO videoSceneProgressVO = new VideoSceneProgressVO();
         if(list == null || list.size()<=0){
             return videoSceneProgressVO;
         }
         BeanUtils.copyProperties(list.get(0), videoSceneProgressVO);
         //更新访问量
-        this.updatePageView(param.getSceneNum());
+        this.updatePageView(param.getNum());
 
         return videoSceneProgressVO;
     }
@@ -57,15 +58,15 @@ public class PicSceneProgressServiceImpl extends ServiceImpl<IPicSceneProgressMa
     @Override
     public void updateProgressRec(RebuildVedioSceneParamVO param) {
         this.update(new LambdaUpdateWrapper<PicSceneProgress>()
-                .set(PicSceneProgress::getRecStatus, RecStatus.DISABLE.code())
-                .eq(PicSceneProgress::getSceneCode, param.getSceneNum()));
+                .set(PicSceneProgress::getTbStatus, TbStatus.DELETE.code())
+                .eq(PicSceneProgress::getNum, param.getNum()));
     }
 
     @Override
     public PicSceneProgress findrebuildVideoProgressDetail(String num,String panId) {
         PicSceneProgress picSceneProgress = this.getOne(new LambdaQueryWrapper<PicSceneProgress>()
-                .eq(PicSceneProgress::getRecStatus, RecStatus.VALID.code())
-                .eq(PicSceneProgress::getSceneCode, num));
+                .eq(PicSceneProgress::getTbStatus, TbStatus.VALID.code())
+                .eq(PicSceneProgress::getNum, num));
         return picSceneProgress;
     }
 
@@ -74,26 +75,26 @@ public class PicSceneProgressServiceImpl extends ServiceImpl<IPicSceneProgressMa
         this.update(new LambdaUpdateWrapper<PicSceneProgress>()
                 .set(PicSceneProgress::getRebuildResult, status)
                 .set(PicSceneProgress::getRebuildEndTime, Calendar.getInstance().getTime())
-                .eq(PicSceneProgress::getSceneCode, num)
-                .eq(PicSceneProgress::getRecStatus, RecStatus.VALID.code()));
+                .eq(PicSceneProgress::getNum, num)
+                .eq(PicSceneProgress::getTbStatus, RecStatus.VALID.code()));
     }
 
     @Override
     public void updatePageView(String sceneCode) {
         this.update(new LambdaUpdateWrapper<PicSceneProgress>()
                 .set(PicSceneProgress::getRebuildResult, RebuildResult.POLLED.code())
-                .eq(PicSceneProgress::getSceneCode, sceneCode)
-                .eq(PicSceneProgress::getRecStatus, RecStatus.VALID.code())
+                .eq(PicSceneProgress::getNum, sceneCode)
+                .eq(PicSceneProgress::getTbStatus, RecStatus.VALID.code())
                 .eq(PicSceneProgress::getRebuildResult, RebuildResult.SUCCESS.code()));
     }
 
     public ResultData rebuildPicSceneProgress(RebuildVedioSceneParamVO param) throws Exception {
 
-        if(StringUtils.isEmpty(param.getSceneNum())){
+        if(StringUtils.isEmpty(param.getNum())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro sceneProEntity = sceneProService.findBySceneNum(param.getSceneNum());
+        ScenePro sceneProEntity = sceneProService.findBySceneNum(param.getNum());
         if(null == sceneProEntity){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }

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

@@ -2,6 +2,7 @@ package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.TbStatus;
@@ -46,10 +47,9 @@ public class Scene3dNumServiceImpl extends ServiceImpl<IScene3dNumMapper, Scene3
 
     @Override
     public Scene3dNum findByNum(String sceneCode) {
-        List<Scene3dNum> list = this.list(new QueryWrapper<Scene3dNum>()
-                .eq("tb_status", TbStatus.VALID.code())
-                .eq("rec_status", RecStatus.VALID.code())
-                .eq("scene_code", sceneCode));
+        List<Scene3dNum> list = this.list(new LambdaQueryWrapper<Scene3dNum>()
+                .eq(Scene3dNum::getTbStatus, TbStatus.VALID.code())
+                .eq(Scene3dNum::getNum, sceneCode));
         if(CollUtil.isEmpty(list)){
             return null;
         }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.RecStatus;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.constant.ZipStatus;
 import com.fdkankan.common.util.CreateObjUtil;
 import com.fdkankan.common.util.FileUtils;
@@ -61,10 +62,10 @@ public class Scene3dfamilyServiceImpl extends ServiceImpl<IScene3dfamilyMapper,
                 baseMapper.findSceneCodeByCode(
                         Scene3dfamilyVO
                             .builder()
-                            .sceneCode(sceneProVo.getSceneCode())
+                            .num(sceneProVo.getNum())
                             .zipStatus(ZipStatus.DOING.code())
                             .build());
-        String path = sceneProVo.getDataSource() + "_3df" + File.separator + sceneProVo.getSceneCode();
+        String path = sceneProVo.getDataSource() + "_3df" + File.separator + sceneProVo.getNum();
         try {
             if(scene3dfamily == null){
                 throw new BusinessException(ErrorCode.FAILURE_CODE_5032);
@@ -75,45 +76,45 @@ public class Scene3dfamilyServiceImpl extends ServiceImpl<IScene3dfamilyMapper,
             FileUtils.createDir(path);
 
             //生成vision.json
-            sceneProService.downloadVisionData(SceneEditParamVO.builder().sceneNum(sceneProVo.getSceneCode()).build());
+            sceneProService.downloadVisionData(SceneEditParamVO.builder().num(sceneProVo.getNum()).build());
             //拉取data
-            CreateObjUtil.ossUtilCp("data" + File.separator + "data" + sceneProVo.getSceneCode()  + File.separator,
-                    path + File.separator + "scene" + File.separator + "data" + File.separator + "data" + sceneProVo.getSceneCode());
+            CreateObjUtil.ossUtilCp("data" + File.separator + "data" + sceneProVo.getNum()  + File.separator,
+                    path + File.separator + "scene" + File.separator + "data" + File.separator + "data" + sceneProVo.getNum());
 
 
             //写入 scene.json 改名为 getinfo.json
-            SceneVO sceneVo = sceneProService.getInfo(sceneProVo.getSceneCode());
+            SceneVO sceneVo = sceneProService.getInfo(sceneProVo.getNum());
 
             JSONObject dataJson = (JSONObject) JSONObject.toJSON(sceneVo);
 
             FileUtils.writeFile(path + File.separator + "scene"  + File.separator + "data" +  File.separator  + "data"
-                    + sceneProVo.getSceneCode() + File.separator + "getinfo.json", dataJson.toString());
+                    + sceneProVo.getNum() + File.separator + "getinfo.json", dataJson.toString());
 
             //拉取images
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getSceneCode()  + File.separator + "floorLogoImg.png",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getSceneCode());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getSceneCode()  + File.separator + "floorplan.png",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getSceneCode());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getSceneCode()  + File.separator + "logo-main.png",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getSceneCode());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getSceneCode()  + File.separator + "logo-main-en.png",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getSceneCode());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getSceneCode()  + File.separator + "smallPic.jpg",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getSceneCode());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getSceneCode()  + File.separator + "thumbBigImg.jpg",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getSceneCode());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getSceneCode()  + File.separator + "thumbSmallImg.jpg",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getSceneCode());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getSceneCode()  + File.separator + "pan",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getSceneCode());
+            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "floorLogoImg.png",
+                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
+            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "floorplan.png",
+                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
+            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "logo-main.png",
+                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
+            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "logo-main-en.png",
+                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
+            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "smallPic.jpg",
+                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
+            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "thumbBigImg.jpg",
+                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
+            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "thumbSmallImg.jpg",
+                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
+            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "pan",
+                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
 
             //拉取video
-            CreateObjUtil.ossUtilCp("video" + File.separator + "video" + sceneProVo.getSceneCode()  + File.separator,
-                    path + File.separator + "scene"  + File.separator + "video" + File.separator + "video" + sceneProVo.getSceneCode());
+            CreateObjUtil.ossUtilCp("video" + File.separator + "video" + sceneProVo.getNum()  + File.separator,
+                    path + File.separator + "scene"  + File.separator + "video" + File.separator + "video" + sceneProVo.getNum());
 
             //拉取voice
-            CreateObjUtil.ossUtilCp("voice" + File.separator + "voice" + sceneProVo.getSceneCode()  + File.separator,
-                    path + File.separator + "scene"  + File.separator + "voice" + File.separator + "voice" + sceneProVo.getSceneCode());
+            CreateObjUtil.ossUtilCp("voice" + File.separator + "voice" + sceneProVo.getNum()  + File.separator,
+                    path + File.separator + "scene"  + File.separator + "voice" + File.separator + "voice" + sceneProVo.getNum());
 
             //压缩zip
             FileUtils.zipFile(path + ".zip", path);
@@ -121,10 +122,10 @@ public class Scene3dfamilyServiceImpl extends ServiceImpl<IScene3dfamilyMapper,
 
             //上传oss
             // 上传到阿里云sso
-            uploadToOssUtil.upload(path + ".zip", DIR_NAME + sceneProVo.getSceneCode() + ".zip");
+            uploadToOssUtil.upload(path + ".zip", DIR_NAME + sceneProVo.getNum() + ".zip");
             log.info("upload success");
 
-            String url = prefixAli + DIR_NAME + sceneProVo.getSceneCode() + ".zip";
+            String url = prefixAli + DIR_NAME + sceneProVo.getNum() + ".zip";
 
             log.info("upload url: {}" + url);
 
@@ -169,7 +170,7 @@ public class Scene3dfamilyServiceImpl extends ServiceImpl<IScene3dfamilyMapper,
     @Override
     public void updateSceneNumByNum(Scene3dfamily scene3dfamily) {
         this.update(new LambdaUpdateWrapper<Scene3dfamily>()
-                .eq(Scene3dfamily::getSceneCode, scene3dfamily.getSceneCode())
-                .set(Scene3dfamily::getRecStatus, RecStatus.DISABLE.code()));
+                .eq(Scene3dfamily::getNum, scene3dfamily.getNum())
+                .set(Scene3dfamily::getTbStatus, TbStatus.DELETE.code()));
     }
 }

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

@@ -69,11 +69,11 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
     @Override
     public int saveInitialPage(SceneEditParamVO base) throws Exception {
-        if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getInitialPoint())){
+        if(StrUtil.isEmpty(base.getNum()) || StrUtil.isEmpty(base.getInitialPoint())){
             return -102;
         }
 
-        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getNum());
         if(Objects.isNull(scene)){
             return -2;
         }
@@ -81,11 +81,11 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getSceneCode())
+                .append("images").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -132,24 +132,24 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
     @Override
     public int saveFloorLogo(SceneEditParamVO base) throws Exception {
-        if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getSize()) ||
+        if(StrUtil.isEmpty(base.getNum()) || StrUtil.isEmpty(base.getSize()) ||
                 StrUtil.isEmpty(base.getLogoType())){
             return -102;
         }
 
-        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getNum());
         if(scene == null){
             return -2;
         }
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getSceneCode())
+                .append("images").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -182,7 +182,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
         String sid = base.getSid();
 
-        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getNum());
         if (scene == null ) {
             return -2;
         }
@@ -192,11 +192,11 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getSceneCode())
+                .append("images").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
@@ -319,11 +319,11 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
     @Override
     public int saveBackgroundMusic(SceneEditParamVO base) throws Exception {
-        if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getMusicName())){
+        if(StrUtil.isEmpty(base.getNum()) || StrUtil.isEmpty(base.getMusicName())){
             return -102;
         }
 
-        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getNum());
         if(scene == null){
             return -2;
         }
@@ -332,7 +332,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
         JSONObject jsonhot = JSONObject.parseObject(base.getHotData());
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -356,19 +356,19 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
     @Override
     public int saveSceneInfo(SceneEditParamVO base) throws Exception {
-        if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getSceneName()) ||
+        if(StrUtil.isEmpty(base.getNum()) || StrUtil.isEmpty(base.getSceneName()) ||
                 StrUtil.isEmpty(base.getSceneType()) || StrUtil.isEmpty(base.getSceneDec())){
             return -102;
         }
 
-        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getNum());
         if(scene == null){
             return -2;
         }
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -397,18 +397,18 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
     @Override
     public int saveSceneKey(SceneEditParamVO base) throws Exception {
-        if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getSceneKey())){
+        if(StrUtil.isEmpty(base.getNum()) || StrUtil.isEmpty(base.getSceneKey())){
             return -102;
         }
 
-        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getNum());
         if(scene == null){
             return -2;
         }
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -430,11 +430,11 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
     @Override
     public int saveTourList(SceneEditParamVO base) throws Exception {
-        if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getTourList())){
+        if(StrUtil.isEmpty(base.getNum()) || StrUtil.isEmpty(base.getTourList())){
             return -102;
         }
 
-        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getNum());
         if(scene == null){
             return -2;
         }
@@ -442,12 +442,12 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getSceneCode())
+                .append("images").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
@@ -630,12 +630,12 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
     @Override
     public int saveScreencapFile(SceneEditParamVO base) throws Exception {
-        if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getIndex()) ||
+        if(StrUtil.isEmpty(base.getNum()) || StrUtil.isEmpty(base.getIndex()) ||
                 StringUtils.isEmpty(base.getCamerasData())){
             return -102;
         }
 
-        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getNum());
         if(scene == null){
             return -2;
         }
@@ -643,7 +643,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -696,7 +696,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
             return -102;
         }
 
-        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getNum());
         if (scene == null ) {
             return -2;
         }
@@ -705,11 +705,11 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getSceneCode())
+                .append("images").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
@@ -743,11 +743,11 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
     @Override
     public int saveLinkPano(SceneEditParamVO base) throws Exception {
-        if(StrUtil.isEmpty(base.getData()) || StrUtil.isEmpty(base.getSceneNum())){
+        if(StrUtil.isEmpty(base.getData()) || StrUtil.isEmpty(base.getNum())){
             return -102;
         }
 
-        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getNum());
         if (scene == null ) {
             return -2;
         }
@@ -756,11 +756,11 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getSceneCode())
+                .append("images").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -811,7 +811,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
             return -102;
         }
 
-        Scene scene = sceneService.getSceneBySceneCode(base.getSceneNum());
+        Scene scene = sceneService.getSceneBySceneCode(base.getNum());
         if (scene == null ) {
             return -2;
         }
@@ -834,43 +834,43 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
         http.connect();
         // 获取文件转化为byte流
         is = http.getInputStream();
-        File dic = new File(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum());
+        File dic = new File(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum());
         if(!dic.exists())
         {
             dic.mkdirs();
         }
-        File voice = new File(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.VOICE_NAME+".amr");
+        File voice = new File(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator+ConstantFileName.VOICE_NAME+".amr");
         if(voice.exists())
         {
-            FileUtils.deleteFile(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.VOICE_NAME+".amr");
+            FileUtils.deleteFile(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator+ConstantFileName.VOICE_NAME+".amr");
         }
-        FileUtils.saveImageToDisk( accessToken,  base.getId(), ConstantFileName.VOICE_NAME, ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator, is);
+        FileUtils.saveImageToDisk( accessToken,  base.getId(), ConstantFileName.VOICE_NAME, ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator, is);
 
         try
         {
-            FileUtils.changeVoiceToMp3(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.VOICE_NAME+".amr",
-                    ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.VOICE_NAME+".mp3");
+            FileUtils.changeVoiceToMp3(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator+ConstantFileName.VOICE_NAME+".amr",
+                    ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator+ConstantFileName.VOICE_NAME+".mp3");
         }
         catch(Exception e)
         {
             StringWriter trace=new StringWriter();
             e.printStackTrace(new PrintWriter(trace));
-            log.error("voice:"+ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.VOICE_NAME+".amr");
+            log.error("voice:"+ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator+ConstantFileName.VOICE_NAME+".amr");
             log.error(trace.toString());
             return -97;
         }
         String originalFileName = ConstantFileName.VOICE_NAME+".mp3";
-        uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator +originalFileName, "voice/voice"+base.getSceneNum()+"/"+originalFileName);
+        uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator +originalFileName, "voice/voice"+base.getNum()+"/"+originalFileName);
 
         Map map = new HashMap();
         map.put("screencapVoiceFileName", originalFileName);
-        String voiceSrc = prefixAli+"voice/voice"+base.getSceneNum()+"/"+originalFileName;
+        String voiceSrc = prefixAli+"voice/voice"+base.getNum()+"/"+originalFileName;
         if("s3".equals(type)){
-            voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+base.getSceneNum()+"/"+originalFileName;
+            voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+base.getNum()+"/"+originalFileName;
         }
         map.put("screencapVoiceSrc", voiceSrc);
         map.put("version", scene.getVersion()+1);
-        FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + base.getSceneNum() + "/scene.json", map);
+        FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + base.getNum() + "/scene.json", map);
 
         scene.setVersion(scene.getVersion());
         scene.setUpdateTime(Calendar.getInstance().getTime());
@@ -880,7 +880,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
         sceneExt.setUpdateTime(Calendar.getInstance().getTime());
         sceneExtService.updateById(sceneExt);
 
-        FileUtils.deleteFile(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.VOICE_NAME+".amr");
+        FileUtils.deleteFile(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator+ConstantFileName.VOICE_NAME+".amr");
         return originalFileName;
     }
 }

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

@@ -48,9 +48,9 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
     @Override
     public void updateRecStatus(String sceneNum) {
         this.update(new LambdaUpdateWrapper<SceneCooperation>()
-                .eq(SceneCooperation::getSceneCode, sceneNum)
+                .eq(SceneCooperation::getNum, sceneNum)
                 .set(SceneCooperation::getUpdateTime, Calendar.getInstance().getTime())
-                .set(SceneCooperation::getRecStatus, RecStatus.DISABLE.code()));
+                .set(SceneCooperation::getTbStatus, TbStatus.DELETE.code()));
     }
 
     @Override
@@ -84,13 +84,13 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
             return ResultData.ok();
         }
 
-        SceneCooperation sceneCooperation = this.findBySceneNum(param.getSceneNum());
+        SceneCooperation sceneCooperation = this.findBySceneNum(param.getNum());
         //若数据为空表示可操作全部资源
         if(sceneCooperation == null || !sceneCooperation.getUserId().equals(param.getUserId())){
             return ResultData.ok();
         }
 
-        ScenePro scenePro= sceneProService.findBySceneNum(param.getSceneNum());
+        ScenePro scenePro= sceneProService.findBySceneNum(param.getNum());
         if(scenePro != null && scenePro.getUserId().equals(sceneCooperation.getUserId())){
             return ResultData.ok();
         }

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

@@ -1,6 +1,7 @@
 package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.TbStatus;
@@ -27,11 +28,10 @@ public class SceneDataDownloadServiceImpl extends ServiceImpl<ISceneDataDownload
     @Override
     public SceneDataDownload findBySceneNum(String sceneNum) {
 
-        List<SceneDataDownload> list = this.list(new QueryWrapper<SceneDataDownload>()
-                .eq("tb_status", TbStatus.VALID.code())
-                .eq("rec_status", RecStatus.VALID.code())
-                .eq("scene_code", sceneNum)
-                .orderByDesc("id"));
+        List<SceneDataDownload> list = this.list(new LambdaQueryWrapper<SceneDataDownload>()
+                .eq(SceneDataDownload::getTbStatus, TbStatus.VALID.code())
+                .eq(SceneDataDownload::getNum, sceneNum)
+                .orderByDesc(SceneDataDownload::getId));
         if(CollUtil.isEmpty(list)){
             return null;
         }

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

@@ -31,8 +31,8 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
     @Override
     public void updateStatusByNum(String sceneNum, Integer status) {
         this.update(new LambdaUpdateWrapper<SceneDownloadLog>()
-                .eq(SceneDownloadLog::getSceneCode, sceneNum)
-                .eq(SceneDownloadLog::getRecStatus, RecStatus.VALID.code())
+                .eq(SceneDownloadLog::getNum, sceneNum)
+                .eq(SceneDownloadLog::getTbStatus, TbStatus.VALID.code())
                 .set(SceneDownloadLog::getUpdateTime, Calendar.getInstance().getTime())
                 .set(SceneDownloadLog::getDownloadStatus, status));
     }
@@ -41,11 +41,11 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
     public void deleteStatusByNum(String sceneNum) {
 
         this.update(new LambdaUpdateWrapper<SceneDownloadLog>()
-                .eq(SceneDownloadLog::getSceneCode, sceneNum)
-                .eq(SceneDownloadLog::getRecStatus, RecStatus.VALID.code())
+                .eq(SceneDownloadLog::getNum, sceneNum)
+                .eq(SceneDownloadLog::getTbStatus, TbStatus.VALID.code())
                 .eq(SceneDownloadLog::getDownloadStatus, DownloadStatus.SUCCESS.code())
                 .set(SceneDownloadLog::getUpdateTime, Calendar.getInstance().getTime())
-                .set(SceneDownloadLog::getRecStatus, RecStatus.DISABLE.code()));
+                .set(SceneDownloadLog::getTbStatus, TbStatus.DELETE.code()));
 
     }
 

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

@@ -754,7 +754,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }else {
 
             if(sceneProPO != null){
-                sceneNum = sceneProPO.getSceneCode();
+                sceneNum = sceneProPO.getNum();
                 //重算的场景，先移除该场景对应的容量
                 sceneProService.rebuildReduceSpaceBySceneNum(sceneNum);
             }else {
@@ -838,7 +838,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         //临时将-2改成1，app还没完全更新
         statusJson.put("status", scene.getSceneStatus() == -2? 1 : scene.getSceneStatus());
         statusJson.put("webSite", scene.getWebSite());
-        statusJson.put("sceneNum", scene.getSceneCode());
+        statusJson.put("sceneNum", scene.getNum());
         statusJson.put("thumb", scene.getThumb());
         statusJson.put("payStatus", scene.getPayStatus());
         FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data/data"+sceneNum+File.separator+"status.json", statusJson.toString());
@@ -888,7 +888,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         SceneProPO sceneProPO = sceneProService.findByFileId("/" + fileId + "/");
         int rebuild = 1;
         if(sceneProPO != null){
-            sceneNum = sceneProPO.getSceneCode();
+            sceneNum = sceneProPO.getNum();
             if(sceneProPO.getSceneStatus() == SceneStatus.wait.code()){
                 log.info(sceneNum + ":场景处于计算中，不能再计算");
                 return;
@@ -986,7 +986,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             //临时将-2改成1，app还没完全更新
             statusJson.put("status", scene.getSceneStatus() == -2? 1 : scene.getSceneStatus());
             statusJson.put("webSite", scene.getWebSite());
-            statusJson.put("sceneNum", scene.getSceneCode());
+            statusJson.put("sceneNum", scene.getNum());
             statusJson.put("thumb", scene.getThumb());
             statusJson.put("payStatus", scene.getPayStatus());
             statusJson.put("recStatus", scene.getRecStatus());
@@ -1174,7 +1174,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 SceneProPO proEntity = sceneProService.findByFileId("/" + fileId + "/");
                 int rebuild = 1;
                 if(proEntity != null){
-                    sceneNum = proEntity.getSceneCode();
+                    sceneNum = proEntity.getNum();
                     if(proEntity.getSceneStatus() == SceneStatus.wait.code()){
                         log.info(sceneNum + ":场景处于计算中，不能再计算");
                         return;
@@ -1286,7 +1286,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                     //临时将-2改成1，app还没完全更新
                     statusJson.put("status", sceneProPO.getSceneStatus() == -2 ? 1 : sceneProPO.getSceneStatus());
                     statusJson.put("webSite", sceneProPO.getWebSite());
-                    statusJson.put("sceneNum", sceneProPO.getSceneCode());
+                    statusJson.put("sceneNum", sceneProPO.getNum());
                     statusJson.put("thumb", sceneProPO.getThumb());
                     statusJson.put("payStatus", sceneProPO.getPayStatus());
                     statusJson.put("recStatus", sceneProPO.getRecStatus());
@@ -1425,7 +1425,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         scene.setWebSite(url+projectNum);
         scene.setCameraId(cameraId);
         scene.setPhoneId(phoneId);
-        scene.setSceneCode(String.valueOf(projectNum));
+        scene.setNum(String.valueOf(projectNum));
         if(scenepsd == null)
         {
             scenepsd = "";
@@ -1571,7 +1571,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         scenePro.setWebSite(url+projectNum);
         scenePro.setCameraId(cameraId);
         sceneProExt.setPhoneId(phoneId);
-        scenePro.setSceneCode(projectNum);
+        scenePro.setNum(projectNum);
 
         String path =  ConstantFilePath.BUILD_MODEL_PATH + unicode;
 
@@ -1716,7 +1716,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             //新增场景时，同时新增场景协作信息
             if(cooperationUser != null){
                 SceneCooperation sceneCooperationEntity = new SceneCooperation();
-                sceneCooperationEntity.setSceneCode(projectNum);
+                sceneCooperationEntity.setNum(projectNum);
                 sceneCooperationEntity.setUserId(cooperationUser);
                 sceneCooperationService.save(sceneCooperationEntity);
 
@@ -1736,7 +1736,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             ScenePro oldScene = sceneProService.findBySceneNum(projectNum);
             scenePro.setId(oldScene.getId());
             scenePro.setSceneStatus(0);
-            scenePro.setRecStatus("A");
+            scenePro.setTbStatus(TbStatus.VALID.code());
             scenePro.setPayStatus(0);
             scenePro.setCreateTime(new Date());
 
@@ -1772,7 +1772,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             sceneProEdit.setId(oldSceneProEdit.getId());
             sceneProEdit.setProId(scenePro.getId());
             sceneProEdit.setFloorLogoSize(100);
-            sceneProEdit.setRecStatus("A");
+            sceneProEdit.setTbStatus(TbStatus.VALID.code());
             sceneProEdit.setFloorPublishVer(oldSceneProEdit.getFloorEditVer() + 1);
             sceneProEdit.setFloorEditVer(oldSceneProEdit.getFloorEditVer() + 1);
             sceneProEdit.setVersion(oldSceneProEdit.getVersion() + 1);
@@ -2089,7 +2089,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             //临时将-2改成1，app还没完全更新
             statusJson.put("status", scenePro.getSceneStatus() == -2 ? 1 : scenePro.getSceneStatus());
             statusJson.put("webSite", scenePro.getWebSite());
-            statusJson.put("sceneNum", scenePro.getSceneCode());
+            statusJson.put("sceneNum", scenePro.getNum());
             statusJson.put("thumb", scenePro.getThumb());
             statusJson.put("payStatus", scenePro.getPayStatus());
             FileUtils.writeFile(ConstantFilePath.SCENE_PATH + "data/data" + sceneCode + File.separator + "status.json", statusJson.toString());
@@ -2136,11 +2136,11 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
     public ResultData rebuildVideoScene(RebuildVedioSceneParamVO param) throws Exception {
 
-        if(StringUtils.isEmpty(param.getSceneNum()) || StringUtils.isEmpty(param.getPanoId())){
+        if(StringUtils.isEmpty(param.getNum()) || StringUtils.isEmpty(param.getPanoId())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        String num = param.getSceneNum();
+        String num = param.getNum();
 
         ScenePro scenePro = sceneProService.findBySceneNum(num);
         SceneProExt sceneProExt = null;
@@ -2159,7 +2159,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
 
         //先从备份文件下拉取
-        CreateObjUtil.ossUtilCp("video/video" +scenePro.getSceneCode()  + File.separator + "back" + File.separator,
+        CreateObjUtil.ossUtilCp("video/video" +scenePro.getNum()  + File.separator + "back" + File.separator,
                 sceneProExt.getDataSource() + "_rv" + File.separator + "videoback_temp");
 
         String backpathtemp = sceneProExt.getDataSource() + "_rv" + File.separator + "videoback_temp";
@@ -2173,7 +2173,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             File file = new File(backpath);
 
             //验证video 文件夹下是否有备份
-            CreateObjUtil.ossUtilCp("video/video" +scenePro.getSceneCode()  + File.separator,
+            CreateObjUtil.ossUtilCp("video/video" +scenePro.getNum()  + File.separator,
                     sceneProExt.getDataSource() + "_rv" + File.separator + "videoback");
 
             String name = "";
@@ -2185,7 +2185,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                     name = f.getName();
                     log.info("file name :" + name);
                     map.put(sceneProExt.getDataSource() + "_rv" + File.separator + "videoback" + File.separator + name,
-                            "video/video" +scenePro.getSceneCode()  + File.separator + "back" + File.separator + name);
+                            "video/video" +scenePro.getNum()  + File.separator + "back" + File.separator + name);
 
                 }
             }
@@ -2243,7 +2243,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         log.info("fileId:" + fileId);
 
         String parametr = "";
-        parametr += scenePro.getSceneCode() + ":;" +
+        parametr += scenePro.getNum() + ":;" +
                 param.getPanoId();
 
 
@@ -2251,7 +2251,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         long start = System.currentTimeMillis();
 
         VideoSceneProgress videoSceneProgress= new VideoSceneProgress();
-        videoSceneProgress.setSceneCode(scenePro.getSceneCode());
+        videoSceneProgress.setNum(scenePro.getNum());
         videoSceneProgress.setVideoName(param.getPanoId());
         videoSceneProgress.setDataSource(sceneProExt.getDataSource());
         videoSceneProgress.setRebuildResult(2);
@@ -2268,11 +2268,11 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
     public ResultData rebuildPicScene(@RequestBody RebuildVedioSceneParamVO param) throws Exception {
 
-        if(StringUtils.isEmpty(param.getSceneNum())){
+        if(StringUtils.isEmpty(param.getNum())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        String num = param.getSceneNum();
+        String num = param.getNum();
 
         ScenePro scenePro = sceneProService.findBySceneNum(num);
         String path = "";
@@ -2300,7 +2300,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         log.info("fileId:" + fileId);
 
         PicSceneProgress picSceneProgress = new PicSceneProgress();
-        picSceneProgress.setSceneCode(scenePro.getSceneCode());
+        picSceneProgress.setNum(scenePro.getNum());
         picSceneProgress.setVideoName(param.getPanoId());
         picSceneProgress.setDataSource(sceneProExt.getDataSource());
         picSceneProgress.setRebuildResult(2);

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

@@ -1,6 +1,7 @@
 package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.TbStatus;
@@ -28,23 +29,21 @@ public class SceneFileUploadServiceImpl extends ServiceImpl<ISceneFileUploadMapp
     @Override
     public Long countUploadSuccessByFileId(String fileId) {
 
-        return this.count(new QueryWrapper<SceneFileUpload>()
-                            .eq("tb_status", TbStatus.VALID.code())
-                            .eq("rec_status", RecStatus.VALID.code())
-                            .eq("file_id", fileId)
-                            .eq("upload_status", UploadStatus.SUCCESS.code()));
+        return this.count(new LambdaQueryWrapper<SceneFileUpload>()
+                            .eq(SceneFileUpload::getTbStatus, TbStatus.VALID.code())
+                            .eq(SceneFileUpload::getFileId, fileId)
+                            .eq(SceneFileUpload::getUploadStatus ,UploadStatus.SUCCESS.code()));
 
     }
 
     @Override
     public SceneFileUpload findByFileIdAndChunk(String fileId, Integer chunk) {
 
-        List<SceneFileUpload> list = this.list(new QueryWrapper<SceneFileUpload>()
-                .eq("tb_status", TbStatus.VALID.code())
-                .eq("rec_status", RecStatus.VALID.code())
-                .eq("file_id", fileId)
-                .eq("chunk", chunk)
-                .orderByDesc("id"));
+        List<SceneFileUpload> list = this.list(new LambdaQueryWrapper<SceneFileUpload>()
+                .eq(SceneFileUpload::getTbStatus, TbStatus.VALID.code())
+                .eq(SceneFileUpload::getFileId, fileId)
+                .eq(SceneFileUpload::getChunk, chunk)
+                .orderByDesc(SceneFileUpload::getId));
 
         if(CollUtil.isEmpty(list))
             return  null;

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

@@ -93,11 +93,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
     @Override
     public ResultData saveInitialPage(SceneEditParamVO base) throws Exception {
-        if(StringUtils.isEmpty(base.getSceneNum()) || StringUtils.isEmpty(base.getInitialPoint())){
+        if(StringUtils.isEmpty(base.getNum()) || StringUtils.isEmpty(base.getInitialPoint())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = baseMapper.findByNum(base.getSceneNum());
+        ScenePro scenePro = baseMapper.findByNum(base.getNum());
         if(Objects.isNull(scenePro)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -106,13 +106,13 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
 
 
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scenePro.getSceneCode())
+                .append("images").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -158,12 +158,12 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
     @Override
     public ResultData saveFloorLogo(SceneEditParamVO base) throws Exception {
-        if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getSize()) ||
+        if(StrUtil.isEmpty(base.getNum()) || StrUtil.isEmpty(base.getSize()) ||
                 StrUtil.isEmpty(base.getLogoType())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = baseMapper.findByNum(base.getSceneNum());
+        ScenePro scenePro = baseMapper.findByNum(base.getNum());
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -172,12 +172,12 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scenePro.getSceneCode())
+                .append("images").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -208,7 +208,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = baseMapper.findByNum(base.getSceneNum());
+        ScenePro scenePro = baseMapper.findByNum(base.getNum());
         if (scenePro == null ) {
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -219,11 +219,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scenePro.getSceneCode())
+                .append("images").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
@@ -260,11 +260,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
     @Override
     public ResultData saveBackgroundMusic(SceneEditParamVO base) throws Exception {
-        if(StringUtils.isEmpty(base.getSceneNum()) || StringUtils.isEmpty(base.getMusicName())){
+        if(StringUtils.isEmpty(base.getNum()) || StringUtils.isEmpty(base.getMusicName())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = baseMapper.findByNum(base.getSceneNum());
+        ScenePro scenePro = baseMapper.findByNum(base.getNum());
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -273,7 +273,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -293,12 +293,12 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
     @Override
     public ResultData saveSceneInfo(SceneEditParamVO base) throws Exception{
-        if(StringUtils.isEmpty(base.getSceneNum()) || StringUtils.isEmpty(base.getSceneName()) ||
+        if(StringUtils.isEmpty(base.getNum()) || StringUtils.isEmpty(base.getSceneName()) ||
                 StringUtils.isEmpty(base.getSceneType()) || StringUtils.isEmpty(base.getSceneDec())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = baseMapper.findByNum(base.getSceneNum());
+        ScenePro scenePro = baseMapper.findByNum(base.getNum());
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -307,7 +307,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -352,11 +352,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
     @Override
     public ResultData saveSceneKey(SceneEditParamVO base) throws Exception{
-        if(StringUtils.isEmpty(base.getSceneNum()) || StringUtils.isEmpty(base.getSceneKey())){
+        if(StringUtils.isEmpty(base.getNum()) || StringUtils.isEmpty(base.getSceneKey())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = baseMapper.findByNum(base.getSceneNum());
+        ScenePro scenePro = baseMapper.findByNum(base.getNum());
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -365,7 +365,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -388,11 +388,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
     @Override
     public ResultData saveTourList(SceneEditParamVO base) throws Exception{
-        if(StringUtils.isEmpty(base.getSceneNum()) || StringUtils.isEmpty(base.getTourList())){
+        if(StringUtils.isEmpty(base.getNum()) || StringUtils.isEmpty(base.getTourList())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = baseMapper.findByNum(base.getSceneNum());
+        ScenePro scenePro = baseMapper.findByNum(base.getNum());
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -401,12 +401,12 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scenePro.getSceneCode())
+                .append("images").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
@@ -583,12 +583,12 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
     @Override
     public ResultData saveScreencapFile(SceneEditParamVO base) throws Exception{
-        if(StringUtils.isEmpty(base.getSceneNum()) || StringUtils.isEmpty(base.getIndex()) ||
+        if(StringUtils.isEmpty(base.getNum()) || StringUtils.isEmpty(base.getIndex()) ||
                 StringUtils.isEmpty(base.getCamerasData())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = baseMapper.findByNum(base.getSceneNum());
+        ScenePro scenePro = baseMapper.findByNum(base.getNum());
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -597,7 +597,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -645,7 +645,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = baseMapper.findByNum(base.getSceneNum());
+        ScenePro scenePro = baseMapper.findByNum(base.getNum());
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -656,11 +656,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scenePro.getSceneCode())
+                .append("images").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
@@ -696,11 +696,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
     @Override
     public ResultData saveLinkPano(SceneEditParamVO base) throws Exception{
-        if(StringUtils.isEmpty(base.getData()) || StringUtils.isEmpty(base.getSceneNum())){
+        if(StringUtils.isEmpty(base.getData()) || StringUtils.isEmpty(base.getNum())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = baseMapper.findByNum(base.getSceneNum());
+        ScenePro scenePro = baseMapper.findByNum(base.getNum());
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -709,11 +709,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scenePro.getSceneCode())
+                .append("images").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -780,11 +780,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
     @Override
     public ResultData getRecordAudioFromWeixin(SceneEditParamVO base) throws Exception{
-        if(StringUtils.isEmpty(base.getSceneNum()) || StringUtils.isEmpty(base.getId())){
+        if(StringUtils.isEmpty(base.getNum()) || StringUtils.isEmpty(base.getId())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = baseMapper.findByNum(base.getSceneNum());
+        ScenePro scenePro = baseMapper.findByNum(base.getNum());
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -807,61 +807,61 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         http.connect();
         // 获取文件转化为byte流
         is = http.getInputStream();
-        File dic = new File(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum());
+        File dic = new File(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum());
         if(!dic.exists())
         {
             dic.mkdirs();
         }
-        File voice = new File(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.WECHAT_VOICE_NAME+".amr");
+        File voice = new File(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator+ConstantFileName.WECHAT_VOICE_NAME+".amr");
         if(voice.exists())
         {
-            FileUtils.deleteFile(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.WECHAT_VOICE_NAME+".amr");
+            FileUtils.deleteFile(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator+ConstantFileName.WECHAT_VOICE_NAME+".amr");
         }
-        FileUtils.saveImageToDisk( accessToken,  base.getId(), ConstantFileName.WECHAT_VOICE_NAME, ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator, is);
+        FileUtils.saveImageToDisk( accessToken,  base.getId(), ConstantFileName.WECHAT_VOICE_NAME, ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator, is);
 
         try
         {
-            FileUtils.changeVoiceToMp3(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.WECHAT_VOICE_NAME+".amr",
-                    ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.WECHAT_VOICE_NAME+".mp3");
+            FileUtils.changeVoiceToMp3(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator+ConstantFileName.WECHAT_VOICE_NAME+".amr",
+                    ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator+ConstantFileName.WECHAT_VOICE_NAME+".mp3");
         }
         catch(Exception e)
         {
             StringWriter trace=new StringWriter();
             e.printStackTrace(new PrintWriter(trace));
-            log.error("voice:"+ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.VOICE_NAME+".amr");
+            log.error("voice:"+ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator+ConstantFileName.VOICE_NAME+".amr");
             log.error(trace.toString());
             return ResultData.error(ErrorCode.FAILURE_CODE_5005);
         }
         String originalFileName = ConstantFileName.WECHAT_VOICE_NAME+".mp3";
-        uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator +originalFileName, "voice/voice"+base.getSceneNum()+"/"+originalFileName);
+        uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator +originalFileName, "voice/voice"+base.getNum()+"/"+originalFileName);
 
         Map map = new HashMap();
         map.put("screencapVoiceSoundsyncFileName", originalFileName);
-        String voiceSrc = prefixAli+"voice/voice"+base.getSceneNum()+"/"+originalFileName;
+        String voiceSrc = prefixAli+"voice/voice"+base.getNum()+"/"+originalFileName;
         if("s3".equals(type)){
-            voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+base.getSceneNum()+"/"+originalFileName;
+            voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+base.getNum()+"/"+originalFileName;
         }
         map.put("screencapVoiceSoundsync", voiceSrc);
         log.info("微信上传的音频路径：{}",  voiceSrc);
         map.put("screencapVoiceType", "soundsync");
         map.put("version", sceneProEdit.getVersion()+1);
-        FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + base.getSceneNum() + "/scene.json", map);
+        FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + base.getNum() + "/scene.json", map);
 
         sceneProEdit.setScreencapVoiceType("soundsync");
         sceneProEdit.setScreencapVoiceSoundsync(voiceSrc);
         sceneProEdit.setVersion(sceneProEdit.getVersion());
         sceneProEdit.setUpdateTime(Calendar.getInstance().getTime());
         sceneProEditService.updateById(sceneProEdit);
-        FileUtils.deleteFile(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.WECHAT_VOICE_NAME+".amr");
+        FileUtils.deleteFile(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator+ConstantFileName.WECHAT_VOICE_NAME+".amr");
         if("s3".equals(type)){
-            return ResultData.ok(ConstantUrl.PREFIX_AWS+"voice/voice"+base.getSceneNum()+"/"+originalFileName);
+            return ResultData.ok(ConstantUrl.PREFIX_AWS+"voice/voice"+base.getNum()+"/"+originalFileName);
         }
-        return ResultData.ok(prefixAli+"voice/voice"+base.getSceneNum()+"/"+originalFileName);
+        return ResultData.ok(prefixAli+"voice/voice"+base.getNum()+"/"+originalFileName);
     }
 
     @Override
     public ResultData getRecordAudioFromWeixinV3(FileParamVO param) throws Exception {
-        String sceneNum = param.getSceneNum();
+        String sceneNum = param.getNum();
         String id = param.getId();
         String fileName = param.getFileName();
         if(StringUtils.isEmpty(sceneNum) || StringUtils.isEmpty(id)){
@@ -948,7 +948,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
     @Override
     public ResultData getRecordAudioFromAppV3(FileParamVO param) throws Exception {
-        String sceneNum = param.getSceneNum();
+        String sceneNum = param.getNum();
         String soundFile = param.getSoundFile();
         String fileName = param.getFileName();
         if(StringUtils.isEmpty(sceneNum) || StringUtils.isEmpty(soundFile)){
@@ -1023,7 +1023,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
     @Override
     public ResultData deleteRecordAudioPart(FileParamVO param) throws Exception {
 
-        String sceneNum = param.getSceneNum();
+        String sceneNum = param.getNum();
         String index = param.getIndex();
         String times = param.getTimes();
         if(StringUtils.isEmpty(sceneNum)){
@@ -1142,7 +1142,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
     @Override
     public ResultData uploadFloorJsonAndRebuild(SceneEditParamVO sceneEdit) throws Exception {
 
-        String lockKey = String.format(RedisLockKey.LOCK_UPLOAD_FLOORJSON_REBUILD, sceneEdit.getSceneNum());
+        String lockKey = String.format(RedisLockKey.LOCK_UPLOAD_FLOORJSON_REBUILD, sceneEdit.getNum());
         Boolean lock = redisLockUtil.lock(lockKey, RedisKey.EXPIRE_TIME_2_HOUR);
         if(!lock){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5036);
@@ -1152,11 +1152,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
             long start = System.currentTimeMillis();
             log.info("画墙重建模型开始时间：{}", start);
-            if(StringUtils.isEmpty(sceneEdit.getSceneNum())){
+            if(StringUtils.isEmpty(sceneEdit.getNum())){
                 throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
             }
 
-            ScenePro scenePro = baseMapper.findByNum(sceneEdit.getSceneNum());
+            ScenePro scenePro = baseMapper.findByNum(sceneEdit.getNum());
             if(scenePro == null){
                 throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
             }
@@ -1167,13 +1167,13 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             }
 
             //更新scene.json文件
-            String strsceneInfos = FileUtils.readFile(ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + sceneEdit.getSceneNum() + File.separator + "scene.json");
+            String strsceneInfos = FileUtils.readFile(ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + sceneEdit.getNum() + File.separator + "scene.json");
             JSONObject scenejson = new JSONObject();
             if(strsceneInfos!=null)
             {
                 scenejson = JSONObject.parseObject(strsceneInfos);
             }else {
-                new File(ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + sceneEdit.getSceneNum() + File.separator + "scene.json").createNewFile();
+                new File(ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + sceneEdit.getNum() + File.separator + "scene.json").createNewFile();
             }
             if(!StringUtils.isEmpty(sceneEdit.getSceneData())){
                 JSONObject sceneObject = JSONObject.parseObject(sceneEdit.getSceneData());
@@ -1189,7 +1189,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             }
 
             //上传过模型只更新floor.json
-            FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data"+File.separator+"data"+sceneEdit.getSceneNum() + File.separator + "floor.json",
+            FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data"+File.separator+"data"+sceneEdit.getNum() + File.separator + "floor.json",
                     new String(sceneEdit.getWebFloor().getBytes(), "UTF-8"));
 
             //更新scene.json文件
@@ -1197,8 +1197,8 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             {
                 scenejson.put("floorEditVer", sceneProEdit.getFloorPublishVer() + 1);
                 scenejson.put("floorPublishVer", sceneProEdit.getFloorPublishVer() + 1);
-                FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data"+File.separator+"data"+sceneEdit.getSceneNum()+File.separator+"scene.json", scenejson.toString());
-                log.info("写入scene.json文件完成, sceneCode:{}", sceneEdit.getSceneNum());
+                FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data"+File.separator+"data"+sceneEdit.getNum()+File.separator+"scene.json", scenejson.toString());
+                log.info("写入scene.json文件完成, sceneCode:{}", sceneEdit.getNum());
             }
 
             //floorEditVer字段增加1
@@ -1207,8 +1207,8 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             sceneProEdit.setUpdateTime(Calendar.getInstance().getTime());
             sceneProEditService.updateById(sceneProEdit);
 
-            uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"data"+File.separator+"data"+sceneEdit.getSceneNum() + File.separator + "floor.json",
-                    "data"+File.separator+"data"+sceneEdit.getSceneNum() + File.separator + "floor.json");
+            uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"data"+File.separator+"data"+sceneEdit.getNum() + File.separator + "floor.json",
+                    "data"+File.separator+"data"+sceneEdit.getNum() + File.separator + "floor.json");
         }catch (Exception e){
             log.error("画墙重建模型失败...", e);
             throw new BusinessException(ErrorCode.FAILURE_CODE_5039);
@@ -1221,22 +1221,22 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
     @Override
     public ResultData saveScreencapData(SceneEditParamVO base) throws Exception {
-        if(StringUtils.isEmpty(base.getSceneNum())){
+        if(StringUtils.isEmpty(base.getNum())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = baseMapper.findByNum(base.getSceneNum());
+        ScenePro scenePro = baseMapper.findByNum(base.getNum());
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scenePro.getSceneCode())
+                .append("images").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -1305,11 +1305,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
     }
 
     public ResultData saveAllVisi(SceneEditParamVO base) throws Exception {
-        if(StrUtil.isEmpty(base.getSceneNum())){
+        if(StrUtil.isEmpty(base.getNum())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = baseMapper.findByNum(base.getSceneNum());
+        ScenePro scenePro = baseMapper.findByNum(base.getNum());
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -1318,7 +1318,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -1366,11 +1366,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
             StringBuffer dataBuf = new StringBuffer()
                     .append("data").append(File.separator)
-                    .append("data").append(scenePro.getSceneCode())
+                    .append("data").append(scenePro.getNum())
                     .append(File.separator);
             StringBuffer imagesBuf = new StringBuffer()
                     .append("images").append(File.separator)
-                    .append("images").append(scenePro.getSceneCode())
+                    .append("images").append(scenePro.getNum())
                     .append(File.separator);
 
             StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
@@ -1442,12 +1442,12 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scenePro.getSceneCode())
+                .append("images").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -1503,7 +1503,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
+                .append("data").append(scenePro.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -1979,13 +1979,12 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             List<SceneCooperation> list = sceneCooperationService.list(
                     new LambdaQueryWrapper<SceneCooperation>()
                             .eq(SceneCooperation::getTbStatus, TbStatus.VALID.code())
-                            .eq(SceneCooperation::getRecStatus, RecStatus.VALID.code())
                             .eq(SceneCooperation::getUserId, userId)
                             .orderByDesc(SceneCooperation::getId));
 
             if(CollUtil.isNotEmpty(list)){
                 sceneCodeList = list.parallelStream().map(co -> {
-                    return co.getSceneCode();
+                    return co.getNum();
                 }).collect(Collectors.toList());
             }
         }
@@ -2074,7 +2073,6 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         List<ScenePro> list = sceneProService.list(
                 new LambdaQueryWrapper<ScenePro>()
                         .eq(ScenePro::getTbStatus, TbStatus.VALID.code())
-                        .eq(ScenePro::getRecStatus, RecStatus.VALID.code())
                         .eq(ScenePro::getCameraId, camera.getId())
                         .ne(ScenePro::getSceneType, SceneType.YJHZXNFY.code())
                         .in(ScenePro::getSceneStatus, SceneStatus.SUCCESS, SceneStatus.NO_DISPLAY).orderByDesc(ScenePro::getId));
@@ -2105,7 +2103,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
     public Integer getSceneStatus(@RequestBody UserParamVO user) {
 
         if(StrUtil.isEmpty(user.getAppUserName()) || StrUtil.isEmpty(user.getAppPassword())
-                || StrUtil.isEmpty(user.getSceneNum())){
+                || StrUtil.isEmpty(user.getNum())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
         ResultData<Camera> CameraResult = platformGoodsClient.getByChildNameAndChildPassword(user.getAppUserName(), user.getAppPassword());
@@ -2114,9 +2112,9 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             throw new BusinessException(ErrorCode.FAILURE_CODE_3014);
         }
 
-        ScenePro scene = sceneProService.findBySceneNum(user.getSceneNum());
+        ScenePro scene = sceneProService.findBySceneNum(user.getNum());
         if(scene == null){
-            scene = sceneProService.findDeleteSceneBySceneNum(user.getSceneNum());
+            scene = sceneProService.findDeleteSceneBySceneNum(user.getNum());
             if(scene == null){
                 throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
             }
@@ -2161,7 +2159,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         //临时将-2改成1，app还没完全更新
         map.put("status", sceneProPO.getSceneStatus() == -2? 1 : sceneProPO.getSceneStatus());
         map.put("webSite", sceneProPO.getWebSite());
-        map.put("sceneNum", sceneProPO.getSceneCode());
+        map.put("sceneNum", sceneProPO.getNum());
         map.put("thumb", sceneProPO.getThumb());
         map.put("dataSource", sceneProPO.getDataSource());
         map.put("payStatus", sceneProPO.getPayStatus());
@@ -2179,7 +2177,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
     @Override
     public ResultData deleteForCameraName(@RequestBody UserParamVO user) throws Exception {
-        if (user.getCameraId() == null || StrUtil.isEmpty(user.getSceneNum())) {
+        if (user.getCameraId() == null || StrUtil.isEmpty(user.getNum())) {
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
         ResultData<CameraDetail> detailResult = platformGoodsClient.getCameraDetailByCameraId(user.getCameraId());
@@ -2188,7 +2186,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             throw new BusinessException(CameraConstant.FAILURE_6003);
         }
 
-        ScenePro scenePro = sceneProService.findBySceneNum(user.getSceneNum());
+        ScenePro scenePro = sceneProService.findBySceneNum(user.getNum());
         if(scenePro == null){
             throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
         }
@@ -2197,7 +2195,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             throw new BusinessException(SceneConstant.FAILURE_CODE_5010, SceneConstant.FAILURE_MSG_5010);
         }
 
-        String[] nums = user.getSceneNum().split(",");
+        String[] nums = user.getNum().split(",");
         for (String num : nums) {
             SceneVO sceneVO = this.getSceneDetail(num);
             if (sceneVO == null){
@@ -2269,18 +2267,18 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             try{
                 Map<String, Object> map = new HashMap<>();
                 map.put("payStatus", 1);
-                FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + scenePro.getSceneCode() + "/scene.json", map);
+                FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + scenePro.getNum() + "/scene.json", map);
                 com.alibaba.fastjson.JSONObject statusJson = new com.alibaba.fastjson.JSONObject();
 
                 //临时将-2改成1，app还没完全更新
                 statusJson.put("status", scenePro.getSceneStatus() == -2? 1 : scenePro.getSceneStatus());
                 statusJson.put("webSite", scenePro.getWebSite());
-                statusJson.put("sceneNum", scenePro.getSceneCode());
+                statusJson.put("sceneNum", scenePro.getNum());
                 statusJson.put("thumb", scenePro.getThumb());
                 statusJson.put("payStatus", scenePro.getPayStatus());
-                FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data/data"+scenePro.getSceneCode()+ File.separator+"status.json", statusJson.toString());
-                uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"data/data"+scenePro.getSceneCode()+File.separator+"status.json",
-                        "data/data"+scenePro.getSceneCode()+File.separator+"status.json");
+                FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data/data"+scenePro.getNum()+ File.separator+"status.json", statusJson.toString());
+                uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"data/data"+scenePro.getNum()+File.separator+"status.json",
+                        "data/data"+scenePro.getNum()+File.separator+"status.json");
 
             }catch (Exception e){
                 e.printStackTrace();
@@ -2345,7 +2343,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         if(scenePo != null){
             sceneService.update(new LambdaUpdateWrapper<Scene>()
                     .eq(Scene::getId, scenePo.getId())
-                    .set(Scene::getRecStatus, RecStatus.DISABLE.code())
+                    .set(Scene::getTbStatus, TbStatus.DELETE.code())
                     .set(Scene::getUpdateTime, Calendar.getInstance().getTime()));
 
             vo = getResponseScene(vo, scenePo);
@@ -2354,7 +2352,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         ScenePro scenePro = sceneProService.findBySceneNum(sceneNum);
         SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
-        scenePro.setRecStatus("I");
+        scenePro.setTbStatus(TbStatus.DELETE.code());
         scenePro.setUpdateTime(new Date());
         sceneProService.updateById(scenePro);
 
@@ -2362,10 +2360,10 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         //临时将-2改成1，app还没完全更新
         statusJson.put("status", scenePro.getSceneStatus() == -2? 1 : scenePro.getSceneStatus());
         statusJson.put("webSite", scenePro.getWebSite());
-        statusJson.put("sceneNum", scenePro.getSceneCode());
+        statusJson.put("sceneNum", scenePro.getNum());
         statusJson.put("thumb", scenePro.getThumb());
         statusJson.put("payStatus", scenePro.getPayStatus());
-        statusJson.put("recStatus", scenePro.getRecStatus());
+        statusJson.put("tbStatus", scenePro.getTbStatus());
         FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data/data"+sceneNum+File.separator+"status.json", statusJson.toString());
         uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"data/data"+sceneNum+File.separator+"status.json",
                 "data/data"+sceneNum+File.separator+"status.json");
@@ -2376,7 +2374,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
     @Override
     public List<SceneVO> findScenesByUserIdAndSceneScheme(Long cameraId, String orderBy, Integer payStatus) {
         List<ScenePro> sceneProList = sceneProService.list(new LambdaQueryWrapper<ScenePro>()
-                .eq(ScenePro::getRecStatus, RecStatus.VALID.code())
+                .eq(ScenePro::getTbStatus, TbStatus.VALID.code())
                 .in(ScenePro::getSceneStatus, SceneStatus.SUCCESS.code(), SceneStatus.NO_DISPLAY.code())
                 .eq(ScenePro::getCameraId, cameraId)
                 .eq(ScenePro::getPayStatus, payStatus).last(orderBy));
@@ -2405,11 +2403,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
     @Override
     public ResultData getScreencapVoice(@RequestBody SceneParamVO scene) throws Exception {
         if (StrUtil.isEmpty(scene.getScreencapMusic()) || StrUtil.isEmpty(scene.getOriginalFileName())
-                || StrUtil.isEmpty(scene.getSceneNum())) {
+                || StrUtil.isEmpty(scene.getNum())) {
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = sceneProService.findBySceneNum(scene.getSceneNum());
+        ScenePro scenePro = sceneProService.findBySceneNum(scene.getNum());
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
@@ -2427,7 +2425,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH)
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneNum());
+                .append("data").append(scene.getNum());
         FileUtils.writeJsonFile(dataBuffer.append(File.separator).append("scene.json").toString(), map);
 
         sceneProEdit.setScreencapVoiceSoundsync(scene.getOriginalFileName() + "?t=" + time);
@@ -2435,7 +2433,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         sceneProEdit.setVersion(sceneProEdit.getVersion() + 1);
 
         FileUtils.downLoadFromUrl(scene.getOriginalFileName() + "?t=" + time, scene.getScreencapMusic() + ".mp3",
-                ConstantFilePath.SCENE_PATH+ "voice" + File.separator + "voice" + scene.getSceneNum());
+                ConstantFilePath.SCENE_PATH+ "voice" + File.separator + "voice" + scene.getNum());
 
         sceneProEditService.updateById(sceneProEdit);
         return ResultData.ok();
@@ -2488,7 +2486,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         List<SceneCooperation> list = sceneCooperationService.list(
                     new LambdaQueryWrapper<SceneCooperation>()
-                            .eq(SceneCooperation::getRecStatus, RecStatus.VALID.code())
+                            .eq(SceneCooperation::getTbStatus, TbStatus.VALID.code())
                             .eq(SceneCooperation::getUserId, ssoUser.getId())
                             .orderByDesc(SceneCooperation::getId));
 
@@ -2497,7 +2495,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         }
 
         List<String> sceneCodeList = list.parallelStream().map(sc -> {
-            return sc.getSceneCode();
+            return sc.getNum();
         }).collect(Collectors.toList());
 
         List<SceneProPO>  sceneProPOList = sceneProService.findBySceneNums(sceneCodeList, user.getCameraType());

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

@@ -48,8 +48,7 @@ public class SceneProEditExtServiceImpl extends ServiceImpl<ISceneProEditExtMapp
                 new LambdaQueryWrapper<ScenePro>()
                         .select(ScenePro::getId)
                         .eq(ScenePro::getTbStatus, TbStatus.VALID.code())
-                        .eq(ScenePro::getSceneCode, sceneNum)
-                        .eq(ScenePro::getRecStatus, RecStatus.VALID.code()));
+                        .eq(ScenePro::getNum, sceneNum));
         if(CollUtil.isEmpty(sceneProList)){
             ResultData.ok(0);
         }
@@ -78,7 +77,7 @@ public class SceneProEditExtServiceImpl extends ServiceImpl<ISceneProEditExtMapp
                 new LambdaQueryWrapper<SceneProEdit>()
                         .select(SceneProEdit::getId)
                         .eq(SceneProEdit::getProId, scenePro.getId())
-                        .eq(SceneProEdit::getRecStatus, RecStatus.VALID.code()));
+                        .eq(SceneProEdit::getTbStatus, TbStatus.VALID.code()));
 
         return this.getOne(new LambdaQueryWrapper<SceneProEditExt>().eq(SceneProEditExt::getProEditId, edit.getId()));
     }

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

@@ -27,13 +27,13 @@ public class SceneResourceCameraServiceImpl extends ServiceImpl<ISceneResourceCa
     public void deleteByCameraId(Long id) {
         this.update(new LambdaUpdateWrapper<SceneResourceCamera>()
                 .eq(SceneResourceCamera::getCameraId, id)
-                .set(SceneResourceCamera::getRecStatus, RecStatus.DISABLE.code()));
+                .set(SceneResourceCamera::getTbStatus, TbStatus.DELETE.code()));
     }
 
     @Override
     public List<SceneResourceCamera> findListByCameraId(Long id) {
         return this.list(new LambdaQueryWrapper<SceneResourceCamera>()
-                .eq(SceneResourceCamera::getRecStatus, RecStatus.VALID.code())
+                .eq(SceneResourceCamera::getTbStatus, TbStatus.VALID.code())
                 .eq(SceneResourceCamera::getTbStatus, TbStatus.VALID.code()).eq(SceneResourceCamera::getCameraId, id));
     }
 }

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

@@ -41,7 +41,6 @@ public class SceneResourceServiceImpl extends ServiceImpl<ISceneResourceMapper,
                 new LambdaQueryWrapper<SceneResourceCooperation>()
                         .select(SceneResourceCooperation::getSceneResourceId)
                         .eq(SceneResourceCooperation::getTbStatus, TbStatus.VALID.code())
-                        .eq(SceneResourceCooperation::getRecStatus, RecStatus.VALID.code())
                         .eq(SceneResourceCooperation::getSceneCooperationId, id));
         if(CollUtil.isEmpty(sceneResourceCooperationList)){
             return null;
@@ -60,7 +59,6 @@ public class SceneResourceServiceImpl extends ServiceImpl<ISceneResourceMapper,
                 new LambdaQueryWrapper<SceneResourceCamera>()
                         .select(SceneResourceCamera::getSceneResourceId)
                         .eq(SceneResourceCamera::getTbStatus, TbStatus.VALID.code())
-                        .eq(SceneResourceCamera::getRecStatus, RecStatus.VALID.code())
                         .eq(SceneResourceCamera::getCameraId, id));
         if(CollUtil.isEmpty(sceneResourceCameraList)){
             return null;

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

@@ -108,7 +108,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
         if (!file.isEmpty()){
 
-            String path = ConstantFilePath.SCENE_PATH + "images" + File.separator + "images" + scene.getSceneCode() + "hot";
+            String path = ConstantFilePath.SCENE_PATH + "images" + File.separator + "images" + scene.getNum() + "hot";
             File targetFile = new File(path);
             if (!targetFile.exists()){
                 targetFile.mkdirs();
@@ -129,7 +129,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
         Scene scene = this.getValidById(Long.valueOf(sceneId));
         if (scene != null && !file.isEmpty()){
 
-            String path = ConstantFilePath.SCENE_PATH + "images" + File.separator + "images" + scene.getSceneCode()
+            String path = ConstantFilePath.SCENE_PATH + "images" + File.separator + "images" + scene.getNum()
                     + File.separator + ConstantFileName.GUIDE_MEDIA_FOLDER;
             File targetFile = new File(path);
             if (!targetFile.exists()){
@@ -153,7 +153,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
         ResultData result = null;
         Scene scene = getValidById(base.getSceneId());
         if (scene != null){
-            String path = ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + scene.getSceneCode()
+            String path = ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + scene.getNum()
                     + File.separator + ConstantFileName.GUIDE_DATAFILE;
 
             File file = new File(path);
@@ -231,7 +231,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
                 unicode = unicode.substring(0, unicode.lastIndexOf("/"));
                 unicode = unicode.replace(ConstantUrl.DEFAULT_PREFIX_QINIU_PIC, "");
                 String path = ConstantFilePath.BUILD_MODEL_PATH + unicode + File.separator + "tex" + File.separator + "floor.json";
-                FileUtils.copyFile(path, ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + scene.getSceneCode() + File.separator + "floor.json", true);
+                FileUtils.copyFile(path, ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + scene.getNum() + File.separator + "floor.json", true);
             }
             result = ResultData.ok();
         } else {
@@ -353,12 +353,12 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
             SceneExt sceneExt = sceneExtService.getBySceneId(scene.getId());
             StringBuffer dataBuf = new StringBuffer()
                     .append("data").append(File.separator)
-                    .append("data").append(scene.getSceneCode())
+                    .append("data").append(scene.getNum())
                     .append(File.separator);
 
             StringBuffer imagesBuf = new StringBuffer()
                     .append("images").append(File.separator)
-                    .append("images").append(scene.getSceneCode())
+                    .append("images").append(scene.getNum())
                     .append(File.separator);
 
             StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -377,7 +377,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
             String sceneType = json.getString("sceneType");
             int type = sceneType != null ? Integer.valueOf(sceneType) : 0;
 
-            scene.setSceneCode(index);
+            scene.setNum(index);
             scene.setSceneName(json.getString("sceneName"));
             scene.setSceneDec(json.getString("sceneDec"));
             scene.setSceneType(type);
@@ -423,11 +423,11 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
             StringBuffer dataBuf = new StringBuffer()
                     .append("data").append(File.separator)
-                    .append("data").append(scene.getSceneCode())
+                    .append("data").append(scene.getNum())
                     .append(File.separator);
             StringBuffer imagesBuf = new StringBuffer()
                     .append("images").append(File.separator)
-                    .append("images").append(scene.getSceneCode())
+                    .append("images").append(scene.getNum())
                     .append(File.separator);
 
             StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
@@ -504,7 +504,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
         String sid = base.getSid();
 
-        ScenePO scene = findBySceneNum(base.getSceneNum());
+        ScenePO scene = findBySceneNum(base.getNum());
         if (scene == null ) {
             return ResultData.error(ErrorCode.FAILURE_CODE_5005);
         }
@@ -513,11 +513,11 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getSceneCode())
+                .append("images").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
@@ -610,11 +610,11 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
     @Override
 //    @SystemServiceLog(description = "漫游可行")
     public ResultData saveLinkPano(SceneEditParamVO base) throws Exception {
-        if(StrUtil.isEmpty(base.getData()) || StrUtil.isEmpty(base.getSceneNum())){
+        if(StrUtil.isEmpty(base.getData()) || StrUtil.isEmpty(base.getNum())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePO scene = baseMapper.findByNum(base.getSceneNum());
+        ScenePO scene = baseMapper.findByNum(base.getNum());
         if (scene == null ) {
             return ResultData.error(ErrorCode.FAILURE_CODE_5005);
         }
@@ -623,11 +623,11 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getSceneCode())
+                .append("images").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -681,8 +681,8 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-//        ScenePO scene = findBySceneNum(base.getSceneNum());
-        Scene scene = this.getSceneBySceneCode(base.getSceneNum());
+//        ScenePO scene = findBySceneNum(base.getNum());
+        Scene scene = this.getSceneBySceneCode(base.getNum());
         if (scene == null ) {
             return ResultData.error(ErrorCode.FAILURE_CODE_5005);
         }
@@ -691,11 +691,11 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
         StringBuffer imagesBuf = new StringBuffer()
                 .append("images").append(File.separator)
-                .append("images").append(scene.getSceneCode())
+                .append("images").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer imagesBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(imagesBuf.toString());
@@ -775,7 +775,6 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
     public Scene getValidById(long id) {
         return this.getOne(new LambdaQueryWrapper<Scene>()
                 .eq(Scene::getTbStatus, TbStatus.VALID.code())
-                .eq(Scene::getRecStatus, RecStatus.VALID.code())
                 .eq(Scene::getId, id));
     }
 
@@ -831,8 +830,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
         List<Scene> list = this.list(new LambdaQueryWrapper<Scene>()
                 .eq(Scene::getTbStatus, TbStatus.VALID.code())
-                .eq(Scene::getRecStatus, RecStatus.VALID.code())
-                .eq(Scene::getSceneCode, sceneCode));
+                .eq(Scene::getNum, sceneCode));
         if(CollUtil.isEmpty(list)){
             return null;
         }
@@ -862,12 +860,12 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 //    }
 
     @Override
-    public Scene getSceneStatusByUnicode(String unicode, String recStatus) {
-        return this.getOne(new LambdaQueryWrapper<Scene>().eq(Scene::getRecStatus, recStatus).like(Scene::getDataSource, "%"+unicode+"%"));
+    public Scene getSceneStatusByUnicode(String unicode, int tbStatus) {
+        return this.getOne(new LambdaQueryWrapper<Scene>().eq(Scene::getTbStatus, tbStatus).like(Scene::getDataSource, "%"+unicode+"%"));
     }
 
     public void updateStatus(String sceneNum, int status) {
-        this.update(new LambdaUpdateWrapper<Scene>().eq(Scene::getSceneCode, sceneNum).set(Scene::getSceneStatus, status));
+        this.update(new LambdaUpdateWrapper<Scene>().eq(Scene::getNum, sceneNum).set(Scene::getSceneStatus, status));
     }
 
     @Override
@@ -875,13 +873,13 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
         List<Scene> sceneList = this.list(new LambdaQueryWrapper<Scene>()
                 .select(Scene::getId)
-                .eq(Scene::getSceneCode, sceneNum));
+                .eq(Scene::getNum, sceneNum));
 
         if(CollUtil.isEmpty(sceneList))
             return ;
 
         this.update(new LambdaUpdateWrapper<Scene>()
-                .eq(Scene::getSceneCode, sceneNum)
+                .eq(Scene::getNum, sceneNum)
                 .set(Scene::getCreateTime, Calendar.getInstance().getTime())
                 .set(Scene::getSceneStatus, SceneStatus.NO_DISPLAY.code()));
 
@@ -896,18 +894,18 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
     @Override
     public ResultData addHotMediaInfo(SceneEditParamVO base) throws Exception{
-        if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getType()) ||
+        if(StrUtil.isEmpty(base.getNum()) || StrUtil.isEmpty(base.getType()) ||
                 StrUtil.isEmpty(base.getInfo())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePO scene = findBySceneNum(base.getSceneNum());
+        ScenePO scene = findBySceneNum(base.getNum());
         if(scene == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -941,19 +939,19 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
     @Override
     public ResultData saveScreencapFile(SceneEditParamVO base) throws Exception{
-        if(StrUtil.isEmpty(base.getSceneNum()) || StrUtil.isEmpty(base.getIndex()) ||
+        if(StrUtil.isEmpty(base.getNum()) || StrUtil.isEmpty(base.getIndex()) ||
                 StrUtil.isEmpty(base.getCamerasData())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePO scene = findBySceneNum(base.getSceneNum());
+        ScenePO scene = findBySceneNum(base.getNum());
         if(scene == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
 
         StringBuffer dataBuf = new StringBuffer()
                 .append("data").append(File.separator)
-                .append("data").append(scene.getSceneCode())
+                .append("data").append(scene.getNum())
                 .append(File.separator);
 
         StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
@@ -1141,10 +1139,10 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
         if(param.getSceneScheme()!= null && param.getSceneScheme() == 4){
             Page<ScenePro> page = new Page<>(param.getPageNum(), param.getPageSize());
             Page<ScenePro> sceneProPage = sceneProService.page(page, new LambdaQueryWrapper<ScenePro>()
-                    .eq(ScenePro::getRecStatus, RecStatus.VALID.code())
+                    .eq(ScenePro::getTbStatus, TbStatus.VALID.code())
                     .in(ScenePro::getSceneStatus, SceneStatus.SUCCESS.code(), SceneStatus.NO_DISPLAY.code())
                     .and(wrapper -> wrapper.or().like(ScenePro::getSceneName, "%" + param.getSceneKey() + "%")
-                            .or().like(ScenePro::getSceneCode, "%" + param.getSceneKey() + "%")).orderByDesc(ScenePro::getId));
+                            .or().like(ScenePro::getNum, "%" + param.getSceneKey() + "%")).orderByDesc(ScenePro::getId));
             if(CollUtil.isEmpty(sceneProPage.getRecords())){
                 return sceneProPage;
             }
@@ -1203,7 +1201,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
         if(path==null&&path.trim().equals(""))
             throw new BusinessException(ErrorCode.FAILURE_CODE_7002);
         path = path.split("/")[path.split("/").length - 1];
-        Scene scene = sceneService.getSceneStatusByUnicode(path, "A");
+        Scene scene = sceneService.getSceneStatusByUnicode(path, TbStatus.VALID.code());
         String sceneNum = null;
         if(scene == null)
         {
@@ -1211,9 +1209,9 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
             if(scenePro == null)
                 throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
 
-            sceneNum = scenePro.getSceneCode();
+            sceneNum = scenePro.getNum();
         }else {
-            sceneNum = scene.getSceneCode();
+            sceneNum = scene.getNum();
         }
         return ResultData.ok(sceneNum);
     }

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

@@ -1,4 +1,4 @@
-package com.fdkankan.scene.service;
+package com.fdkankan.scene.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ErrorCode;
@@ -11,6 +11,9 @@ import com.fdkankan.platform.api.vo.Camera;
 import com.fdkankan.platform.api.vo.User;
 import com.fdkankan.scene.entity.SceneCooperation;
 import com.fdkankan.scene.entity.SceneProPO;
+import com.fdkankan.scene.service.ISceneCooperationService;
+import com.fdkankan.scene.service.ISceneService;
+import com.fdkankan.scene.service.IUserSceneService;
 import com.fdkankan.scene.vo.SceneParamVO;
 import com.fdkankan.scene.vo.SceneVO;
 import lombok.extern.slf4j.Slf4j;
@@ -24,7 +27,7 @@ import java.util.stream.Collectors;
 
 @Service
 @Slf4j
-public class UserSceneService {
+public class UserSceneService implements IUserSceneService {
 
     @Autowired
     private SSOLoginHelper ssoLoginHelper;
@@ -37,6 +40,7 @@ public class UserSceneService {
     @Autowired
     private ISceneService sceneService;
 
+    @Override
     public Page<SceneVO> getScenes(String token, SceneParamVO param) {
         SSOUser ssoUser = ssoLoginHelper.loginCheck(token);
         if(ssoUser == null){
@@ -57,7 +61,7 @@ public class UserSceneService {
 
             if(userIds.size() > 0){
                 List<SceneCooperation> cooperationList = sceneCooperationService.getListByUserId(userIds);
-                nums = cooperationList.parallelStream().map(entity->"'"+entity.getSceneCode()+"'").collect(Collectors.joining(","));
+                nums = cooperationList.parallelStream().map(entity->"'"+entity.getNum()+"'").collect(Collectors.joining(","));
                 param.setNums(nums);
             }
         }

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.RebuildResult;
-import com.fdkankan.common.constant.RecStatus;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.entity.ScenePro;
@@ -44,8 +44,8 @@ public class VideoSceneProgressServiceImpl extends ServiceImpl<IVideoSceneProgre
         List<VideoSceneProgress> videoSceneProgressyList =
                 this.list(new LambdaQueryWrapper<VideoSceneProgress>()
                         .select(VideoSceneProgress::getId, VideoSceneProgress::getVideoName, VideoSceneProgress::getRebuildResult)
-                        .eq(VideoSceneProgress::getRecStatus, RecStatus.VALID.code())
-                        .eq(VideoSceneProgress::getSceneCode, param.getSceneNum()));
+                        .eq(VideoSceneProgress::getTbStatus, TbStatus.VALID.code())
+                        .eq(VideoSceneProgress::getNum, param.getNum()));
 
         List<VideoSceneProgressVO> result = videoSceneProgressyList.parallelStream().map(vsp -> {
             VideoSceneProgressVO vo = new VideoSceneProgressVO();
@@ -55,8 +55,8 @@ public class VideoSceneProgressServiceImpl extends ServiceImpl<IVideoSceneProgre
 
         this.update(new LambdaUpdateWrapper<VideoSceneProgress>()
                 .set(VideoSceneProgress::getRebuildResult, RebuildResult.POLLED.code())
-                .eq(VideoSceneProgress::getSceneCode, param.getSceneNum())
-                .eq(VideoSceneProgress::getRecStatus, RecStatus.VALID.code())
+                .eq(VideoSceneProgress::getNum, param.getNum())
+                .eq(VideoSceneProgress::getTbStatus, TbStatus.VALID.code())
                 .eq(VideoSceneProgress::getRebuildResult, RebuildResult.SUCCESS.code()));
 
         //更新访问量
@@ -66,8 +66,8 @@ public class VideoSceneProgressServiceImpl extends ServiceImpl<IVideoSceneProgre
     @Override
     public void updateProgressRec(RebuildVedioSceneParamVO param) {
         this.update(new LambdaUpdateWrapper<VideoSceneProgress>()
-                .set(VideoSceneProgress::getRecStatus, RecStatus.DISABLE.code())
-                .eq(VideoSceneProgress::getSceneCode, param.getSceneNum())
+                .set(VideoSceneProgress::getTbStatus, TbStatus.DELETE.code())
+                .eq(VideoSceneProgress::getNum, param.getNum())
                 .eq(VideoSceneProgress::getVideoName, param.getPanoId()));
     }
 
@@ -75,8 +75,8 @@ public class VideoSceneProgressServiceImpl extends ServiceImpl<IVideoSceneProgre
     public VideoSceneProgress findrebuildVideoProgressDetail(String num,String panId) {
         VideoSceneProgress videoSceneProgress =
                 this.getOne(new LambdaQueryWrapper<VideoSceneProgress>()
-                        .eq(VideoSceneProgress::getRecStatus, RecStatus.VALID.code())
-                        .eq(VideoSceneProgress::getSceneCode, num)
+                        .eq(VideoSceneProgress::getTbStatus, TbStatus.VALID.code())
+                        .eq(VideoSceneProgress::getNum, num)
                         .eq(VideoSceneProgress::getVideoName, panId));
         return videoSceneProgress;
     }
@@ -87,19 +87,19 @@ public class VideoSceneProgressServiceImpl extends ServiceImpl<IVideoSceneProgre
         this.update(new LambdaUpdateWrapper<VideoSceneProgress>()
                 .set(VideoSceneProgress::getRebuildResult, status)
                 .set(VideoSceneProgress::getRebuildEndTime, Calendar.getInstance().getTime())
-                .eq(VideoSceneProgress::getSceneCode, num)
-                .eq(VideoSceneProgress::getRecStatus, RecStatus.VALID.code())
+                .eq(VideoSceneProgress::getNum, num)
+                .eq(VideoSceneProgress::getTbStatus, TbStatus.VALID.code())
                 .eq(VideoSceneProgress::getVideoName, panId));
 
     }
 
     public ResultData rebuildVideoSceneProgress(RebuildVedioSceneParamVO param) throws Exception {
 
-        if(StringUtils.isEmpty(param.getSceneNum())){
+        if(StringUtils.isEmpty(param.getNum())){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = sceneProService.findBySceneNum(param.getSceneNum());
+        ScenePro scenePro = sceneProService.findBySceneNum(param.getNum());
         if(null == scenePro){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/FileParamVO.java

@@ -22,8 +22,8 @@ public class FileParamVO {
     /**
      * 场景吗
      */
-    @NotBlank(message = "sceneNum不能为空！")
-    private String sceneNum;
+    @NotBlank(message = "场景码不能为空！")
+    private String num;
 
     private String id;
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/FolderVO.java

@@ -34,7 +34,7 @@ public class FolderVO {
 
     private String createTimeStr;
 
-    private Integer sceneNum;
+    private Integer num;
 
     private Integer isFolder;
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/RebuildVedioSceneParamVO.java

@@ -10,7 +10,7 @@ import java.util.Map;
 @Data
 public class RebuildVedioSceneParamVO extends RequestBase implements Serializable {
 
-    private String sceneNum;
+    private String num;
 
     private String panoId;
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/Scene3dfamilyVO.java

@@ -20,7 +20,7 @@ public class Scene3dfamilyVO{
     /**
      * 场景码
      */
-    private String sceneCode;
+    private String num;
 
     /**
      * zip包存放路径

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneCooperationParamVO.java

@@ -16,7 +16,7 @@ public class SceneCooperationParamVO {
 
     private Long id;
 
-    private String sceneNum;
+    private String num;
 
     private Long userId;
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneEditParamVO.java

@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class SceneEditParamVO {
 
-    private String sceneNum;
+    private String num;
 
     /**
      * scene.json的数据内容

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneParamVO.java

@@ -1,7 +1,6 @@
 package com.fdkankan.scene.vo;
 
 import com.fdkankan.common.request.RequestBase;
-import com.fdkankan.common.response.PageInfo;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -29,7 +28,7 @@ public class SceneParamVO extends RequestBase implements Serializable {
 
     private String guideName;
 
-    private String sceneNum;
+    private String num;
 
     private String childName;
     //场景的二维设计图数据
@@ -123,8 +122,6 @@ public class SceneParamVO extends RequestBase implements Serializable {
 
     private String snCode;
 
-    private String num;
-
     private String objName;
 
     private String mntName;

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneProEditVO.java

@@ -1,9 +1,10 @@
 package com.fdkankan.scene.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
 
 import java.util.Date;
 
+@Data
 public class SceneProEditVO {
 
     private Long id;

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneProVO.java

@@ -54,7 +54,7 @@ public class SceneProVO {
     /**
      * 大场景序号
      */
-    private String sceneCode;
+    private String num;
 
     /**
      * 0-其他，1-文博，2-地产，3-电商，4-餐饮，5-家居,99-一件换装虚拟房源

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/UserParamVO.java

@@ -59,7 +59,7 @@ public class UserParamVO extends RequestBase implements Serializable {
 
     private String searchKey;
 
-    private String sceneNum;
+    private String num;
 
     private String unicode;
 

4dkankan-center-scene/src/main/resources/mapper/scene/FolderMapper.xml

@@ -7,9 +7,6 @@
         SELECT *
         FROM t_folder
         WHERE tb_status = 0
-        <if test="recStatus != null and recStatus != ''">
-            and rec_status = #{recStatus}
-        </if>
         <if test="folderName != null and folderName != ''">
             and folder_name = #{folderName}
         </if>
@@ -29,7 +26,6 @@
         SELECT *
         FROM t_folder
         WHERE tb_status = 0
-        and rec_status = 'A'
         and user_id = #{userId}
         and folder_type = #{folderType}
         <if test= "name != null">

4dkankan-center-scene/src/main/resources/mapper/scene/Scene3dNumMapper.xml

@@ -3,11 +3,11 @@
 <mapper namespace="com.fdkankan.scene.mapper.IScene3dNumMapper">
 
     <select id="findSceneNum" resultType="java.lang.String">
-        SELECT scene_code FROM t_scene_3d_num  WHERE used = 0 AND rec_status = 'A' LIMIT 500
+        SELECT scene_code FROM t_scene_3d_num  WHERE used = 0 AND tb_status = 0 LIMIT 500
     </select>
 
     <select id="updateUsedStatus">
-        update t_scene_3d_num set used = 1 , update_time = now() where scene_code in
+        update t_scene_3d_num set used = 1 , update_time = now() where num in
         <foreach item="sceneCode" collection="sceneCodes" open="(" separator="," close=")">
           #{sceneCode}
         </foreach>

4dkankan-center-scene/src/main/resources/mapper/scene/Scene3dfamilyMapper.xml

@@ -5,8 +5,7 @@
     <select id="findSceneCodeByCode" resultType="com.fdkankan.scene.entity.Scene3dfamily">
         select * from t_scene_3dfamily
         where tb_status = 0
-        AND rec_status = 'A'
-        and scene_code = #{sceneCode}
+        and num = #{sceneCode}
         <if test="zipStatus ！= null">
             AND zip_status = #{zipStatus}
         </if>

4dkankan-center-scene/src/main/resources/mapper/scene/SceneMapper.xml

@@ -5,13 +5,13 @@
     <sql id="Scene_column">
         id, scene_name, scene_dec, web_site, thumb, scene_status,
         data_source, user_id, pay_status, camera_id, phone_id,
-        scene_type, scene_code, scene_key, recommend, view_count,
+        scene_type, num, scene_key, recommend, view_count,
         version, thumb_status, floor_logo, floor_logo_size, rec_status,
         create_time, update_time, tb_status
     </sql>
 
     <sql id="SceneExt_column" >
-        hots_ids, entry, shoot_count, style,
+        hots_ids, entry, shoot_count, `style`,
         gps, scene_scheme, bg_music, screencap_voice_src, screencap_music, screencap_len,
         screencap_voice_sound, screencap_voice_type, play_data, algorithm, oss,floor_edit_ver,floor_publish_ver,space,screencap_thumb
     </sql>
@@ -23,19 +23,19 @@
         <include refid="SceneExt_column" />
         FROM t_scene t
         left join  t_scene_ext ext on t.id = ext.scene_id
-        WHERE t.scene_code = #{sceneCode}
+        WHERE t.num = #{sceneCode}
         AND t.rec_status = 'A'
         LIMIT 1
     </select>
 
     <select id="queryByParam" resultType="com.fdkankan.scene.vo.SceneVO">
         SELECT * FROM (
-            SELECT t.id, t.thumb, t.scene_code, t.scene_type, t.scene_name, t.create_time, ext.gps,
+            SELECT t.id, t.thumb, t.num, t.scene_type, t.scene_name, t.create_time, ext.gps,
             t.scene_key, t.view_count, t.scene_status, ext.scene_scheme, t.web_site, t.rec_status, t.user_id, t.camera_id
             FROM t_scene t
             left join  t_scene_ext ext on t.id = ext.scene_id
             UNION
-            SELECT t.id, t.thumb, t.scene_code, t.scene_type, t.scene_name, t.create_time, t.gps,
+            SELECT t.id, t.thumb, t.num, t.scene_type, t.scene_name, t.create_time, t.gps,
             'pro' as scene_key, t.view_count, ext.scene_status, t.scene_scheme, t.web_site, t.rec_status, t.user_id, t.camera_id
             FROM t_scene_pro t
             left join t_scene_pro_ext ext on t.id = ext.scene_pro_id
@@ -52,7 +52,7 @@
 
     <select id="queryByParamNew" resultType="com.fdkankan.scene.vo.SceneVO">
         SELECT * FROM (
-            SELECT t.id, t.thumb, t.scene_code, t.scene_type, t.scene_name, t.create_time, ext.gps,
+            SELECT t.id, t.thumb, t.num, t.scene_type, t.scene_name, t.create_time, ext.gps,
             t.scene_key, t.view_count, t.scene_status, ext.scene_scheme, t.web_site, t.rec_status, t.user_id, t.camera_id
             FROM t_scene t
             left join  t_scene_ext ext on t.id = ext.scene_id
@@ -97,13 +97,13 @@
             resultType="com.fdkankan.scene.entity.SceneProPO">
         select a.* from (
         SELECT t.id,scene_name, scene_dec, web_site, thumb, scene_type,
-        t.create_time, scene_status, user_id, pay_status, camera_id, scene_code, scene_scheme, shoot_count,
+        t.create_time, scene_status, user_id, pay_status, camera_id, num, scene_scheme, shoot_count,
         rec_status, SPACE, recommend, view_count, 'V1' AS build_type
         FROM `t_scene` t
         LEFT JOIN  t_scene_ext ext ON t.id = ext.scene_id
         UNION
         SELECT t.id,t.scene_name, t.scene_dec, t.web_site, t.thumb, t.scene_type,
-        t.create_time, t.scene_status, t.user_id, t.pay_status, t.camera_id, t.scene_code, t.scene_scheme, ext.shoot_count,
+        t.create_time, t.scene_status, t.user_id, t.pay_status, t.camera_id, t.num, t.scene_scheme, ext.shoot_count,
         t.rec_status, ext.space, ext.recommend, ext.view_count, t.build_type
         FROM `t_scene_pro` t
         LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
@@ -139,9 +139,9 @@
                 <choose>
                     <when test="param.sceneName != null and param.sceneName != '' and param.cameraIds != null">
                         and (a.scene_name like CONCAT('%',#{param.sceneName},'%')
-                            or a.scene_code like #{param.likeNum}
+                            or a.num like #{param.likeNum}
                             or a.camera_id in (#{param.cameraId})
-                            or a.scene_code in
+                            or a.num in
                             <foreach collection="param.nums" item="item" open="(" close=")" separator=",">
                                 #{item}
                             </foreach>
@@ -149,13 +149,13 @@
                     </when>
                     <when test="param.sceneName != null and param.sceneName !=''">
                         and (a.scene_name like CONCAT('%',#{param.sceneName},'%')
-                            or a.scene_code like #{param.likeNum}
-                            or a.scene_code in (#{param.nums})
+                            or a.num like #{param.likeNum}
+                            or a.num in (#{param.nums})
                         )
                     </when>
                     <otherwise>
                         and (a.camera_id = #{param.cameraId}
-                            or a.scene_code in (#{param.nums})
+                            or a.num in (#{param.nums})
                         )
                     </otherwise>
                 </choose>
@@ -164,14 +164,14 @@
                 <choose>
                     <when test="param.sceneName != null and param.sceneName != '' and param.cameraId != null">
                         and (a.scene_name like CONCAT('%',#{param.sceneName},'%')
-                            or a.scene_code like #{param.likeNum}
+                            or a.num like #{param.likeNum}
                             or a.camera_id in #{param.cameraId}
-                            or a.scene_code in  (#{param.nums})
+                            or a.num in  (#{param.nums})
                         )
                     </when>
                     <when test="param.sceneName != null and param.sceneName !=''">
                         and (a.scene_name like CONCAT('%',#{param.sceneName},'%')
-                            or a.scene_code like #{param.likeNum}
+                            or a.num like #{param.likeNum}
                         )
                     </when>
                     <otherwise>
@@ -187,7 +187,7 @@
             and a.create_time <![CDATA[ <= ]]> #{param.endDate}
         </if>
         <if test="param.num != null and param.num != ''">
-            and a.scene_code = #{param.num}
+            and a.num = #{param.num}
         </if>
         <if test="param.order != null and param.order != ''">
             order by ${param.order}
@@ -197,13 +197,13 @@
     <select id="unionSearchBySceneName" resultType="com.fdkankan.scene.entity.ScenePO">
         select a.* from (
             SELECT t.id,scene_name, scene_dec, web_site, thumb, scene_type,
-            t.create_time, scene_status, user_id, pay_status, camera_id, scene_code, scene_scheme, shoot_count,
+            t.create_time, scene_status, user_id, pay_status, camera_id, num, scene_scheme, shoot_count,
             rec_status, SPACE, recommend, view_count, 'V1' AS build_type
             FROM `t_scene` t
             LEFT JOIN  t_scene_ext ext ON t.id = ext.scene_id
             UNION
             SELECT t.id,t.scene_name, t.scene_dec, t.web_site, t.thumb, t.scene_type,
-            t.create_time, t.scene_status, t.user_id, t.pay_status, t.camera_id, t.scene_code, t.scene_scheme, ext.shoot_count,
+            t.create_time, t.scene_status, t.user_id, t.pay_status, t.camera_id, t.num, t.scene_scheme, ext.shoot_count,
             t.rec_status, ext.space, ext.recommend, ext.view_count, t.build_type
             FROM `t_scene_pro` t
             LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
@@ -218,13 +218,13 @@
             resultType="com.fdkankan.scene.entity.SceneProPO">
         select a.* from (
             SELECT t.id,scene_name, scene_dec, web_site, thumb, scene_type,
-            t.create_time, scene_status, user_id, pay_status, camera_id, scene_code, scene_scheme, shoot_count,
+            t.create_time, scene_status, user_id, pay_status, camera_id, num, scene_scheme, shoot_count,
             rec_status, SPACE, recommend, view_count, 'V1' AS build_type, '2' AS scene_source
             FROM `t_scene` t
             LEFT JOIN  t_scene_ext ext ON t.id = ext.scene_id
             UNION
             SELECT t.id,t.scene_name, t.scene_dec, t.web_site, t.thumb, t.scene_type,
-            t.create_time, ext.scene_status, t.user_id, ext.pay_status, t.camera_id, t.scene_code, t.scene_scheme, t.shoot_count,
+            t.create_time, ext.scene_status, t.user_id, ext.pay_status, t.camera_id, t.num, t.scene_scheme, t.shoot_count,
             t.rec_status, ext.space, ext.recommend, t.view_count, t.build_type, ext.scene_source
             FROM `t_scene_pro` t
             LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
@@ -243,7 +243,7 @@
           and a.create_time &lt;= #{endTime}
         </if> 
         <if test="nums != null"> 
-          and a.scene_code in (${nums})
+          and a.num in (${nums})
         </if> 
         <if test="calculated  != null and calculated == true"> 
           and (a.status = 1 or a.status = -2)
@@ -266,7 +266,7 @@
         left join  t_scene_ext ext on t.id = ext.scene_id
         WHERE rec_status = 'A'
         AND t.scene_status in (1, -2)
-        and (t.scene_name like CONCAT('%',#{param.searchKey},'%') or t.scene_code like CONCAT('%',#{param.searchKey},'%'))
+        and (t.scene_name like CONCAT('%',#{param.searchKey},'%') or t.num like CONCAT('%',#{param.searchKey},'%'))
         <if test="param.orderBy != null and param.orderBy != ''">
             order by ${param.orderBy}
         </if>

4dkankan-center-scene/src/main/resources/mapper/scene/SceneProMapper.xml

@@ -11,14 +11,13 @@
         <result column="user_id" property="userId" jdbcType="BIGINT" />
         <result column="camera_id" property="cameraId" jdbcType="BIGINT" />
         <result column="scene_logo" property="sceneLogo" jdbcType="VARCHAR" />
-        <result column="scene_code" property="sceneCode" jdbcType="VARCHAR" />
+        <result column="num" property="num" jdbcType="VARCHAR" />
         <result column="scene_type" property="sceneType" jdbcType="TINYINT" />
         <result column="scene_status" property="sceneStatus" jdbcType="INTEGER" />
         <result column="pay_status" property="payStatus" jdbcType="TINYINT" />
         <result column="videos" property="videos" jdbcType="VARCHAR" />
         <result column="gps" property="gps" jdbcType="VARCHAR" />
         <result column="scene_scheme" property="sceneScheme" jdbcType="TINYINT" />
-        <result column="rec_status" property="recStatus" jdbcType="VARCHAR" />
         <result column="build_type" property="buildType" jdbcType="VARCHAR" />
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
@@ -27,8 +26,8 @@
 
     <sql id="ScenePro_column">
         t.id, t.scene_name, t.scene_dec, t.web_site, t.thumb, t.user_id,
-        t.camera_id, t.scene_logo, t.scene_code, t.scene_type, t.scene_status,
-        t.pay_status, t.videos, t.gps, t.scene_scheme, t.rec_status, t.build_type,
+        t.camera_id, t.scene_logo, t.num, t.scene_type, t.scene_status,
+        t.pay_status, t.videos, t.gps, t.scene_scheme, t.tb_status, t.build_type,
         t.create_time, t.update_time, t.tb_status
     </sql>
 
@@ -65,14 +64,14 @@
 
     <select id="findLikeNum" resultType="com.fdkankan.scene.entity.ScenePro">
         SELECT * FROM t_scene_pro
-        WHERE scene_code like CONCAT(#{sceneCode}, '%')
-        AND rec_status = 'A'
+        WHERE num like CONCAT(#{sceneCode}, '%')
+        AND tb_status = 0
         ORDER BY id desc
         limit 1
     </select>
 
     <select id="findByNum" resultType="com.fdkankan.scene.entity.ScenePro">
-        SELECT * FROM t_scene_pro WHERE scene_code = #{sceneCode} AND rec_status = 'A' LIMIT 1
+        SELECT * FROM t_scene_pro WHERE num = #{sceneCode} AND tb_status = 0 LIMIT 1
     </select>
 
     <select id="getSceneStatusByUnicode" resultType="com.fdkankan.scene.entity.SceneProPO">
@@ -81,7 +80,7 @@
         <include refid="SceneProExt_column"/>
         from t_scene_pro t
         left join t_scene_pro_ext ext on t.id = ext.scene_pro_id
-        WHERE ext.data_source LIKE CONCAT('%',#{unicode},'%') AND t.rec_status = #{recStatus}
+        WHERE ext.data_source LIKE CONCAT('%',#{unicode},'%') AND t.tb_status = #{tbStatus}
         order by t.create_time desc
         LIMIT 1
     </select>
@@ -94,7 +93,7 @@
         LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
         WHERE t.user_id = #{userId}
         AND ext.camera_type = #{cameraType}
-        AND t.rec_status = 'A'
+        AND t.tb_status = 0
         AND t.scene_status IN (1,-2)
         AND t.scene_type != 99
         ORDER BY t.create_time DESC
@@ -107,12 +106,12 @@
         FROM t_scene_pro t
         LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
         WHERE t.user_id = #{userId}
-        AND t.rec_status = 'A'
+        AND t.tb_status = 0
         AND t.scene_status in (1, -2)
         AND t.scene_type != 99
         AND ext.scene_source = 1
         <if test= 'excludeNums != null and excludeNums.size > 0'>
-            and t.scene_code not in
+            and t.num not in
             <foreach item='num' collection='excludeNums' open='(' separator=',' close=')'>
                 #{num}
             </foreach>
@@ -127,11 +126,11 @@
         FROM t_scene_pro t
         LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
         WHERE ext.camera_type = #{cameraType}
-        AND t.rec_status = 'A'
+        AND t.tb_status = 0
         AND t.scene_status IN (1,-2)
         AND t.scene_type != 99
         <if test= 'sceneCodeList != null and sceneCodeList.size > 0'>
-            and t.scene_code in
+            and t.num in
             <foreach item='sceneCode' collection='sceneCodeList' open='(' separator=',' close=')'>
                 #{sceneCode}
             </foreach>
@@ -146,7 +145,7 @@
         FROM t_scene_pro t
         LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
         WHERE t.user_id = #{userId}
-        AND t.rec_status = 'A'
+        AND t.tb_status = 0
         AND t.camera_id is not null
         ORDER BY t.create_time DESC
         LIMIT 1
@@ -159,7 +158,7 @@
         FROM t_scene_pro t
         LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
         WHERE t.camera_id = #{cameraId}
-        AND t.rec_status = 'A'
+        AND t.tb_status = 0
     </select>
 
     <select id="findByFileId" resultType="com.fdkankan.scene.entity.SceneProPO">
@@ -169,17 +168,17 @@
         FROM t_scene_pro t
         LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
         WHERE ext.data_source LIKE CONCAT('%',#{fileId},'%')
-        AND t.rec_status = 'A'
+        AND t.tb_status = 0
         order by t.create_time desc
         LIMIT 1
     </select>
 
     <select id="findTempScenes" resultType="com.fdkankan.scene.entity.ScenePro">
         SELECT
-        t.id, t.scene_code
+        t.id, t.num
         FROM t_scene_pro t
         LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
-        WHERE t.rec_status = 'A'
+        WHERE t.tb_status = 0
         and ext.pay_status = -2
         and (DATEDIFF(t.update_time,NOW()) <![CDATA[ <= ]]> -365)
     </select>
@@ -193,7 +192,7 @@
             FROM t_scene_pro t
             LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
             WHERE t.user_id = #{userId} AND ext.camera_type = #{cameraType}
-            AND t.rec_status = 'A' AND t.scene_status in (1, -2) AND t.scene_type != 99
+            AND t.tb_status = 0 AND t.scene_status in (1, -2) AND t.scene_type != 99
         </if>
         <if test= 'userId != null and cameraId != null'>
             UNION
@@ -203,7 +202,7 @@
             FROM t_scene_pro t
             LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
             WHERE t.camera_id = #{cameraId}
-            AND t.scene_status in (1, -2) AND t.scene_type != 99 AND t.rec_status = 'A'
+            AND t.scene_status in (1, -2) AND t.scene_type != 99 AND t.tb_status = 0
         </if>
         <if test= 'sceneCodeList != null and sceneCodeList.size() > 0'>
             UNION
@@ -213,12 +212,12 @@
             FROM t_scene_pro t
             LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
             WHERE t.scene_status in (1, -2)
-            AND  t.scene_code IN
+            AND  t.num IN
             <foreach collection="sceneCodeList" item="sceneCode" open="(" close=")" separator=",">
                 #{sceneCode}
             </foreach>
         </if>
-         ) a WHERE rec_status = 'A'
+         ) a WHERE tb_status = 0
         <if test= 'sceneType != null'>
            AND scene_type = #{sceneType}
         </if>
@@ -236,7 +235,7 @@
         <include refid="SceneProExt_column"/>
         from t_scene_pro t
         LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
-        where t.rec_status = 'A' and t.camera_id = #{cameraId}
+        where t.tb_status = 0 and t.camera_id = #{cameraId}
         order by t.create_time desc
         limit 1
     </select>
@@ -247,7 +246,7 @@
         <include refid="SceneProExt_column"/>
         from t_scene_pro t
         LEFT JOIN t_scene_pro_ext ext ON t.id = ext.scene_pro_id
-        where t.scene_code = #{sceneCode}
+        where t.num = #{sceneCode}
         limit 1
     </select>
 

4dkankan-center-scene/src/main/resources/mapper/test/SceneEditInfoMapper.xml

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