场景保存、获取场景详情删除floorPlanPaths

修改字段floorLogoUploadFile musicUploadFile

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/request/RequestUserIncrement.java

@@ -1,9 +1,8 @@
 package com.fdkankan.platform.user.request;
 
 import com.fdkankan.common.request.RequestBase;
-import lombok.Data;
-
 import java.util.Date;
+import lombok.Data;
 
 @Data
 public class RequestUserIncrement extends RequestBase {

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/impl/UserIncrementServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.platform.user.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -169,7 +170,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         Page<ResponseUserIncrement> pageVo = new Page<>(param.getPageNum(), param.getPageSize());
 
         List<Long> cameraIdList = null;
-        if(StringUtils.isNotEmpty(param.getSnCode().trim())){
+        if(StrUtil.isNotEmpty(param.getSnCode()) && StrUtil.isNotEmpty(param.getSnCode().trim())){
             List<Camera> cameraEntityList = cameraService.getCameraLikeSnCode(param.getSnCode().trim());
             if(cameraEntityList == null || cameraEntityList.size()<=0){
                 return pageVo;

4dkankan-center-scene/src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java

@@ -41,7 +41,7 @@ public class SceneJsonBean {
     /**
      * 地面logo文件名称
      */
-    private String floorLogoUploadFile;
+    private String floorLogoFile;
 
     /**
      * 背景音乐名称
@@ -51,7 +51,7 @@ public class SceneJsonBean {
     /**
      * 背景音乐文件名称
      */
-    private String musicUploadFile;
+    private String musicFile;
 
     /**
      * 浏览密码
@@ -90,10 +90,10 @@ public class SceneJsonBean {
      */
     private Integer version;
 
-    /**
-     * 户型图文件路径集合
-     */
-    private String[] floorPlanPaths;
+//    /**
+//     * 户型图文件路径集合
+//     */
+//    private String[] floorPlanPaths;
 
     /**
      * 是否上传了户型图（0-否，1-是）

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

@@ -12,9 +12,13 @@ import com.fdkankan.common.user.SSOUser;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.platform.api.feign.PlatformGoodsClient;
 import com.fdkankan.platform.api.vo.Camera;
+import com.fdkankan.scene.entity.Folder;
 import com.fdkankan.scene.entity.SceneCooperation;
+import com.fdkankan.scene.entity.ScenePro;
+import com.fdkankan.scene.service.IFolderService;
 import com.fdkankan.scene.service.ISceneCooperationService;
 import com.fdkankan.scene.vo.SceneCooperationParamVO;
+import com.fdkankan.scene.vo.SceneParamVO;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -43,6 +47,8 @@ public class SceneCooperationController extends BaseController {
     private SSOLoginHelper ssoLoginHelper;
     @Autowired
     private ISceneCooperationService sceneCooperationService;
+    @Autowired
+    private IFolderService folderService;
 
     /**
      * 协作者根据场景码获取场景资源集合
@@ -65,12 +71,11 @@ public class SceneCooperationController extends BaseController {
         return sceneCooperationService.sceneResourceBySceneNum(param);
     }
 
-//    /**
-//     * 协作的场景
-//     * @return
-//     */
-//    @ApiOperation("协作的场景--文件夹形式")
-//    @RequestMapping(value = "/cooperationSceneListNew", method = RequestMethod.POST)
+    /**
+     * 协作的场景--文件夹形式
+     * @return
+     */
+    @RequestMapping(value = "/cooperationSceneListNew", method = RequestMethod.POST)
 //    @ApiImplicitParams({
 //        @ApiImplicitParam(name = "pageNum", value = "分页", dataType = "number"),
 //        @ApiImplicitParam(name = "sceneSource", value = "1表示八目，2双目", dataType = "number"),
@@ -79,130 +84,11 @@ public class SceneCooperationController extends BaseController {
 //        @ApiImplicitParam(name = "startTime", value = "开始时间", dataType = "String"),
 //        @ApiImplicitParam(name = "endTime", value = "结束时间", dataType = "String"),
 //        @ApiImplicitParam(name = "pageSize", value = "每页大小", dataType = "number")})
-//    public Result cooperationSceneListNew(@RequestBody RequestScene param) throws Exception{
-//        SSOUser ssoUser = SSOLoginHelper.loginCheck(getToken());
-//
-//        //查询该用户所有的协作场景
-//        Condition condition = new Condition(SceneCooperationEntity.class);
-//        condition.and().andEqualTo("userId", ssoUser.getId());
-//        condition.orderBy("id").desc();
-//        List<SceneCooperationEntity> list = sceneCooperationService.findAll(condition, "create_time desc");
-//
-//        //获取所有协作场景的场景码集合
-//        List<String> sceneNumList = new ArrayList<>();
-//        for(SceneCooperationEntity cooperationEntity: list){
-//            sceneNumList.add(cooperationEntity.getSceneNum());
-//        }
-//
-//        List<Object> result = new ArrayList<>();
-//        List<SceneProEntity> sceneEntityList = new ArrayList<>();
-//        List<FolderEntity> folderEntityList = new ArrayList<>();
-//
-//        if(sceneNumList.size() <= 0){
-//            result.addAll(folderService.convert(folderEntityList));
-//            PageInfo<Object> data = PageInfoUtils.list2PageInfo(result, param.getPageNum(), param.getPageSize());
-//            return Result.success(data);
-//        }
-//
-//        //根目录时，需要排除已经归类的场景
-//        if(ObjectUtils.isEmpty(param.getFolderId())){
-//            Condition sceneCondition = new Condition(SceneProEntity.class);
-//            sceneCondition.and().andNotEqualTo("sceneSource", "11").andIn("num", sceneNumList);
-//            if(!ObjectUtils.isEmpty(param.getSceneSource())){
-//                if(param.getSceneSource().contains(",")){
-//                    sceneCondition.and().andIn("sceneSource", Arrays.asList(param.getSceneSource().split(",")));
-//                }else{
-//                    sceneCondition.and().andEqualTo("sceneSource", param.getSceneSource());
-//                }
-//            }
-//            if(!StringUtil.isNotEmpty(param.getSceneType())){
-//                sceneCondition.and().andEqualTo("sceneType", param.getSceneType());
-//            }
-//            if(!ObjectUtils.isEmpty(param.getStartTime())){
-//                sceneCondition.and().andGreaterThanOrEqualTo("createTime", param.getStartTime());
-//            }
-//            if(!ObjectUtils.isEmpty(param.getEndTime())){
-//                sceneCondition.and().andLessThanOrEqualTo("createTime", param.getEndTime());
-//            }
-//            sceneEntityList = sceneProService.findAll(sceneCondition, "create_time desc");
-//
-//        }else {
-//            //获取文件夹数量
-//            condition = new Condition(FolderEntity.class);
-//            condition.and().andEqualTo("userId", ssoUser.getId()).andEqualTo("parentId", param.getFolderId());
-//            folderEntityList = folderService.findAll(condition, "create_time desc");
-//            //没有协作场景，直接放回文件夹的列表
-//            if(sceneNumList.size() <= 0){
-//                result.addAll(folderService.convert(folderEntityList));
-//                PageInfo<Object> data = PageInfoUtils.list2PageInfo(result, param.getPageNum(), param.getPageSize());
-//                return Result.success(data);
-//            }
-//
-//            //进入目录层级后，根据目录获取当前目录的所有场景
-//            Condition folderSceneCondition = new Condition(FolderSceneEntity.class);
-//            folderSceneCondition.and().andEqualTo("folderId", param.getFolderId());
-//
-//            List<Long> sceneIdList = new ArrayList<>();
-//
-//            List<FolderSceneEntity> folderSceneList = folderSceneService.findAll(folderSceneCondition, "create_time desc");
-//            if(folderSceneList != null && folderSceneList.size() > 0){
-//                for (FolderSceneEntity folderSceneEntity : folderSceneList) {
-//                    sceneIdList.add(folderSceneEntity.getSceneId());
-//                }
-//            }
-//
-//            if(sceneIdList.size() > 0){
-//                Condition sceneCondition = new Condition(SceneProEntity.class);
-//                sceneCondition.and().andIn("id", sceneIdList)
-//                    .andNotEqualTo("sceneSource", "11").andIn("num", sceneNumList);
-//
-//                if(param.getSceneSource() != null){
-//                    if(param.getSceneSource().contains(",")){
-//                        sceneCondition.and().andIn("sceneSource", Arrays.asList(param.getSceneSource().split(",")));
-//                    }else{
-//                        sceneCondition.and().andEqualTo("sceneSource", param.getSceneSource());
-//                    }
-//                }
-//                if(StringUtil.isNotEmpty(param.getSceneType())){
-//                    sceneCondition.and().andEqualTo("sceneType", param.getSceneType());
-//                }
-//                if(param.getStartTime() != null){
-//                    sceneCondition.and().andGreaterThanOrEqualTo("createTime", param.getStartTime());
-//                }
-//                if(param.getEndTime() != null){
-//                    sceneCondition.and().andLessThanOrEqualTo("createTime", param.getEndTime());
-//                }
-//                sceneEntityList = sceneProService.findAll(sceneCondition, "create_time desc");
-//            }
-//        }
-//        List<ResponseScene> responseScenes = sceneService.convertPro(sceneEntityList);
-//
-//        if(ObjectUtils.isEmpty(param.getSceneSource())&& StringUtil.isEmpty(param.getSceneType()) &&
-//            param.getStartTime() == null && param.getEndTime() == null){
-//
-//            result.addAll(folderService.convert(folderEntityList));
-//        }
-//
-//        result.addAll(responseScenes);
-//
-//        PageInfo<Object> data = PageInfoUtils.list2PageInfo(result, param.getPageNum(), param.getPageSize());
-//        data.getList().parallelStream().filter(object -> object instanceof ResponseScene).forEach(object -> {
-//            ResponseScene responseScene = (ResponseScene) object;
-//            if (responseScene.getCameraId() != null) {
-//                CameraEntity cameraEntity = goodsService.findCameraById(responseScene.getCameraId());
-//                if (cameraEntity != null) {
-//                    responseScene.setChildName(cameraEntity.getChildName());
-//                    responseScene.setSnCode(cameraEntity.getSnCode());
-//                }
-//            }
-//            // 获取VrThumb
-//            SceneProEditEntity editEntity = sceneProEditService.findByProId(responseScene.getId());
-//            if (!ObjectUtils.isEmpty(editEntity)) {
-//                responseScene.setVrNum(editEntity.getVrNum());
-//            }
-//        });
-//        return Result.success(data);
-//    }
+    public Page cooperationSceneListNew(@RequestBody SceneParamVO param) throws Exception{
+        long userId = this.getUserId();
+        param.setUserId(userId);
+        return sceneCooperationService.cooperationSceneListNew(param);
+    }
 
 
     @PostMapping("/test")

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

@@ -47,7 +47,7 @@ public class SceneEditInfo implements Serializable {
      * 地面logo文件名称
      */
     @TableField("floor_logo_upload_file")
-    private String floorLogoUploadFile;
+    private String floorLogoFile;
 
     /**
      * 背景音乐名称
@@ -59,7 +59,7 @@ public class SceneEditInfo implements Serializable {
      * 背景音乐文件名称
      */
     @TableField("music_upload_file")
-    private String musicUploadFile;
+    private String musicFile;
 
     /**
      * 浏览密码

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

@@ -1,7 +1,9 @@
 package com.fdkankan.scene.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.scene.entity.SceneCooperation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.scene.vo.SceneParamVO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -15,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ISceneCooperationMapper extends BaseMapper<SceneCooperation> {
 
+    Page selectCooperationSceneListNew(SceneParamVO param);
+
 }

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

@@ -1,11 +1,14 @@
 package com.fdkankan.scene.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.entity.SceneCooperation;
 import com.fdkankan.scene.vo.SceneCooperationParamVO;
 
+import com.fdkankan.scene.vo.SceneParamVO;
 import java.util.List;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -26,4 +29,6 @@ public interface ISceneCooperationService extends IService<SceneCooperation> {
     ResultData sceneResourceBySceneNum(SceneCooperationParamVO param) throws Exception;
 
     List<SceneCooperation> getListByUserId(List<Long> userIds);
+
+    Page cooperationSceneListNew(SceneParamVO param) throws Exception;
 }

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

@@ -4,13 +4,16 @@ import cn.hutool.core.collection.CollUtil;
 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.user.SSOLoginHelper;
+import com.fdkankan.common.user.SSOUser;
 import com.fdkankan.platform.api.feign.PlatformGoodsClient;
 import com.fdkankan.platform.api.vo.Camera;
+import com.fdkankan.scene.entity.Folder;
 import com.fdkankan.scene.entity.SceneCooperation;
 import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.mapper.ISceneCooperationMapper;
@@ -18,12 +21,18 @@ import com.fdkankan.scene.service.ISceneCooperationService;
 import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.service.ISceneResourceService;
 import com.fdkankan.scene.vo.SceneCooperationParamVO;
+import com.fdkankan.scene.vo.SceneParamVO;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Calendar;
 import java.util.List;
 import java.util.Objects;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -103,4 +112,136 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
         queryWrapper.in(SceneCooperation::getUserId,userIds);
         return this.list(queryWrapper);
     }
+
+    @Override
+    public Page cooperationSceneListNew(SceneParamVO param) throws Exception{
+
+        //查询该用户所有的协作场景
+        List<SceneCooperation> list = this.list(
+            new LambdaQueryWrapper<SceneCooperation>()
+                .select(SceneCooperation::getNum)
+                .eq(SceneCooperation::getUserId, param.getUserId())
+                .orderByDesc(SceneCooperation::getId));
+        if(CollUtil.isEmpty(list)){
+            return new Page(param.getPageNum(), param.getPageSize());
+        }
+
+
+        //获取所有协作场景的场景码集合
+        List<String> sceneNumList = new ArrayList<>();
+        for(SceneCooperation cooperation: list){
+            if(Objects.isNull(cooperation.getNum())){
+                continue;
+            }
+            sceneNumList.add(cooperation.getNum());
+        }
+
+        if(sceneNumList.size() <= 0){
+            return new Page(param.getPageNum(), param.getPageSize());
+        }
+
+        List<Object> result = new ArrayList<>();
+        List<ScenePro> sceneEntityList = new ArrayList<>();
+        List<Folder> folderEntityList = new ArrayList<>();
+
+
+        //根目录时，需要排除已经归类的场景
+//        if(ObjectUtils.isEmpty(param.getFolderId())){
+//            param.setNumList(sceneNumList);
+//            if(Objects.nonNull(param.getSceneSource())){
+//                List<Integer> sceneSourceList = Arrays.asList(param.getSceneSource().split(","))
+//                    .parallelStream().map(source -> {
+//                        return Integer.parseInt(source);
+//                    }).collect(Collectors.toList());
+//                param.setSceneSourceList(sceneSourceList);
+//            }
+//            if(!StringUtil.isNotEmpty(param.getSceneType())){
+//                sceneCondition.and().andEqualTo("sceneType", param.getSceneType());
+//            }
+//            if(!ObjectUtils.isEmpty(param.getStartTime())){
+//                sceneCondition.and().andGreaterThanOrEqualTo("createTime", param.getStartTime());
+//            }
+//            if(!ObjectUtils.isEmpty(param.getEndTime())){
+//                sceneCondition.and().andLessThanOrEqualTo("createTime", param.getEndTime());
+//            }
+//            sceneEntityList = sceneProService.findAll(sceneCondition, "create_time desc");
+//
+//        }else {
+//            //获取文件夹数量
+//            condition = new Condition(FolderEntity.class);
+//            condition.and().andEqualTo("userId", ssoUser.getId()).andEqualTo("parentId", param.getFolderId());
+//            folderEntityList = folderService.findAll(condition, "create_time desc");
+//            //没有协作场景，直接放回文件夹的列表
+//            if(sceneNumList.size() <= 0){
+//                result.addAll(folderService.convert(folderEntityList));
+//                PageInfo<Object> data = PageInfoUtils.list2PageInfo(result, param.getPageNum(), param.getPageSize());
+//                return Result.success(data);
+//            }
+//
+//            //进入目录层级后，根据目录获取当前目录的所有场景
+//            Condition folderSceneCondition = new Condition(FolderSceneEntity.class);
+//            folderSceneCondition.and().andEqualTo("folderId", param.getFolderId());
+//
+//            List<Long> sceneIdList = new ArrayList<>();
+//
+//            List<FolderSceneEntity> folderSceneList = folderSceneService.findAll(folderSceneCondition, "create_time desc");
+//            if(folderSceneList != null && folderSceneList.size() > 0){
+//                for (FolderSceneEntity folderSceneEntity : folderSceneList) {
+//                    sceneIdList.add(folderSceneEntity.getSceneId());
+//                }
+//            }
+//
+//            if(sceneIdList.size() > 0){
+//                Condition sceneCondition = new Condition(SceneProEntity.class);
+//                sceneCondition.and().andIn("id", sceneIdList)
+//                    .andNotEqualTo("sceneSource", "11").andIn("num", sceneNumList);
+//
+//                if(param.getSceneSource() != null){
+//                    if(param.getSceneSource().contains(",")){
+//                        sceneCondition.and().andIn("sceneSource", Arrays.asList(param.getSceneSource().split(",")));
+//                    }else{
+//                        sceneCondition.and().andEqualTo("sceneSource", param.getSceneSource());
+//                    }
+//                }
+//                if(StringUtil.isNotEmpty(param.getSceneType())){
+//                    sceneCondition.and().andEqualTo("sceneType", param.getSceneType());
+//                }
+//                if(param.getStartTime() != null){
+//                    sceneCondition.and().andGreaterThanOrEqualTo("createTime", param.getStartTime());
+//                }
+//                if(param.getEndTime() != null){
+//                    sceneCondition.and().andLessThanOrEqualTo("createTime", param.getEndTime());
+//                }
+//                sceneEntityList = sceneProService.findAll(sceneCondition, "create_time desc");
+//            }
+//        }
+//        List<ResponseScene> responseScenes = sceneService.convertPro(sceneEntityList);
+//
+//        if(ObjectUtils.isEmpty(param.getSceneSource())&& StringUtil.isEmpty(param.getSceneType()) &&
+//            param.getStartTime() == null && param.getEndTime() == null){
+//
+//            result.addAll(folderService.convert(folderEntityList));
+//        }
+//
+//        result.addAll(responseScenes);
+//
+//        PageInfo<Object> data = PageInfoUtils.list2PageInfo(result, param.getPageNum(), param.getPageSize());
+//        data.getList().parallelStream().filter(object -> object instanceof ResponseScene).forEach(object -> {
+//            ResponseScene responseScene = (ResponseScene) object;
+//            if (responseScene.getCameraId() != null) {
+//                CameraEntity cameraEntity = goodsService.findCameraById(responseScene.getCameraId());
+//                if (cameraEntity != null) {
+//                    responseScene.setChildName(cameraEntity.getChildName());
+//                    responseScene.setSnCode(cameraEntity.getSnCode());
+//                }
+//            }
+//            // 获取VrThumb
+//            SceneProEditEntity editEntity = sceneProEditService.findByProId(responseScene.getId());
+//            if (!ObjectUtils.isEmpty(editEntity)) {
+//                responseScene.setVrNum(editEntity.getVrNum());
+//            }
+//        });
+//        return Result.success(data);
+        return null;
+    }
 }

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

@@ -176,9 +176,9 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         SceneEditControlsVO sceneEditControlsVO = BeanUtil.copyProperties(sceneEditControls, SceneEditControlsVO.class);
         sceneJson.setControls(sceneEditControlsVO);
         sceneJson.setNum(sceneNum);
-        if(StrUtil.isNotEmpty(sceneEditInfo.getFloorPlanPath())){
-            sceneJson.setFloorPlanPaths(sceneEditInfo.getFloorPlanPath().split(","));
-        }
+//        if(StrUtil.isNotEmpty(sceneEditInfo.getFloorPlanPath())){
+//            sceneJson.setFloorPlanPaths(sceneEditInfo.getFloorPlanPath().split(","));
+//        }
         sceneJson.setCreateTime(scenePro.getCreateTime());
 
         sceneJson.setSceneResolution(sceneProExt.getSceneResolution());
@@ -325,9 +325,9 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         sceneInfoVO.setControls(BeanUtil.copyProperties(sceneEditControls, SceneEditControlsVO.class));
         sceneInfoVO.setNum(num);
         //生成sceneJson
-        if(StrUtil.isNotEmpty(sceneEditInfo.getFloorPlanPath())){
-            sceneInfoVO.setFloorPlanPaths(sceneEditInfo.getFloorPlanPath().split(","));
-        }
+//        if(StrUtil.isNotEmpty(sceneEditInfo.getFloorPlanPath())){
+//            sceneInfoVO.setFloorPlanPaths(sceneEditInfo.getFloorPlanPath().split(","));
+//        }
         sceneInfoVO.setCreateTime(scenePro.getCreateTime());
 
         sceneInfoVO.setSceneResolution(sceneProExt.getSceneResolution());
@@ -410,19 +410,19 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         String floors = fileInfoJson.getString("floors");
         String cadInfo = fileInfoJson.getString("cadInfo");
         String floorJsonData = fileInfoJson.getString("floorJsonData");
-        String filePaths = fileInfoJson.getString("filePaths");
+//        String filePaths = fileInfoJson.getString("filePaths");
 //        Byte reSet = fileInfoJson.getByte("reset");
 
         //户型图文件路径
-        if(StrUtil.isNotEmpty(filePaths)){
-            cn.hutool.json.JSONArray filePathsArrs = JSONUtil.parseArray(filePaths);
-            List<String> filePathsList = filePathsArrs.toList(String.class);
-            StringBuilder filePathBuilder = new StringBuilder();
-            filePathsList.parallelStream().forEach(path -> {
-                filePathBuilder.append(",").append(path);
-            });
-            filePathStr = filePathBuilder.substring(1);
-        }
+//        if(StrUtil.isNotEmpty(filePaths)){
+//            cn.hutool.json.JSONArray filePathsArrs = JSONUtil.parseArray(filePaths);
+//            List<String> filePathsList = filePathsArrs.toList(String.class);
+//            StringBuilder filePathBuilder = new StringBuilder();
+//            filePathsList.parallelStream().forEach(path -> {
+//                filePathBuilder.append(",").append(path);
+//            });
+//            filePathStr = filePathBuilder.substring(1);
+//        }
 
         //处理户型图数据
         if(StrUtil.isNotEmpty(floors)) {

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

@@ -0,0 +1,249 @@
+package com.fdkankan.scene.vo;
+
+import java.math.BigInteger;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/3/7
+ **/
+@Data
+public class CooperationSceneVO {
+
+    private Long id;
+
+    private String name;
+
+    /**
+     * 文件夹类型，0我的场景，1协作场景
+     */
+    private Integer type;
+
+    private Long parentId;
+
+    private Date createTime;
+
+    private String createTimeStr;
+
+    private Integer sceneNum;
+
+    private Integer isFolder;
+
+    private String img;
+
+    private String thumb;
+
+    private String sceneKey;
+
+    private String sceneName;
+
+    private String sceneDec;
+
+    private int sceneType;
+
+    private int thumbImg;
+
+    private int version;
+
+    private String markerLogo;
+
+    private String floorLogo;
+
+    private int floorLogoSize;
+
+    private String entry;
+
+    private int shootCount;
+
+    private int status;
+
+    private int sceneIndex;
+
+    private String hasBGM;
+
+    private int cameraType;
+
+    private int isPublic;
+
+    private String gps;
+
+    private String childName;
+
+    private String userName;
+
+    private String nickName;
+
+    private int viewCount;
+
+    private String webSite;
+
+    private String dataSource;
+
+    private int payStatus;
+
+    private String phoneId;
+
+    private String num;
+
+    private int recommend;
+
+    private int thumbStatus;
+
+    private String hotsIds;
+
+    private String initialPointId;
+
+    private int style;
+
+    private int sceneScheme;
+
+    private String bgMusic;
+
+    private Long userId;
+
+    private Long cameraId;
+
+    private BigInteger space;
+
+    private Long createDate;
+
+    private String shareLogo;
+
+    private int mapVisi;
+
+    private int tourVisi;
+
+    private int vrVisi;
+
+
+    /**
+     * 普通录屏文件地址
+     */
+    private String screencapVoiceSrc;
+
+    /**
+     * 录音文件地址
+     */
+    private String screencapVoiceSound;
+
+    /**
+     * 同步录音文件地址
+     */
+    private String screencapVoiceSoundsync;
+
+    /**
+     * 选择的类型，sound为screencapVoiceSound，file为screencapVoiceSrc
+     */
+    private String screencapVoiceType;
+
+    /**
+     * 录屏文件地址
+     */
+    private String playData;
+
+
+    /**
+     * 重新建模的版本
+     */
+    private int floorEditVer;
+
+    /**
+     * 正式发布重新建模的版本
+     */
+    private int floorPublishVer;
+
+    /**
+     * 录屏图片
+     */
+    private String screencapThumb;
+
+    /**
+     * cad平面图参数
+     */
+    private String cadInfo;
+
+    /**
+     * cad平面图参数
+     */
+    private String floorPlanPng;
+
+    /**
+     * 展示页面是否显示标尺
+     */
+    private int rulerVisi;
+
+    /**
+     * 展示页面cad图在平面图是否显示
+     */
+    private int cadImgVisi;
+
+    private int panoVisi;
+
+    private int m2dVisi;
+
+    private int m3dVisi;
+
+    private int measureVisi;
+
+    private String videos;
+
+    private String snCode;
+
+    private String overlay;
+
+    private Integer showLogoBottom;
+
+    private String recStatus;
+
+    private Integer needKey;
+
+    private String buildType;
+
+    private Integer imagesVersion;
+
+    private String bgMusicName;
+
+    /**
+     * 协作者用户id
+     */
+    private String cooperationUserId;
+
+    private String cooperationUserName;
+
+    private Integer sceneSource;
+
+    private boolean jumpScene;
+
+    /**
+     * 服务器的服务商
+     */
+    private String ecs;
+
+    /**
+     * 场景来源方式，为app提供，0相机，1用户，2协作者
+     */
+    private Integer sceneSourceType;
+
+    /**
+     * 随心装场景码
+     */
+    private String vrNum;
+
+    /**
+     * 随心装场景码
+     */
+    private String vrThumb;
+
+    /**
+     * 旋转角度
+     */
+    private String floorPlanAngle;
+
+    private String videosUser;
+
+}

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

@@ -1,6 +1,6 @@
 package com.fdkankan.scene.vo;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.common.request.RequestBase;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SceneCooperationParamVO {
+public class SceneCooperationParamVO extends RequestBase {
 
     private Long id;
 
@@ -26,4 +26,5 @@ public class SceneCooperationParamVO {
     private String resourceIds;
 
     private Long cameraId;
+
 }

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

@@ -41,7 +41,7 @@ public class SceneEditInfoParamVO {
     /**
      * 地面logo文件名称
      */
-    private String floorLogoUploadFile;
+    private String floorLogoFile;
 
     /**
      * 背景音乐名称
@@ -51,7 +51,7 @@ public class SceneEditInfoParamVO {
     /**
      * 背景音乐文件名称
      */
-    private String musicUploadFile;
+    private String musicFile;
 
     /**
      * 浏览密码
@@ -73,7 +73,6 @@ public class SceneEditInfoParamVO {
      */
     private String loadingLogo;
 
-
     private SceneEditControlsParamVO controls;
 
 

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

@@ -32,7 +32,7 @@ public class SceneEditInfoVO implements Serializable {
     /**
      * 地面logo文件名称
      */
-    private String floorLogoUploadFile;
+    private String floorLogoFile;
 
     /**
      * 背景音乐名称
@@ -42,7 +42,7 @@ public class SceneEditInfoVO implements Serializable {
     /**
      * 背景音乐文件名称
      */
-    private String musicUploadFile;
+    private String musicFile;
 
     /**
      * 浏览密码

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

@@ -40,7 +40,7 @@ public class SceneInfoVO {
     /**
      * 地面logo文件名称
      */
-    private String floorLogoUploadFile;
+    private String floorLogoFile;
 
     /**
      * 背景音乐
@@ -50,7 +50,7 @@ public class SceneInfoVO {
     /**
      * 背景音乐文件名称
      */
-    private String musicUploadFile;
+    private String musicFile;
 
     /**
      * 浏览密码
@@ -90,11 +90,6 @@ public class SceneInfoVO {
     private Integer version;
 
     /**
-     * 户型图文件路径集合
-     */
-    private String[] floorPlanPaths;
-
-    /**
      * 是否上传了户型图（0-否，1-是）
      */
     private Byte floorPlanUser;
@@ -143,7 +138,4 @@ public class SceneInfoVO {
     private String loadingLogo;
 
 
-
-
-
 }

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

@@ -1,11 +1,10 @@
 package com.fdkankan.scene.vo;
 
 import com.fdkankan.common.request.RequestBase;
-import lombok.Data;
-
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import lombok.Data;
 
 @Data
 public class SceneParamVO extends RequestBase implements Serializable {
@@ -147,7 +146,9 @@ public class SceneParamVO extends RequestBase implements Serializable {
 
     private Integer folderType;
 
-    private Integer sceneSource;
+    private String sceneSource;
+
+    private List<Integer> sceneSourceList;
 
     private Date startTime;
 

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

@@ -2,4 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.scene.mapper.ISceneCooperationMapper">
 
+  <select id="selectCooperationSceneListNew" parameterType="com.fdkankan.scene.vo.SceneParamVO" resultType="com.fdkankan.scene.vo.CooperationSceneVO">
+    select * from
+    t_scene_pro p
+    left join t_scene_pro_ext px on p.id = px.scene_pro_id
+    where px.scene_source != 11
+    and num in
+    <foreach collection="numList" item="num" open="(" close=")" separator=",">
+      #{num}
+    </foreach>
+
+
+
+
+
+  </select>
+
+
 </mapper>

4dkankan-common/src/main/java/com/fdkankan/common/response/BaseResponseAdvice.java

@@ -41,7 +41,6 @@ public class BaseResponseAdvice implements ResponseBodyAdvice<Object> {
             return new PageInfo(page.getCurrent(), page.getSize(), page.getTotal(), page.getRecords());
 
         }
-
         if (body instanceof ResultData) {
             return body;
         } else {