同步 V3 获取看看，看见，深时场景列表

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

@@ -4,11 +4,12 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.RecStatus;
-import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.constant.TbStatus;
+import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.DateExtUtil;
 import com.fdkankan.scene.entity.Folder;
@@ -17,12 +18,9 @@ import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.mapper.IFolderMapper;
 import com.fdkankan.scene.service.IFolderSceneService;
 import com.fdkankan.scene.service.IFolderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.vo.FolderParamVO;
 import com.fdkankan.scene.vo.FolderVO;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.exception.BusinessException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -219,6 +217,9 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
         }else{
             wrapper.eq(Folder::getParentId, param.getParentId());
         }
+        if(param.getType() !=null){
+            wrapper.eq(Folder::getFolderType,param.getType());
+        }
         long count = this.count(wrapper);
         if(count > 0){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5030);

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

@@ -17,6 +17,7 @@ import com.fdkankan.scene.entity.*;
 import com.fdkankan.scene.mapper.ISceneCooperationMapper;
 import com.fdkankan.scene.mapper.ISceneProMapper;
 import com.fdkankan.scene.service.*;
+import com.fdkankan.scene.util.ParamConvertUtil;
 import com.fdkankan.scene.vo.SceneCooperationParamVO;
 import com.fdkankan.scene.vo.SceneParamVO;
 import com.fdkankan.scene.vo.SceneVO;
@@ -150,6 +151,9 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
         List<SceneProPO> sceneList = new ArrayList<>();
         List<Folder> folderList = new ArrayList<>();
 
+        if(StringUtil.isNotBlank(param.getSceneSource())){
+            param.setSceneSourceList(ParamConvertUtil.getSceneSource(param.getSceneSource()));
+        }
 
         //根目录时，需要排除已经归类的场景
         if(ObjectUtils.isEmpty(param.getFolderId())){

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

@@ -26,6 +26,7 @@ import com.fdkankan.scene.api.dto.SceneProDTO;
 import com.fdkankan.scene.entity.*;
 import com.fdkankan.scene.mapper.ISceneProMapper;
 import com.fdkankan.scene.service.*;
+import com.fdkankan.scene.util.ParamConvertUtil;
 import com.fdkankan.scene.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -455,10 +456,7 @@ public class UserSceneServiceImpl implements IUserSceneService {
             }
 
             if(StrUtil.isNotBlank(param.getSceneSource())){
-                param.setSceneSourceList(
-                    Arrays.stream(param.getSceneSource().split(","))
-                        .map(source->Integer.parseInt(source))
-                        .collect(Collectors.toList()));
+                param.setSceneSourceList(ParamConvertUtil.getSceneSource(param.getSceneSource()));
             }
 
             if(searchCamera){
@@ -477,6 +475,9 @@ public class UserSceneServiceImpl implements IUserSceneService {
             List<Long> sceneIdList = folderSceneService
                 .getSceneIdListByFolderId(param.getFolderId());
 
+            if(StrUtil.isNotBlank(param.getSceneSource())){
+                param.setSceneSourceList(ParamConvertUtil.getSceneSource(param.getSceneSource()));
+            }
             if(CollUtil.isNotEmpty(sceneIdList)){
                 param.setSceneIdList(sceneIdList);
                 if(searchCamera){

4dkankan-center-scene/src/main/java/com/fdkankan/scene/util/ParamConvertUtil.java

@@ -0,0 +1,24 @@
+package com.fdkankan.scene.util;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class ParamConvertUtil {
+
+    public static List<String> getSceneSource(String sceneSource){
+        List<String> sceneSourceList ;
+        switch (sceneSource){
+            case "1" : sceneSourceList = Arrays.asList("1","2","12","13","14"); break;  //四维看看
+            case "3" : sceneSourceList = Collections.singletonList("3"); break;//四维看见
+            default:
+                if(sceneSource.contains(",")){
+                    sceneSource = sceneSource + ",12,13,14";
+                    sceneSourceList = Arrays.asList(sceneSource.split(","));
+                    break;
+                }
+                sceneSourceList = Collections.singletonList(sceneSource);break;
+        }
+        return sceneSourceList;
+    }
+}

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

@@ -148,7 +148,7 @@ public class SceneParamVO extends RequestBase implements Serializable {
 
     private String sceneSource;
 
-    private List<Integer> sceneSourceList;
+    private List<String> sceneSourceList;
 
     private Date startTime;